Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/.version.in (from rev 16612, freeswitch/trunk/.version.in) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/.version.in	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/.version.in	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1 @@
+@SWITCH_VERSION_REVISION@

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/build/Makefile.am (from rev 16612, freeswitch/trunk/build/Makefile.am) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/build/Makefile.am	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/build/Makefile.am	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,68 @@
+MK=`echo $(MAKE) | $(AWK) '{printf "%5s\n", $$0}' `
+
+all:
+	@echo " +---------- FreeSWITCH Build Complete ----------+"
+	@echo " + FreeSWITCH has been successfully built.       +"
+	@echo " + Install by running:                           +"
+	@echo " +                                               +"
+	@echo " +               $(MK) install                   +"
+	@echo " +-----------------------------------------------+"
+
+install:
+	@echo " +---------- FreeSWITCH install Complete ----------+"
+	@echo " + FreeSWITCH has been successfully installed.     +"
+	@echo " +                                                 +"
+	@echo " +       Install sounds:                           +"
+	@echo " +       (uhd-sounds includes hd-sounds, sounds)   +"
+	@echo " +       (hd-sounds includes sounds)               +"
+	@echo " +       ------------------------------------      +"
+	@echo " +               $(MK) cd-sounds-install           +"
+	@echo " +               $(MK) cd-moh-install              +"
+	@echo " +                                                 +"
+	@echo " +               $(MK) uhd-sounds-install          +"
+	@echo " +               $(MK) uhd-moh-install             +"
+	@echo " +                                                 +"
+	@echo " +               $(MK) hd-sounds-install           +"
+	@echo " +               $(MK) hd-moh-install              +"
+	@echo " +                                                 +"
+	@echo " +               $(MK) sounds-install              +"
+	@echo " +               $(MK) moh-install                 +"
+	@echo " +                                                 +"
+	@echo " +       Install non english sounds:               +"
+	@echo " +       replace XX with language                  +"
+	@echo " +       (ru : Russian)                            +"
+	@echo " +       ------------------------------------      +"
+	@echo " +               $(MK) cd-sounds-XX-install        +"
+	@echo " +               $(MK) uhd-sounds-XX-install       +"
+	@echo " +               $(MK) hd-sounds-XX-install        +"
+	@echo " +               $(MK) sounds-XX-install           +"
+	@echo " +                                                 +"
+	@echo " +       Upgrade to latest:                        +"
+	@echo " +       ----------------------------------        +"
+	@echo " +               $(MK) current                     +"
+	@echo " +                                                 +"
+	@echo " +       Rebuild all:                              +"
+	@echo " +       ----------------------------------        +"
+	@echo " +               $(MK) sure                        +"
+	@echo " +                                                 +"
+	@echo " +       Install/Re-install default config:        +"
+	@echo " +       ----------------------------------        +"
+	@echo " +               $(MK) samples                     +"
+	@echo " +                                                 +"
+	@echo " +                                                 +"
+	@echo " +       Additional resources:                     +"
+	@echo " +       ----------------------------------        +"
+	@echo " +       http://www.freeswitch.org                 +"
+	@echo " +       http://wiki.freeswitch.org                +"
+	@echo " +       http://jira.freeswitch.org                +"
+	@echo " +       http://lists.freeswitch.org               +"
+	@echo " +                                                 +"
+	@echo " +       irc.freenode.net / #freeswitch            +"
+	@echo " +                                                 +"
+	@echo " +-------------------------------------------------+"
+
+
+
+.PHONY: check dvi html info install-data \
+        install-dvi install-exec install-html install-info install-pdf install-ps installcheck installdirs pdf \
+        ps uninstall mostlyclean clean distclean maintainer-clean

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/build/buildmrcpserver.sh (from rev 16612, freeswitch/trunk/build/buildmrcpserver.sh) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/build/buildmrcpserver.sh	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/build/buildmrcpserver.sh	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,6 @@
+#!/bin/sh
+base=`pwd`
+cd libs/unimrcp
+./configure --with-pocketsphinx=$base/libs/pocketsphinx-0.5.99 --with-sphinxbase=$base/libs/sphinxbase-0.4.99 --with-flite=$base/libs/flite-1.3.99 --with-apr=$base/libs/apr --with-apr-util=$base/libs/apr-util --with-sofia-sip=$base/libs/sofia-sip --prefix=/usr/local/unimrcpserver --enable-pocketsphinx-plugin --enable-flite-plugin --disable-demosynth-plugin --disable-demorecog-plugin --disable-recorder-plugin --disable-cepstral-plugin
+make
+make install

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/build/config/sched_setaffinity.m4 (from rev 16612, freeswitch/trunk/build/config/sched_setaffinity.m4) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/build/config/sched_setaffinity.m4	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/build/config/sched_setaffinity.m4	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,19 @@
+AC_DEFUN([AX_HAVE_CPU_SET], [
+#
+# Check for the Linux functions for controlling processor affinity.
+#
+# LINUX: sched_setaffinity
+AC_CHECK_FUNCS(sched_setaffinity sched_getaffinity)
+	if test "$ac_cv_func_sched_setaffinity" = "yes" ; then
+        AC_CACHE_CHECK([whether the CPU_SET and CPU_ZERO macros are defined],
+        ac_cv_cpu_set_defined,[
+	saved_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS $SWITCH_AM_CFLAGS $SWITCH_ANSI_CFLAGS -D_GNU_SOURCE"
+        AC_TRY_COMPILE( [#include <sched.h>],[ cpu_set_t t; CPU_ZERO(&t); CPU_SET(1,&t); ],
+	        ac_cv_cpu_set_defined=yes,ac_cv_cpu_set_defined=no)])
+        if test "$ac_cv_cpu_set_defined" = "yes" ; then
+        	AC_DEFINE(HAVE_CPU_SET_MACROS,1,[Define if CPU_SET and CPU_ZERO defined])
+        fi
+	CFLAGS="$saved_CFLAGS"
+	fi
+])

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/build/config.layout (from rev 16612, freeswitch/trunk/build/config.layout) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/build/config.layout	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/build/config.layout	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,66 @@
+##
+##  config.layout -- Pre-defined Installation Path Layouts
+##
+##  Hints:
+##  - layouts can be loaded with configure's --enable-layout=ID option
+##  - when no --enable-layout option is given, the default layout is `FreeSWITCH'
+##  - a trailing plus character (`+') on paths is replaced with a 
+##    `/<target>' suffix where <target> is currently hardcoded to 'freeswitch'.
+##    (This may become a configurable parameter at some point.)
+##
+
+#   Default FreeSWITCH path layout.
+<Layout FreeSWITCH>
+    prefix:         /usr/local/freeswitch
+    exec_prefix:    ${prefix}
+    bindir:         ${exec_prefix}/bin
+    sbindir:        ${exec_prefix}/bin
+    libdir:         ${exec_prefix}/lib
+    libexecdir:     ${exec_prefix}/modules
+    modulesdir:     ${exec_prefix}/modules
+    mandir:         ${prefix}/man
+    sysconfdir:     ${prefix}/conf
+    datadir:        ${prefix}
+    includedir:     ${prefix}/include
+    localstatedir:  ${prefix}
+    runtimedir:     ${localstatedir}/log
+    logfiledir:     ${localstatedir}/log
+</Layout>
+
+#   GNU standards conforming path layout.
+#   See FSF's GNU project `make-stds' document for details.
+<Layout GNU>
+    prefix:         /usr/local
+    exec_prefix:    ${prefix}
+    bindir:         ${exec_prefix}/bin
+    sbindir:        ${exec_prefix}/sbin
+    libdir:         ${exec_prefix}/lib
+    libexecdir:     ${exec_prefix}/libexec
+    modulesdir:     ${libdir}/freeswitch/modules
+    mandir:         ${prefix}/man
+    sysconfdir:     ${prefix}/etc/freeswitch
+    datadir:        ${prefix}/share/freeswitch
+    includedir:     ${prefix}/include/freeswitch
+    localstatedir:  ${prefix}/var/freeswitch
+    runtimedir:     ${localstatedir}/run
+    logfiledir:     ${localstatedir}/log
+</Layout>
+
+# Linux FHS (File Hierarchy Standard) layout
+# see 
+<Layout FHS>
+    prefix:         /usr
+    exec_prefix:    ${prefix}
+    bindir:         ${exec_prefix}/bin
+    sbindir:        ${exec_prefix}/sbin
+    libdir:         ${exec_prefix}/lib/freeswitch
+    libexecdir:     ${exec_prefix}/libexec
+    modulesdir:     ${libdir}/modules
+    mandir:         ${prefix}/man
+    sysconfdir:     /etc/freeswitch
+    datadir:        ${prefix}/share/freeswitch
+    includedir:     ${prefix}/include/freeswitch
+    localstatedir:  /var/lib/freeswitch
+    runtimedir:     /var/run/freeswitch
+    logfiledir:     /var/log/freeswitch
+</Layout>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/build/freeswitch.pc.in (from rev 16612, freeswitch/trunk/build/freeswitch.pc.in) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/build/freeswitch.pc.in	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/build/freeswitch.pc.in	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,23 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+libexecdir=@libexecdir@
+includedir=@includedir@
+modulesdir=@modulesdir@
+runtimedir=@runtimedir@
+logfiledir=@logfiledir@
+sysconfdir=@sysconfdir@
+dbdir=@dbdir@
+htdocsdir=@htdocsdir@
+localstatedir=@localstatedir@
+grammardir=@grammardir@
+soundsdir=@soundsdir@
+scriptdir=@scriptdir@
+recordingsdir=@recordingsdir@
+bindir=@bindir@
+
+Name: freeswitch
+Version: @PACKAGE_VERSION@
+Description: FreeSWITCH open source telephony platform
+Libs: -L${libdir} -lfreeswitch
+Cflags: -I${includedir}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/build/modmake.rulesam (from rev 16612, freeswitch/trunk/build/modmake.rulesam) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/build/modmake.rulesam	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/build/modmake.rulesam	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,19 @@
+AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
+AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
+AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS)
+#we should set all these vars from configure, no reason to have these in each Makefile.am
+LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \
+then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool;  fi`
+AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s`
+# Dirty trick to override the link output
+LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi
+
+moddir=@modulesdir@
+
+all-modules: all
+depend-modules: depend
+clean-modules: clean
+install-modules: install
+uninstall-modules: uninstall
+distclean-modules: distclean
+extraclean-modules: extraclean

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/conf/autoload_configs/erlang_event.conf.xml (from rev 16612, freeswitch/trunk/conf/autoload_configs/erlang_event.conf.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/conf/autoload_configs/erlang_event.conf.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/conf/autoload_configs/erlang_event.conf.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,14 @@
+<configuration name="erlang_event.conf" description="Erlang Socket Client">
+  <settings>
+    <param name="listen-ip" value="0.0.0.0"/>
+    <param name="listen-port" value="8031"/>
+    <param name="cookie" value="ClueCon"/>
+    <param name="shortname" value="true"/>
+    <!-- in additon to cookie, optionally restrict by ACL -->
+    <!--<param name="apply-inbound-acl" value="lan"/>-->
+    <!-- alternative is "binary" -->
+    <!--<param name="encoding" value="string"/>--> 
+    <!-- provide compatability with previous OTP release (use with care) -->
+    <!--<param name="compat-rel" value="12"/> -->
+  </settings>
+</configuration>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/conf/ivr_menus (from rev 16612, freeswitch/trunk/conf/ivr_menus)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/conf/ivr_menus/demo_ivr.xml (from rev 16612, freeswitch/trunk/conf/ivr_menus/demo_ivr.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/conf/ivr_menus/demo_ivr.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/conf/ivr_menus/demo_ivr.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,64 @@
+<include>
+  <!-- demo IVR setup -->
+  <!-- demo IVR, Main Menu -->
+  <menu name="demo_ivr"
+      greet-long="phrase:demo_ivr_main_menu"
+      greet-short="phrase:demo_ivr_main_menu_short"
+      invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav"
+      exit-sound="voicemail/vm-goodbye.wav"
+      confirm-macro=""
+      confirm-key=""
+      tts-engine="flite"
+      tts-voice="rms"
+      confirm-attempts="3"
+      timeout="10000"
+      inter-digit-timeout="2000"
+      max-failures="3"
+      max-timeouts="3"
+      digit-len="4">
+
+    <!-- The following are the definitions for the digits the user dials -->
+    <!-- Digit 1 transfer caller to the public FreeSWITCH conference -->
+    <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888@conference.freeswitch.org"/>
+    <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>    <!-- FS echo -->
+    <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>    <!-- MOH -->
+    <entry action="menu-exec-app" digits="4" param="transfer 9991 XML default"/>    <!-- ClueCon -->
+    <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>       <!-- Screaming monkeys -->
+    <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>                  <!-- demo sub menu -->
+    <!-- Using a regex in the digits tag lets you define a dial pattern for the caller
+         You may define multiple regexes if you need a different pattern for some reason -->
+    <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML features"/> 
+    <entry action="menu-top" digits="9"/>          <!-- Repeat this menu -->
+  </menu>
+
+  <!-- Demo IVR, Sub Menu -->
+  <menu name="demo_ivr_submenu"
+      greet-long="phrase:demo_ivr_sub_menu"
+      greet-short="phrase:demo_ivr_sub_menu_short"
+      invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav"
+      exit-sound="voicemail/vm-goodbye.wav"
+      timeout="15000"
+      max-failures="3"
+      max-timeouts="3">
+
+    <!-- The demo IVR sub menu prompt basically just says, "press star to return to previous menu..." -->
+    <entry action="menu-top" digits="*"/>
+   </menu>
+
+
+<!-- TTS sample; non-functional but it demonstrates say: and TTS -->
+<!--
+  <menu name="demo3"
+      greet-long="say:Press 1 to join the conference, Press 2 to join the other conference"
+      greet-short="say:Press 1 to join the conference, Press 2 to join the other conference"
+      invalid-sound="say:invalid extension"
+      exit-sound="say:exit sound"
+      timeout ="15000"
+      max-failures="3">
+    <entry action="menu-exit" digits="*"/>
+    <entry action="menu-playback" digits="1" param="say:You pressed 1"/>
+    <entry action="menu-exec-app" digits="2" param="transfert 1000 XML default"/>
+    <entry action="menu-exec-app" digits="3" param="transfert 1001 XML default"/>
+  </menu>
+-->
+</include>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc (from rev 16612, freeswitch/trunk/contrib/diegoviola/ruby/misc)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc/bridge.rb (from rev 16612, freeswitch/trunk/contrib/diegoviola/ruby/misc/bridge.rb) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc/bridge.rb	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc/bridge.rb	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'sinatra'
+require 'fsr'
+
+FSR.load_all_commands
+
+get '/' do
+  "Phone number: <form action=\"/originate\" method=\"post\"><input type=\"text\" name=\"phone_number\"><input type=\"submit\"></form>"
+end
+
+post '/originate' do
+  sock = FSR::CommandSocket.new
+  sock.originate(:target => "sofia/gateway/flowroute/#{params[:phone_number]}", :endpoint => FSR::App::Conference.new("3030", "default")).run
+  redirect '/'
+end

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc/presence.rb (from rev 16612, freeswitch/trunk/contrib/diegoviola/ruby/misc/presence.rb) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc/presence.rb	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/diegoviola/ruby/misc/presence.rb	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'fsr'
+require "fsr/listener/inbound"
+
+def presence_handler(event)
+  FSR::Log.info "From: #{event.content[:from]} - #{event.content[:status]}"
+end
+
+# Event hooks for presence.
+FSL::Inbound.add_event_hook(:PRESENCE_IN) {|event| presence_handler(event) }
+FSL::Inbound.add_event_hook(:PRESENCE_OUT) {|event| presence_handler(event) }
+
+FSR.start_ies!(FSL::Inbound, :host => "localhost", :port => 8021)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.project (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/.project) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.project	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.project	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.freeswitch.esl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.settings (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/.settings)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.settings/org.maven.ide.eclipse.prefs (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/.settings/org.maven.ide.eclipse.prefs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.settings/org.maven.ide.eclipse.prefs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/.settings/org.maven.ide.eclipse.prefs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,9 @@
+#Sat Dec 12 17:33:34 EST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.classpath (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.classpath) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.classpath	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.classpath	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.project (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.project) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.project	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.project	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.freeswitch.esl.client.netty</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,13 @@
+#Sun Jan 03 23:33:57 EST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,9 @@
+#Sat Dec 12 17:44:54 EST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/TODO.txt (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/TODO.txt) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/TODO.txt	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/TODO.txt	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,29 @@
+
+As at 2010.01.03
+
+Features still to be implemented
+ * More testing of the outbound socket client template code
+ * Implement Send event command
+ * Testing of SendMsg command 
+ * Refactor the api of the inbound client into the abstract handler so it is also available in outbound handlers as well
+ * Per event(s) listener
+ * Provide XML event handling - not sure if this is useful since the raw event is not exposed, although it could be if needed.
+ * Implement 'myevent' event subscription for inbound - not a priority here, easy if required.
+ * Provide timeout protection on the client.sendSyncApiCommand().  It will currently block for ever if get no response from server.
+ * Working examples in an example project (started).
+ * Add OSGi example 
+ * Chase down the apparent issue with Netty when using executor in pipeline (wierd).
+  
+Distribution
+ * Basic usage docs
+ * Package jar, javadocs, source and dependencies (slf4j, netty) for people to trial without having to build.
+ * Find out how (if ok) to put binary distribution on files.freeswitch.org
+ * Cut a release, look at usage of tags in FS svn repo.
+ 
+Quality items
+ * Ask FS dev team for any ESL event generation test strategies/suites.
+ * Are all message header names in the enum ?
+ * Improve Javadoc coverage
+ * Add cross references to the FS wiki in the Javadocs .. eg list of api commands and events.
+ * Add unit test coverage
+ * Investigate availability of FS JIRA for issue tracking

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/pom.xml (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/pom.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/pom.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/pom.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.freeswitch.esl.client</groupId>
+    <artifactId>esl-client-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.freeswitch.esl.client</artifactId>
+  <name>FreeSWITCH Event Socket Library - Java Client</name>
+  <packaging>bundle</packaging>
+  <build>
+  
+    <plugins>
+    
+      <!--  this plugin will create the target jar as a correct OSGi bundle  -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.0.1</version>
+        <extensions>true</extensions>
+        <configuration>
+          <unpackBundle>true</unpackBundle>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Version>${project.version}</Bundle-Version>
+            <Bundle-DocURL>http://www.freeswitch.org</Bundle-DocURL>
+            <Import-Package>*</Import-Package>
+            <Export-Package>
+              org.freeswitch.esl.client,
+              org.freeswitch.esl.client.transport.event,
+              org.freeswitch.esl.client.transport.message,
+            </Export-Package>
+            <!--  the debug package is a temporary hack  -->
+            <Private-Package>
+              org.freeswitch.esl.client.internal,
+              org.freeswitch.esl.client.debug
+            </Private-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes> 
+            <exclude>**/ClientTest.java</exclude>            
+            <exclude>**/SocketClientTest.java</exclude>            
+          </excludes>
+        </configuration>
+      </plugin>
+      
+    </plugins>
+    
+  </build>
+  <dependencies>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.5.10</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+      <version>3.1.5.GA</version>
+    </dependency>
+    
+    <!--  test dependencies -->
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.7</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.18</version>
+      <scope>test</scope>
+    </dependency>
+    
+  </dependencies>
+  
+  <repositories>
+    <!--  for netty dependency -->
+    <repository>
+      <id>repository.jboss.org</id>
+      <url>http://repository.jboss.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+   
+</project>
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client;
+
+import org.freeswitch.esl.client.transport.event.EslEvent;
+
+/**
+ * Interface for observers wanting to be notified of incoming FreeSWITCH Event Socket events.
+ * </p>
+ * Incoming events arrive asynchronously and are processed into two queues, one for server 
+ * initiated events, and one for the results of client requested background jobs.
+ * </p>  
+ * Each queue is serviced by a different thread pool (to ensure lowest latency for event-driven events) 
+ * and each queue is guaranteed to be processed (and listeners notified) in the order in which the
+ * events are received off the wire.
+ * </p>
+ * This design ensures that incoming event processing is not blocked by any long-running listener process.
+ * However multiple listeners will be notified sequentially, and so one slow listener can cause latency
+ * to other listeners.
+ *   
+ * @author  david varnes
+ * @version $Id$
+ */
+public interface IEslEventListener
+{
+    /**
+     * Signal of a server initiated event.
+     * 
+     * @param event as an {@link EslEvent} 
+     */
+    void eventReceived( EslEvent event );
+    
+    /**
+     * Signal of an event containing the result of a client requested background job.  The Job-UUID will
+     * be available as an event header of that name.
+     * 
+     * @param event as an {@link EslEvent}
+     */
+    void backgroundJobResultReceived( EslEvent event );
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,491 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.inbound;
+
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.freeswitch.esl.client.IEslEventListener;
+import org.freeswitch.esl.client.internal.IEslProtocolListener;
+import org.freeswitch.esl.client.transport.CommandResponse;
+import org.freeswitch.esl.client.transport.SendMsg;
+import org.freeswitch.esl.client.transport.event.EslEvent;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Entry point to connect to a running FreeSWITCH Event Socket Library module, as a client.
+ * </p>
+ * This class provides what the FreeSWITCH documentation refers to as an 'Inbound' connection
+ * to the Event Socket module. That is, with reference to the socket listening on the FreeSWITCH
+ * server, this client occurs as an inbound connection to the server.
+ * </p>
+ * See http://wiki.freeswitch.org/wiki/Mod_event_socket
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class Client
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+    
+    private final List<IEslEventListener> eventListeners = new CopyOnWriteArrayList<IEslEventListener>();
+    private final Executor eventListenerExecutor = Executors.newSingleThreadExecutor( 
+        new ThreadFactory()
+        {
+            AtomicInteger threadNumber = new AtomicInteger( 1 );
+            public Thread newThread( Runnable r )
+            {
+                return new Thread( r, "EslEventNotifier-" + threadNumber.getAndIncrement() );
+            }
+        });
+    private final Executor backgroundJobListenerExecutor = Executors.newSingleThreadExecutor( 
+        new ThreadFactory()
+        {
+            AtomicInteger threadNumber = new AtomicInteger( 1 );
+            public Thread newThread( Runnable r )
+            {
+                return new Thread( r, "EslBackgroundJobNotifier-" + threadNumber.getAndIncrement() );
+            }
+        });
+    
+    private AtomicBoolean authenticatorResponded = new AtomicBoolean( false );
+    private boolean authenticated;
+    private CommandResponse authenticationResponse;
+    private Channel channel;
+    
+    public boolean canSend()
+    {
+        return channel != null && channel.isConnected() && authenticated; 
+    }
+    
+    public void addEventListener( IEslEventListener listener )
+    {
+        if ( listener != null )
+        {
+            eventListeners.add( listener );
+        }
+    }
+
+    /**
+     * Attempt to establish an authenticated connection to the nominated FreeSWITCH ESL server socket.
+     * This call will block, waiting for an authentication handshake to occur, or timeout after the
+     * supplied number of seconds.  
+     *  
+     * @param host can be either ip address or hostname
+     * @param port tcp port that server socket is listening on (set in event_socket_conf.xml)
+     * @param password server event socket is expecting (set in event_socket_conf.xml) 
+     * @param timeoutSeconds number of seconds to wait for the server socket before aborting
+     */
+    public void connect( String host, int port, String password, int timeoutSeconds ) throws InboundConnectionFailure
+    {
+        // If already connected, disconnect first
+        if ( canSend() )
+        {
+            close();
+        }
+        
+        // Configure this client
+        ClientBootstrap bootstrap = new ClientBootstrap(
+            new NioClientSocketChannelFactory( 
+                Executors.newCachedThreadPool(), 
+                Executors.newCachedThreadPool() ) ); 
+        
+        // Add ESL handler and factory
+        InboundClientHandler handler = new InboundClientHandler( password, protocolListener );
+        bootstrap.setPipelineFactory( new InboundPipelineFactory( handler ) );
+        
+        // Attempt connection
+        ChannelFuture future = bootstrap.connect( new InetSocketAddress( host, port ) );
+        
+        // Wait till attempt succeeds, fails or timeouts
+        if ( ! future.awaitUninterruptibly( timeoutSeconds, TimeUnit.SECONDS ) )
+        {
+            throw new InboundConnectionFailure( "Timeout connecting to " + host + ":" + port );
+        }
+        // Did not timeout 
+        channel = future.getChannel();
+        // But may have failed anyway
+        if ( !future.isSuccess() )
+        {
+            log.warn( "Failed to connect to [{}:{}]", host, port );
+            log.warn( "  * reason: {}", future.getCause() );
+            
+            channel = null;
+            bootstrap.releaseExternalResources();
+            
+            throw new InboundConnectionFailure( "Could not connect to " + host + ":" + port, future.getCause() );
+        }
+        
+        //  Wait for the authentication handshake to call back
+        while ( ! authenticatorResponded.get() )
+        {
+            try
+            {
+                Thread.sleep( 250 );
+            } 
+            catch ( InterruptedException e )
+            {
+                // ignore
+            }
+        }
+        
+        if ( ! authenticated )
+        {
+            throw new InboundConnectionFailure( "Authentication failed: " + authenticationResponse.getReplyText() );
+        }
+    }
+    
+    /**
+     * Sends a FreeSWITCH API command to the server and blocks, waiting for an immediate response from the 
+     * server.
+     * <p/>
+     * The outcome of the command from the server is retured in an {@link EslMessage} object.
+     * 
+     * @param command API command to send
+     * @param arg command arguments
+     * @return an {@link EslMessage} containing command results
+     */
+    public EslMessage sendSyncApiCommand( String command, String arg )
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        StringBuilder sb = new StringBuilder();
+        if ( command != null && !command.isEmpty() )
+        {
+            sb.append( "api " );
+            sb.append( command );
+        }
+        if ( arg != null && !arg.isEmpty() )
+        {
+            sb.append( ' ' );
+            sb.append( arg );
+        }
+
+        return handler.sendSyncSingleLineCommand( channel, sb.toString() );
+    }
+    
+    /**
+     * Submit a FreeSWITCH API command to the server to be executed in background mode. A synchronous 
+     * response from the server provides a UUID to identify the job execution results. When the server
+     * has completed the job execution it fires a BACKGROUND_JOB Event with the execution results.<p/>
+     * Note that this Client must be subscribed in the normal way to BACKGOUND_JOB Events, in order to 
+     * receive this event.
+     *     
+     * @param command API command to send
+     * @param arg command arguments
+     * @return String Job-UUID that the server will tag result event with.
+     */
+    public String sendAsyncApiCommand( String command, String arg )
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        StringBuilder sb = new StringBuilder();
+        if ( command != null && !command.isEmpty() )
+        {
+            sb.append( "bgapi " );
+            sb.append( command );
+        }
+        if ( arg != null && !arg.isEmpty() )
+        {
+            sb.append( ' ' );
+            sb.append( arg );
+        }
+        
+        return handler.sendAsyncCommand( channel, sb.toString() );
+    }
+    
+    /**
+     * Set the current event subscription for this connection to the server.  Examples of the events 
+     * argument are:
+     * <pre>
+     *   ALL
+     *   CHANNEL_CREATE CHANNEL_DESTROY HEARTBEAT
+     *   CUSTOM conference::maintenance
+     *   CHANNEL_CREATE CHANNEL_DESTROY CUSTOM conference::maintenance sofia::register sofia::expire
+     * </pre> 
+     * Subsequent calls to this method replaces any previous subscriptions that were set.
+     * </p>
+     * Note: current implementation can only process 'plain' events.
+     * 
+     * @param format can be { plain | xml }
+     * @param events { all | space separated list of events } 
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse setEventSubscriptions( String format, String events )
+    {
+        // temporary hack
+        if ( ! format.equals( "plain" ) )
+        {
+            throw new IllegalStateException( "Only 'plain' event format is supported at present" );
+        }
+        
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        StringBuilder sb = new StringBuilder();
+        if ( format != null && !format.isEmpty() )
+        {
+            sb.append( "event " );
+            sb.append( format );
+        }
+        if ( events != null && !events.isEmpty() )
+        {
+            sb.append( ' ' );
+            sb.append( events );
+        }
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, sb.toString() );
+
+        return new CommandResponse( sb.toString(), response );
+    }
+    
+    /**
+     * Cancel any existing event subscription.
+     * 
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse cancelEventSubscriptions()
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, "noevents" );
+
+        return new CommandResponse( "noevents", response );
+    }
+
+    /**
+     * Add an event filter to the current set of event filters on this connection. Any of the event headers
+     * can be used as a filter.
+     * </p>
+     * Note that event filters follow 'filter-in' semantics. That is, when a filter is applied
+     * only the filtered values will be received. Multiple filters can be added to the current
+     * connection.
+     * </p>
+     * Example filters:
+     * <pre>
+     *    eventHeader        valueToFilter
+     *    ----------------------------------
+     *    Event-Name         CHANNEL_EXECUTE
+     *    Channel-State      CS_NEW
+     * </pre>
+     * 
+     * @param eventHeader to filter on
+     * @param valueToFilter the value to match
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse addEventFilter( String eventHeader, String valueToFilter )
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        StringBuilder sb = new StringBuilder();
+        if ( eventHeader != null && !eventHeader.isEmpty() )
+        {
+            sb.append( "filter " );
+            sb.append( eventHeader );
+        }
+        if ( valueToFilter != null && !valueToFilter.isEmpty() )
+        {
+            sb.append( ' ' );
+            sb.append( valueToFilter );
+        }
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, sb.toString() );
+        
+        return new CommandResponse( sb.toString(), response );
+    }
+    
+    /**
+     * Delete an event filter from the current set of event filters on this connection.  See  
+     * {@link Client.addEventFilter}   
+     * 
+     * @param eventHeader   to remove
+     * @param valueToFilter to remove
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse deleteEventFilter( String eventHeader, String valueToFilter )
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        StringBuilder sb = new StringBuilder();
+        if ( eventHeader != null && !eventHeader.isEmpty() )
+        {
+            sb.append( "filter delete " );
+            sb.append( eventHeader );
+        }
+        if ( valueToFilter != null && !valueToFilter.isEmpty() )
+        {
+            sb.append( ' ' );
+            sb.append( valueToFilter );
+        }
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, sb.toString() );
+
+        return new CommandResponse( sb.toString(), response );
+    }
+
+    /**
+     * Send a {@link SendMsg} command to FreeSWITCH.  This client requires that the {@link SendMsg}
+     * has a call UUID parameter.
+     *  
+     * @param sendMsg a {@link SendMsg} with call UUID
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse sendMessage( SendMsg sendMsg )
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        EslMessage response = handler.sendSyncMultiLineCommand( channel, sendMsg.getMsgLines() );
+        
+        return new CommandResponse( sendMsg.toString(), response );
+    }
+    
+    /**
+     * Enable log output.
+     * 
+     * @param level using the same values as in console.conf
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse setLoggingLevel( String level )
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        StringBuilder sb = new StringBuilder();
+        if ( level != null && !level.isEmpty() )
+        {
+            sb.append( "log " );
+            sb.append( level );
+        }
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, sb.toString() );
+
+        return new CommandResponse( sb.toString(), response );
+    }
+
+    /**
+     * Disable any logging previously enabled with setLogLevel().
+     * 
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse cancelLogging()
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, "nolog" );
+
+        return new CommandResponse( "nolog", response );
+    }
+
+    /**
+     * Close the socket connection
+     * 
+     * @return a {@link CommandResponse} with the server's response.
+     */
+    public CommandResponse close()
+    {
+        checkConnected();
+        InboundClientHandler handler = (InboundClientHandler)channel.getPipeline().getLast();
+        EslMessage response = handler.sendSyncSingleLineCommand( channel, "exit" );
+
+        return new CommandResponse( "exit", response );
+    }
+    
+    /*
+     *  Internal observer of the ESL protocol 
+     */
+    private final IEslProtocolListener protocolListener = new IEslProtocolListener()
+    {
+        public void authResponseReceived( CommandResponse response )
+        {
+            authenticatorResponded.set( true );
+            authenticated = response.isOk();
+            authenticationResponse = response;
+            log.debug( "Auth response success={}, message=[{}]", authenticated, response.getReplyText() );
+        }
+        
+        public void eventReceived( final EslEvent event )
+        {
+            log.debug( "Event received [{}]", event );
+            /*
+             *  Notify listeners in a different thread in order to:
+             *    - not to block the IO threads with potentially long-running listeners
+             *    - generally be defensive running other people's code
+             *  Use a different worker thread pool for async job results than for event driven
+             *  events to keep the latency as low as possible.
+             */
+            if ( event.getEventName().equals( "BACKGROUND_JOB" ) )
+            {
+                for ( final IEslEventListener listener : eventListeners )
+                {
+                    backgroundJobListenerExecutor.execute( new Runnable()
+                    {
+                        public void run()
+                        {
+                            try
+                            {
+                                listener.backgroundJobResultReceived( event );
+                            }
+                            catch ( Throwable t )
+                            {
+                                log.error( "Error caught notifying listener of job result [" + event + ']', t );
+                            }
+                        }
+                    } );
+                }
+            }
+            else
+            {
+                for ( final IEslEventListener listener : eventListeners )
+                {
+                    eventListenerExecutor.execute( new Runnable()
+                    {
+                        public void run()
+                        {
+                            try
+                            {
+                                listener.eventReceived( event );
+                            }
+                            catch ( Throwable t )
+                            {
+                                log.error( "Error caught notifying listener of event [" + event + ']', t );
+                            }
+                        }
+                    } );
+                }
+            }
+        }
+
+        public void disconnected()
+        {
+            log.info( "Disconnected .." );
+        }
+    };
+    
+    private void checkConnected()
+    {
+        if ( ! canSend() )
+        {
+            throw new IllegalStateException( "Not connected to FreeSWITCH Event Socket" );
+        }
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.inbound;
+
+import org.freeswitch.esl.client.internal.AbstractEslClientHandler;
+import org.freeswitch.esl.client.internal.IEslProtocolListener;
+import org.freeswitch.esl.client.transport.CommandResponse;
+import org.freeswitch.esl.client.transport.event.EslEvent;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Value;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.handler.execution.ExecutionHandler;
+
+/**
+ * End users of the inbound {@link Client} should not need to use this class. 
+ * </p>
+ * Specialised {@link AbstractEslClientHandler} that implements the connection logic for an 
+ * 'Inbound' FreeSWITCH Event Socket connection.  The responsibilities for this class are:
+ * </p>
+ * * To handle the auth request that the FreeSWITCH server will send immediately following a new 
+ * connection when mode is Inbound.
+ * </p>
+ * * To signal the observing {@link IEslProtocolListener} (expected to be the Inbound client 
+ * implementation when ESL events are received.
+ * </p>
+ * Note: implementation requirement is that an {@link ExecutionHandler} is placed in the processing 
+ * pipeline prior to this handler. This will ensure that each incoming message is processed in its
+ * own thread (although still guaranteed to be processed in the order of receipt).
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+@ChannelPipelineCoverage( "one" )
+public class InboundClientHandler extends AbstractEslClientHandler
+{
+    private final String password;
+    private final IEslProtocolListener listener;
+    
+    public InboundClientHandler( String password, IEslProtocolListener listener )
+    {
+        this.password = password;
+        this.listener = listener;
+    }
+    
+    protected void handleEslEvent( ChannelHandlerContext ctx, EslEvent event )
+    {
+        log.debug( "Received event: [{}]", event );
+        listener.eventReceived( event );
+    }
+
+    protected void handleAuthRequest( ChannelHandlerContext ctx )
+    {
+        log.debug( "Auth requested, sending [auth {}]", "*****" );
+        EslMessage response = sendSyncSingleLineCommand( ctx.getChannel(), "auth " + password );
+        log.debug( "Auth response [{}]", response );
+        if ( response.getContentType().equals( Value.COMMAND_REPLY ) )
+        {
+            CommandResponse commandResponse = new CommandResponse( "auth " + password, response );
+            listener.authResponseReceived( commandResponse );
+        }
+        else
+        {
+            log.error( "Bad auth response message [{}]", response );
+            throw new IllegalStateException( "Incorrect auth response" ); 
+        }
+    }
+
+    @Override
+    protected void handleDisconnectionNotice()
+    {
+        log.debug( "Received disconnection notice" );
+        listener.disconnected();
+    }
+    
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.inbound;
+
+/**
+ * Checked exception to handle connection failures.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class InboundConnectionFailure extends Exception
+{
+    private static final long serialVersionUID = 1L;
+
+    public InboundConnectionFailure( String message )
+    {
+        super( message );
+    }
+    
+    public InboundConnectionFailure( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.inbound;
+
+import org.freeswitch.esl.client.internal.debug.ExecutionHandler;
+import org.freeswitch.esl.client.transport.message.EslMessageDecoder;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+
+/**
+ * End users of the {@link Client} should not need to use this class. 
+ * </p>
+ * Convenience factory to assemble a Netty processing pipeline for inbound clients.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class InboundPipelineFactory implements ChannelPipelineFactory
+{
+    private final ChannelHandler handler;
+    
+    private final ChannelBuffer[] delimiters = 
+        new ChannelBuffer[] { ChannelBuffers.wrappedBuffer( new byte[] { '\n' } ),
+                              ChannelBuffers.wrappedBuffer( new byte[] { '\n', '\n' } ) };
+    
+    public InboundPipelineFactory( ChannelHandler handler )
+    {
+        this.handler = handler;
+    }
+    
+    public ChannelPipeline getPipeline() throws Exception
+    {
+        ChannelPipeline pipeline = Channels.pipeline(); 
+        // Add the text line codec combination first
+        pipeline.addLast( "framer", new DelimiterBasedFrameDecoder( 8192, delimiters ) );  
+        pipeline.addLast( "stringDecoder", new StringDecoder() );
+        pipeline.addLast( "encoder", new StringEncoder() );
+        pipeline.addLast( "eslMessageDecoder", new EslMessageDecoder() );
+        // Add an executor to ensure separate thread for each upstream message from here
+        pipeline.addLast( "executor", new ExecutionHandler( 
+            new OrderedMemoryAwareThreadPoolExecutor( 16, 1048576, 1048576 ) ) );
+
+        // now the inbound client logic
+        pipeline.addLast( "clientHandler", handler );
+        
+        return pipeline;
+    }
+
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.internal;
+
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.freeswitch.esl.client.transport.event.EslEvent;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Value;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.execution.ExecutionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Specialised {@link ChannelUpstreamHandler} that implements the logic of an ESL connection that
+ * is common to both inbound and outbound clients. This 
+ * handler expects to receive decoded {@link EslMessage} or {@link EslEvent} objects. The key 
+ * responsibilities for this class are:
+ * </p>
+ * * To synthesise a synchronous command/response api.  All IO operations using the underlying Netty 
+ * library are intrinsically asynchronous which provides for excellent response and scalability.  This 
+ * class provides for a blocking wait mechanism for responses to commands issued to the server.  A 
+ * key assumption here is that the FreeSWITCH server will process synchronous requests in the order they
+ * are received.
+ * </p>
+ * * Concrete sub classes are expected to 'terminate' the Netty IO processing pipeline (ie be the 'last'
+ * handler). 
+ * </p>
+ * Note: implementation requirement is that an {@link ExecutionHandler} is placed in the processing 
+ * pipeline prior to this handler. This will ensure that each incoming message is processed in its
+ * own thread (although still guaranteed to be processed in the order of receipt).
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public abstract class AbstractEslClientHandler extends SimpleChannelUpstreamHandler
+{
+    public static final String MESSAGE_TERMINATOR = "\n\n";  
+    public static final String LINE_TERMINATOR = "\n";  
+
+    protected final Logger log = LoggerFactory.getLogger( this.getClass() );
+
+    private final Lock syncLock = new ReentrantLock();
+    private final Queue<SyncCallback> syncCallbacks = new ConcurrentLinkedQueue<SyncCallback>();
+
+    @Override
+    public void messageReceived( ChannelHandlerContext ctx, MessageEvent e ) throws Exception
+    {
+        if ( e.getMessage() instanceof EslMessage )
+        {
+            EslMessage message = (EslMessage)e.getMessage();
+            String contentType = message.getContentType();
+            if ( contentType.equals( Value.TEXT_EVENT_PLAIN ) ||
+                    contentType.equals( Value.TEXT_EVENT_XML ) )
+            {
+                //  transform into an event
+                EslEvent eslEvent = new EslEvent( message );
+                handleEslEvent( ctx, eslEvent );
+            }
+            else
+            {
+                handleEslMessage( ctx, (EslMessage)e.getMessage() );
+            }
+        }
+        else
+        {
+            throw new IllegalStateException( "Unexpected message type: " + e.getMessage().getClass() );
+        }
+    }
+    
+    /**
+     * Synthesise a synchronous command/response by creating a callback object which is placed in 
+     * queue and blocks waiting for another IO thread to process an incoming {@link EslMessage} and
+     * attach it to the callback.
+     * 
+     * @param channel
+     * @param command single string to send
+     * @return the {@link EslMessage} attached to this command's callback
+     */
+    public EslMessage sendSyncSingleLineCommand( Channel channel, final String command )
+    {
+        SyncCallback callback = new SyncCallback();
+        syncLock.lock();
+        try 
+        {
+            syncCallbacks.add( callback );
+            channel.write( command + MESSAGE_TERMINATOR );
+        } 
+        finally 
+        {
+            syncLock.unlock();
+        }
+        
+        //  Block until the response is available 
+        return callback.get();
+    }
+
+    /**
+     * Synthesise a synchronous command/response by creating a callback object which is placed in 
+     * queue and blocks waiting for another IO thread to process an incoming {@link EslMessage} and
+     * attach it to the callback.
+     * 
+     * @param channel
+     * @param command List of command lines to send
+     * @return the {@link EslMessage} attached to this command's callback
+     */
+    public EslMessage sendSyncMultiLineCommand( Channel channel, final List<String> commandLines )
+    {
+        SyncCallback callback = new SyncCallback();
+        //  Build command with double line terminator at the end
+        StringBuilder sb = new StringBuilder();
+        for ( String line : commandLines )
+        {
+            sb.append( line );
+            sb.append( LINE_TERMINATOR );
+        }
+        sb.append( LINE_TERMINATOR );
+        
+        syncLock.lock();
+        try 
+        {
+            syncCallbacks.add( callback );
+            channel.write( sb.toString() );
+        } 
+        finally 
+        {
+            syncLock.unlock();
+        }
+        
+        //  Block until the response is available 
+        return callback.get();
+    }
+
+    /**
+     * Returns the Job UUID of that the response event will have.
+     * 
+     * @param channel
+     * @param command
+     * @return Job-UUID as a string
+     */
+    public String sendAsyncCommand( Channel channel, final String command )
+    {
+        /*
+         * Send synchronously to get the Job-UUID to return, the results of the actual 
+         * job request will be returned by the server as an async event.
+         */
+        EslMessage response = sendSyncSingleLineCommand( channel, command );
+        if ( response.hasHeader( Name.JOB_UUID ) )
+        {
+            return response.getHeaderValue( Name.JOB_UUID );
+        }
+        else
+        {
+            throw new IllegalStateException( "Missing Job-UUID header in bgapi response" );
+        }
+    }
+    
+    protected void handleEslMessage( ChannelHandlerContext ctx, EslMessage message )
+    {
+        log.info( "Received message: [{}]", message );
+        String contentType = message.getContentType();
+        
+        if ( contentType.equals( Value.API_RESPONSE ) )
+        {
+            log.debug( "Api response received [{}]", message );
+            syncCallbacks.poll().handle( message );
+        }
+        else if ( contentType.equals( Value.COMMAND_REPLY ) )
+        {
+            log.debug( "Command reply received [{}]", message );
+            syncCallbacks.poll().handle( message );
+        }
+        else if ( contentType.equals( Value.AUTH_REQUEST ) )
+        {
+            log.debug( "Auth request received [{}]", message );
+            handleAuthRequest( ctx );
+        }
+        else if ( contentType.equals( Value.TEXT_DISCONNECT_NOTICE ) )
+        {
+            log.debug( "Disconnect notice received [{}]", message );
+            handleDisconnectionNotice();
+        }
+        else
+        {
+            log.warn( "Unexpected message content type [{}]", contentType );
+        }
+    }
+
+    protected abstract void handleEslEvent( ChannelHandlerContext ctx, EslEvent event );
+
+    protected abstract void handleAuthRequest( ChannelHandlerContext ctx );
+
+    protected abstract void handleDisconnectionNotice();
+    
+    private static class SyncCallback
+    {
+        private static final Logger log = LoggerFactory.getLogger( SyncCallback.class );
+        private final CountDownLatch latch = new CountDownLatch( 1 );
+        private EslMessage response;
+
+        /**
+         * Block waiting for the countdown latch to be released, then return the 
+         * associated response object.
+         * @return
+         */
+        EslMessage get()
+        {
+            try
+            {
+                log.trace( "awaiting latch ... " );
+                latch.await();
+            }
+            catch ( InterruptedException e )
+            {
+                throw new RuntimeException( e );
+            }
+            
+            log.trace( "returning response [{}]", response );
+            return response;
+        }
+
+        /**
+         * Attach this response to the callback and release the countdown latch.
+         * @param response
+         */
+        void handle( EslMessage response )
+        {
+            this.response = response;
+            log.trace( "releasing latch for response [{}]", response );
+            latch.countDown();
+        }
+    }
+
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.internal;
+
+/**
+ * This parser provides a static helper method to split a standard Header field
+ * into the name and value parts.
+ * <p/>
+ * This code was copied from the splitHeader() method in the 
+ * <code>org.jboss.netty.handler.codec.http.HttpMessageDecoder</code> class, which
+ * is licensed under the Apache License version 2. Original author: Trustin Lee.
+ *  
+ * @author	 Trustin Lee
+ * @author   david varnes
+ */
+public class HeaderParser
+{
+    /**
+     * Split a header in the form 
+     * <pre>
+     *   Header-Name: Some_header-value
+     * </pre>
+     * into a String array.
+     * 
+     * @param  sb the string header to parse
+     * @return a String[] array with header name at 0 and header value at 1
+     */
+    public static String[] splitHeader(String sb) {
+        final int length = sb.length();
+        int nameStart;
+        int nameEnd;
+        int colonEnd;
+        int valueStart;
+        int valueEnd;
+
+        nameStart = findNonWhitespace(sb, 0);
+        for (nameEnd = nameStart; nameEnd < length; nameEnd ++) {
+            char ch = sb.charAt(nameEnd);
+            if (ch == ':' || Character.isWhitespace(ch)) {
+                break;
+            }
+        }
+
+        for (colonEnd = nameEnd; colonEnd < length; colonEnd ++) {
+            if (sb.charAt(colonEnd) == ':') {
+                colonEnd ++;
+                break;
+            }
+        }
+
+        valueStart = findNonWhitespace(sb, colonEnd);
+        if (valueStart == length) {
+            return new String[] {
+                    sb.substring(nameStart, nameEnd),
+                    ""
+            };
+        }
+
+        valueEnd = findEndOfString(sb);
+        return new String[] {
+                sb.substring(nameStart, nameEnd),
+                sb.substring(valueStart, valueEnd)
+        };
+    }
+
+    private static int findNonWhitespace(String sb, int offset) {
+        int result;
+        for (result = offset; result < sb.length(); result ++) {
+            if (!Character.isWhitespace(sb.charAt(result))) {
+                break;
+            }
+        }
+        return result;
+    }
+
+    private static int findEndOfString(String sb) {
+        int result;
+        for (result = sb.length(); result > 0; result --) {
+            if (!Character.isWhitespace(sb.charAt(result - 1))) {
+                break;
+            }
+        }
+        return result;
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.internal;
+
+import org.freeswitch.esl.client.inbound.Client;
+import org.freeswitch.esl.client.transport.CommandResponse;
+import org.freeswitch.esl.client.transport.event.EslEvent;
+
+/**
+ * End users of the {@link Client} should not need to use this class. 
+ * </p>
+ * Allow client implementations to observe events arriving from the server.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public interface IEslProtocolListener
+{
+    void authResponseReceived( CommandResponse response );
+    
+    void eventReceived( EslEvent event );
+    
+    void disconnected();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,87 @@
+package org.freeswitch.esl.client.internal.debug;
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.util.EstimatableObjectWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * a {@link Runnable} which sends the specified {@link ChannelEvent} upstream.
+ * Most users will not see this type at all because it is used by
+ * {@link Executor} implementors only
+ *
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ *
+ * @version $Rev: 1685 $, $Date: 2009-08-28 16:15:49 +0900 (금, 28 8 2009) $
+ *
+ */
+public class ChannelEventRunnable implements Runnable, EstimatableObjectWrapper {
+    
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+    private final ChannelHandlerContext ctx;
+    private final ChannelEvent e;
+    volatile int estimatedSize;
+
+    /**
+     * Creates a {@link Runnable} which sends the specified {@link ChannelEvent}
+     * upstream via the specified {@link ChannelHandlerContext}.
+     */
+    public ChannelEventRunnable(ChannelHandlerContext ctx, ChannelEvent e) {
+        this.ctx = ctx;
+        this.e = e;
+    }
+
+    /**
+     * Returns the {@link ChannelHandlerContext} which will be used to
+     * send the {@link ChannelEvent} upstream.
+     */
+    public ChannelHandlerContext getContext() {
+        return ctx;
+    }
+
+    /**
+     * Returns the {@link ChannelEvent} which will be sent upstream.
+     */
+    public ChannelEvent getEvent() {
+        return e;
+    }
+
+    /**
+     * Sends the event upstream.
+     */
+    public void run() {
+//        log.info( "Sending [{}] upstream in [{}]", e, ctx );
+        try
+        {
+            ctx.sendUpstream(e);
+        }
+        catch ( Throwable t )
+        {
+            log.error( "Caught -->", t );
+        }
+    }
+
+    public Object unwrap() {
+        return e;
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,118 @@
+package org.freeswitch.esl.client.internal.debug;
+
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+import org.jboss.netty.util.ExternalResourceReleasable;
+import org.jboss.netty.util.internal.ExecutorUtil;
+
+/**
+ * Forwards an upstream {@link ChannelEvent} to an {@link Executor}.
+ * <p>
+ * You can implement various thread model by adding this handler to a
+ * {@link ChannelPipeline}.  The most common use case of this handler is to
+ * add a {@link ExecutionHandler} which was specified with
+ * {@link OrderedMemoryAwareThreadPoolExecutor}:
+ * <pre>
+ * ChannelPipeline pipeline = ...;
+ * pipeline.addLast("decoder", new MyProtocolDecoder());
+ * pipeline.addLast("encoder", new MyProtocolEncoder());
+ *
+ * // HERE
+ * <strong>pipeline.addLast("executor", new {@link ExecutionHandler}(new {@link OrderedMemoryAwareThreadPoolExecutor}(16, 1048576, 1048576)));</strong>
+ *
+ * pipeline.addLast("handler", new MyBusinessLogicHandler());
+ * </pre>
+ * to utilize more processors to handle {@link ChannelEvent}s.  You can also
+ * use other {@link Executor} implementation than the recommended
+ * {@link OrderedMemoryAwareThreadPoolExecutor}.
+ *
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ *
+ * @version $Rev: 1685 $, $Date: 2009-08-28 16:15:49 +0900 (금, 28 8 2009) $
+ *
+ * @apiviz.landmark
+ * @apiviz.has java.util.concurrent.ThreadPoolExecutor
+ */
+@ChannelPipelineCoverage("all")
+public class ExecutionHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler, ExternalResourceReleasable {
+
+    private final Executor executor;
+
+    /**
+     * Creates a new instance with the specified {@link Executor}.
+     * Specify an {@link OrderedMemoryAwareThreadPoolExecutor} if unsure.
+     */
+    public ExecutionHandler(Executor executor) {
+        if (executor == null) {
+            throw new NullPointerException("executor");
+        }
+        this.executor = executor;
+    }
+
+    /**
+     * Returns the {@link Executor} which was specified with the constructor.
+     */
+    public Executor getExecutor() {
+        return executor;
+    }
+
+    /**
+     * Shuts down the {@link Executor} which was specified with the constructor
+     * and wait for its termination.
+     */
+    public void releaseExternalResources() {
+        ExecutorUtil.terminate(getExecutor());
+    }
+
+    public void handleUpstream(
+            ChannelHandlerContext context, ChannelEvent e) throws Exception {
+        executor.execute(new ChannelEventRunnable(context, e));
+    }
+
+    public void handleDownstream(
+            ChannelHandlerContext ctx, ChannelEvent e) throws Exception {
+        if (e instanceof ChannelStateEvent) {
+            ChannelStateEvent cse = (ChannelStateEvent) e;
+            if (cse.getState() == ChannelState.INTEREST_OPS &&
+                (((Integer) cse.getValue()).intValue() & Channel.OP_READ) != 0) {
+
+                // setReadable(true) requested
+                boolean readSuspended = ctx.getAttachment() != null;
+                if (readSuspended) {
+                    // Drop the request silently if MemoryAwareThreadPool has
+                    // set the flag.
+                    e.getFuture().setSuccess();
+                    return;
+                }
+            }
+        }
+
+        ctx.sendDownstream(e);
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.outbound;
+
+import org.freeswitch.esl.client.internal.AbstractEslClientHandler;
+import org.freeswitch.esl.client.transport.event.EslEvent;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.handler.execution.ExecutionHandler;
+
+/**
+ * Specialised {@link AbstractEslClientHandler} that implements the base connecction logic for an 
+ * 'Outbound' FreeSWITCH Event Socket connection.  The responsibilities for this class are:
+ * </p>
+ * * To send a 'connect' command when the FreeSWITCH server first establishes a new connection with
+ * the socket client in Outbound mode.  This will result in an incoming {@link EslMessage} that is
+ * transformed into an {@link EslEvent} that sub classes can handle.
+ * </p>
+ * Note: implementation requirement is that an {@link ExecutionHandler} is placed in the processing 
+ * pipeline prior to this handler. This will ensure that each incoming message is processed in its
+ * own thread (although still guaranteed to be processed in the order of receipt).
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+@ChannelPipelineCoverage( "one" )
+public abstract class AbstractOutboundClientHandler extends AbstractEslClientHandler
+{
+
+    @Override
+    public void channelConnected( ChannelHandlerContext ctx, ChannelStateEvent e ) throws Exception
+    {
+        // Have received a connection from FreeSWITCH server, send connect response
+        log.debug( "Received new connection from server, sending connect message" );
+        
+        EslMessage response = sendSyncSingleLineCommand( ctx.getChannel(), "connect" );
+        // A hack in the message decoder treats most of this incoming message as an event so parse now
+        EslEvent channelDataEvent = new EslEvent( response, true );
+        // Let implementing sub classes choose what to do next
+        handleConnectResponse( ctx, channelDataEvent );
+    }
+
+    protected abstract void handleConnectResponse( ChannelHandlerContext ctx, EslEvent event );
+
+    @Override
+    protected void handleAuthRequest( ChannelHandlerContext ctx )
+    {
+        // This should not happen in outbound mode
+        log.warn( "Auth request received in outbound mode, ignoring" ); 
+    }
+
+    @Override
+    protected void handleDisconnectionNotice()
+    {
+        log.debug( "Received disconnection notice" );
+    }    
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.outbound;
+
+import org.freeswitch.esl.client.internal.debug.ExecutionHandler;
+import org.freeswitch.esl.client.transport.message.EslMessageDecoder;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+
+/**
+ * </p>
+ * An abstract factory to assemble a Netty processing pipeline for outbound clients.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public abstract class AbstractOutboundPipelineFactory implements ChannelPipelineFactory
+{
+    
+    private final ChannelBuffer[] delimiters = 
+        new ChannelBuffer[] { ChannelBuffers.wrappedBuffer( new byte[] { '\n' } ),
+                              ChannelBuffers.wrappedBuffer( new byte[] { '\n', '\n' } ) };
+    
+    public ChannelPipeline getPipeline() throws Exception
+    {
+        ChannelPipeline pipeline = Channels.pipeline(); 
+        // Add the text line codec combination first
+        pipeline.addLast( "framer", new DelimiterBasedFrameDecoder( 8192, delimiters ) );  
+        pipeline.addLast( "stringDecoder", new StringDecoder() );
+        pipeline.addLast( "encoder", new StringEncoder() );
+        pipeline.addLast( "eslMessageDecoder", new EslMessageDecoder( true ) );
+        // Add an executor to ensure separate thread for each upstream message from here
+        pipeline.addLast( "executor", new ExecutionHandler( 
+            new OrderedMemoryAwareThreadPoolExecutor( 16, 1048576, 1048576 ) ) );
+
+        // now the outbound client logic
+        pipeline.addLast( "clientHandler", makeHandler() );
+        
+        return pipeline;
+    }
+
+    protected abstract AbstractOutboundClientHandler makeHandler();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.outbound;
+
+import java.net.InetSocketAddress;
+import java.util.concurrent.Executors;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.group.ChannelGroupFuture;
+import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Entry point to run a socket client that a running FreeSWITCH Event Socket Library module can
+ * make outbound connections to.
+ * </p>
+ * This class provides for what the FreeSWITCH documentation refers to as 'Outbound' connections
+ * from the Event Socket module. That is, with reference to the module running on the FreeSWITCH
+ * server, this client accepts an outbound connection from the server module.
+ * </p>
+ * See http://wiki.freeswitch.org/wiki/Mod_event_socket
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class SocketClient
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+
+    private final ChannelGroup allChannels = new DefaultChannelGroup( "esl-socket-client" );
+    
+    private final int port;
+    private final ChannelFactory channelFactory;
+    private final AbstractOutboundPipelineFactory pipelineFactory;
+    
+    public SocketClient( int port, AbstractOutboundPipelineFactory pipelineFactory )
+    {
+        this.port = port;
+        this.pipelineFactory = pipelineFactory;
+        this.channelFactory =  new NioServerSocketChannelFactory( 
+            Executors.newCachedThreadPool(), 
+            Executors.newCachedThreadPool() ); 
+    }
+    
+    public void start()
+    {
+        ServerBootstrap bootstrap = new ServerBootstrap( channelFactory );
+        
+        bootstrap.setPipelineFactory( pipelineFactory );
+        bootstrap.setOption( "child.tcpNoDelay", true );
+        bootstrap.setOption( "child.keepAlive", true );
+        
+        Channel serverChannel = bootstrap.bind( new InetSocketAddress( port ) );
+        allChannels.add( serverChannel );
+        log.info( "SocketClient waiting for connections on port [{}] ...", port );
+    }
+    
+    public void stop()
+    {
+        ChannelGroupFuture future = allChannels.close();
+        future.awaitUninterruptibly();
+        channelFactory.releaseExternalResources();
+        log.info( "SocketClient stopped" );
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.outbound.example;
+
+import org.freeswitch.esl.client.outbound.AbstractOutboundClientHandler;
+import org.freeswitch.esl.client.transport.SendMsg;
+import org.freeswitch.esl.client.transport.event.EslEvent;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+
+/**
+ * Simple example of a handler for outbound connection from FreeSWITCH server.
+ * This class will log some of the FreeSWTICH call channel variables and 
+ * then hangup the call.  
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class SimpleHangupOutboundHandler extends AbstractOutboundClientHandler
+{
+    
+    @Override
+    protected void handleConnectResponse( ChannelHandlerContext ctx, EslEvent event )
+    {
+        log.info( "Received connect response [{}]", event );
+        if ( event.getEventName().equalsIgnoreCase( "CHANNEL_DATA" ) )
+        {
+            // this is the response to the initial connect 
+            log.info( "=======================  incoming channel data  =============================" );
+            log.info( "Event-Date-Local: [{}]", event.getEventDateLocal() );
+            log.info( "Unique-ID: [{}]", event.getEventHeaders().get( "Unique-ID" ) );
+            log.info( "Channel-ANI: [{}]", event.getEventHeaders().get( "Channel-ANI" ) );
+            log.info( "Answer-State: [{}]", event.getEventHeaders().get( "Answer-State" ) );
+            log.info( "Caller-Destination-Number: [{}]", event.getEventHeaders().get( "Caller-Destination-Number" ) );
+            log.info( "=======================  = = = = = = = = = = =  =============================" );
+            
+            // now hangup the call
+            hangupCall( ctx.getChannel() );
+        }
+        else
+        {
+            throw new IllegalStateException( "Unexpected event after connect: [" + event.getEventName() + ']' );
+        }
+    }
+
+    @Override
+    protected void handleEslEvent( ChannelHandlerContext ctx, EslEvent event )
+    {
+        log.info( "Received event [{}]", event );
+    }
+    
+    private void hangupCall( Channel channel )
+    {
+        SendMsg hangupMsg = new SendMsg();
+        hangupMsg.addCallCommand( "execute" );
+        hangupMsg.addExecuteAppName( "hangup" );
+        
+        EslMessage response = sendSyncMultiLineCommand( channel, hangupMsg.getMsgLines() );
+        
+        if ( response.getHeaderValue( Name.REPLY_TEXT ).startsWith( "+OK" ) )
+        {
+            log.info( "Call hangup successful" );
+        }
+        else
+        {
+            
+        }
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.outbound.example;
+
+import org.freeswitch.esl.client.outbound.AbstractOutboundClientHandler;
+import org.freeswitch.esl.client.outbound.AbstractOutboundPipelineFactory;
+
+/**
+ * Factory for the simple hangup handler
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class SimpleHangupPipelineFactory extends AbstractOutboundPipelineFactory
+{
+
+    @Override
+    protected AbstractOutboundClientHandler makeHandler()
+    {
+        return new SimpleHangupOutboundHandler();
+    }
+
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport;
+
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+
+/**
+ * Result object to carry the results of a command sent to the FreeSWITCH Event Socket.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class CommandResponse
+{
+    private final String command;
+    private final String replyText;
+    private final EslMessage response;
+    private final boolean success;
+    
+    public CommandResponse( String command, EslMessage response )
+    {
+        this.command = command;
+        this.response = response;
+        this.replyText = response.getHeaderValue( Name.REPLY_TEXT );
+        this.success = replyText.startsWith( "+OK" );
+    }
+    
+    /**
+     * @return the original command sent to the server
+     */
+    public String getCommand()
+    {
+        return command;
+    }
+    
+    /**
+     * @return true if and only if the response Reply-Text line starts with "+OK"
+     */
+    public boolean isOk()
+    {
+        return success;
+    }
+    
+    /**
+     * @return the full response Reply-Text line.
+     */
+    public String getReplyText()
+    {
+        return replyText;
+    }
+    
+    /**
+     * @return {@link EslMessage} the full response from the server 
+     */
+    public EslMessage getResponse()
+    {
+        return response;
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class SendMsg
+{
+    private final List<String> msgLines = new ArrayList<String>();
+    private final boolean hasUuid;
+    
+    /**
+     * Constructor for use with outbound socket client only.  This client mode does not need a call
+     * UUID for context.
+     */
+    public SendMsg()
+    {
+        msgLines.add( "sendmsg" );
+        hasUuid = false;
+    }
+    
+    /**
+     * Constructor for use with the inbound client. 
+     * 
+     * @param uuid of the call to send message to (it should be in 'park' to be operated on).
+     */
+    public SendMsg( String uuid )
+    {
+        msgLines.add( "sendmsg " + uuid );
+        hasUuid = true;
+    }
+    
+    /**
+     * Adds the following line to the message:
+     * <pre>
+     *   call-command: command
+     * </pre>
+     * @param command the string command [ execute | hangup ] 
+     */
+    public void addCallCommand( String command )
+    {
+        msgLines.add( "call-command: " + command );
+    }
+    
+    /**
+     * Adds the following line to the message:
+     * <pre>
+     *   execute-app-name: appName
+     * </pre>
+     * @param appName the string app name to execute 
+     */
+    public void addExecuteAppName( String appName )
+    {
+        msgLines.add( "execute-app-name: " + appName );
+    }
+    
+    /**
+     * Adds the following line to the message:
+     * <pre>
+     *   execute-app-arg: arg
+     * </pre>
+     * @param arg the string arg
+     */
+    public void addExecuteAppArg( String arg )
+    {
+        msgLines.add( "execute-app-arg: " + arg );
+    }
+
+    /**
+     * Adds the following line to the message:
+     * <pre>
+     *   loops: count
+     * </pre>
+     * @param count the int number of times to loop
+     */
+    public void addLoops( int count )
+    {
+        msgLines.add( "loops: " + count );
+    }
+
+    /**
+     * Adds the following line to the message:
+     * <pre>
+     *   hangup-cause: cause
+     * </pre>
+     * @param cause the string cause
+     */
+    public void addHangupCause( String cause )
+    {
+        msgLines.add( "hangup-cause: " + cause );
+    }
+
+    /**
+     * Adds the following line to the message:
+     * <pre>
+     *   nomedia-uid: value
+     * </pre>
+     * @param value the string value part of the line
+     */
+    public void addNomediaUuid( String value )
+    {
+        msgLines.add( "nomedia-uuid: " + value );
+    }
+    
+    /**
+     *  Adds the following line to the message:
+     *  <pre>
+     *    event-lock: true
+     *  </pre> 
+     */
+    public void addEventLock()
+    {
+        msgLines.add( "event-lock: true" );
+    }
+    
+    /**
+     * A generic method to add a message line. The constructed line in the sent message will be in the
+     * form:
+     * <pre>
+     *   name: value
+     * </pre>
+     * 
+     * @param name part of line 
+     * @param value part of line
+     */
+    public void addGenericLine( String name, String value )
+    {
+        msgLines.add( name + ": " + value );
+    }
+    
+    /**
+     * The list of strings that make up the message to send to FreeSWITCH.
+     * 
+     * @return list of strings, as they were added to this message.
+     */
+    public List<String> getMsgLines()
+    {
+        return msgLines;
+    }
+
+    /**
+     * Indicate if message was constructed with a UUID.
+     * 
+     * @return true if constructed with a UUID.
+     */
+    public boolean hasUuid()
+    {
+        return hasUuid;
+    }
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder( "SendMsg: " );
+        if ( msgLines.size() > 1 )
+        {
+            sb.append( msgLines.get( 1 ) );
+        } 
+        else if ( msgLines.size() > 0 )
+        {
+            sb.append( 0 );
+        }
+        
+        return sb.toString();
+    }
+    
+    
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport.event;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.freeswitch.esl.client.internal.HeaderParser;
+import org.freeswitch.esl.client.transport.message.EslHeaders;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * FreeSWITCH Event Socket events are decoded into this data object.
+ * </p>
+ * An ESL event is modelled as a collection of text lines. An event always has several eventHeader
+ * lines, and optionally may have some eventBody lines.  In addition the messageHeaders of the 
+ * original containing {@link EslMessage} which carried the event are also available. 
+ * </p>
+ * The eventHeader lines are parsed and cached in a map keyed by the eventHeader name string. An event
+ * is always expected to have an "Event-Name" eventHeader. Commonly used eventHeader names are coded
+ * in {@link EslEventHeaderNames}</br>
+ * Any eventBody lines are cached in a list.</br>
+ * The messageHeader lines from the original message are cached in a map keyed by {@link EslHeaders.Name}.
+ *  
+ * @author  david varnes
+ * @version $Id$
+ * @see EslEventHeaderNames
+ */
+public class EslEvent 
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+    
+    private final Map<Name,String> messageHeaders;
+    private final Map<String,String> eventHeaders;
+    private final List<String> eventBody;
+    private boolean decodeEventHeaders = true;
+    
+    public EslEvent( EslMessage rawMessage )
+    {
+        this( rawMessage, false );
+    }
+    
+    public EslEvent( EslMessage rawMessage, boolean parseCommandReply )
+    {
+        messageHeaders = rawMessage.getHeaders();
+        eventHeaders = new HashMap<String,String>( rawMessage.getBodyLines().size() );
+        eventBody = new ArrayList<String>();
+        // plain or xml body
+        if ( rawMessage.getContentType().equals( Value.TEXT_EVENT_PLAIN ) )
+        {
+            parsePlainBody( rawMessage.getBodyLines() );
+        }
+        else if ( rawMessage.getContentType().equals( Value.TEXT_EVENT_XML ) )
+        {
+            throw new IllegalStateException( "XML events are not yet supported" );
+        }
+        else if ( rawMessage.getContentType().equals( Value.COMMAND_REPLY ) && parseCommandReply )
+        {
+            parsePlainBody( rawMessage.getBodyLines() );
+        }
+        else
+        {
+            throw new IllegalStateException( "Unexpected EVENT content-type: " + 
+                rawMessage.getContentType() );
+        }
+    }
+
+    /**
+     * The message headers of the original ESL message from which this event was decoded.
+     * The message headers are stored in a map keyed by {@link EslHeaders.Name}. The string mapped value 
+     * is the parsed content of the header line (ie, it does not include the header name).
+     *  
+     * @return map of header values
+     */
+    public Map<Name,String> getMessageHeaders()
+    {
+        return messageHeaders;
+    }
+
+    /**
+     * The event headers of this event. The headers are parsed and stored in a map keyed by the string 
+     * name of the header, and the string mapped value is the parsed content of the event header line 
+     * (ie, it does not include the header name).
+     *  
+     * @return map of event header values
+     */
+    public Map<String, String> getEventHeaders()
+    {
+        return eventHeaders;
+    }
+    
+    /**
+     * Any event body lines that were present in the event.
+     * 
+     * @return list of decoded event body lines, may be an empty list.
+     */
+    public List<String> getEventBodyLines()
+    {
+        return eventBody;
+    }
+    
+    /**
+     * Convenience method.
+     * 
+     * @return the string value of the event header "Event-Name"
+     */
+    public String getEventName()
+    {
+        return getEventHeaders().get( EslEventHeaderNames.EVENT_NAME ); 
+    }
+    
+    /**
+     * Convenience method.
+     * 
+     * @return long value of the event header "Event-Date-Timestamp"
+     */
+    public long getEventDateTimestamp()
+    {
+        return Long.valueOf( getEventHeaders().get( EslEventHeaderNames.EVENT_DATE_TIMESTAMP ) );
+    }
+
+    /**
+     * Convenience method.
+     * 
+     * @return long value of the event header "Event-Date-Local"
+     */
+    public String getEventDateLocal()
+    {
+        return getEventHeaders().get( EslEventHeaderNames.EVENT_DATE_LOCAL );
+    }
+
+    /**
+     * Convenience method.
+     * 
+     * @return long value of the event header "Event-Date-GMT"
+     */
+    public String getEventDateGmt()
+    {
+        return getEventHeaders().get( EslEventHeaderNames.EVENT_DATE_GMT );
+    }
+
+    /**
+     * Convenience method.
+     * 
+     * @return true if the eventBody list is not empty.
+     */
+    public boolean hasEventBody()
+    {
+        return ! eventBody.isEmpty();
+    }
+    
+    private void parsePlainBody( final List<String> rawBodyLines )
+    {
+        boolean isEventBody = false;
+        for ( String rawLine : rawBodyLines )
+        {
+            if ( ! isEventBody )
+            {
+                // split the line
+                String[] headerParts = HeaderParser.splitHeader( rawLine );
+                if ( decodeEventHeaders )
+                {
+                    try
+                    {
+                        String decodedValue = URLDecoder.decode( headerParts[1], "UTF-8" );
+                        log.trace( "decoded from: [{}]", headerParts[1] );
+                        log.trace( "decoded   to: [{}]", decodedValue );
+                        eventHeaders.put( headerParts[0], decodedValue );
+                    }
+                    catch ( UnsupportedEncodingException e )
+                    {
+                        log.warn( "Could not URL decode [{}]", headerParts[1] );
+                        eventHeaders.put( headerParts[0], headerParts[1] );
+                    }
+                }
+                else
+                {
+                    eventHeaders.put( headerParts[0], headerParts[1] );
+                }
+                if ( headerParts[0].equals( EslEventHeaderNames.CONTENT_LENGTH ) )
+                {
+                    // the remaining lines will be considered body lines
+                    isEventBody = true;
+                }
+            }
+            else
+            {
+                // ignore blank line (always is one following the content-length
+                if ( rawLine.length() > 0 )
+                {
+                    eventBody.add( rawLine );
+                }
+            }
+        }
+
+    }
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder( "EslEvent: name=[" );
+        sb.append( getEventName() );
+        sb.append( "] headers=" );
+        sb.append( messageHeaders.size() );
+        sb.append( ", eventHeaders=" );
+        sb.append( eventHeaders.size() );
+        sb.append( ", eventBody=" );
+        sb.append( eventBody.size() );
+        sb.append( " lines." );
+        
+        return sb.toString();
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport.event;
+
+/**
+ * Container class for some commonly used ESL event header names (note there are many more!).
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class EslEventHeaderNames
+{
+    /**
+     * {@code "Event-Name"}
+     */
+    public static final String EVENT_NAME = "Event-Name";
+    /**
+     * {@code "Event-Date-Local"}
+     */
+    public static final String EVENT_DATE_LOCAL = "Event-Date-Local";
+    /**
+     * {@code "Event-Date-GMT"}
+     */
+    public static final String EVENT_DATE_GMT = "Event-Date-GMT";
+    /**
+     * {@code "Event-Date-Timestamp"}
+     */
+    public static final String EVENT_DATE_TIMESTAMP = "Event-Date-Timestamp";
+    /**
+     * {@code "Event-Calling-File"}
+     */
+    public static final String EVENT_CALLING_FILE = "Event-Calling-File";
+    /**
+     * {@code "Event-Calling-Function"}
+     */
+    public static final String EVENT_CALLING_FUNCTION = "Event-Calling-Function";
+    /**
+     * {@code "Event-Calling-Line-Number"}
+     */
+    public static final String EVENT_CALLING_LINE_NUMBER = "Event-Calling-Line-Number";
+    /**
+     * {@code "FreeSWITCH-Hostname"}
+     */
+    public static final String FREESWITCH_HOSTNAME = "FreeSWITCH-Hostname";
+    /**
+     * {@code "FreeSWITCH-IPv4"}
+     */
+    public static final String FREESWITCH_IPV4 = "FreeSWITCH-IPv4";
+    /**
+     * {@code "FreeSWITCH-IPv6"}
+     */
+    public static final String FREESWITCH_IPV6 = "FreeSWITCH-IPv6";
+    /**
+     * {@code "Core-UUID"}
+     */
+    public static final String CORE_UUID = "Core-UUID";
+    /**
+     * {@code "Content-Length"}
+     */
+    public static final String CONTENT_LENGTH = "Content-Length";
+    /**
+     * {@code "Job-Command"}
+     */
+    public static final String JOB_COMMAND = "Job-Command";
+    /**
+     * {@code "Job-UUID"}
+     */
+    public static final String JOB_UUID = "Job-UUID";
+
+    private EslEventHeaderNames()
+    {
+        /* private class */
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport.message;
+
+/**
+ * Container class for enumeration of ESL message header names, and some commonly used 
+ * header string values.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+public class EslHeaders
+{
+    /**
+     * Standard ESL header names.
+     * </p>
+     * Note this enum will need to be kept in synch with any new headers introduced on the server side.
+     * 
+     * @author david varnes 
+     * @version $Id$
+     */
+    public enum Name
+    {
+        /*
+         *  Minor optimization - put most often used headers at the top for fastest resolution
+         *  in static fromLiteral().  
+         */
+        
+        /**
+         * {@code "Content-Type"}
+         */
+        CONTENT_TYPE( "Content-Type" ),
+        /**
+         * {@code "Content-Length"}
+         */
+        CONTENT_LENGTH( "Content-Length" ),
+        /**
+         * {@code "Reply-Text"}
+         */
+        REPLY_TEXT( "Reply-Text" ),
+        /**
+         * {@code "Job-UUID"}
+         */
+        JOB_UUID( "Job-UUID" ),
+        /**
+         * {@code "Socket-Mode"}
+         */
+        SOCKET_MODE( "Socket-Mode" ),
+        /**
+         * {@code "Control"}
+         */
+        Control( "Control" ),
+        ;
+        
+        private final String literal;
+        
+        private Name( String literal )
+        {
+            this.literal = literal;
+        }
+        
+        public String literal()
+        {
+            return literal;
+        }
+        
+        public static Name fromLiteral( String literal )
+        {
+            for ( Name name : values() )
+            {
+                if ( name.literal.equalsIgnoreCase( literal ) )
+                {
+                    return name;
+                }
+            }
+            
+            return null;
+        }
+    }
+    
+    /**
+     * Some common ESL header values. These are provided as a convenience for commonly used values.
+     * </p>
+     * This values are not coded as an enum to allow for the very large range of possible values,
+     * since they are just Strings.
+     *
+     * @author david varnes
+     * @version $Id$
+     */
+    public static final class Value 
+    {
+        /**
+         * {@code "+OK"}
+         */
+        public static final String OK = "+OK";
+        /**
+         * {@code "auth/request"}
+         */
+        public static final String AUTH_REQUEST = "auth/request";
+        /**
+         * {@code "api/response"}
+         */
+        public static final String API_RESPONSE = "api/response";
+        /**
+         * {@code "command/reply"}
+         */
+        public static final String COMMAND_REPLY = "command/reply";
+        /**
+         * {@code "text/event-plain"}
+         */
+        public static final String TEXT_EVENT_PLAIN = "text/event-plain";
+        /**
+         * {@code "text/event-xml"}
+         */
+        public static final String TEXT_EVENT_XML = "text/event-xml";
+        /**
+         * {@code "text/disconnect-notice"}
+         */
+        public static final String TEXT_DISCONNECT_NOTICE = "text/disconnect-notice";
+        /**
+         * {@code "-ERR invalid"}
+         */
+        public static final String ERR_INVALID = "-ERR invalid";
+    }
+    
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport.message;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Basic FreeSWITCH Event Socket messages from the server are decoded into this data object.
+ * </p>
+ * An ESL message is modelled as text lines.  A message always has one or more header lines, and 
+ * optionally may have some body lines.
+ * <p/>
+ * Header lines are parsed and cached in a map keyed by the {@link EslHeaders.Name} enum.  A message
+ * is always expected to have a "Content-Type" header</br>
+ * Any Body lines are cached in a list.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ * @see EslHeaders.Name
+ */
+public class EslMessage
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+    
+    private final Map<Name,String> headers = new HashMap<Name,String>();
+    private final List<String> body = new ArrayList<String>();
+    
+    private Integer contentLength = null;
+    private int receivedContentLength = 0;
+
+    /**
+     * All the received message headers in a map keyed by {@link EslHeaders.Name}. The string mapped value 
+     * is the parsed content of the header line (ie, it does not include the header name).
+     *  
+     * @return map of header values
+     */
+    public Map<Name,String> getHeaders()
+    {
+        return headers;
+    }
+
+    /**
+     * Convenience method
+     * 
+     * @param headerName as a {@link EslHeaders.Name}
+     * @return true if an only if there is a header entry with the supplied header name 
+     */
+    public boolean hasHeader( Name headerName )
+    {
+        return headers.containsKey( headerName );
+    }
+
+    /**
+     * Convenience method
+     * 
+     * @param headerName as a {@link EslHeaders.Name}
+     * @return same as getHeaders().get( headerName )
+     */
+    public String getHeaderValue( Name headerName )
+    {
+        return headers.get( headerName );
+    }
+    
+    /**
+     * Convenience method
+     * 
+     * @return true if and only if a header exists with name "Content-Length" 
+     */
+    public boolean hasContentLength()
+    {
+        return headers.containsKey( Name.CONTENT_LENGTH );
+    }
+    
+    /**
+     * Convenience method
+     * 
+     * @return integer value of header with name "Content-Length"
+     */
+    public Integer getContentLength()
+    {
+        if ( contentLength != null )
+        {
+            return contentLength;
+        }
+        if ( hasContentLength() )
+        {
+            contentLength = Integer.valueOf( headers.get( Name.CONTENT_LENGTH) );
+        }
+        return contentLength;
+    }
+    
+    /**
+     * Convenience method
+     * 
+     * @return header value of header with name "Content-Type"
+     */
+    public String getContentType()
+    {
+        return headers.get( Name.CONTENT_TYPE );
+    }
+
+    /**
+     * Any received message body lines
+     * 
+     * @return list with a string for each line received, may be an empty list
+     */
+    public List<String> getBodyLines()
+    {
+        return body;
+    }
+    
+    /**
+     * Used by the {@link EslMessageDecoder}.
+     * 
+     * @param name
+     * @param value
+     */
+    void addHeader( Name name, String value )
+    {
+        log.debug( "adding header [{}] [{}]", name, value );
+        headers.put( name, value );
+    }
+    
+    /**
+     * Used by the {@link EslMessageDecoder}
+     * 
+     * @param line
+     */
+    void addBodyLine( String line )
+    {
+        if ( line == null )
+        {
+            return;
+        }
+        receivedContentLength += ( line.length() + 1 );
+        // ignore empty lines (signals the end of a body section)
+        if ( line.length() > 0 )
+        {
+            body.add( line );
+        }
+    }
+
+    /**
+     * Used by the {@link EslMessageDecoder}
+     * 
+     * @return true if receivedContentLength < contentLength
+     */
+    boolean waitingForContent()
+    {
+        log.debug( "received [{}], expecting [{}]", receivedContentLength, getContentLength() );
+        return receivedContentLength < getContentLength();
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder( "EslMessage: contentType=[" );
+        sb.append( getContentType() );
+        sb.append( "] headers=" );
+        sb.append( headers.size() );
+        sb.append( ", body=" );
+        sb.append( body.size() );
+        sb.append( " lines." );
+        
+        return sb.toString();
+    }
+    
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessageDecoder.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessageDecoder.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessageDecoder.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessageDecoder.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.transport.message;
+
+import org.freeswitch.esl.client.internal.HeaderParser;
+import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.UpstreamMessageEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Decoder used by the IO processing pipeline. Client consumers should never need to use
+ * this class.
+ * 
+ * @author  david varnes
+ * @version $Id$
+ */
+@ChannelPipelineCoverage( "one" )
+public class EslMessageDecoder extends SimpleChannelUpstreamHandler
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+    
+    private EslMessage currentMessage;
+    private boolean treatUnknownHeadersAsBody = false;
+    
+    public EslMessageDecoder()
+    {
+        
+    }
+    
+    public EslMessageDecoder( boolean treatUnknownHeadersAsBody )
+    {
+        this.treatUnknownHeadersAsBody = treatUnknownHeadersAsBody;
+    }
+    
+    private enum State
+    {
+        NEW_MESSAGE,
+        READ_HEADER_LINE,
+        READ_BODY_LINE,
+    }
+    
+    private State state = State.NEW_MESSAGE;
+    
+    @Override
+    public void messageReceived( ChannelHandlerContext ctx, MessageEvent e ) throws Exception
+    {
+        // Assume this is a decoded string
+        String messageLine = e.getMessage().toString();
+        
+        log.debug( "Received string: [{}]", e.getMessage() );
+        log.trace( "State [{}]", state );
+        
+        switch ( state )
+        {
+        case NEW_MESSAGE:
+            if ( messageLine.isEmpty() )
+            {
+                break;
+            }
+            currentMessage = new EslMessage();
+            state = State.READ_HEADER_LINE;
+            // fall-through  
+        case READ_HEADER_LINE:
+            if ( messageLine.isEmpty() )
+            {
+                if ( currentMessage.hasContentLength() )
+                {
+                    //  end of headers - body to come
+                    state = State.READ_BODY_LINE;
+                }
+                else
+                {
+                    // end of message
+                    state = State.NEW_MESSAGE;
+                    // send upstream
+                    UpstreamMessageEvent upstreamEvent = new UpstreamMessageEvent( e.getChannel(), 
+                        currentMessage, e.getRemoteAddress() );
+                    currentMessage = null;
+                    
+                    ctx.sendUpstream( upstreamEvent );
+                }
+            }
+            else
+            {
+                // split the line
+                String[] headerParts = HeaderParser.splitHeader( messageLine );
+                Name headerName = Name.fromLiteral( headerParts[0] );
+                if ( headerName == null )
+                {
+                    if ( treatUnknownHeadersAsBody )
+                    {
+                        // treat this as a body line - note that this will screw up genuine body 
+                        // content-length calculations
+                        currentMessage.addBodyLine( messageLine );
+                    }
+                    else
+                    {
+                        throw new IllegalStateException( "Unhandled ESL header [" + headerParts[0] + ']' );
+                    }
+                }
+                currentMessage.addHeader( headerName, headerParts[1] );
+            }
+            break;
+        case READ_BODY_LINE:
+            // monitor received content compared to expected content-length
+            currentMessage.addBodyLine( messageLine );
+            if ( ! currentMessage.waitingForContent() )
+            {
+                // end of message
+                state = State.NEW_MESSAGE;
+                // send upstream
+                UpstreamMessageEvent upstreamEvent = new UpstreamMessageEvent( e.getChannel(), 
+                    currentMessage, e.getRemoteAddress() );
+                currentMessage = null;
+                
+                ctx.sendUpstream( upstreamEvent );
+            }
+            break;
+        default:
+            break;
+        }
+        
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/resources (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/main/resources)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.inbound;
+
+import org.freeswitch.esl.client.IEslEventListener;
+import org.freeswitch.esl.client.inbound.Client;
+import org.freeswitch.esl.client.inbound.InboundConnectionFailure;
+import org.freeswitch.esl.client.transport.event.EslEvent;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClientTest
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+
+    private String host = "localhost";
+    private int port = 8021;
+    private String password = "ClueCon"; 
+        
+    @Test
+    public void do_connect() throws InterruptedException
+    {
+        Client client = new Client();
+     
+        client.addEventListener( new IEslEventListener()
+        {
+            public void eventReceived( EslEvent event )
+            {
+                log.info( "Event received [{}]", event );
+            }
+            public void backgroundJobResultReceived( EslEvent event )
+            {
+                log.info( "Background job result received [{}]", event );
+            }
+            
+        } );
+        
+        log.info( "Client connecting .." );
+        try
+        {
+            client.connect( host, port, password, 2 );
+        }
+        catch ( InboundConnectionFailure e )
+        {
+            log.error( "Connect failed", e );
+            return;
+        }
+        log.info( "Client connected .." );
+        
+//      client.setEventSubscriptions( "plain", "heartbeat CHANNEL_CREATE CHANNEL_DESTROY BACKGROUND_JOB" );
+        client.setEventSubscriptions( "plain", "all" );
+        client.addEventFilter( "Event-Name", "heartbeat" );
+        client.cancelEventSubscriptions();
+        client.setEventSubscriptions( "plain", "all" );
+        client.addEventFilter( "Event-Name", "heartbeat" );
+        client.addEventFilter( "Event-Name", "channel_create" );
+        client.addEventFilter( "Event-Name", "background_job" );
+//        client.sendSyncCommand( "echo", "Foo foo bar" );
+//        client.sendSyncCommand( "originate", "sofia/internal/101@192.168.100.201! sofia/internal/102@192.168.100.201!" );
+        
+//        client.sendSyncApiCommand( "sofia status", "" );
+        String jobId = client.sendAsyncApiCommand( "status", "" );
+        log.info( "Job id [{}] for [status]", jobId );
+        client.sendSyncApiCommand( "version", "" );
+//        client.sendAsyncApiCommand( "status", "" );
+//        client.sendSyncApiCommand( "sofia status", "" );
+//        client.sendAsyncApiCommand( "status", "" );
+        EslMessage response = client.sendSyncApiCommand( "sofia status", "" );
+        log.info( "sofia status = [{}]", response.getBodyLines().get( 3 ) );
+        
+        Thread.sleep( 25000 );
+        client.close();
+    }
+
+    @Test
+    public void do_multi_connects() throws InterruptedException
+    {
+        Client client = new Client();
+        
+        log.info( "Client connecting .." );
+        try
+        {
+            client.connect( host, port, password, 2 );
+        }
+        catch ( InboundConnectionFailure e )
+        {
+            log.error( "Connect failed", e );
+            return;
+        }
+        log.info( "Client connected .." );
+        
+        log.info( "Client connecting .." );
+        try
+        {
+            client.connect( "127.0.0.1", 8021, password, 2 );
+        }
+        catch ( InboundConnectionFailure e )
+        {
+            log.error( "Connect failed", e );
+            return;
+        }
+        log.info( "Client connected .." );
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.freeswitch.esl.client.outbound;
+
+import org.freeswitch.esl.client.outbound.example.SimpleHangupPipelineFactory;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SocketClientTest
+{
+    private final Logger log = LoggerFactory.getLogger( this.getClass() );
+
+    @Test
+    public void run_client() throws InterruptedException
+    {
+        log.info( "Test starting ..." );
+
+        
+        SocketClient client = new SocketClient( 8084, new SimpleHangupPipelineFactory() );
+        
+        client.start();
+        
+        Thread.sleep( 45000 );
+
+        client.stop();
+
+        
+        log.info( "Test ended" );
+    }
+    
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/resources (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/resources)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/resources/logback-test.xml (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/resources/logback-test.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/resources/logback-test.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client/src/test/resources/logback-test.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<configuration>
+
+  <appender name="STDOUT"
+   class="ch.qos.logback.core.ConsoleAppender">
+   <layout class="ch.qos.logback.classic.PatternLayout">
+     <Pattern>
+        %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+      </Pattern>
+    </layout>
+  </appender>
+
+  <logger name="org.freeswitch.esl.client.outbound.example">
+    <level value="debug" />
+  </logger>
+  <logger name="org.freeswitch.esl.client.inbound">
+    <level value="debug" />
+  </logger>
+  <logger name="org.freeswitch.esl.client.transport.message">
+    <level value="info" />
+  </logger>
+  <logger name="org.freeswitch.esl.client">
+    <level value="info" />
+  </logger>
+
+  <root>
+    <level value="warn" />
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.classpath (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.classpath) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.classpath	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.classpath	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.project (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.project) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.project	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.project	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.freeswitch.esl.client.example</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,6 @@
+#Sun Jan 03 23:33:58 EST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,9 @@
+#Sat Jan 02 16:18:40 EST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/pom.xml (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/pom.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/pom.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/org.freeswitch.esl.client.example/pom.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.freeswitch.esl.client</groupId>
+    <artifactId>esl-client-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.freeswitch.esl.client.example</artifactId>
+  <name>FreeSWITCH Event Socket Library - Java Client example usage</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.freeswitch.esl.client</groupId>
+      <artifactId>org.freeswitch.esl.client</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/pom.xml (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/pom.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/pom.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/pom.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2010 david varnes.
+ *
+ * Licensed under the Apache License, version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.freeswitch.esl.client</groupId>
+  <artifactId>esl-client-parent</artifactId>
+  <version>0.9.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>FreeSWITCH Event Socket Library - Java Client project</name>
+  <url>http://www.freeswitch.org</url>
+  <description>
+    The FreeSWITCH Event Socket Library provides a TCP based control and/or
+    monitoring interface to a running switch.  This project provides a Java
+    client to the ESL.
+  </description>
+  <organization>
+    <name>FreeSWITCH.org</name>
+    <url>http://www.freeswitch.org</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
+  <inceptionYear>2009</inceptionYear>
+  <scm>
+    <connection>scm:svn:http://svn.freeswitch.org/svn/freeswitch/trunk/contrib/dvarnes/java/esl-client</connection>
+    <developerConnection>scm:svn:http://svn.freeswitch.org/svn/freeswitch/trunk/contrib/dvarnes/java/esl-client</developerConnection>
+  </scm>
+  <developers>
+    <developer>
+      <id>dvarnes</id>
+      <name>david varnes</name>
+      <email>david at varnes dot net</email>
+      <timezone>GMT+10</timezone>
+    </developer>
+  </developers>
+  <modules>
+  	<module>org.freeswitch.esl.client</module>
+  	<module>org.freeswitch.esl.client.example</module>
+  </modules>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!--  every child project inherits these plugins -->
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <id>attach-source</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <attach>true</attach>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>  
+</project>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/src (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/src)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/java/esl-client/src/site (from rev 16612, freeswitch/trunk/contrib/dvarnes/java/esl-client/src/site)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/dvarnes/vala (from rev 16612, freeswitch/trunk/contrib/dvarnes/vala)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/michaelgg (from rev 16612, freeswitch/trunk/contrib/michaelgg)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/Download CSTAInside.vcproj (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/Download CSTAInside.vcproj) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/Download CSTAInside.vcproj	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/Download CSTAInside.vcproj	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="Download CSTAInside"
+	ProjectGUID="{4F92B672-DADB-4047-8D6A-4BB3796733FD}"
+	RootNamespace="Download CSTAInside"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Downloading CSTAInside"
+				CommandLine="if not exist &quot;$(ProjectDir)CSTAInsideCore&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://freefr.dl.sourceforge.net/project/cstainside/cstainside/v0.2.0/cstainside_v0.2.0.92.zip &quot;$(ProjectDir).&quot;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="if exist cstainside_v0.2.0.92 ren cstainside_v0.2.0.92 CSTAInsideCore"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Downloading CSTAInside"
+				CommandLine="if not exist &quot;$(ProjectDir)CSTAInsideCore&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://freefr.dl.sourceforge.net/project/cstainside/cstainside/v0.2.0/cstainside_v0.2.0.92.zip &quot;$(ProjectDir).&quot;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="if exist cstainside_v0.2.0.92 ren cstainside_v0.2.0.92 CSTAInsideCore"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath=".\cleancount"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Downloading CSTAInsideCore."
+					CommandLine="if not exist &quot;$(ProjectDir)CSTAInsideCore&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://freefr.dl.sourceforge.net/project/cstainside/cstainside/v0.2.0/cstainside_v0.2.0.92.zip &quot;$(ProjectDir).&quot;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)."
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Downloading CSTAInsideCore."
+					CommandLine="if not exist &quot;$(ProjectDir)CSTAInsideCore&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://freefr.dl.sourceforge.net/project/cstainside/cstainside/v0.2.0/cstainside_v0.2.0.92.zip &quot;$(ProjectDir).&quot;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)."
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.cpp (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,1737 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ * 
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+#include <switch.h>
+#include <direct.h>
+#include "FreeSWITCH.h"
+
+#include "MonitorStartRequest.h"
+#include "UniversalErrorResponse.h"
+#include "MonitorStartResponse.h"
+#include "MakeCallRequest.h"
+#include "MakeCallResponse.h"
+#include "AnswerCallRequest.h"
+#include "AnswerCallResponse.h"
+#include "SingleStepTransferCallRequest.h"
+#include "SingleStepTransferCallResponse.h"
+#include "DeflectCallRequest.h"
+#include "DeflectCallResponse.h"
+#include "PlayMessageRequest.h"
+#include "PlayMessageResponse.h"
+#include "RecordMessageRequest.h"
+#include "RecordMessageResponse.h"
+#include "StopRequest.h"
+#include "StopResponse.h"
+#include "ServiceInitiatedEvent.h"
+#include "OriginatedEvent.h"
+#include "DeliveredEvent.h"
+#include "EstablishedEvent.h"
+#include "ConnectionClearedEvent.h"
+#include "QueuedEvent.h"
+#include "DtmfDetectedEvent.h"
+#include "PlayEvent.h"
+#include "RecordEvent.h"
+#include "StopEvent.h"
+#include "ClearConnectionRequest.h"
+#include "ClearConnectionResponse.h"
+#include "SnapshotDeviceRequest.h"
+#include "SnapshotDeviceResponse.h"
+#include "SnapshotCallRequest.h"
+#include "SnapshotCallResponse.h"
+
+#include <string>
+using namespace std;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// class FreeSwitchDevice
+
+/*static*/ std::string FreeSwitchDevice::Channel2Device(const char* channel)
+{
+	string strDevice;
+	if(strncmp(channel, "sofia/internal/", 15)==0)
+	{
+		if(strncmp(channel+15, "sip:", 4)==0)
+			strDevice=channel+19;
+		else
+			strDevice=channel+15;
+	}
+	std::string::size_type i=strDevice.find("@");
+	if(i!=strDevice.npos)
+	{
+		strDevice.erase(i);
+	}	
+	
+	return strDevice;
+}
+
+/*static*/ char * FreeSwitchDevice::Type2Prefix(FreeSwitchDeviceType type)
+{
+	switch(type)
+	{
+	case type_network_interface: return "01";
+	case type_queue: return "02";
+	default: return "";
+	};
+}
+
+/*static*/ FreeSwitchDeviceType FreeSwitchDevice::Device2Type(DeviceID device)
+{
+	if(device.GetTypeOfNumber()==typeOfNumberDialable)
+		return type_internal_subscriber;
+
+	if(device.GetCallNr().size()<2)
+		return type_unknown;
+
+	for(int i=type_network_interface;Type2Prefix((FreeSwitchDeviceType)i)[0]!=0;i++)
+	{
+		if(strncmp(Type2Prefix((FreeSwitchDeviceType)i),device.GetCallNr().c_str(),2)==0)
+		{
+			return (FreeSwitchDeviceType)i;
+		}
+	}
+
+	return type_unknown;
+}
+
+
+FreeSwitchDevice::FreeSwitchDevice(const char* pcDevice, FreeSwitchDeviceType deviceType/*=type_internal_subscriber*/) : m_strDevice(pcDevice), m_deviceType(deviceType), m_bIsMakeCallOriginator(false)
+{
+	
+}
+
+FreeSwitchConnection* FreeSwitchDevice::FindConnection(const char* uuid)
+{
+	for(MapCall2Connection::iterator it=connections.begin();it!=connections.end();it++)	
+	{
+		if(it->first->strUUID==uuid)			
+			return it->second;
+	}
+	return NULL;
+}
+
+FreeSwitchConnection* FreeSwitchDevice::FindConnection(FreeSwitchCall* pCall)
+{
+	MapCall2Connection::iterator it=connections.find(pCall);
+	if(it==connections.end())
+		return NULL;
+	else
+		return it->second;
+}
+
+FreeSwitchConnection* FreeSwitchDevice::AddConnection(const char* uuid, const char * channel, FreeSwitchCall* pCall, eDirection direction)
+{
+	FreeSwitchConnection* pConnection=new FreeSwitchConnection();		
+	pConnection->pCall=pCall;
+	pConnection->strUUID=uuid;
+	pConnection->state=STATE_INITIATED;	
+	pConnection->direction=direction;
+	pConnection->strChannel=channel;
+	pCall->devices[GetDeviceID()]=this;
+	connections[pCall]=pConnection;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSwitchDevice::AddConnection: connection %s - %s added.\n",this->m_strDevice.c_str(),pCall->strUUID.c_str());
+	
+	return pConnection;
+}
+
+void FreeSwitchDevice::DeleteConnection(FreeSwitchCall* pCall)
+{	
+	MapCall2Connection::iterator it=connections.find(pCall);
+	if(it==connections.end())
+		return;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSwitchDevice::DeleteConnection: connection %s - %s deleted.\n",this->m_strDevice.c_str(),pCall->strUUID.c_str());
+
+	delete it->second;
+	connections.erase(it);
+
+	pCall->devices.erase(this->GetDeviceID());
+}
+
+
+bool FreeSwitchDevice::IsMonitoredWithID(string crossRefID)
+{
+	return m_MonitoringSessions.find(crossRefID)==m_MonitoringSessions.end()?false:true;
+}
+
+bool FreeSwitchDevice::AddMonitor(CISession* session, string crossRefID)
+{
+	if(IsMonitoredWithID(crossRefID))
+		return false;	//XRefID already used
+	
+	m_MonitoringSessions[crossRefID]=session;
+	return true;
+}
+
+bool FreeSwitchDevice::RemoveMonitor(CISession* session)
+{
+	bool found=false;
+	for(MapStr2Session::iterator it=m_MonitoringSessions.begin();it!=m_MonitoringSessions.end();it++)
+		if(it->second==session)
+		{
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSwitchDevice::RemoveMonitor: removing session 0x%08X from device %s\n",session, m_strDevice.c_str());
+			it=m_MonitoringSessions.erase(it);
+			found=true;
+			if(it==m_MonitoringSessions.end())
+				break;
+		}
+	return found;
+}
+
+bool FreeSwitchDevice::RemoveMonitor(CISession* session, string crossRefID)
+{
+	MapStr2Session::iterator it=m_MonitoringSessions.find(crossRefID);
+	
+	if(it==m_MonitoringSessions.end())
+		return false;	//XRefID not found
+
+	if(it->second!=session)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSwitchDevice::RemoveMonitor: XRefID %s mapped to device %sbut from session 0x%08X instead of 0x%08X, removal denied.\n",crossRefID.c_str(), m_strDevice.c_str(), it->second, session);
+	}
+	m_MonitoringSessions.erase(it);
+	return true;
+}
+
+void FreeSwitchDevice::SendEvent(CSTAEvent* pEvent)
+{
+	for(MapStr2Session::iterator it=m_MonitoringSessions.begin();it!=m_MonitoringSessions.end();it++)
+	{
+		pEvent->SetCrossRefID(it->first);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSwitchDevice::SendEvent: device %s, session %X, sending event: \n%s\n",GetDeviceID().c_str(),it->second,pEvent->GetReadable().c_str());
+		it->second->SendMsg(pEvent);	
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// class FreeSwitchCall
+
+FreeSwitchDevice* FreeSwitchCall::GetDevice(std::string strDeviceID)
+{	
+	MapStr2Device::iterator it=devices.find(strDeviceID);
+	if(it!=devices.end())
+		return it->second;
+	else 
+		return NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// class FreeSwitch
+
+FreeSWITCH::FreeSWITCH(switch_memory_pool_t *pool) : m_pool(pool), m_nLastXRefID(0)
+{
+	switch_mutex_init(&m_mutex, SWITCH_MUTEX_NESTED, m_pool);
+}
+
+
+FreeSWITCH::~FreeSWITCH()
+{
+	for(MapStr2Device::iterator it=m_DeviceMap.begin();it!=m_DeviceMap.end();it++)
+	{
+		delete it->second;
+	}
+	m_DeviceMap.clear();
+	switch_mutex_destroy(m_mutex);
+}
+
+string FreeSWITCH::GetNextXRefID()
+{
+	++m_nLastXRefID;
+	if(m_nLastXRefID>100000)
+		m_nLastXRefID=1;
+	char temp[8];	
+	itoa(m_nLastXRefID,temp,10);
+	return string(temp);
+}
+
+
+FreeSwitchDevice * FreeSWITCH::PrepareDevice(const char * pcDevice, FreeSwitchDeviceType type/*=type_internal_subscriber*/)
+{
+	string strFullDevName=FreeSwitchDevice::Type2Prefix(type);
+	strFullDevName+=pcDevice;
+	
+	MapStr2Device::iterator it=m_DeviceMap.find(strFullDevName);
+	FreeSwitchDevice* pDevice=NULL;
+	if(it==m_DeviceMap.end())
+	{
+		pDevice=new FreeSwitchDevice(strFullDevName.c_str(),type);
+		m_DeviceMap[strFullDevName]=pDevice;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PrepareDevice: device %s type %d added.", pcDevice, type);
+	}
+	else
+	{
+		pDevice=it->second;
+		if(pDevice->GetDeviceType()!=type)
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PrepareDevice: device %s found but type is different!",pcDevice);
+
+	}
+
+	return pDevice;
+}
+
+FreeSwitchCall* FreeSWITCH::GetCall(const char * pcUUID)
+{
+	if(!pcUUID)
+		return NULL;
+	MapStr2Call::iterator it=m_CallMap.find(pcUUID);
+	if(it==m_CallMap.end())
+		return NULL;
+	else return it->second;	//TODO: might chech the secondary UUID
+}
+
+bool FreeSWITCH::IsXRefIDUsed(string crossRefID)
+{
+	switch_mutex_lock(m_mutex);
+	
+	for(MapStr2Device::iterator it=m_DeviceMap.begin();it!=m_DeviceMap.end();it++)
+	{
+		if(it->second->IsMonitoredWithID(crossRefID))
+		{
+			switch_mutex_unlock(m_mutex);
+			return true;
+		}
+	}
+
+	switch_mutex_unlock(m_mutex);	
+	return false;
+}
+
+bool FreeSWITCH::FindCallerCalled(const char* uuid, string* pstrCaller, string* pstrCalled)
+{
+	switch_core_session_t * session=NULL;
+	for(int i=0;i<3;i++)
+	{
+		session=switch_core_session_locate(uuid);
+		if(session)
+			break;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "FreeSWITCH::FindCallerCalled: Session %s not available, waiting.\n",uuid);
+		switch_yield(100000);
+	}
+
+	if(!session)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::FindCallerCalled: Session %s no longer exists.\n",uuid);
+		return false;
+	}
+	switch_channel_t* channel=switch_core_session_get_channel(session);
+	switch_caller_profile_t * caller=switch_channel_get_caller_profile(channel);
+	
+	if(pstrCaller)
+		*pstrCaller=caller->caller_id_number;
+
+	if(pstrCalled)
+	{
+		if(strncmp(caller->destination_number, "sip:", 4)==0)
+			*pstrCalled=caller->destination_number+4;
+		else
+			*pstrCalled=caller->destination_number;
+
+		std::string::size_type i=(*pstrCalled).find("@");
+		if(i!=(*pstrCalled).npos)
+		{
+			(*pstrCalled).erase(i);
+		}	
+	}
+
+	switch_core_session_rwunlock(session);
+	return true;
+}
+
+bool FreeSWITCH::PrepareCallData(const char* uuid, const char* uuid2, const char* channel, FreeSwitchDevice** ppDevice, FreeSwitchCall** ppCall, FreeSwitchConnection** ppConnection, bool bCreateCall, FreeSwitchDevice** ppQueue, FreeSwitchDevice** ppInboundNID, FreeSwitchDevice** ppOutboundNID, string* pstrCaller, string* pstrCalled)
+{
+	if(!ppDevice || !ppCall)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PrepareCallData: mandatory parameter is null.\n");
+		return false;
+	}
+	
+	//Finding call:
+	if( !(*ppCall=GetCall(uuid)) && !(uuid2 && (*ppCall=GetCall(uuid2))) )
+	{
+		if(!bCreateCall)
+		{
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "FreeSWITCH::PrepareCallData: call %s [or %s] not found.\n",uuid, uuid2?uuid2:"NULL");
+			return false;
+		}
+			
+		*ppCall=new FreeSwitchCall();
+		(*ppCall)->strUUID=uuid;
+		m_CallMap[(*ppCall)->strUUID]=*ppCall;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PrepareCallData: call %s created.\n",(*ppCall)->strUUID.c_str());
+	}	
+
+	//Finding the subscriber:
+	if(strncmp(channel,"sofia/external",14)==0)
+	{
+		//Network interface - finding later
+		*ppDevice=NULL;
+	}
+	else
+	{
+		//Internal subscriber
+		string device=FreeSwitchDevice::Channel2Device(channel);
+		if(!device.size())
+		{			
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PrepareCallData: Channel %s not recognized.\n",channel);
+			return false;
+		}
+		*ppDevice=PrepareDevice(device.c_str());	
+		if(!(*ppDevice))
+		{
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PrepareCallData: Device %s not recognized.\n",device.c_str());
+			return false;
+		}	
+	}
+	if(!*ppDevice || ppQueue || ppInboundNID || ppOutboundNID)
+	{
+
+		//Collecting special devices from the call & finding network subscriber:
+		for(MapStr2Device::iterator it=(*ppCall)->devices.begin();it!=(*ppCall)->devices.end();it++)
+		{
+			if(ppQueue && it->second->GetDeviceType()==type_queue)
+			{
+				*ppQueue=it->second;			
+			}
+			else
+			if(it->second->GetDeviceType()==type_network_interface)
+			{
+				FreeSwitchConnection* pTempConn=it->second->FindConnection(*ppCall);
+				if(!pTempConn)
+				{
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "FreeSWITCH::PrepareCallData: trunk %s is mapped to call %s without connection????\n",it->second->GetDeviceID().c_str(),(*ppCall)->strUUID.c_str());
+					continue;
+				}
+				if(ppInboundNID && pTempConn->direction==direction_incoming)
+					*ppInboundNID=it->second;
+				else
+				if(ppOutboundNID && pTempConn->direction==direction_outgoing)
+					*ppOutboundNID=it->second;
+
+				if( (!*ppDevice) && (pTempConn->strChannel==channel) )
+					*ppDevice=it->second;	
+				
+				if( (!*ppDevice) && (pTempConn->strChannel.size()==0) && (pTempConn->direction==direction_outgoing) )
+				{
+					//External outbound call: the device was created before the FS channel, updating the data. 				
+					*ppDevice=it->second;
+					pTempConn->strUUID=uuid;
+					pTempConn->strChannel=channel;
+				}
+			}
+		}
+	}
+
+	if(!*ppDevice)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PrepareCallData: Device for channel %s not recognized.\n",channel);
+		return false;
+	}
+
+	//Finding connection:
+	if(ppConnection)
+		*ppConnection=(*ppDevice)->FindConnection(*ppCall);
+	
+	
+	//Finding caller & called
+	if(pstrCaller || pstrCalled)
+	{		
+		FindCallerCalled(uuid, pstrCaller, pstrCalled);		
+	}
+
+	return true;
+}
+
+
+
+void FreeSWITCH::OnChannelCreate(switch_event_t *event)
+{		
+	const char* channel=switch_event_get_header(event, "Channel-Name");
+	if(!channel || strstr(channel,"sofia/external"))	//External inbound calls are handled in OnCallNetworkIncoming
+		return;
+	
+	string device=FreeSwitchDevice::Channel2Device(channel);
+	if(!device.size())
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnChannelCreate: Channel %s not recognized.\n",channel);
+		return;
+	}
+	switch_mutex_lock(m_mutex);
+	FreeSwitchDevice* pDevice=PrepareDevice(device.c_str());
+	if(!pDevice)	
+		return;
+	const char* direction=switch_event_get_header(event, "Call-Direction");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");
+	if(		!direction || !uuid 
+		|| (strcmp(direction, "inbound") && !pDevice->IsMakeCallOriginator()) )	//direction= "inbound" means outgoing call, direction is wrong from some reason
+	{
+		switch_mutex_unlock(m_mutex);
+		return;
+	}
+
+	if(GetCall(uuid))
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnChannelCreate: Call %s already exists.\n",uuid);
+		switch_mutex_unlock(m_mutex);
+		return;
+	}
+
+	FreeSwitchCall* pCall=new FreeSwitchCall();
+	pCall->strUUID=uuid;
+	m_CallMap[pCall->strUUID]=pCall;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnChannelCreate: call %s created.\n",pCall->strUUID.c_str());
+
+	pDevice->AddConnection(uuid, switch_event_get_header(event, "Channel-Name"), pCall,direction_outgoing);
+	if(pDevice->IsMonitored())
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnChannelCreate: ServiceInitiated device: %s, call: %s.\n",pDevice->GetDeviceID().c_str(),uuid);
+		ServiceInitiatedEvent si(ConnectionID(pDevice->GetDeviceID(),pCall->strUUID));
+		if(pDevice->IsMakeCallOriginator())
+			si.SetEventCause(CAUSE_MAKE_CALL);
+		pDevice->SendEvent(&si);
+	}
+	switch_mutex_unlock(m_mutex);
+}
+
+
+void FreeSWITCH::OnProgress(switch_event_t *event)
+{
+	const char* channel=switch_event_get_header(event, "Channel-Name");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");
+	const char* uuid2=switch_event_get_header(event, "Other-Leg-Unique-ID");
+	if(!channel || !uuid)				
+		return;	
+	
+	FreeSwitchCall* pCall;	
+	FreeSwitchDevice* pDevice=NULL, *pInboundNIDDevice=NULL, *pOutboundNIDDevice=NULL;
+	string caller, called;
+	FreeSwitchConnection* pConnection=NULL;
+	
+	switch_mutex_lock(m_mutex);
+	if(!PrepareCallData(uuid, uuid2, channel, &pDevice, &pCall, &pConnection, true, NULL, &pInboundNIDDevice, &pOutboundNIDDevice, &caller, &called))
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnProgress: PrepareCallData failed.\n");
+		return;
+	}
+	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnProgress: %s device: %s, call: %s [%s].\n",event->event_id==SWITCH_EVENT_CHANNEL_PROGRESS?"CHANNEL_PROGRESS":"CHANNEL_PROGRESS_MEDIA",pDevice->GetDeviceID().c_str(), uuid, uuid2?uuid2:"NULL");
+		
+	if(!pConnection)
+	{
+		pConnection=pDevice->AddConnection(uuid,channel,pCall,direction_incoming);
+		pConnection->state=STATE_ALERTING;
+	}
+	else
+		pConnection->state=STATE_CONNECTED;
+			
+	DeviceID alertingDevice(called);
+
+	OriginatedEvent oe(ConnectionID(caller,pCall->strUUID), caller, called);	
+	oe.SetLocalConnectionInfo(STATE_CONNECTED);
+	DeliveredEvent de(ConnectionID(alertingDevice,pCall->strUUID), alertingDevice, caller, called);
+	de.SetLocalConnectionInfo(pConnection->state);
+
+	if(pInboundNIDDevice)
+	{
+		oe.SetNetworkCalledDevice(called);
+		oe.SetNetworkCallingDevice(caller);
+		oe.SetAssociatedCallingDevice(DeviceID(typeOfNumberDevice,pInboundNIDDevice->GetDeviceID()));
+
+		de.SetNetworkCalledDevice(called);
+		de.SetNetworkCallingDevice(caller);
+		de.SetAssociatedCallingDevice(DeviceID(typeOfNumberDevice,pInboundNIDDevice->GetDeviceID()));
+	}
+	if(pOutboundNIDDevice)
+	{
+		de.SetAssociatedCalledDevice(DeviceID(typeOfNumberDevice,pOutboundNIDDevice->GetDeviceID()));
+		de.SetConnection(ConnectionID(DeviceID(typeOfNumberDevice,pOutboundNIDDevice->GetDeviceID()),pCall->strUUID));
+	}
+		
+	if(pDevice->IsMonitored())
+	{
+		if(pConnection->state==STATE_CONNECTED)
+			pDevice->SendEvent(&oe);
+		pDevice->SendEvent(&de);		
+	}
+
+	switch_mutex_unlock(m_mutex);
+}
+
+
+void FreeSWITCH::OnChannelAnswer(switch_event_t *event)
+{
+	const char* channel=switch_event_get_header(event, "Channel-Name");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");
+	const char* uuid2=switch_event_get_header(event, "Other-Leg-Unique-ID");
+	if(!channel || !uuid)				
+		return;	
+	
+	FreeSwitchCall* pCall;	
+	FreeSwitchDevice* pDevice=NULL, *pQueueDevice=NULL, *pInboundNIDDevice=NULL, *pOutboundNIDDevice=NULL;
+	string caller, called;
+	FreeSwitchConnection* pConnection=NULL;
+	
+	switch_mutex_lock(m_mutex);
+	if(!PrepareCallData(uuid, uuid2, channel, &pDevice, &pCall, &pConnection, true, &pQueueDevice, &pInboundNIDDevice, &pOutboundNIDDevice, &caller, &called))
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnChannelAnswer: PrepareCallData failed.\n");
+		return;
+	}
+	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnChannelAnswer: CHANNEL_ANSWER device: %s, call: %s [%s].\n",pDevice->GetDeviceID().c_str(), uuid, uuid2?uuid2:"NULL");
+		
+	if(!pConnection)
+	{
+		pConnection=pDevice->AddConnection(uuid,channel,pCall,direction_incoming);
+	}
+
+	pConnection->state=STATE_CONNECTED;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnChannelAnswer: Established device: %s, call: %s.\n",pDevice->GetDeviceID().c_str(),pCall->strUUID.c_str());
+		
+	DeviceID answeringDevice;
+	if(pQueueDevice)
+	{
+		answeringDevice.SetCallNr(pQueueDevice->GetDeviceID().c_str());
+		answeringDevice.SetTypeOfNumber(typeOfNumberDevice);
+	}
+	else
+	{
+		answeringDevice.SetCallNr(called);
+	}
+	EstablishedEvent ee(ConnectionID(answeringDevice,pCall->strUUID), answeringDevice, caller, called);
+
+	if(pInboundNIDDevice)
+	{
+		ee.SetNetworkCalledDevice(called);
+		ee.SetNetworkCallingDevice(caller);
+		ee.SetAssociatedCallingDevice(DeviceID(typeOfNumberDevice,pInboundNIDDevice->GetDeviceID()));
+	}
+	if(pOutboundNIDDevice)
+	{
+		ee.SetAssociatedCalledDevice(DeviceID(typeOfNumberDevice,pOutboundNIDDevice->GetDeviceID()));
+		ee.SetEstablishedConnection(ConnectionID(DeviceID(typeOfNumberDevice,pOutboundNIDDevice->GetDeviceID()),pCall->strUUID));
+	}
+		
+	if(pDevice->IsMonitored())
+		pDevice->SendEvent(&ee);	
+		
+	if(pQueueDevice && pQueueDevice->IsMonitored())
+		pQueueDevice->SendEvent(&ee);	
+
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::OnChannelHangup(switch_event_t *event)
+{
+	char* channel=switch_event_get_header(event, "Channel-Name");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");
+	const char* uuid2=switch_event_get_header(event, "Other-Leg-Unique-ID");
+	const char* cause=switch_event_get_header(event, "Hangup-Cause");
+	if(!channel || !uuid)				
+		return;	
+
+	FreeSwitchCall* pCall=NULL;	
+	FreeSwitchDevice* pDevice=NULL, *pQueueDevice=NULL;	
+
+	switch_mutex_lock(m_mutex);
+	if(!PrepareCallData(uuid, uuid2, channel, &pDevice, &pCall, NULL, false, NULL, NULL, NULL, NULL, NULL))
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnChannelHangup: PrepareCallData failed.\n");
+		return;
+	}	
+	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnChannelHangup: CHANNEL_HANGUP device: %s, call: %s [%s], cause: %s.\n",pDevice->GetDeviceID().c_str(),uuid, uuid2?uuid2:"NULL", cause?cause:"NULL");
+
+	ConnectionClearedEvent cc(ConnectionID(pDevice->GetDeviceID(),pCall->strUUID));
+
+	//Setting cause
+	if(!cause || !strcmp(cause,"NORMAL_CLEARING") )
+		cc.SetEventCause(CAUSE_NORMAL_CLEARING);
+	else
+	if(!strcmp(cause,"NO_ROUTE_DESTINATION"))
+		cc.SetEventCause(CAUSE_DEST_NOT_OBTAINABLE);
+	else
+	if(!strcmp(cause,"USER_BUSY"))
+		cc.SetEventCause(CAUSE_BUSY);
+	if(!strcmp(cause,"ORIGINATOR_CANCEL"))
+		cc.SetEventCause(CAUSE_CALL_NOT_ANSWERED);
+
+	int devices_in_call=pCall->devices.size();	
+	//Sending event to all devices in the call
+	FreeSwitchConnection* pConnection=NULL;
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{		
+		pConnection=it->second->FindConnection(pCall->strUUID.c_str());
+		if(!pConnection)
+		{
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnChannelHangup: Device %s could not have connection to %s.",it->second->GetDeviceID().c_str(),pCall->strUUID.c_str());
+			continue;
+		}
+		
+		if(it->second->GetDeviceType()==type_queue)
+		{
+			pConnection->state=STATE_NULL;	
+			pQueueDevice=it->second;
+		}
+		else
+		if(it->second==pDevice)			
+			pConnection->state=STATE_NULL;	//The terminated device
+		else
+		if(devices_in_call<=2)
+			pConnection->state=STATE_FAIL;	//If only one device remain, it will be in failed state
+											//If more than one devices remain (conference), they will have the original state.	
+		
+		if(it->second->IsMonitored())
+		{			
+			cc.SetLocalConnectionInfo(pConnection->state);
+			it->second->SendEvent(&cc);			
+		}	
+	}
+	pDevice->DeleteConnection(pCall);
+	if(pQueueDevice)
+	{
+		if(pQueueDevice->IsMonitored())
+		{
+			ConnectionClearedEvent cc2(ConnectionID(DeviceID(typeOfNumberDevice,pQueueDevice->GetDeviceID()),pCall->strUUID));
+			cc2.SetLocalConnectionInfo(STATE_NULL);
+			cc2.SetEventCause(cc.GetEventCause());
+			pQueueDevice->SendEvent(&cc2);
+		}
+		pQueueDevice->DeleteConnection(pCall);
+	}
+
+	if(pCall->devices.size()==0)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnChannelHangup: call %s deleted.\n",pCall->strUUID.c_str());
+		m_CallMap.erase(pCall->strUUID);
+		delete pCall;
+	}	
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::OnDtmf(switch_event_t *event)
+{
+	char* channel=switch_event_get_header(event, "Channel-Name");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");	
+	const char* uuid2=switch_event_get_header(event, "Other-Leg-Unique-ID");
+	if(!channel || !uuid)				
+		return;	
+
+	FreeSwitchCall* pCall=NULL;	
+	FreeSwitchDevice* pDevice=NULL, *pQueueDevice=NULL;	
+	
+	switch_mutex_lock(m_mutex);
+	
+	if(!PrepareCallData(uuid, uuid2, channel, &pDevice, &pCall, NULL, false, &pQueueDevice, NULL, NULL, NULL, NULL))
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnDtmf: PrepareCallData failed.\n");
+		return;
+	}	
+
+	const char* digit=switch_event_get_header(event, "DTMF-Digit");
+	if(!digit)	
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnDtmf: DTMF-Digit not found in event.");
+		switch_mutex_unlock(m_mutex);
+		return;
+	}
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnDtmf: DTMF device: %s, call: %s \n",pDevice->GetDeviceID().c_str(),pCall->strUUID.c_str());
+	
+	DeviceID dev(pDevice->GetDeviceType()==type_internal_subscriber?typeOfNumberDialable:typeOfNumberDevice,pDevice->GetDeviceID());
+	DtmfDetectedEvent dd(ConnectionID(dev,pCall->strUUID),digit[0]);
+
+	if(pDevice->IsMonitored())
+		pDevice->SendEvent(&dd);
+	
+	if(pQueueDevice && pQueueDevice->IsMonitored())	
+		pQueueDevice->SendEvent(&dd);
+
+	switch_mutex_unlock(m_mutex);
+
+}
+
+void FreeSWITCH::OnPlayback(switch_event_t *event)
+{
+	char* channel=switch_event_get_header(event, "Channel-Name");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");	
+	const char* uuid2=switch_event_get_header(event, "Other-Leg-Unique-ID");
+	if(!channel || !uuid)				
+		return;	
+
+	FreeSwitchCall* pCall=NULL;	
+	FreeSwitchDevice* pDevice=NULL;	
+	
+	switch_mutex_lock(m_mutex);
+	
+	if(!PrepareCallData(uuid, uuid2, channel, &pDevice, &pCall, NULL, false, NULL, NULL, NULL, NULL, NULL))
+	{
+		switch_mutex_unlock(m_mutex);
+		if(event->event_id!=SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE)	//Could be normal if call terminates during playback.
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnPlayback: PrepareCallData failed.\n");
+		return;
+	}	
+
+	const char* file=switch_event_get_header(event, "Application-Data");
+	if(!file)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnPlayback: Filename not found in event.\n");
+		switch_mutex_unlock(m_mutex);
+		return;
+	}
+	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnPlayback: device: %s, call: %s \n",pDevice->GetDeviceID().c_str(),pCall->strUUID.c_str());
+	
+	DeviceID dev(pDevice->GetDeviceType()==type_internal_subscriber?typeOfNumberDialable:typeOfNumberDevice,pDevice->GetDeviceID());
+	
+	CSTAEvent* pEvent=NULL;
+	if(event->event_id==SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE)
+	{
+		pEvent=new StopEvent(ConnectionID(dev,pCall->strUUID),file);
+		char* result=switch_event_get_header(event, "Application-Response");
+		if(result)
+		{
+			if(	strcmp(result, "FILE PLAYED")==0)
+				pEvent->SetEventCause(CAUSE_END_OF_MESSAGE_DETECTED);
+			else
+			if(strcmp(result, "FILE NOT FOUND")==0)
+				pEvent->SetEventCause(CAUSE_RESOURCES_NOT_AVAILABLE);
+			else
+			if(strcmp(result, "PLAYBACK ERROR")==0)
+				pEvent->SetEventCause(CAUSE_BLOCKED);
+		}		
+	}
+	else
+	{
+		pEvent=new PlayEvent(ConnectionID(dev,pCall->strUUID),file);
+	}
+
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{
+		if(it->second->IsMonitored())		
+			it->second->SendEvent(pEvent);		
+	}
+
+	delete pEvent;
+
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::OnRecord(switch_event_t *event)
+{
+	char* channel=switch_event_get_header(event, "Channel-Name");
+	const char* uuid=switch_event_get_header(event, "Unique-ID");	
+	const char* uuid2=switch_event_get_header(event, "Other-Leg-Unique-ID");
+	if(!channel || !uuid)				
+		return;	
+
+	FreeSwitchCall* pCall=NULL;	
+	FreeSwitchDevice* pDevice=NULL;	
+	
+	switch_mutex_lock(m_mutex);
+	
+	if(!PrepareCallData(uuid, uuid2, channel, &pDevice, &pCall, NULL, false, NULL, NULL, NULL, NULL, NULL))
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnRecord: PrepareCallData failed.\n");
+		return;
+	}	
+	
+	char* p=switch_event_get_header(event, "Application-Data");
+	if(!p)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnRecord: Filename not found in event.\n");
+		switch_mutex_unlock(m_mutex);
+		return;
+	}
+
+	char file[MAX_PATH];
+	strcpy(file,p);	
+	p=strstr(file,".wav ");
+	if(p)
+		p[4]=0;	//cutting length parameter
+	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnRecord: device: %s, call: %s \n",pDevice->GetDeviceID().c_str(),pCall->strUUID.c_str());
+	
+	DeviceID dev(pDevice->GetDeviceType()==type_internal_subscriber?typeOfNumberDialable:typeOfNumberDevice,pDevice->GetDeviceID());
+	
+	CSTAEvent* pEvent=NULL;
+	if(event->event_id==SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE)
+	{
+		pEvent=new StopEvent(ConnectionID(dev,pCall->strUUID),file);
+		pEvent->SetEventCause(CAUSE_MESSAGE_DURATION_EXCEEDED);		
+	}
+	else
+	{
+		pEvent=new RecordEvent(ConnectionID(dev,pCall->strUUID),file);
+	}
+
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{
+		if(it->second->IsMonitored())		
+			it->second->SendEvent(pEvent);		
+	}
+
+	delete pEvent;
+
+	switch_mutex_unlock(m_mutex);
+}
+
+
+void FreeSWITCH::OnCallQueued(const char* queue, switch_core_session_t *session)
+{
+	const char* uuid=switch_core_session_get_uuid(session);
+	switch_channel_t* channel=switch_core_session_get_channel(session);
+	switch_caller_profile_t * caller=switch_channel_get_caller_profile(channel);	
+
+	switch_mutex_lock(m_mutex);
+	
+	FreeSwitchDevice* pDevice=PrepareDevice(queue,type_queue);
+	if(!pDevice)	
+		return;
+
+	FreeSwitchCall* pCall=GetCall(uuid);
+	if(!pCall)
+	{
+		pCall=new FreeSwitchCall();
+		pCall->strUUID=uuid;
+		m_CallMap[pCall->strUUID]=pCall;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnCallQueued: call %s created.\n",pCall->strUUID.c_str());
+	}
+	
+	FreeSwitchConnection* pConnection=pDevice->AddConnection(uuid, switch_channel_get_name(channel),pCall, direction_incoming);
+	pConnection->state=STATE_QUEUED;
+	QueuedEvent qe(ConnectionID(DeviceID(typeOfNumberDevice,pDevice->GetDeviceID()),uuid),DeviceID(typeOfNumberDevice,pDevice->GetDeviceID()),caller->caller_id_number, caller->destination_number);
+	
+	if(strstr(caller->chan_name,"sofia/external"))
+	{		
+		qe.SetNetworkCallingDevice(caller->caller_id_number);
+		qe.SetNetworkCalledDevice(caller->destination_number);
+		for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)		
+			if(it->second->GetDeviceType()==type_network_interface)
+			{
+				qe.SetAssociatedCallingDevice(DeviceID(typeOfNumberDevice,it->second->GetDeviceID()));
+				break;
+			}
+		
+	}	
+	qe.SetNumberQueued(pDevice->GetConnectionCount());
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{
+		//Sending queued event for the queue and the caller.
+		if(it->second->IsMonitored())		
+			it->second->SendEvent(&qe);
+	}
+
+
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::OnCallNetworkIncoming(const char* trunk, switch_core_session_t *session)
+{
+	const char* uuid=switch_core_session_get_uuid(session);
+	switch_channel_t* channel=switch_core_session_get_channel(session);	
+	//switch_caller_profile_t * caller=switch_channel_get_caller_profile(channel);
+
+	switch_mutex_lock(m_mutex);
+	
+	FreeSwitchDevice* pDevice=PrepareDevice(trunk,type_network_interface);
+	if(!pDevice)	
+		return;
+
+	FreeSwitchCall* pCall=GetCall(uuid);
+	if(!pCall)
+	{
+		pCall=new FreeSwitchCall();
+		pCall->strUUID=uuid;
+		m_CallMap[pCall->strUUID]=pCall;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnCallNetworkIncoming: call %s created.\n",pCall->strUUID.c_str());
+	}
+	
+	FreeSwitchConnection* pConnection=pDevice->AddConnection(uuid, switch_channel_get_name(channel), pCall, direction_incoming);
+	pConnection->strChannel=switch_channel_get_name(channel);	
+	if(pDevice->IsMonitored())
+	{
+		ServiceInitiatedEvent si(ConnectionID(DeviceID(typeOfNumberDevice,pDevice->GetDeviceID()),uuid));
+		//TODO: add networkCallingDevice, networkCalledDevice, associatedCallingDevice fields
+		pDevice->SendEvent(&si);
+	}
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::OnCallNetworkOutgoing(const char* trunk, switch_core_session_t *session)
+{
+	const char* uuid=switch_core_session_get_uuid(session);
+	//switch_channel_t* channel=switch_core_session_get_channel(session);	
+	//switch_caller_profile_t * caller=switch_channel_get_caller_profile(channel);
+
+	switch_mutex_lock(m_mutex);
+	
+	FreeSwitchDevice* pDevice=PrepareDevice(trunk,type_network_interface);
+	if(!pDevice)	
+		return;
+
+	FreeSwitchCall* pCall=GetCall(uuid);
+	if(!pCall)
+	{
+		pCall=new FreeSwitchCall();
+		pCall->strUUID=uuid;
+		m_CallMap[pCall->strUUID]=pCall;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnCallNetworkOutgoing: call %s created.\n",pCall->strUUID.c_str());
+	}
+	
+	//outgoing uuid and channel name is not yet known.
+	pDevice->AddConnection("", "", pCall, direction_outgoing);
+	
+	if(pDevice->IsMonitored())
+	{
+		//TODO: Network Reached
+	}
+	switch_mutex_unlock(m_mutex);
+}
+
+
+
+void FreeSWITCH::OnSessionFinished(CISession* sender)
+{
+	switch_mutex_lock(m_mutex);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::OnSessionFinished: removing session 0x%08X\n",sender);
+	
+	try
+	{
+		for(MapStr2Device::iterator it=m_DeviceMap.begin();it!=m_DeviceMap.end();it++)
+		{
+			it->second->RemoveMonitor(sender);
+		}
+	}
+	catch(...)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::OnSessionFinished: Exception.");
+	}
+
+	switch_mutex_unlock(m_mutex);	
+}
+
+void FreeSWITCH::MonitorStart(CISession* sender, MonitorStartRequest* pRequest)
+{	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::MonitorStart: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+	
+	if(!pRequest->GetMonitorObject().GetCallNr().size())
+	{
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation, invalidMonitorObject);
+		sender->SendMsg(&err);
+		return;
+	}
+	
+	
+	FreeSwitchDeviceType type=FreeSwitchDevice::Device2Type(pRequest->GetMonitorObject());
+	if(type==type_unknown)
+	{
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation, invalidMonitorObject);
+		sender->SendMsg(&err);
+		return;
+	}
+
+	switch_mutex_lock(m_mutex);
+	FreeSwitchDevice* pDevice=PrepareDevice(pRequest->GetMonitorObject().GetCallNr().c_str()+(type==type_internal_subscriber?0:2), type);
+	
+	string crossRefID=pDevice->GetDeviceID().c_str();
+	for(crossRefID=pDevice->GetDeviceID();IsXRefIDUsed(crossRefID);crossRefID=GetNextXRefID());
+	
+	if(pDevice->AddMonitor(sender, crossRefID))
+	{
+		MonitorStartResponse resp(pRequest->GetInvokeID(),crossRefID);
+		sender->SendMsg(&resp);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::MonitorStart: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+	}
+	else
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::MonitorStart: AddMonitor failed.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation, invalidMonitorObject);
+		sender->SendMsg(&err);
+	}
+	switch_mutex_unlock(m_mutex);
+}
+
+
+void FreeSWITCH::SnapshotDevice(CISession* sender, SnapshotDeviceRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SnapshotDevice: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+	
+	FreeSwitchDeviceType type=FreeSwitchDevice::Device2Type(pRequest->GetSnapshotObject());
+	if(type==type_unknown)
+	{
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation, invalidDeviceID);
+		sender->SendMsg(&err);
+		return;
+	}
+
+	switch_mutex_lock(m_mutex);
+	FreeSwitchDevice* pDevice=PrepareDevice(pRequest->GetSnapshotObject().GetCallNr().c_str()+(type==type_internal_subscriber?0:2), type);
+	
+	SnapshotDeviceResponse resp(pRequest->GetInvokeID());
+	
+	for(MapCall2Connection::iterator it=pDevice->connections.begin();it!=pDevice->connections.end();it++)	
+	{
+		SnapshotDeviceData data(ConnectionID(pRequest->GetSnapshotObject(),it->second->pCall->strUUID),it->second->state);
+		resp.AddSnapshotData(data);
+	}
+
+	sender->SendMsg(&resp);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SnapshotDevice: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::SnapshotCall(CISession* sender, SnapshotCallRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SnapshotCall: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_mutex_lock(m_mutex);	
+	FreeSwitchCall* pCall=GetCall(pRequest->GetSnapshotObject().GetCallID().c_str());	
+	if(!pCall)
+		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::SnapshotCall: CallID %s not found.",pRequest->GetSnapshotObject().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID);
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SnapshotCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	SnapshotCallResponse resp(pRequest->GetInvokeID());
+	
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{
+		FreeSwitchConnection* pConn=it->second->FindConnection(pCall); 
+		SnapshotCallData data(it->second->GetDeviceID(),pConn?pConn->state:STATE_NULL);		
+		resp.AddSnapshotData(data);
+	}
+	string caller, called;
+	FindCallerCalled(pCall->strUUID.c_str(), &caller, &called);
+	resp.SetCallingDevice(caller);
+	resp.SetCalledDevice(called);
+
+	sender->SendMsg(&resp);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SnapshotDevice: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+
+	switch_mutex_unlock(m_mutex);
+
+}
+
+
+void FreeSWITCH::MakeCall(CISession* sender, MakeCallRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::MakeCall: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_channel_t *caller_channel;
+	switch_core_session_t *caller_session = NULL;
+	char aleg[400], exten[400];
+	uint32_t timeout = 60;
+	switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
+	FreeSwitchDevice* pDevice=NULL;
+		
+	if(pRequest->GetCallingDevice().GetTypeOfNumber()==typeOfNumberDialable)
+	{
+		sprintf(aleg,"%ssofia/internal/%s%s%s",pRequest->GetAutoOriginate()==ORIGINATE_DO_NOT_PROMPT?"{sip_auto_answer=true}":"",pRequest->GetCallingDevice().GetCallNr().c_str(),"%",switch_core_get_variable("domain"));
+		pDevice=PrepareDevice(pRequest->GetCallingDevice().GetCallNr().c_str());
+		pDevice->SetMakeCallOriginator(true);
+	}
+	else
+	{
+		sprintf(aleg,"loopback/%s",pRequest->GetCallingDevice().GetCallNr().c_str()+2);
+	}
+	sprintf(exten,"%s",pRequest->GetCalledDirectoryNumber().GetCallNr().c_str());
+		
+	if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, NULL, "CSTA", pRequest->GetCallingDevice().GetCallNr().c_str(), NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS	|| !caller_session) 
+	{		
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "-ERR Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause));
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); //TODO: refine error code
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::MakeCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		if(pDevice)
+			pDevice->SetMakeCallOriginator(false);
+		return;
+	}
+
+	caller_channel = switch_core_session_get_channel(caller_session);
+	switch_channel_clear_state_handler(caller_channel, NULL);
+	
+	switch_ivr_session_transfer(caller_session, exten, "XML", "default");	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "+OK Created Session: %s\n", switch_core_session_get_uuid(caller_session));
+	
+	MakeCallResponse resp(pRequest->GetInvokeID(),ConnectionID(pRequest->GetCallingDevice(),switch_core_session_get_uuid(caller_session)));
+	sender->SendMsg(&resp);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::MakeCall: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+	if(pDevice)
+		pDevice->SetMakeCallOriginator(false);
+	
+	switch_core_session_rwunlock(caller_session);	
+	
+}
+
+
+void FreeSWITCH::AnswerCall(CISession* sender, AnswerCallRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetCallToBeAnswered().GetCallID().c_str());	
+	if(!pCall)
+		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::AnswerCall: CallID %s not found.",pRequest->GetCallToBeAnswered().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	FreeSwitchDevice * pDevice=pCall->GetDevice(pRequest->GetCallToBeAnswered().GetDeviceID()->GetCallNr());	
+	if(!pDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::AnswerCall: Device %s not found.",pRequest->GetCallToBeAnswered().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	FreeSwitchConnection* pConnection=pDevice->FindConnection(pCall);
+	if(!pConnection)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::AnswerCall: Connection %s/%s not found.",pRequest->GetCallToBeAnswered().GetDeviceID()->GetCallNr().c_str(),pRequest->GetCallToBeAnswered().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	switch_core_session_t* session=switch_core_session_locate(pConnection->strUUID.c_str());
+
+	if(!session)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::AnswerCall: No session for CallID %s found.",pRequest->GetCallToBeAnswered().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	switch_channel_t * channel=switch_core_session_get_channel(session);
+	switch_channel_clear_flag(channel, CF_PROXY_MEDIA);
+	switch_channel_clear_flag(channel, CF_PROXY_MODE);
+	if(switch_channel_answer(channel)==SWITCH_STATUS_SUCCESS)
+	{
+		AnswerCallResponse resp(pRequest->GetInvokeID());
+		sender->SendMsg(&resp);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+	}
+	else
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::AnswerCall: switch_channel_answer failed.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::AnswerCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+
+	}
+	switch_core_session_rwunlock(session);
+	
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::PlayMessage(CISession* sender, PlayMessageRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PlayMessage: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetOverConnection().GetCallID().c_str());	
+	if(!pCall)
+		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PlayMessage: CallID %s not found.",pRequest->GetOverConnection().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PlayMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	FreeSwitchDevice * pDevice=pCall->GetDevice(pRequest->GetOverConnection().GetDeviceID()->GetCallNr());	
+	if(!pDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PlayMessage: Device %s not found.",pRequest->GetOverConnection().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PlayMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	FreeSwitchConnection* pConnection=pDevice->FindConnection(pCall);
+	if(!pConnection)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PlayMessage: Connection %s/%s not found.",pRequest->GetOverConnection().GetDeviceID()->GetCallNr().c_str(),pRequest->GetOverConnection().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PlayMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	
+	if(switch_ivr_broadcast(pConnection->strUUID.c_str(), pRequest->GetMessageToBePlayed().c_str(), SMF_ECHO_ALEG)==SWITCH_STATUS_SUCCESS)
+	{
+		PlayMessageResponse resp(pRequest->GetInvokeID());
+		sender->SendMsg(&resp);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PlayMessage: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+	}
+	else
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::PlayMessage: switch_ivr_broadcast failed.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::PlayMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+	}
+
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::RecordMessage(CISession* sender, RecordMessageRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+	
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetCallToBeRecorded().GetCallID().c_str());	
+	if(!pCall)		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage: CallID %s not found.",pRequest->GetCallToBeRecorded().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	FreeSwitchDevice * pDevice=pCall->GetDevice(pRequest->GetCallToBeRecorded().GetDeviceID()->GetCallNr());	
+	if(!pDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage: Device %s not found.",pRequest->GetCallToBeRecorded().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	FreeSwitchConnection* pConnection=pDevice->FindConnection(pCall);
+	if(!pConnection)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage: Connection %s/%s not found.",pRequest->GetCallToBeRecorded().GetDeviceID()->GetCallNr().c_str(),pRequest->GetCallToBeRecorded().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	switch_core_session_t *session=switch_core_session_locate(pConnection->strUUID.c_str());
+	if(!session)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage: Session %s not found.",pConnection->strUUID.c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	
+
+	if ((switch_channel_test_flag(switch_core_session_get_channel(session), CF_EVENT_PARSE))) 
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage: Record or broadcast already in progress.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	char filename[MAX_PATH];
+	sprintf(filename,"%s-%X.wav",pRequest->GetCallToBeRecorded().GetCallID().c_str(),clock());
+	char arg[MAX_PATH+20];
+	
+	if(pRequest->GetMaxDuration()>1000)
+	{
+		sprintf(arg, "%s %d",filename,pRequest->GetMaxDuration()/1000);
+	}
+	else
+	{
+		strcpy(arg,filename);
+	}
+	
+    char path[MAX_PATH];          
+	strcat(path,switch_channel_get_variable(switch_core_session_get_channel(session), "sound_prefix"));
+	strcat(path,SWITCH_PATH_SEPARATOR);
+	strcat(path,filename);
+	
+	switch_event_t *event;
+	if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) 
+	{		
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", "record");
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", arg);			
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true");
+		switch_core_session_queue_private_event(session, &event);		
+
+		RecordMessageResponse resp(pRequest->GetInvokeID(),path);
+		sender->SendMsg(&resp);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+	}
+	else
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage: switch_event_create failed.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+	}
+	switch_core_session_rwunlock(session);
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::StopMessage(CISession* sender, StopRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::StopMessage: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+	
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetConnection().GetCallID().c_str());	
+	if(!pCall)		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::StopMessage: CallID %s not found.",pRequest->GetConnection().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::StopMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	FreeSwitchDevice * pDevice=pCall->GetDevice(pRequest->GetConnection().GetDeviceID()->GetCallNr());	
+	if(!pDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::StopMessage: Device %s not found.",pRequest->GetConnection().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::StopMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+	FreeSwitchConnection* pConnection=pDevice->FindConnection(pCall);
+	if(!pConnection)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::StopMessage: Connection %s/%s not found.",pRequest->GetConnection().GetDeviceID()->GetCallNr().c_str(),pRequest->GetConnection().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::StopMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	switch_core_session_t *session=switch_core_session_locate(pConnection->strUUID.c_str());
+	if(!session)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::StopMessage: Session %s not found.",pConnection->strUUID.c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::StopMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}	
+
+	if (!switch_channel_test_flag(switch_core_session_get_channel(session), CF_EVENT_PARSE)) 
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::RecordMessage:No record or broadcast running.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::RecordMessage: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}	
+	
+	switch_ivr_stop_record_session(session, pRequest->GetMessageToBeStopped().size()?pRequest->GetMessageToBeStopped().c_str():"all");
+	switch_channel_stop_broadcast(switch_core_session_get_channel(session));
+
+	StopResponse resp(pRequest->GetInvokeID());
+	sender->SendMsg(&resp);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::StopMessage: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());	
+	
+	switch_core_session_rwunlock(session);
+	switch_mutex_unlock(m_mutex);
+}
+
+
+void FreeSWITCH::SingleStepTransferCall(CISession* sender,SingleStepTransferCallRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetActiveCall().GetCallID().c_str());	
+	if(!pCall)		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::SingleStepTransferCall: CallID %s not found.",pRequest->GetActiveCall().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	//Retrieving the device that initiates the transfer
+	FreeSwitchDevice * pTransferringDevice=pCall->GetDevice(pRequest->GetActiveCall().GetDeviceID()->GetCallNr());	
+	if(!pTransferringDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::SingleStepTransferCall: Device %s not found.",pRequest->GetActiveCall().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{
+		if(it->second!=pTransferringDevice)	
+		{
+			FreeSwitchConnection* pConnectionToTransfer=it->second->FindConnection(pCall);
+			if(!pConnectionToTransfer)
+			{
+				switch_mutex_unlock(m_mutex);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::SingleStepTransferCall: Connection %s/%s not found.",it->second->GetDeviceID().c_str(),pRequest->GetActiveCall().GetCallID().c_str());
+				UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+				sender->SendMsg(&err);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+				return;
+			}
+
+			switch_core_session_t* sessionToTransfer=switch_core_session_locate(pConnectionToTransfer->strUUID.c_str());
+			if(!sessionToTransfer)
+			{
+				switch_mutex_unlock(m_mutex);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::SingleStepTransferCall: Session %s not found.",pConnectionToTransfer->strUUID.c_str());
+				UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+				sender->SendMsg(&err);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+				return;
+			}
+
+			if(switch_ivr_session_transfer(sessionToTransfer,pRequest->GetTransferredTo().GetCallNr().c_str(),NULL,NULL)==SWITCH_STATUS_SUCCESS)
+			{
+				SingleStepTransferCallResponse resp(pRequest->GetInvokeID(),ConnectionID(pRequest->GetTransferredTo(),pCall->strUUID));
+				sender->SendMsg(&resp);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+			}
+			else
+			{
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::SingleStepTransferCall: switch_ivr_session_transfer failed.");
+				UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+				sender->SendMsg(&err);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::SingleStepTransferCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+			}
+			switch_core_session_rwunlock(sessionToTransfer);
+		}
+	}
+
+	//TODO: send transferred event
+	pTransferringDevice->DeleteConnection(pCall);
+	
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::DeflectCall(CISession* sender,DeflectCallRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetCallToBeDiverted().GetCallID().c_str());	
+	if(!pCall)		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::DeflectCall: CallID %s not found.",pRequest->GetCallToBeDiverted().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	//Retrieving the device that initiates the transfer
+	FreeSwitchDevice * pTransferringDevice=pCall->GetDevice(pRequest->GetCallToBeDiverted().GetDeviceID()->GetCallNr());	
+	if(!pTransferringDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::DeflectCall: Device %s not found.",pRequest->GetCallToBeDiverted().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	for(MapStr2Device::iterator it=pCall->devices.begin();it!=pCall->devices.end();it++)
+	{
+		if(it->second!=pTransferringDevice)	
+		{
+			FreeSwitchConnection* pConnectionToTransfer=it->second->FindConnection(pCall);
+			if(!pConnectionToTransfer)
+			{
+				switch_mutex_unlock(m_mutex);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::DeflectCall: Connection %s/%s not found.",it->second->GetDeviceID().c_str(),pRequest->GetCallToBeDiverted().GetCallID().c_str());
+				UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+				sender->SendMsg(&err);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+				return;
+			}
+
+			switch_core_session_t* sessionToTransfer=switch_core_session_locate(pConnectionToTransfer->strUUID.c_str());
+			if(!sessionToTransfer)
+			{
+				switch_mutex_unlock(m_mutex);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::DeflectCall: Session %s not found.",pConnectionToTransfer->strUUID.c_str());
+				UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+				sender->SendMsg(&err);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+				return;
+			}
+
+			if(switch_ivr_session_transfer(sessionToTransfer,pRequest->GetNewDestination().GetCallNr().c_str(),NULL,NULL)==SWITCH_STATUS_SUCCESS)
+			{
+				DeflectCallResponse resp(pRequest->GetInvokeID());
+				sender->SendMsg(&resp);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+			}
+			else
+			{
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::DeflectCall: switch_ivr_session_transfer failed.");
+				UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+				sender->SendMsg(&err);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::DeflectCall: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+			}
+			switch_core_session_rwunlock(sessionToTransfer);
+		}
+	}
+
+	//TODO: send transferred event
+	pTransferringDevice->DeleteConnection(pCall);
+	
+	switch_mutex_unlock(m_mutex);
+}
+
+void FreeSWITCH::ClearConnection(CISession* sender, ClearConnectionRequest* pRequest)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Request with InvokeID: %d\n:%s\n",pRequest->GetInvokeID(), pRequest->GetReadable().c_str());
+
+	switch_mutex_lock(m_mutex);
+
+	FreeSwitchCall* pCall=GetCall(pRequest->GetConnectionToBeCleared().GetCallID().c_str());	
+	if(!pCall)		
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::ClearConnection: CallID %s not found.",pRequest->GetConnectionToBeCleared().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidCallID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	//Retrieving the device that initiates the transfer
+	FreeSwitchDevice * pDevice=pCall->GetDevice(pRequest->GetConnectionToBeCleared().GetDeviceID()->GetCallNr());	
+	if(!pDevice)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::ClearConnection: Device %s not found.",pRequest->GetConnectionToBeCleared().GetDeviceID()->GetCallNr().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	FreeSwitchConnection* pConnection=pDevice->FindConnection(pCall);
+	if(!pConnection)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::ClearConnection: Connection %s/%s not found.",pDevice->GetDeviceID().c_str(),pRequest->GetConnectionToBeCleared().GetCallID().c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	switch_core_session_t* session=switch_core_session_locate(pConnection->strUUID.c_str());
+	if(!session)
+	{
+		switch_mutex_unlock(m_mutex);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::ClearConnection: Session %s not found.",pConnection->strUUID.c_str());
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,invalidDeviceID); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+		return;
+	}
+
+	switch_channel_t *channel = switch_core_session_get_channel(session);	
+
+	if(switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING)==CS_HANGUP)
+	{
+		ClearConnectionResponse resp(pRequest->GetInvokeID());
+		sender->SendMsg(&resp);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Response sent with InvokeID: %d\n:%s\n",resp.GetInvokeID(), resp.GetReadable().c_str());
+	}
+	else
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FreeSWITCH::ClearConnection: switch_ivr_session_transfer failed.");
+		UniversalErrorResponse err(pRequest->GetInvokeID(),error_type_operation,genericError); 
+		sender->SendMsg(&err);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeSWITCH::ClearConnection: Response sent with InvokeID: %d\n:%s\n",err.GetInvokeID(), err.GetReadable().c_str());
+	}
+	switch_core_session_rwunlock(session);
+	switch_mutex_unlock(m_mutex);
+}
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.h (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,248 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+#ifndef CI_FREE_SWITCH_H
+#define CI_FREE_SWITCH_H
+
+#include "CICTIHandler.h"
+#include "CISession.h"
+#include "CSTAEvent.h"
+#include <map>
+#include <list>
+#include <string>
+
+
+using namespace std;
+
+
+
+class FreeSwitchCall;
+
+enum eDirection
+{
+	direction_incoming,	//!< attached device is the called (on internal subscriber) or call is incoming (on network interface)
+	direction_outgoing, //!< attached device is the caller (on internal subscriber) or call is outgoing (on network interface)
+};
+
+class FreeSwitchConnection
+{
+public:
+	FreeSwitchCall* pCall;
+	string strUUID;					//<! Unique ID of the connection (could be different from the call's unique ID)
+	eLocalConnectionState state;	//!< Local connection state
+	eDirection	direction;			//!< direction of the call	
+	string strChannel;				//!< channel name
+};
+
+typedef map<FreeSwitchCall*,FreeSwitchConnection*> MapCall2Connection;
+typedef map<string, CISession*> MapStr2Session;
+
+enum FreeSwitchDeviceType
+{
+	type_internal_subscriber=0,
+	type_network_interface,
+	type_queue,
+	type_unknown,
+};
+
+class FreeSwitchDevice
+{
+protected:
+	string m_strDevice;	
+	MapStr2Session m_MonitoringSessions;				//!< Sessions monitoring this device
+
+	FreeSwitchDeviceType m_deviceType;
+
+	bool m_bIsMakeCallOriginator;					
+public:
+	static std::string Channel2Device(const char* channel);	
+	
+	static char * Type2Prefix(FreeSwitchDeviceType type);
+	
+	//! finds out FreeSWITCH device type of CSTA DeviceID object
+	/*!
+		CSTA devices with type "dialingNumber" will mapped to internal subscribers (Note, that in some cases, 
+		the implementation will ignore the type field in CSTA devices and interprets the CallNr as a dial string, 
+		e.g in MakeCall request the device type is checked for callingDevice but not for calledDirectoryNumber).
+
+		CSTA devices with type "deviceNumber" are used to represent non subscriber type entities. 
+		For FreeSWITCH implementation, the number string begins with 2 byte long device 
+		type identifier and a device identifier. The device identifier must only contain numeric characters
+
+		Current device type prefixes:
+		"02" - Queue
+
+		\sa queue_function
+	*/
+	static FreeSwitchDeviceType Device2Type(DeviceID device);
+public:
+	MapCall2Connection connections;	//!< Active connections of this device
+
+	FreeSwitchDevice(const char* pcDevice, FreeSwitchDeviceType deviceType=type_internal_subscriber);
+
+	string& GetDeviceID() {return m_strDevice;}
+
+	bool IsMonitoredWithID(string crossRefID);
+	
+	bool AddMonitor(CISession* session, string crossRefID);
+
+	bool RemoveMonitor(CISession* session);
+
+	bool RemoveMonitor(CISession* session, string crossRefID);
+
+	bool IsMonitored() {return m_MonitoringSessions.size()>0?true:false;}
+
+	FreeSwitchConnection* FindConnection(const char* uuid);
+
+	FreeSwitchConnection* FindConnection(FreeSwitchCall* pCall);
+
+	FreeSwitchConnection* AddConnection(const char* uuid, const char * channel, FreeSwitchCall* pCall, eDirection direction);
+
+	void DeleteConnection(FreeSwitchCall* pCall);
+
+	//! Sends CSTA event to all sessions monitoring the device
+	void SendEvent(CSTAEvent* pEvent);
+
+	FreeSwitchDeviceType GetDeviceType() {return m_deviceType;}
+
+	int GetConnectionCount() {return connections.size();}
+
+	bool IsMakeCallOriginator() {return m_bIsMakeCallOriginator;}
+
+	void SetMakeCallOriginator (bool bMakeCallOriginator) {m_bIsMakeCallOriginator=bMakeCallOriginator;}
+};
+
+typedef map<string,FreeSwitchDevice*> MapStr2Device;
+typedef map<string,FreeSwitchCall*> MapStr2Call;
+
+class FreeSwitchCall
+{
+public:
+	string strUUID;					//!< Unique ID (used for CSTA CallID) - the FreeSWITCH unique ID of the first connection in the call.
+	MapStr2Device devices;	
+
+	FreeSwitchDevice* GetDevice(std::string strDeviceID);
+};
+
+
+
+
+//! CSTA Inside CICTIHandler interface realization for FreeSWITCH.
+/*!
+Provides FreeSWITCH specific telephony methods to used by CSTA Inside.
+*/
+class FreeSWITCH : public CICTIHandler
+{
+protected:
+	 MapStr2Device m_DeviceMap;			//!< Stores the known devices. Map key is the device id (usually the dialing number)
+	 MapStr2Call m_CallMap;				//!< Stores the active calls. Map key is the call ID (1st FreeSWITCH UUID)
+	 switch_mutex_t *m_mutex;			//!< To protect the device and call map
+	 switch_memory_pool_t * m_pool;
+
+	 int m_nLastXRefID;
+
+	 bool FindCallerCalled(const char* uuid, string* pstrCaller, string* pstrCalled);
+
+	 bool PrepareCallData(const char* uuid, const char* uuid2, const char* channel, FreeSwitchDevice** ppDevice, FreeSwitchCall** ppCall, FreeSwitchConnection** ppConnection, bool bCreateCall, FreeSwitchDevice** ppQueue, FreeSwitchDevice** ppInboundNID, FreeSwitchDevice** ppOutboundNID, string* pstrCaller, string* pstrCalled);
+
+public:
+	FreeSWITCH(switch_memory_pool_t *pool);
+
+	virtual ~FreeSWITCH();
+
+	FreeSwitchDevice * PrepareDevice(const char * pcDevice, FreeSwitchDeviceType type=type_internal_subscriber);
+
+	FreeSwitchCall* GetCall(const char * pcUUID);
+
+	bool IsXRefIDUsed(string crossRefID);	//!< Returns true if given XRefID already used in the current CTI handler
+
+	string GetNextXRefID();	//!< Returns the next available monitor cross reference ID	
+
+//Switch event handlers:
+	void OnChannelCreate(switch_event_t *event);	//!< Handling CHANNEL_CREATE FreeSwitch event
+
+	void OnChannelHangup(switch_event_t *event);	//!< Handling CHANNEL_HANGUP FreeSwitch event
+
+	void OnChannelAnswer(switch_event_t *event);	//!< Handling CHANNEL_ANSWER FreeSwitch event
+
+	void OnProgress(switch_event_t *event);			//!< Handling CHANNEL_PROGRESS_MEDIA and CHANNEL_PROGRESS events
+
+	void OnDtmf(switch_event_t *event);				//!< Handling DTMF FreeSWITCH event
+	
+	void OnCallQueued(const char* queue, switch_core_session_t *session);		//!< Handling incoming call on queue
+
+	void OnCallNetworkIncoming(const char* trunk, switch_core_session_t *session);		//!< Handling incoming call on a gateway
+
+	void OnCallNetworkOutgoing(const char* trunk, switch_core_session_t *session);		//!< Handling outgoing call on a gateway
+
+	void OnPlayback(switch_event_t *event);			//!< Handling playback application start or stop
+
+	void OnRecord(switch_event_t *event);			//!< Handling record application start or stop
+
+//Session event handlers:
+
+	void OnSessionFinished(CISession* sender);		//!< Called if given session is disconnected
+
+	void MonitorStart(CISession* sender, MonitorStartRequest* pRequest);	//!< called if a Monitor Start request should be processed
+
+	void SnapshotDevice(CISession* sender, SnapshotDeviceRequest* pRequest);	//!< Called if Snapshot Device request is received
+
+	void SnapshotCall(CISession* sender, SnapshotCallRequest* pRequest);	//!< Called if Snapshot Call request is received
+
+	
+	void MakeCall(CISession* sender, MakeCallRequest* pRequest);		//!< Called if Make Call request is received
+
+	void AnswerCall(CISession* sender, AnswerCallRequest* pRequest);	//!< Called if Answer Call request is received
+
+	void PlayMessage(CISession* sender, PlayMessageRequest* pRequest);	//!< Called if Play Message request is received
+
+	void RecordMessage(CISession* sender, RecordMessageRequest* pRequest);	//!< Called if Record Message request is received
+
+	void StopMessage(CISession* sender, StopRequest* pRequest);				//!< Called if Stop request is received
+
+	void SingleStepTransferCall(CISession* sender,SingleStepTransferCallRequest* pRequest);	//!< Called if Single Step Transfer Call Message request is received
+
+	void ClearConnection(CISession* sender,ClearConnectionRequest* pRequest);
+
+	void DeflectCall(CISession* sender,DeflectCallRequest* pRequest);	//!< Called if Deflect Call Message request is received
+};
+
+#endif	//CI_FREE_SWITCH_H
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.cpp (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,72 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+#include "FreeSWITCHPlatform.h"
+#include "switch.h"
+
+
+FreeSWITCHPlatform::FreeSWITCHPlatform(void)
+{
+}
+
+FreeSWITCHPlatform::~FreeSWITCHPlatform(void)
+{
+}
+
+void FreeSWITCHPlatform::Trace(ci_trace_level loglevel, const char *fmt, ...)
+{
+	switch_log_level_t fsloglevel=SWITCH_LOG_ALERT;
+	switch (loglevel)
+	{
+	case CI_LLV_FATAL: fsloglevel=SWITCH_LOG_ALERT;break;
+	case CI_LLV_ERROR: fsloglevel=SWITCH_LOG_ERROR;break;
+	case CI_LLV_WARN: fsloglevel=SWITCH_LOG_WARNING;break;
+	case CI_LLV_INFO: fsloglevel=SWITCH_LOG_NOTICE;break;
+	case CI_LLV_DEBUG: fsloglevel=SWITCH_LOG_DEBUG;break;
+	}
+	
+	va_list ap;
+	va_start(ap, fmt);
+	
+
+	switch_log_vprintf(SWITCH_CHANNEL_LOG, fsloglevel, fmt, ap);	
+	va_end(ap);
+}
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.h (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHPlatform.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,62 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+
+#ifndef CI_FREE_SWITCH_PLATFORM_H
+#define CI_FREE_SWITCH_PLATFORM_H
+
+#include "CIPlatform.h"
+
+//! CSTA Inside CIPlatform interface realization for FreeSWITCH.
+/*!
+Provides FreeSWITCH platform specific OS/XML/... methods required by by CSTA Inside.
+*/
+class FreeSWITCHPlatform : public CIPlatform
+{
+public:
+	FreeSWITCHPlatform();
+
+	virtual ~FreeSWITCHPlatform();
+
+	virtual void Trace(ci_trace_level loglevel, const char *fmt, ...);
+};
+
+#endif	//CI_FREE_SWITCH_PLATFORM_H
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.cpp (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,98 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+
+#include "FreeSwitchSocket.h"
+#include <apr_errno.h>
+
+FreeSWITCHSocket::FreeSWITCHSocket(switch_socket_t* pSocket, switch_memory_pool_t *pool) : m_pSocket(pSocket), m_pool(pool)
+{
+	switch_mutex_init(&m_mutex, SWITCH_MUTEX_NESTED, m_pool);
+	switch_socket_opt_set(m_pSocket, SWITCH_SO_TCP_NODELAY, TRUE);
+	switch_socket_opt_set(m_pSocket, SWITCH_SO_NONBLOCK, FALSE);
+
+	char remote_ip[50];
+	switch_sockaddr_t *sa;
+
+	switch_socket_addr_get(&sa, SWITCH_TRUE, m_pSocket);
+	switch_get_addr(remote_ip, sizeof(remote_ip), sa);
+	switch_port_t remote_port = switch_sockaddr_get_port(sa);
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Connection Open from %s:%d\n", remote_ip, remote_port);
+}
+
+FreeSWITCHSocket::~FreeSWITCHSocket()
+{
+	switch_mutex_destroy(m_mutex);
+}
+
+int FreeSWITCHSocket::Receive(unsigned char *buf, size_t *len) 
+{
+	switch_status_t status=switch_socket_recv(m_pSocket, (char*)buf, len);
+	if(status)
+	{
+		char errbuf[4096];
+		switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_NOTICE,"Receive: socket terminated: %d (%s)",status, apr_strerror(status,errbuf,sizeof(errbuf)));
+	}
+	else
+		switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_NOTICE,"%d bytes received:\n%s",*len, buf);
+	return status;
+}	
+
+int FreeSWITCHSocket::Send(const unsigned char *buf, size_t *len) 
+{
+	switch_mutex_lock(m_mutex);
+	switch_status_t status=switch_socket_send(m_pSocket, (const char*)buf, len);
+	if(status)
+	{
+		char errbuf[4096];
+		switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_NOTICE,"Send: socket terminated: %d (%s)",status, apr_strerror(status,errbuf,sizeof(errbuf)));
+	}
+	switch_mutex_unlock(m_mutex);
+	return status;
+}
+
+int FreeSWITCHSocket::Close()
+{
+	switch_socket_shutdown(m_pSocket, SWITCH_SHUTDOWN_READWRITE);
+	switch_socket_close(m_pSocket);	
+	return 0;
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.h (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCHSocket.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,71 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+
+#ifndef CI_FREE_SWITCH_SOCKET_H
+#define CI_FREE_SWITCH_SOCKET_H
+
+#include "CISocket.h"
+#include "switch.h"
+
+//! CSTA Inside CISocket interface realization for FreeSWITCH.
+/*!
+Provides FreeSWITCH platform specific socket manipulation methods required by CSTA Inside.
+*/
+class FreeSWITCHSocket : public CISocket
+{
+protected:
+	switch_socket_t* m_pSocket;
+	switch_mutex_t *m_mutex;
+	switch_memory_pool_t* m_pool;
+public:
+	FreeSWITCHSocket(switch_socket_t* pSocket, switch_memory_pool_t *pool);
+
+	virtual ~FreeSWITCHSocket();
+
+	virtual int Receive(unsigned char *buf, size_t *len);	
+
+	virtual int Send(const unsigned char *buf, size_t *len);
+
+	virtual int Close();
+};
+
+#endif	//CI_FREE_SWITCH_SOCKET_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH_CSTA.rc (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH_CSTA.rc) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH_CSTA.rc	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/FreeSWITCH_CSTA.rc	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,115 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Hungarian resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
+#ifdef _WIN32
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Hungarian resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,2,0,92
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040e04b0"
+        BEGIN
+            VALUE "Comments", "http://cstainside.sourceforge.net/"
+            VALUE "FileDescription", "CSTA interface for FreeSWITCH"
+            VALUE "FileVersion", "0, 2, 0, 92"
+            VALUE "InternalName", "mod_csta_socket"
+            VALUE "LegalCopyright", "Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>"
+            VALUE "LegalTrademarks", "Licensed under MPL 1.1"
+            VALUE "OriginalFilename", "mod_csta_socket.dll"
+            VALUE "ProductName", "CSTA Inside"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40e, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/README (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/README) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/README	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/README	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,192 @@
+                              mod_csta_socket - CSTA interface for FreeSWITCH
+                            
+    
+1. Capabilities
+   
+As a communication & encoding interface CSTA XML over TCP without SOAP is supported yet (ECMA-323 Annex J-2).
+Module is based on CSTA Inside library.
+
+Supported device types:
+
+1.1. internal subscribers
+- internal subscribers are mapped to CSTA "dialingNumber" type of devices. The dialing sequence is the 
+phone number without any leading characters
+
+1.2 queues
+Queues are able to enqueue multiple calls. To configure a CSTA queue, add the csta_trigger_queue application 
+to a dialplan entry:
+
+<action application="csta_trigger_queue" data="9500"/>
+
+Data is the name of the queue. In CSTA events and requeust, the queue will be referenced as a device with type 
+of "deviceNumber". The callNr will be concatenated with a type ID of "02" and the queue name (029500 on the above example).
+Queue name should be numeric to comply with CSTA standard.
+
+1.3 network interfaces
+Network interfaces or trunks representing devices via calls can leave or enter the CSTA subdomain.
+To configure CSTA NIDs, add the csta_trigger_trunk_inbound and csta_trigger_trunk_outbound application
+to the corresponding dialplan entry (if a call is directed to a gateway or external call directed into FreeSWITCH):
+
+outgoing example:
+
+<extension name="outbound_example">
+	<condition field="destination_number" expression="^20(.*)$">
+		<action application="csta_trigger_trunk_outbound" data="20"/>		
+		<action application="bridge" data="sofia/gateway/example_gw/$1"/>
+	</condition>
+</extension> 
+
+incoming example:
+
+<extension name="inbound_example">
+	<condition field="destination_number" expression="^193190$">       
+		 <action application="csta_trigger_trunk_inbound" data="20"/>
+		 <action application="set" data="domain_name=$${domain}"/>      
+		 <action application="transfer" data="9500 XML default"/>
+	</condition>
+ </extension>  
+ 
+Data is the name of the queue. In CSTA events and requeust, the NID will be referenced as a device with type 
+of "deviceNumber". The callNr will be concatenated with a type ID of "01" and the NID name (0120 on the above example).
+NID name should be numeric to comply with CSTA standard. 
+
+The following CSTA messages are implemented:
+
+requests and responses:
+- Monitor Start
+  Starts monitoring of a device. 
+  Supported types: internal subscriber, queue, NID
+
+- Make Call
+  Originates a call to an extension
+  Supported types: callingDevice: internal subscriber 
+                   calledDirectoryNumber: any extension, used as dialing string
+  Do Not Prompt (auto originate) option works only with devices supporting sip_auto_answer flag
+  
+- Answer Call
+  Answers a ringing call
+  Supported Types: queue
+  
+- Single Step Transfer Call
+  Transfers a connection to another endpoint without hold & consultation
+  Supported types: activeCall: internal subscriber, queue.
+                   transferredTo: any extension, used as dialing string.
+  
+- Play Message
+  Plays a wavefile for a connected connection. Wavefile path relative to "/sounds/en/us/callie" is to specify in 
+  messageToBePlayed parameter. If positive response is returned, check Stop event for result of the service.
+  Supported types: internal subscriber, queue
+  
+- Record Message
+  Records a connection to a wavefile. Filename is generated by the service and returned (with full path) in the response.
+  Supported types: internal subscriber, queue
+  
+- Stop
+  Stops playing or recording of a wavefile. 
+  Supported types: internal subscriber, queue
+  
+- Clear Connection
+  Clears an active connection. 
+  Supported types: internal subscriber, queue, NID
+  
+- Snapshot Device
+  Returns the active connections of a device. 
+  Supported types: internal subscriber, queue, NID
+  
+- Snapshot Call
+  Returns the devices participating in an active call. 
+  Supported types: internal subscriber, queue, NID
+
+- Deflect Call
+  Transfers a connection to another endpoint 
+  Supported types: callToBeDiverted: internal subscriber, queue.
+                   newDestination: any extension, used as dialing string.
+
+events:
+- Service Initiated
+  Generated if an outbound channel is created from a device
+  Supported types: internal subscriber, network interface
+  
+- Originated
+  Generated from the caller if call is delivered
+  Supported types: internal subscriber
+  
+- Delivered
+  Generated if call is delivered to called party
+  Supported types: internal subscriber
+
+- Established
+  Generated if channel is answered
+  Supported types: internal subscriber, queue, network interface
+
+- Connection Cleared
+  Generated if a device leaves a call
+  Supported types: internal subscriber, queue, network interface
+
+- Queued
+  Generated if a call enters a queue
+  Supported types: internal subscriber, queue,  network interface
+  
+- DTMF Detected
+  Generated if a DTMF tone is detected on a connected connection
+  Supported types: internal subscriber, queue (if a device connected to a queue generates a tone), network interface
+  Note: On queues FreeSWITCH only detects DTMF if acoustic conection is on. 
+  Workaround: add <action application="playback" data="silence_stream://1800000"/> after queue is answered to queue dialplan.
+  
+- Play
+  Generated if playback application is started.
+  The "message" field contains the soundfile relative path.
+
+- Record
+  Generated if record application is started.
+  The "message" field contains the soundfile relative path.
+
+- Stop     
+  Generated if playback or record application is stopped.
+  The "message" field contains the soundfile relative path. The "cause" field is set to "endOfMessageDetected" if 
+  file played successfully or stop service is invoked, "resourcesNotAvailable" if file not found, and "blocked" if playback failed from any other reason.
+  For recording "messageDurationExceeded" cause is used if record stopped after recording length reached maxDuration or stop service is invoked.
+  If recording stopped because of hangup, no Stop event will be generated, only Connection Cleared. 
+  
+                            
+2. Building from source
+
+For Win32 platform Visual Studio 2008 project file is included. Use only Release configuration. 
+
+Requirements:
+- CSTA Inside Core - Multi-purpose C++ CSTA-XML library 
+  download from: http://cstainside.sourceforge.net/
+  place to: <root>\CSTAInsideCore (project file expects ..\CSTAInsideCore directory)
+- FreeSWITCH
+  download from: http://wiki.freeswitch.org/wiki/Installation_Guide#Download_Source_Tarball
+  place to: <root>\3rdparty\freeswitch-snapshot
+
+Both must be build before building mod_csta_socket
+
+3. Usage
+
+mod_csta_socket.dll is placed to <root>\3rdparty\freeswitch-snapshot\Release\mod directory. To load use load 
+FreeSWITCH command or set automatic load in modules.conf.xml
+
+4. Configuration
+
+module reads configuration data from csta_socket.conf.xml file under <freeswitch>\conf\autoload_configs directory.
+
+Example:
+<configuration name="csta_socket.conf" description="CSTA Interface">
+  <settings>        
+    <param name="listen-ip" value="127.0.0.1"/>
+    <param name="xml-listen-port" value="3000"/>
+    <param name="apply-inbound-acl" value="csta"/>
+  </settings>
+</configuration>
+
+listen-ip:          the IP address of interface to listen on. 0.0.0.0 specifies to listen on all interfaces.
+                    default: 127.0.0.1
+xml-listen-port:    the listening port for CSTA-XML over TCPinterface.
+                    default: 3000
+apply-inbound-acl:  the name of ACL entry configured in acl.conf to filter inbound connections.
+                    default: empty (no ACL applied)
+
+
+Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.cpp (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,88 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+#include <switch.h>
+#include "config.h"
+
+
+/*static*/ Config Config::_instance;
+
+Config::Config()
+{
+	strcpy(listen_address,"127.0.0.1");
+	xml_port=3000;
+	acl_name[0]=0;
+}
+
+bool Config::ReadConfig()
+{
+	
+	char *cf = "csta_socket.conf";
+	switch_xml_t cfg, xml, settings, param;
+
+	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Open of %s failed, using defaults.\n", cf);
+	} else {
+		if ((settings = switch_xml_child(cfg, "settings"))) {
+			for (param = switch_xml_child(settings, "param"); param; param = param->next) {
+				char *var = (char *) switch_xml_attr_soft(param, "name");
+				char *val = (char *) switch_xml_attr_soft(param, "value");
+
+				if (!strcmp(var, "listen-ip"))
+				{
+					strncpy(listen_address,val,sizeof(listen_address));	
+					listen_address[sizeof(listen_address)-1]=0;
+				}
+				else if (!strcmp(var, "xml-listen-port"))
+					xml_port=(switch_port_t)atoi(val);
+				else if (!strcasecmp(var, "apply-inbound-acl")) 
+				{
+					strncpy(acl_name,val,sizeof(acl_name));	
+					acl_name[sizeof(acl_name)-1]=0;
+				}
+			}
+		}
+		switch_xml_free(xml);
+	}
+	
+	return true;
+
+}
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.h (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/config.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,73 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+#ifndef CI_FS_CONFIG_H
+#define CI_FS_CONFIG_H
+
+
+//! Stores module configuration and processes module configuration file.
+class Config
+{
+protected:
+	static Config _instance;
+public:
+	static Config* Instance() {return &_instance;}
+protected:
+	char listen_address[50];
+	switch_port_t xml_port;
+	char acl_name[50];
+protected:
+	Config();
+public:
+	bool ReadConfig();
+
+	const char* GetListenAddress() {return listen_address;}
+
+	const switch_port_t GetXmlPort() {return xml_port;}
+
+	bool IsACLEnabled() {return acl_name[0]==0?false:true;}
+
+	const char* GetACLName() {return acl_name;}
+};
+
+
+
+#endif //CI_FS_CONFIG_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.cpp (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,476 @@
+/* 
+ * CSTA interface for FreeSWICH 
+ * Copyright (C) 2009, Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CSTA interface for FreeSWICH   
+ *
+ * The Initial Developer of the Original Code is
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Szentesi Krisztian <sz.krisz@freemail.hu>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+/*! \file mod_csta_socket.cpp
+\brief PBX module interface implementation for FreeSWITCH.
+
+Provides interface functions to allow integrate the module to FreeSWITCH 
+*/
+
+
+#include <switch.h>
+
+#include "FreeSwitch.h"
+#include "FreeSwitchPlatform.h"
+#include "FreeSwitchSocket.h"
+#include "XMLSession.h"
+#include "config.h"
+#include "UniversalErrorResponse.h"
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_csta_socket_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_csta_socket_shutdown);
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_csta_socket_runtime);
+SWITCH_MODULE_DEFINITION(mod_csta_socket, mod_csta_socket_load, mod_csta_socket_shutdown, mod_csta_socket_runtime);
+
+static volatile bool bRunning=true;
+
+FreeSWITCH* fs=NULL;
+FreeSWITCHPlatform* platform=NULL;
+
+
+struct THREAD_INFO
+{
+	switch_memory_pool_t *pool;
+	switch_socket_t* socket;
+};
+
+
+switch_socket_t* listen_socket=NULL;
+switch_event_node_t *node=NULL;
+
+
+//! Called if a call hits a queue
+/*!
+	Called if call enters into a queue. Queues should be defined in dialplan 
+	default section with csta_trigger_queue application triggered.
+	\param session The FreeSWITCH session
+	\param data	The queue name set in dialplan (data parameter of csta_trigger_queue application)
+	
+	Example configuration:	
+
+   <extension name="example_queue">
+      <condition field="destination_number" expression="^9500$">  
+          <action application="ring_ready"/>
+          <action application="csta_trigger_queue" data="9500"/>
+          <action application="sleep" data="600000"/>
+      </condition>      
+   </extension> 
+
+   Note that queue name must only contain numeric characters to fit CSTA standard
+*/
+SWITCH_STANDARD_APP(queue_function)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Queue triggered, queue: %s, call:%s!\n", data, switch_core_session_get_uuid(session));
+	fs->OnCallQueued(data, session); 
+}
+
+
+//! Called if a call enters FreeSWITCH from outside
+/*!
+	Called if a call enters FreeSWITCH from outside. Incoming CSTA Network interfaces should be defined in dialplan 
+	public section with csta_trigger_trunk_inbound application triggered.
+	\param session The FreeSWITCH session
+	\param data	The NID name set in dialplan (data parameter of csta_trigger_trunk_inbound application)
+	
+	Example configuration:	
+   
+	  <extension name="inbound_example">
+		<condition field="destination_number" expression="^193190$">       
+		  <action application="csta_trigger_trunk_inbound" data="20"/>
+		  <action application="set" data="domain_name=$${domain}"/>      
+		  <action application="transfer" data="9500 XML default"/>
+		</condition>
+	  </extension>  
+
+   Note that NID name must only contain numeric characters to fit CSTA standard
+*/
+SWITCH_STANDARD_APP(trunk_inbound_function)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Inbound call on trunk %s, call:%s!\n", data, switch_core_session_get_uuid(session));
+	fs->OnCallNetworkIncoming(data, session);
+}
+
+//! Called if a call leaves FreeSWITCH via a gateway
+/*!
+	Called if a call leaves FreeSWITCH via a gateway. Outgoing CSTA Network interfaces should be defined in dialplan 
+	default section with csta_trigger_trunk_outbound application triggered.
+	\param session The FreeSWITCH session
+	\param data	The NID name set in dialplan (data parameter of csta_trigger_trunk_outbound application)
+	
+	Example configuration:	
+   
+	  <extension name="outbound_example">
+		<condition field="destination_number" expression="^20(.*)$">
+			<action application="csta_trigger_trunk_outbound" data="20"/>
+			<action application="set" data="effective_caller_id_number=193190"/>
+			<action application="bridge" data="sofia/gateway/example_gw/$1"/>
+		</condition>
+	  </extension> 
+
+   Note that NID name must only contain numeric characters to fit CSTA standard
+*/
+SWITCH_STANDARD_APP(trunk_outbound_function)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Outbound call on trunk %s, call:%s!\n", data, switch_core_session_get_uuid(session));
+	fs->OnCallNetworkOutgoing(data, session);
+}
+
+static void event_handler(switch_event_t *event)
+{
+	
+	switch(event->event_id)
+	{
+	case SWITCH_EVENT_CUSTOM:
+		break;
+	case SWITCH_EVENT_CLONE:
+		break;
+	case SWITCH_EVENT_CHANNEL_CREATE:
+		fs->OnChannelCreate(event);
+		break;
+	case SWITCH_EVENT_CHANNEL_DESTROY:
+		break;
+	case SWITCH_EVENT_CHANNEL_STATE:
+		break;
+	case SWITCH_EVENT_CHANNEL_ANSWER:
+		fs->OnChannelAnswer(event);
+		break;
+	case SWITCH_EVENT_CHANNEL_HANGUP:
+		fs->OnChannelHangup(event);
+		break;
+	case SWITCH_EVENT_CHANNEL_EXECUTE:		
+	case SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE:
+		{
+			const char* app=switch_event_get_header(event, "Application");
+			if(app) 
+			{
+				if(strcmp(app,"playback")==0)
+					fs->OnPlayback(event);
+				else
+				if(strcmp(app,"record")==0)
+					fs->OnRecord(event);
+			}
+		}
+		break;
+	case SWITCH_EVENT_CHANNEL_BRIDGE:
+		break;
+	case SWITCH_EVENT_CHANNEL_UNBRIDGE:
+		break;
+	case SWITCH_EVENT_CHANNEL_PROGRESS:		
+	case SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA:
+		fs->OnProgress(event);
+		break;
+	case SWITCH_EVENT_CHANNEL_OUTGOING:
+		break;
+	case SWITCH_EVENT_CHANNEL_PARK:
+		break;
+	case SWITCH_EVENT_CHANNEL_UNPARK:
+		break;
+	case SWITCH_EVENT_CHANNEL_APPLICATION:
+		break;
+	case SWITCH_EVENT_CHANNEL_ORIGINATE:
+		break;
+	case SWITCH_EVENT_CHANNEL_UUID:
+		break;
+	case SWITCH_EVENT_API:
+		break;
+	case SWITCH_EVENT_LOG:
+		break;
+	case SWITCH_EVENT_INBOUND_CHAN:
+		break;
+	case SWITCH_EVENT_OUTBOUND_CHAN:
+		break;
+	case SWITCH_EVENT_STARTUP:
+		break;
+	case SWITCH_EVENT_SHUTDOWN:
+		break;
+	case SWITCH_EVENT_PUBLISH:
+		break;
+	case SWITCH_EVENT_UNPUBLISH:
+		break;
+	case SWITCH_EVENT_TALK:
+		break;
+	case SWITCH_EVENT_NOTALK:
+		break;
+	case SWITCH_EVENT_SESSION_CRASH:
+		break;
+	case SWITCH_EVENT_MODULE_LOAD:
+		break;
+	case SWITCH_EVENT_MODULE_UNLOAD:
+		break;
+	case SWITCH_EVENT_DTMF:
+		fs->OnDtmf(event);
+		break;
+	case SWITCH_EVENT_MESSAGE:
+		break;
+	case SWITCH_EVENT_PRESENCE_IN:
+		break;
+	case SWITCH_EVENT_NOTIFY_IN:
+		break;
+	case SWITCH_EVENT_PRESENCE_OUT:
+		break;
+	case SWITCH_EVENT_PRESENCE_PROBE:
+		break;
+	case SWITCH_EVENT_MESSAGE_WAITING:
+		break;
+	case SWITCH_EVENT_MESSAGE_QUERY:
+		break;
+	case SWITCH_EVENT_ROSTER:
+		break;
+	case SWITCH_EVENT_CODEC:
+		break;
+	case SWITCH_EVENT_BACKGROUND_JOB:
+		break;
+	case SWITCH_EVENT_DETECTED_SPEECH:
+		break;
+	case SWITCH_EVENT_DETECTED_TONE:
+		break;
+	case SWITCH_EVENT_PRIVATE_COMMAND:
+		break;
+	case SWITCH_EVENT_HEARTBEAT:
+		break;
+	case SWITCH_EVENT_TRAP:
+		break;
+	case SWITCH_EVENT_ADD_SCHEDULE:
+		break;
+	case SWITCH_EVENT_DEL_SCHEDULE:
+		break;
+	case SWITCH_EVENT_EXE_SCHEDULE:
+		break;
+	case SWITCH_EVENT_RE_SCHEDULE:
+		break;
+	case SWITCH_EVENT_RELOADXML:
+		break;
+	case SWITCH_EVENT_NOTIFY:
+		break;
+	case SWITCH_EVENT_SEND_MESSAGE:
+		break;
+	case SWITCH_EVENT_RECV_MESSAGE:
+		break;
+	case SWITCH_EVENT_REQUEST_PARAMS:
+		break;
+	case SWITCH_EVENT_CHANNEL_DATA:
+		break;
+	case SWITCH_EVENT_GENERAL:
+		break;
+	case SWITCH_EVENT_COMMAND:
+		break;
+	case SWITCH_EVENT_SESSION_HEARTBEAT:
+		break;
+	case SWITCH_EVENT_CLIENT_DISCONNECTED:
+		break;
+	case SWITCH_EVENT_SERVER_DISCONNECTED:
+		break;
+	case SWITCH_EVENT_SEND_INFO:
+		break;
+	case SWITCH_EVENT_RECV_INFO:
+		break;
+	}
+	
+}
+
+
+static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
+{
+	THREAD_INFO* thread_info=(THREAD_INFO*)obj;
+	
+	FreeSWITCHSocket socket(thread_info->socket,thread_info->pool );
+	XMLSession csta_session(platform, &socket, fs);
+	
+	char remote_ip[50];
+	switch_sockaddr_t *sa;
+	switch_socket_addr_get(&sa, SWITCH_TRUE, thread_info->socket);
+	switch_get_addr(remote_ip, sizeof(remote_ip), sa);	
+	if(		(Config::Instance()->IsACLEnabled())
+		&&	(!switch_check_network_list_ip(remote_ip, Config::Instance()->GetACLName())) )
+	{		
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", remote_ip, Config::Instance()->GetACLName());		
+		UniversalErrorResponse err(0,error_type_security,genericError);
+		csta_session.SendMsg(&err);
+		socket.Close();		
+	}
+	else
+		csta_session.Run();
+
+	delete thread_info;
+	return NULL;
+}
+
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_csta_socket_load)
+{	
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+	switch_application_interface_t *app_interface;
+	
+	fs=new FreeSWITCH(pool);
+	platform=new FreeSWITCHPlatform();
+
+	bRunning=true;
+	Config::Instance()->ReadConfig();
+
+	SWITCH_ADD_APP(app_interface, "csta_trigger_queue", "Notifies about call entered a CSTA queue", "Notifies CSTA module about a call entered a CSAT queue.", queue_function, "", SAF_SUPPORT_NOMEDIA);
+	SWITCH_ADD_APP(app_interface, "csta_trigger_trunk_inbound", "Notifies about call entering FreeSWITCH from outside", "Notifies CSTA module about about call entering FreeSWITCH from outside.", trunk_inbound_function, "", SAF_SUPPORT_NOMEDIA);
+	SWITCH_ADD_APP(app_interface, "csta_trigger_trunk_outbound", "Notifies about call leaving FreeSWITCH", "Notifies CSTA module about call leaving FreeSWITCH.", trunk_outbound_function, "", SAF_SUPPORT_NOMEDIA);
+
+	//TODO: filter events
+	if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &node) != SWITCH_STATUS_SUCCESS) 
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to events!\n");
+		return SWITCH_STATUS_GENERR;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_csta_socket_shutdown)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting down..\n");
+	bRunning=false;
+	if(listen_socket)
+	{
+		switch_socket_shutdown(listen_socket, SWITCH_SHUTDOWN_READWRITE);
+		switch_socket_close(listen_socket);
+		listen_socket=NULL;
+	}
+
+	switch_event_unbind(&node);
+
+	delete fs;
+	delete platform;
+	fs=NULL;
+	platform=NULL;
+	
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
+
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_csta_socket_runtime)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting..\n");
+
+	switch_status_t rv;
+	
+	switch_sockaddr_t *sa;
+	switch_memory_pool_t *pool = NULL, *listener_pool = NULL;
+	switch_socket_t *inbound_socket = NULL;	
+
+	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) 
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_core_new_memory_pool failed.\n");
+		return SWITCH_STATUS_TERM;
+	}
+
+	rv = switch_sockaddr_info_get(&sa, Config::Instance()->GetListenAddress(), SWITCH_INET, Config::Instance()->GetXmlPort(), 0, pool);
+	if(rv)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_sockaddr_info_get failed.\n");
+		return SWITCH_STATUS_TERM;
+	}
+	rv = switch_socket_create(&listen_socket, switch_sockaddr_get_family(sa), SOCK_STREAM, SWITCH_PROTO_TCP, pool);
+	if(rv)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_socket_create failed.\n");
+		return SWITCH_STATUS_TERM;
+	}
+
+	rv = switch_socket_opt_set(listen_socket, SWITCH_SO_REUSEADDR, 1);
+	if (rv)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_socket_opt_set failed.\n");
+		return SWITCH_STATUS_TERM;
+	}
+	rv = switch_socket_bind(listen_socket, sa);
+	if (rv)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_socket_bind failed.\n");
+		return SWITCH_STATUS_TERM;
+	}
+	rv = switch_socket_listen(listen_socket, 5);
+	if (rv)
+	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_socket_listen failed.\n");
+		return SWITCH_STATUS_TERM;
+	}
+			
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "CSTA-XML socket up listening on %s:%u\n", Config::Instance()->GetListenAddress(),Config::Instance()->GetXmlPort());
+
+	while(bRunning)
+	{
+		if (switch_core_new_memory_pool(&listener_pool) != SWITCH_STATUS_SUCCESS) 
+		{
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n");
+			return SWITCH_STATUS_TERM;
+		}
+		
+		if ((rv = switch_socket_accept(&inbound_socket, listen_socket, listener_pool))) {
+			if (!bRunning) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting Down\n");
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error\n");
+			}
+			break;
+		}
+		
+
+		switch_thread_t *thread;
+		switch_threadattr_t *thd_attr = NULL;
+		THREAD_INFO * thread_info=new THREAD_INFO;
+		thread_info->socket=inbound_socket;
+		thread_info->pool=listener_pool;
+
+		switch_threadattr_create(&thd_attr, listener_pool);
+		switch_threadattr_detach_set(thd_attr, 1);
+		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+		switch_thread_create(&thread, thd_attr, listener_run, thread_info, listener_pool);		
+
+	}
+
+	if(listen_socket)
+	{
+		switch_socket_shutdown(listen_socket, SWITCH_SHUTDOWN_READWRITE);
+		//switch_socket_close(listen_socket);
+		listen_socket=NULL;
+	}
+
+	return SWITCH_STATUS_TERM;
+}
+
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.def (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.def) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.def	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.def	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+EXPORTS
+   mod_csta_socket_module_interface
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.vcproj (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.vcproj) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.vcproj	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/mod_csta_socket.vcproj	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="FreeSWITCH_CSTA"
+	ProjectGUID="{05515420-16DE-4E63-B373-85BE859A5142}"
+	RootNamespace="mod_csta_socket"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\..\w32\module_Debug.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\src\include&quot;;&quot;..\..\..\..\..\libs\include&quot;;..\CSTAInsideCore\include\csta;..\CSTAInsideCore\include"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="freeswitchcore.lib libapr-1.lib CSTAInsideCore.lib"
+				OutputFile="..\..\..\..\..\$(ConfigurationName)/mod/mod_csta_socket.dll"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\..\w32\library\$(ConfigurationName)\&quot;;&quot;..\..\..\..\..\libs\win32\apr\$(ConfigurationName)\&quot;;..\CSTAInsideCore\lib\VC90"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\..\w32\module_Debug.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\..\w32\module_Release.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\src\include&quot;;&quot;..\..\..\..\..\libs\include&quot;;..\CSTAInsideCore\include\csta;..\CSTAInsideCore\include"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="freeswitchcore.lib libapr-1.lib CSTAInsideCore.lib"
+				OutputFile="..\..\..\..\..\$(ConfigurationName)/mod/mod_csta_socket.dll"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\..\w32\library\$(ConfigurationName)\&quot;;&quot;..\..\..\..\..\libs\win32\apr\$(ConfigurationName)\&quot;;..\CSTAInsideCore\lib\VC90"
+				ModuleDefinitionFile="$(InputName).def"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\..\w32\module_Release.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath=".\config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\FreeSWITCH.h"
+				>
+			</File>
+			<File
+				RelativePath=".\FreeSWITCHPlatform.h"
+				>
+			</File>
+			<File
+				RelativePath=".\FreeSWITCHSocket.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\config.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FreeSWITCH.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FreeSWITCHPlatform.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FreeSWITCHSocket.cpp"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\FreeSWITCH_CSTA.rc"
+			>
+		</File>
+		<File
+			RelativePath=".\mod_csta_socket.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\mod_csta_socket.def"
+			>
+		</File>
+		<File
+			RelativePath=".\README"
+			>
+		</File>
+		<File
+			RelativePath=".\resource.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/resource.h (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/resource.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/resource.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/FreeSWITCH/resource.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FreeSWITCH_CSTA.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/mod_csta_socket.sln (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/mod_csta_socket.sln) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/mod_csta_socket.sln	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/mod_csta_socket.sln	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSWITCH_CSTA", "FreeSWITCH\mod_csta_socket.vcproj", "{05515420-16DE-4E63-B373-85BE859A5142}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD} = {4F92B672-DADB-4047-8D6A-4BB3796733FD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CSTAInside", "Download CSTAInside.vcproj", "{4F92B672-DADB-4047-8D6A-4BB3796733FD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{05515420-16DE-4E63-B373-85BE859A5142}.Debug|Win32.ActiveCfg = Debug|Win32
+		{05515420-16DE-4E63-B373-85BE859A5142}.Debug|Win32.Build.0 = Debug|Win32
+		{05515420-16DE-4E63-B373-85BE859A5142}.Debug|x64.ActiveCfg = Debug|x64
+		{05515420-16DE-4E63-B373-85BE859A5142}.Debug|x64.Build.0 = Debug|x64
+		{05515420-16DE-4E63-B373-85BE859A5142}.Release|Win32.ActiveCfg = Release|Win32
+		{05515420-16DE-4E63-B373-85BE859A5142}.Release|Win32.Build.0 = Release|Win32
+		{05515420-16DE-4E63-B373-85BE859A5142}.Release|x64.ActiveCfg = Release|x64
+		{05515420-16DE-4E63-B373-85BE859A5142}.Release|x64.Build.0 = Release|x64
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|Win32.Build.0 = Debug|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x64.ActiveCfg = Debug|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|Win32.ActiveCfg = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|Win32.Build.0 = Release|Win32
+		{4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x64.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/util.vbs (from rev 16612, freeswitch/trunk/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/util.vbs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/util.vbs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/mod/event_handlers/mod_csta_socket/mod_csta_socket/util.vbs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,329 @@
+'
+' Contributor(s):
+' Michael Jerris <mike@jerris.com>
+' David A. Horner http://dave.thehorners.com
+'----------------------------------------------
+
+'On Error Resume Next
+' **************
+' Initialization
+' **************
+
+Set WshShell = CreateObject("WScript.Shell")
+Set FSO = CreateObject("Scripting.FileSystemObject")
+Set WshSysEnv = WshShell.Environment("SYSTEM")
+Set xml = CreateObject("Microsoft.XMLHTTP")
+Dim UseWgetEXE
+
+On Error Resume Next
+Set oStream = CreateObject("Adodb.Stream")
+On Error Goto 0
+
+If Not IsObject(oStream)  Then
+	wscript.echo("Failed to create Adodb.Stream, using alternative download method.")
+	UseWgetEXE=true
+Else
+	UseWgetEXE=false
+End If
+Randomize
+Set objArgs = WScript.Arguments
+quote=Chr(34)
+ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName))
+UtilsDir=Showpath(ScriptDir)
+ToolsBase="http://files.freeswitch.org/downloads/win32/"
+
+If UseWgetEXE Then
+	GetWgetEXE UtilsDir
+End If
+
+GetCompressionTools UtilsDir
+
+
+If objArgs.Count >=3 Then
+	Select Case objArgs(0)
+		Case "Get"		
+			Wget objArgs(1), Showpath(objArgs(2))
+		Case "GetUnzip"		
+			WgetUnCompress objArgs(1), Showpath(objArgs(2))
+		Case "Version"					
+			'CreateVersion(tmpFolder, VersionDir, includebase, includedest)
+			CreateVersion Showpath(objArgs(1)), Showpath(objArgs(2)), objArgs(3), objArgs(4)
+	End Select
+End If
+
+
+' *******************
+' Utility Subroutines
+' *******************
+
+
+Sub WgetUnCompress(URL, DestFolder)
+	If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
+	StartPos = InstrRev(URL, "/", -1, 1) 
+	strlength = Len(URL)
+	filename=Right(URL,strlength-StartPos)
+	NameEnd = InstrRev(filename, ".",-1, 1)
+	filestrlength = Len(filename)
+	filebase = Left(filename,NameEnd)
+	fileext = Right(filename, Len(filename) - NameEnd)
+	Wget URL, DestFolder
+	If fileext = "zip" Then
+		UnCompress Destfolder & filename, DestFolder & filebase
+	Else
+		UnCompress Destfolder & filename, DestFolder	
+	End If
+End Sub
+
+Sub GetCompressionTools(DestFolder)
+	Dim oExec
+	If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
+	If Not FSO.FileExists(DestFolder & "7za.exe") Then 
+		If Not FSO.FileExists(DestFolder & "7za.tag") Then 
+			Set MyFile = fso.CreateTextFile(DestFolder & "7za.tag", True)
+			MyFile.WriteLine("This file marks a pending download for 7za.exe so we don't download it twice at the same time")
+			MyFile.Close
+				
+				Wget ToolsBase & "7za.exe", DestFolder
+			
+			FSO.DeleteFile DestFolder & "7za.tag" ,true 
+		Else
+			WScript.Sleep(5000)
+		End If	
+	End If	
+End Sub
+
+Sub GetWgetEXE(DestFolder)
+	Dim oExec
+	If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
+	If Not FSO.FileExists(DestFolder & "wget.exe") Then 
+		Slow_Wget ToolsBase & "wget.exe", DestFolder
+	End If	
+End Sub
+
+Sub UnCompress(Archive, DestFolder)
+	batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat"
+	wscript.echo("Extracting: " & Archive)
+	Set MyFile = fso.CreateTextFile(UtilsDir & batname, True)
+	MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote )
+	MyFile.Close
+	Set oExec = WshShell.Exec(UtilsDir & batname)
+	Do
+		WScript.Echo OExec.StdOut.ReadLine()
+	Loop While Not OExec.StdOut.atEndOfStream
+	If FSO.FileExists(Left(Archive, Len(Archive)-3))Then  
+		Set MyFile = fso.CreateTextFile(UtilsDir & batname, True)
+		MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & quote & " -y -o" & quote & DestFolder & quote )
+		MyFile.Close
+		Set oExec = WshShell.Exec(UtilsDir & batname)
+		Do
+			WScript.Echo OExec.StdOut.ReadLine()
+		Loop While Not OExec.StdOut.atEndOfStream
+		WScript.Sleep(500)
+		FSO.DeleteFile Left(Archive, Len(Archive)-3) ,true 
+	End If
+	If FSO.FileExists(Left(Archive, Len(Archive)-3) & "tar")Then  
+		Set MyFile = fso.CreateTextFile(UtilsDir & batname, True)
+		MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & "tar" & quote & " -y -o" & quote & DestFolder & quote )
+		MyFile.Close
+		Set oExec = WshShell.Exec(UtilsDir & batname)
+		Do
+			WScript.Echo OExec.StdOut.ReadLine()
+		Loop While Not OExec.StdOut.atEndOfStream
+		WScript.Sleep(500)
+		FSO.DeleteFile Left(Archive, Len(Archive)-3) & "tar",true 
+	End If
+	
+	WScript.Sleep(500)
+	If FSO.FileExists(UtilsDir & batname)Then  
+		FSO.DeleteFile UtilsDir & batname, True
+	End If
+End Sub
+
+Sub Wget(URL, DestFolder)
+	StartPos = InstrRev(URL, "/", -1, 1)   
+	strlength = Len(URL)
+	filename=Right(URL,strlength-StartPos)
+	If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
+
+	Wscript.echo("Downloading: " & URL)
+	
+If UseWgetEXE Then
+	batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat"
+	Set MyFile = fso.CreateTextFile(UtilsDir & batname, True)
+	MyFile.WriteLine("@cd " & quote & DestFolder & quote)
+	MyFile.WriteLine("@" & quote & UtilsDir & "wget.exe" & quote & " " & URL)
+	MyFile.Close
+	Set oExec = WshShell.Exec(UtilsDir & batname)
+	Do
+		WScript.Echo OExec.StdOut.ReadLine()
+	Loop While Not OExec.StdOut.atEndOfStream
+
+Else
+	xml.Open "GET", URL, False
+	xml.Send
+	
+	Const adTypeBinary = 1
+	Const adSaveCreateOverWrite = 2
+	Const adSaveCreateNotExist = 1 
+
+	oStream.type = adTypeBinary
+	oStream.open
+	oStream.write xml.responseBody
+	oStream.savetofile DestFolder & filename, adSaveCreateOverWrite
+	oStream.close
+End If
+
+End Sub
+
+Sub Slow_Wget(URL, DestFolder)
+	StartPos = InstrRev(URL, "/", -1, 1)   
+	strlength = Len(URL)
+	filename=Right(URL,strlength-StartPos)
+	If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
+
+	Wscript.echo("Downloading: " & URL)
+	xml.Open "GET", URL, False
+	xml.Send
+	
+	const ForReading = 1 , ForWriting = 2 , ForAppending = 8 
+Set MyFile = fso.OpenTextFile(DestFolder & filename ,ForWriting, True)
+For i = 1 to lenb(xml.responseBody)
+ MyFile.write Chr(Ascb(midb(xml.responseBody,i,1)))
+Next
+MyFile.Close()
+
+End Sub
+
+Function Showpath(folderspec)
+	Set f = FSO.GetFolder(folderspec)
+	showpath = f.path & "\"
+End Function
+
+
+Function FindVersionStringInConfigure(strConfigFile, strVersionString)
+
+Set objRegEx = CreateObject("VBScript.RegExp")
+objRegEx.Pattern = "[^#]AC_SUBST\(" & strVersionString & ".*\[([^\[]*)\]"
+ 
+Set objFSO = CreateObject("Scripting.FileSystemObject")
+Set objFile = objFSO.OpenTextFile(strConfigFile, 1)
+strSearchString = objFile.ReadAll
+objFile.Close
+
+Set colMatches = objRegEx.Execute(strSearchString)  
+
+strResult = ""
+If colMatches.Count > 0 Then
+   For Each strMatch in colMatches   
+	strResult = objRegEx.Replace(strMatch.Value, "$1")
+    Next
+End If
+
+	FindVersionStringInConfigure = strResult
+
+End Function
+
+Sub FindReplaceInFile(FileName, sFind, sReplace)
+	Const OpenAsASCII = 0  ' Opens the file as ASCII (TristateFalse) 
+	Const OpenAsUnicode = -1  ' Opens the file as Unicode (TristateTrue) 
+	Const OpenAsDefault = -2  ' Opens the file using the system default 
+	
+	Const OverwriteIfExist = -1 
+	Const FailIfNotExist   =  0 
+	Const ForReading       =  1 
+	
+	Set fOrgFile = FSO.OpenTextFile(FileName, ForReading, FailIfNotExist, OpenAsASCII)
+	sText = fOrgFile.ReadAll
+	fOrgFile.Close
+	sText = Replace(sText, sFind, sReplace)
+	Set fNewFile = FSO.CreateTextFile(FileName, OverwriteIfExist, OpenAsASCII)
+	fNewFile.WriteLine sText
+	fNewFile.Close
+End Sub
+
+Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
+	Dim oExec
+	
+	strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MAJOR")
+	strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MINOR")
+	strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MICRO")
+	strVerRev   = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION")
+	
+	If Right(tmpFolder, 1) <> "\" Then tmpFolder = tmpFolder & "\" End If
+	If Not FSO.FileExists(tmpFolder & "fs_svnversion.exe") Then 
+		Wget ToolsBase & "fs_svnversion.exe", tmpFolder
+	End If	
+
+	If Not FSO.FileExists(tmpFolder & "libdb44.dll") Then 
+		Wget ToolsBase & "libdb44.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libsvn_diff-1.dll") Then 
+		Wget ToolsBase & "libsvn_diff-1.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libsvn_subr-1.dll") Then 
+		Wget ToolsBase & "libsvn_subr-1.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libsvn_wc-1.dll") Then 
+		Wget ToolsBase & "libsvn_wc-1.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "intl3_svn.dll") Then 
+		Wget ToolsBase & "intl3_svn.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libapr-1.dll") Then 
+		Wget ToolsBase & "libapr-1.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libaprutil-1.dll") Then 
+		Wget ToolsBase & "libaprutil-1.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libapriconv-1.dll") Then 
+		Wget ToolsBase & "libapriconv-1.dll", tmpFolder
+	End If	
+	If Not FSO.FileExists(tmpFolder & "libsvn_delta-1.dll") Then 
+		Wget ToolsBase & "libsvn_delta-1.dll", tmpFolder
+	End If	
+
+	Dim sLastFile
+	Const OverwriteIfExist = -1
+	Const ForReading       =  1
+
+	if strVerRev = "" Then
+	    VersionCmd="fs_svnversion " & quote & VersionDir & "." & quote &  " -n"
+	    Set MyFile = fso.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)
+	    MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote )
+	    MyFile.WriteLine("@" & VersionCmd)
+	    MyFile.Close
+	    Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote)
+	    Do
+		    strFromProc = OExec.StdOut.ReadLine()
+		    VERSION=strFromProc
+	    Loop While Not OExec.StdOut.atEndOfStream
+	    sLastVersion = ""
+	    Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)
+	    If Not sLastFile.atEndOfStream Then
+		    sLastVersion = sLastFile.ReadLine()
+	    End If
+	    sLastFile.Close
+    End If
+	
+	if strVerRev <> "" Then
+	    VERSION = strVerRev
+	End If
+
+	If VERSION = "" Then
+		VERSION = "UNKNOWN"
+	End If
+
+	If VERSION <> sLastVersion Then
+		Set MyFile = fso.CreateTextFile(tmpFolder & "lastversion", True)
+		MyFile.WriteLine(VERSION)
+		MyFile.Close
+	
+		FSO.CopyFile includebase, includedest, true
+		FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION@", VERSION
+		FindReplaceInFile includedest, "@SWITCH_VERSION_MAJOR@", strVerMajor
+		FindReplaceInFile includedest, "@SWITCH_VERSION_MINOR@", strVerMinor
+		FindReplaceInFile includedest, "@SWITCH_VERSION_MICRO@", strVerMicro
+
+	End If
+	
+End Sub

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm (from rev 16612, freeswitch/trunk/contrib/seven/fscomm)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/FSComm.2008.vcproj (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/FSComm.2008.vcproj) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/FSComm.2008.vcproj	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/FSComm.2008.vcproj	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,771 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="FSComm"
+	ProjectGUID="{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"
+	RootNamespace="FSComm"
+	Keyword="Qt4VSv1.0"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="debug\"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189 -w34100 -w34189"
+				Optimization="4"
+				AdditionalIncludeDirectories="$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include;.;$(QTDIR)\include\ActiveQt;debug;&quot;$(QTDIR)\mkspecs\win32-msvc2008&quot;;..\src\include;$(QTDIR)\include\QtXml"
+				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
+				GeneratePreprocessedFile="0"
+				ExceptionHandling="1"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="false"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="debug\"
+				ObjectFile="debug\"
+				ProgramDataBaseFileName=".\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,_DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
+				AdditionalDependencies="$(QTDIR)\lib\qtmaind.lib $(QTDIR)\lib\QtGuid4.lib $(QTDIR)\lib\QtCored4.lib $(QTDIR)\lib\QtXml4.lib"
+				OutputFile="debug\FSComm.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=""
+				SubSystem="2"
+				LinkTimeCodeGeneration="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="release\"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189 -w34100 -w34189"
+				Optimization="2"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include&quot;,&quot;.&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;release&quot;,&quot;.&quot;,$(QTDIR)\mkspecs\win32-msvc2008;$(QTDIR)\include\QtXml"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
+				GeneratePreprocessedFile="0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="false"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="release\"
+				ObjectFile="release\"
+				ProgramDataBaseFileName=".\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
+				AdditionalDependencies="$(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\QtGui4.lib $(QTDIR)\lib\QtCore4.lib"
+				OutputFile="release)\FSComm.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="2"
+				LinkTimeCodeGeneration="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\preferences\accountdialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="call.cpp"
+				>
+			</File>
+			<File
+				RelativePath="fshost.cpp"
+				>
+			</File>
+			<File
+				RelativePath="main.cpp"
+				>
+			</File>
+			<File
+				RelativePath="mainwindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath="mod_qsettings\mod_qsettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath="preferences\prefdialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="preferences\prefportaudio.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\preferences\prefsofia.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="preferences\accountdialog.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC accountdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_accountdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\accountdialog.h -o debug\moc_accountdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.h"
+						Outputs="debug\moc_accountdialog.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC accountdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_accountdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\accountdialog.h -o release\moc_accountdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.h"
+						Outputs="release\moc_accountdialog.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="call.h"
+				>
+			</File>
+			<File
+				RelativePath="fshost.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC fshost.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_fshost.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 fshost.h -o debug\moc_fshost.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;fshost.h"
+						Outputs="debug\moc_fshost.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC fshost.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_fshost.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 fshost.h -o release\moc_fshost.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;fshost.h"
+						Outputs="release\moc_fshost.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mainwindow.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC mainwindow.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_mainwindow.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o debug\moc_mainwindow.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.h"
+						Outputs="debug\moc_mainwindow.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC mainwindow.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_mainwindow.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o release\moc_mainwindow.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.h"
+						Outputs="release\moc_mainwindow.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mod_qsettings\mod_qsettings.h"
+				>
+			</File>
+			<File
+				RelativePath="preferences\prefdialog.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefdialog.h -o debug\moc_prefdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.h"
+						Outputs="debug\moc_prefdialog.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefdialog.h -o release\moc_prefdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.h"
+						Outputs="release\moc_prefdialog.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefportaudio.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefportaudio.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefportaudio.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefportaudio.h -o debug\moc_prefportaudio.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefportaudio.h"
+						Outputs="debug\moc_prefportaudio.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefportaudio.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefportaudio.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefportaudio.h -o release\moc_prefportaudio.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefportaudio.h"
+						Outputs="release\moc_prefportaudio.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefsofia.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefsofia.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefsofia.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefsofia.h -o debug\moc_prefsofia.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefsofia.h"
+						Outputs="debug\moc_prefsofia.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefportaudio.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefsofia.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefsofia.h -o release\moc_prefsofia.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefsofia.h"
+						Outputs="release\moc_prefsofia.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generated Files"
+			Filter="cpp;c;cxx;moc;h;def;odl;idl;res;"
+			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"
+			>
+			<File
+				RelativePath="debug\moc_accountdialog.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_accountdialog.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_fshost.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\moc_fshost.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\moc_mainwindow.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_mainwindow.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_prefdialog.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_prefdialog.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\moc_prefdialog.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\moc_prefdialog.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\moc_prefportaudio.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_prefportaudio.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\moc_prefsofia.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\moc_prefsofia.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="release\qrc_resources.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="debug\qrc_resources.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ui_mainwindow.h"
+				>
+			</File>
+			<File
+				RelativePath="ui_prefdialog.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Form Files"
+			Filter="ui"
+			UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}"
+			ParseFiles="false"
+			>
+			<File
+				RelativePath="preferences\accountdialog.ui"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC accountdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_accountdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\accountdialog.ui -o ui_accountdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.ui"
+						Outputs="ui_accountdialog.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC accountdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_accountdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\accountdialog.ui -o ui_accountdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.ui"
+						Outputs="ui_accountdialog.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mainwindow.ui"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC mainwindow.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_mainwindow.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe mainwindow.ui -o ui_mainwindow.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.ui"
+						Outputs="ui_mainwindow.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC mainwindow.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_mainwindow.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe mainwindow.ui -o ui_mainwindow.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.ui"
+						Outputs="ui_mainwindow.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefdialog.ui"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC prefdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_prefdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\prefdialog.ui -o ui_prefdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.ui"
+						Outputs="ui_prefdialog.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC prefdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_prefdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\prefdialog.ui -o ui_prefdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.ui"
+						Outputs="ui_prefdialog.h"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="qrc;*"
+			UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}"
+			ParseFiles="false"
+			>
+			<File
+				RelativePath="conf\event_socket.conf.xml"
+				>
+			</File>
+			<File
+				RelativePath="conf\accounts\example.xml"
+				>
+			</File>
+			<File
+				RelativePath="conf\freeswitch.xml"
+				>
+			</File>
+			<File
+				RelativePath="conf\portaudio.conf.xml"
+				>
+			</File>
+			<File
+				RelativePath="resources\pref_audio.gif"
+				>
+			</File>
+			<File
+				RelativePath="resources\pref_sip.png"
+				>
+			</File>
+			<File
+				RelativePath="resources.qrc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="RCC resources.qrc"
+						CommandLine="$(QTDIR)\bin\rcc.exe -name resources resources.qrc -o debug\qrc_resources.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="$(QTDIR)\bin\rcc.exe;conf\accounts\example.xml;conf\event_socket.conf.xml;conf\freeswitch.xml;conf\portaudio.conf.xml;resources.qrc;resources\pref_audio.gif;resources\pref_sip.png;resources\splash.png"
+						Outputs="debug\qrc_resources.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="RCC resources.qrc"
+						CommandLine="$(QTDIR)\bin\rcc.exe -name resources resources.qrc -o release\qrc_resources.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="$(QTDIR)\bin\rcc.exe;conf\accounts\example.xml;conf\event_socket.conf.xml;conf\freeswitch.xml;conf\portaudio.conf.xml;resources.qrc;resources\pref_audio.gif;resources\pref_sip.png;resources\splash.png"
+						Outputs="release\qrc_resources.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="resources\splash.png"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/FSComm.pro (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/FSComm.pro) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/FSComm.pro	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/FSComm.pro	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,49 @@
+# #####################################
+# version check qt
+# #####################################
+contains(QT_VERSION, ^4\.[0-5]\..*) { 
+    message("Cannot build FsGui with Qt version $$QT_VERSION.")
+    error("Use at least Qt 4.6.")
+}
+QT += xml
+TARGET = fscomm
+macx:TARGET = FSComm
+TEMPLATE = app
+INCLUDEPATH = ../src/include \
+    ../libs/apr/include \
+    ../libs/libteletone/src
+LIBS = -L../.libs \
+    -lfreeswitch \
+    -lm
+!win32:!macx { 
+    # This is here to comply with the default freeswitch installation
+    QMAKE_LFLAGS += -Wl,-rpath,/usr/local/freeswitch/lib
+    LIBS += -lcrypt \
+        -lrt
+}
+SOURCES += main.cpp \
+    mainwindow.cpp \
+    fshost.cpp \
+    call.cpp \
+    mod_qsettings/mod_qsettings.cpp \
+    preferences/prefdialog.cpp \
+    preferences/prefportaudio.cpp \
+    preferences/prefsofia.cpp \
+    preferences/accountdialog.cpp
+HEADERS += mainwindow.h \
+    fshost.h \
+    call.h \
+    mod_qsettings/mod_qsettings.h \
+    preferences/prefdialog.h \
+    preferences/prefportaudio.h \
+    preferences/prefsofia.h \
+    preferences/accountdialog.h
+FORMS += mainwindow.ui \
+    preferences/prefdialog.ui \
+    preferences/accountdialog.ui
+RESOURCES += resources.qrc
+OTHER_FILES += conf/portaudio.conf.xml \
+    conf/event_socket.conf.xml \
+    conf/freeswitch.xml \
+    conf/sofia.conf.xml \
+    conf/account.conf.xml

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/call.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/call.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/call.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/call.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,43 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include "call.h"
+
+Call::Call()
+{
+}
+
+Call::Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid) :
+        _call_id(call_id),
+        _cid_name(cid_name),
+        _cid_number(cid_number),
+        _direction(direction),
+        _uuid (uuid)
+{
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/call.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/call.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/call.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/call.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,73 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+#ifndef CALL_H
+#define CALL_H
+
+#include <QtCore>
+#include <QString>
+#include <fshost.h>
+
+typedef enum {
+    FSCOMM_CALL_STATE_RINGING = 0,
+    FSCOMM_CALL_STATE_TRYING  = 1,
+    FSCOMM_CALL_STATE_ANSWERED = 2
+} fscomm_call_state_t;
+
+typedef enum {
+        FSCOMM_CALL_DIRECTION_INBOUND = 0,
+        FSCOMM_CALL_DIRECTION_OUTBOUND = 1
+} fscomm_call_direction_t;
+
+class Call
+{
+public:
+    Call(void);
+    Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid);
+    QString getCidName(void) { return _cid_name; }
+    QString getCidNumber(void) { return _cid_number; }
+    int getCallID(void) { return _call_id; }
+    QString getUUID(void) { return _uuid; }
+    void setbUUID(QString uuid) { _buuid = uuid; }
+    fscomm_call_direction_t getDirection() { return _direction; }
+    fscomm_call_state_t getState() { return _state; }
+    void setState(fscomm_call_state_t state) { _state = state; }
+
+private:
+    int _call_id;
+    QString _cid_name;
+    QString _cid_number;
+    fscomm_call_direction_t _direction;
+    QString _uuid;
+    QString _buuid;
+    fscomm_call_state_t _state;
+};
+
+Q_DECLARE_METATYPE(Call)
+
+#endif // CALL_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/account.conf.xml (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/account.conf.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/account.conf.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/account.conf.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,17 @@
+<gateway name="${name}">
+  <param name="username" value="${username}"/>
+  <param name="realm" value="${realm}"/>
+  <param name="from-user" value="${from-user}"/>
+  <param name="from-domain" value="${from-domain}"/>
+  <param name="password" value="${password}"/>
+  <param name="extension" value="${extension}"/>
+  <param name="proxy" value="${proxy}"/>
+  <param name="register-proxy" value="${register-proxy}"/>
+  <param name="expire-seconds" value="${expire-seconds}"/>
+  <param name="register" value="${register}"/>
+  <param name="register-transport" value="${register-transport}"/>
+  <param name="retry-seconds" value="${retry-seconds}"/>
+  <param name="caller-id-in-from" value="${caller-id-in-from}"/>
+  <param name="contact-params" value="${contact-params}"/>
+  <param name="ping" value="${ping}"/>
+</gateway>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/accounts (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/accounts)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/accounts/example.xml (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/accounts/example.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/accounts/example.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/accounts/example.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,34 @@
+<include>
+  <!--<gateway name="default">-->
+  <!--/// account username *required* ///-->
+  <!--<param name="username" value="cluecon"/>-->
+  <!--/// auth realm: *optional* same as gateway name, if blank ///-->
+  <!--<param name="realm" value="asterlink.com"/>-->
+  <!--/// username to use in from: *optional* same as  username, if blank ///-->
+  <!--<param name="from-user" value="cluecon"/>-->
+  <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
+  <!--<param name="from-domain" value="asterlink.com"/>-->
+  <!--/// account password *required* ///-->
+  <!--<param name="password" value="cluecon"/>-->
+  <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
+  <!--<param name="extension" value="cluecon"/>-->
+  <!--/// proxy host: *optional* same as realm, if blank ///-->
+  <!--<param name="proxy" value="asterlink.com"/>-->
+  <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
+  <!--<param name="register-proxy" value="mysbc.com"/>-->
+  <!--/// expire in seconds: *optional* 3600, if blank ///-->
+  <!--<param name="expire-seconds" value="60"/>-->
+  <!--/// do not register ///-->
+  <!--<param name="register" value="false"/>-->
+  <!-- which transport to use for register -->
+  <!--<param name="register-transport" value="udp"/>-->
+  <!--How many seconds before a retry when a failure or timeout occurs -->
+  <!--<param name="retry-seconds" value="30"/>-->
+  <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
+  <!--<param name="caller-id-in-from" value="false"/>-->
+  <!--extra sip params to send in the contact-->
+  <!--<param name="contact-params" value="tport=tcp"/>-->
+  <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
+  <!--<param name="ping" value="25"/>-->
+  <!--</gateway>-->
+</include>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/event_socket.conf.xml (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/event_socket.conf.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/event_socket.conf.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/event_socket.conf.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,12 @@
+<document type="freeswitch/xml">
+    <section name="configuration">
+<configuration name="event_socket.conf" description="Socket Client">
+	  <settings>
+		<param name="nat-map" value="false"/>
+		<param name="listen-ip" value="127.0.0.1"/>
+		<param name="listen-port" value="8021"/>
+		<param name="password" value="ClueCon"/>
+	  </settings>
+    </configuration>
+  </section>
+</document>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/freeswitch.xml (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/freeswitch.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/freeswitch.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/freeswitch.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,266 @@
+<?xml version="1.0"?>
+<document type="freeswitch/xml">
+	<X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
+	<X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
+	<X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
+	<X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+	<X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
+	<X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
+	<X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
+	<X-PRE-PROCESS cmd="set" data="default_gateway=default"/>
+	<X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.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="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
+
+	<section name="configuration" description="Various Configuration">
+		<configuration name="cdr_csv.conf" description="CDR CSV Format">
+			<settings>
+				<param name="default-template" value="example"/>
+				<param name="rotate-on-hup" value="true"/>
+				<param name="legs" value="a"/>
+			</settings>
+			<templates>
+				<template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"</template>
+			</templates>
+		</configuration>
+
+		<configuration name="console.conf" description="Console Logger">
+			<mappings>
+				<map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
+			</mappings>
+			<settings>
+				<param name="colorize" value="true"/>
+				<param name="loglevel" value="$${console_loglevel}"/>
+			</settings>
+		</configuration>
+
+		<configuration name="enum.conf" description="ENUM Module">
+			<settings>
+				<param name="default-root" value="e164.org"/>
+				<param name="default-isn-root" value="freenum.org"/>
+				<param name="query-timeout" value="10"/>
+				<param name="auto-reload" value="true"/>
+			</settings>
+			<routes>
+				<route service="E2U+SIP" regex="sip:(.*)" replace="sofia/softphone/$1"/>
+			</routes>
+		</configuration>
+
+		<configuration name="qsettings.conf" description="configures our mod_qsettings">
+			<bindings value="configuration" />
+		</configuration>
+
+		<configuration name="local_stream.conf" description="stream files from local dir">
+			<directory name="moh/48000" path="$${base_dir}/sounds/music/48000">
+				<param name="rate" value="48000"/>
+				<param name="shuffle" value="true"/>
+				<param name="channels" value="1"/>
+				<param name="interval" value="10"/>
+				<param name="timer-name" value="soft"/>
+			</directory>
+		</configuration>
+
+		<configuration name="logfile.conf" description="File Logging">
+			<settings>
+				<param name="rotate-on-hup" value="true"/>
+			</settings>
+			<profiles>
+				<profile name="default">
+					<settings>
+					</settings>
+					<mappings>
+						<map name="all" value="debug,info,notice,warning,err,crit,alert"/>
+					</mappings>
+				</profile>
+			</profiles>
+		</configuration>
+
+		<configuration name="modules.conf" description="Modules">
+			<modules>
+				<load module="mod_console"/>
+				<load module="mod_logfile"/>
+				<load module="mod_enum"/>
+				<load module="mod_cdr_csv"/>
+				<load module="mod_sofia"/>
+				<load module="mod_loopback"/>
+				<load module="mod_commands"/>
+				<load module="mod_dptools"/>
+				<load module="mod_dialplan_xml"/>
+				<load module="mod_voipcodecs"/>
+				<load module="mod_ilbc"/>
+				<load module="mod_speex"/>
+				<load module="mod_celt"/>
+				<load module="mod_siren"/>
+				<load module="mod_sndfile"/>
+				<load module="mod_tone_stream"/>
+				<load module="mod_local_stream"/>
+				<load module="mod_portaudio"/>
+				<load module="mod_event_socket"/>
+			</modules>
+		</configuration>
+
+		<configuration name="post_load_modules.conf" description="Modules">
+			<modules>
+			</modules>
+		</configuration>
+
+		<configuration name="sofia.conf" description="sofia Endpoint">
+			<global_settings>
+				<param name="log-level" value="0"/>
+				<param name="auto-restart" value="true"/>
+				<param name="debug-presence" value="0"/>
+			</global_settings>
+			<profiles>
+				<profile name="softphone">
+					<gateways>
+						<X-PRE-PROCESS cmd="include" data="accounts/*.xml"/>
+					</gateways>
+					<settings>
+						<!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
+						<param name="user-agent-string" value="FreeSWITCH/FSComm"/>
+						<!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
+						<param name="debug" value="0"/>
+						<param name="sip-trace" value="no"/>
+						<param name="context" value="public"/>
+						<param name="rfc2833-pt" value="101"/>
+						<!-- port to bind to for sip traffic -->
+						<param name="sip-port" value="12345"/>
+						<param name="dialplan" value="XML"/>
+						<param name="dtmf-duration" value="100"/>
+						<param name="codec-prefs" value="$${codec_prefs}"/>
+						<param name="use-rtp-timer" value="true"/>
+						<param name="rtp-timer-name" value="soft"/>
+						<!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
+						<param name="rtp-ip" value="$${local_ip_v4}"/>
+						<!-- ip address to bind to, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
+						<param name="sip-ip" value="$${local_ip_v4}"/>
+						<param name="hold-music" value="$${hold_music}"/>
+						<param name="apply-nat-acl" value="rfc1918"/>
+						<!--<param name="enable-timer" value="false"/>-->
+						<!--<param name="enable-100rel" value="true"/>-->
+						<!--<param name="minimum-session-expires" value="120"/>-->
+						<!--<param name="dtmf-type" value="info"/>-->
+						<param name="manage-presence" value="false"/>
+						<!--<param name="bitpacking" value="aal2"/> -->
+						<param name="max-proceeding" value="3"/>
+						<!--<param name="session-timeout" value="120"/>-->
+						<!--set to 'greedy' if you want your codec list to take precedence -->
+						<param name="inbound-codec-negotiation" value="generous"/>
+						<!-- if you want to send any special bind params of your own -->
+						<!--<param name="bind-params" value="transport=udp"/>-->
+						<!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
+						<!--<param name="inbound-late-negotiation" value="true"/>-->
+						<!--<param name="accept-blind-reg" value="true"/> -->
+						<!--<param name="accept-blind-auth" value="true"/> -->
+						<!--<param name="suppress-cng" value="true"/> -->
+						<param name="nonce-ttl" value="60"/>
+						<!--<param name="NDLB-broken-auth-hash" value="true"/>-->
+						<!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
+						<param name="auth-calls" value="false"/>
+						<param name="auth-all-packets" value="false"/>
+						<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
+						<param name="ext-sip-ip" value="$${external_sip_ip}"/>
+						<!-- rtp inactivity timeout -->
+						<param name="rtp-timeout-sec" value="300"/>
+						<param name="rtp-hold-timeout-sec" value="1800"/>
+						<!-- VAD choose one (out is a good choice); -->
+						<!-- <param name="vad" value="in"/> -->
+						<!-- <param name="vad" value="out"/> -->
+						<!-- <param name="vad" value="both"/> -->
+						<param name="disable-register" value="true"/>
+						<!--<param name="NDLB-force-rport" value="true"/>-->
+						<param name="challenge-realm" value="auto_from"/>
+						<!--<param name="disable-rtp-auto-adjust" value="true"/>-->
+						<!--<param name="inbound-use-callid-as-uuid" value="true"/>-->
+						<!--<param name="outbound-use-uuid-as-callid" value="true"/>-->
+						<!--<param name="auto-rtp-bugs" data="clear"/>-->
+					</settings>
+				</profile>
+			</profiles>
+		</configuration>
+
+		<configuration name="switch.conf" description="Core Configuration">
+			<cli-keybindings>
+				<key name="1" value="help"/>
+				<key name="2" value="status"/>
+				<key name="3" value="pa answer"/>
+				<key name="4" value="pa hangup"/>
+				<key name="5" value="sofia status"/>
+				<key name="6" value="reloadxml"/>
+				<key name="7" value="console loglevel 0"/>
+				<key name="8" value="console loglevel 7"/>
+				<key name="9" value="sofia status profile softphone"/>
+				<key name="10" value="fsctl pause"/>
+				<key name="11" value="fsctl resume"/>
+				<key name="12" value="version"/>
+			</cli-keybindings> 
+			<settings>
+				<param name="colorize-console" value="true"/>
+				<param name="max-sessions" value="20"/>
+				<param name="sessions-per-second" value="5"/>
+				<param name="loglevel" value="debug"/>
+				<param name="crash-protection" value="false"/>
+				<param name="dump-cores" value="yes"/>
+				<param name="rtp-start-port" value="16384"/>
+				<param name="rtp-end-port" value="16484"/>
+			</settings>
+		</configuration>
+	</section>
+
+	<section name="dialplan" description="Regex/XML Dialplan">
+		<context name="default">
+			<extension name="codec_and_sip_uri">
+				<condition field="destination_number" expression="^sip:(.*):(.*)$">
+					<action application="bridge" data="{absolute_codec_string=$1}sofia/softphone/$2"/>
+				</condition>
+			</extension>
+			<extension name="sip_uri">
+				<condition field="destination_number" expression="^sip:(.*)$">
+					<action application="bridge" data="sofia/softphone/$1"/>
+				</condition>
+			</extension>
+			<extension name="codec_and_number">
+				<condition field="destination_number" expression="^(.*):(.*)@(.*)$">
+					<action application="bridge" data="{absolute_codec_string=$1}sofia/gateway/$3/$2"/>
+				</condition>
+			</extension>
+			<extension name="number">
+				<condition field="destination_number" expression="^(.*)@(.*)$">
+					<action application="bridge" data="sofia/gateway/$2/$1"/>
+				</condition>
+			</extension>
+			<extension name="number">
+				<condition field="destination_number" expression="^(.*)$">
+					<action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
+				</condition>
+			</extension>
+		</context>
+		<context name="public">
+			<extension name="public_extensions">
+				<condition field="$${auto_answer}" expression="^true$"/>
+				<condition field="destination_number" expression="^(.*)$">
+					<action application="info"/>
+					<action application="bridge" data="portaudio/auto_answer"/>
+				</condition>
+			</extension>
+			<extension name="public_extensions">
+				<condition field="${sip_to_params}" expression="intercom=true"/>
+				<condition field="${alert_info}" expression="Ring;Answer"/>
+				<condition field="destination_number" expression="^(.*)$">
+					<action application="info"/>
+					<action application="bridge" data="portaudio/auto_answer"/>
+				</condition>
+			</extension>
+			<extension name="public_extensions">
+				<condition field="destination_number" expression="^(.*)$">
+					<action application="info"/>
+					<action application="set" data="ringback=${us-ring}"/>
+					<action application="pre_answer"/>
+					<action application="bridge" data="portaudio"/>
+				</condition>
+			</extension>
+		</context>
+	</section>
+</document>
+
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/portaudio.conf.xml (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/portaudio.conf.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/portaudio.conf.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/portaudio.conf.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,23 @@
+<document type="freeswitch/xml">
+    <section name="configuration">
+        <configuration name="portaudio.conf" description="Soundcard Endpoint">
+            <settings>
+                <!-- DO NOT take the # off the devices config -->
+                <param name="indev" value="#${indev}"/>
+                <!-- device to use for output -->
+                <param name="outdev" value="#${outdev}"/>
+                <param name="ringdev" value="#${ringdev}"/>
+                <param name="ring-file" value="${ring-file}"/>
+                <param name="ring-interval" value="${ring-interval}"/>
+                <param name="hold-file" value="${hold-file}"/>
+                <!--<param name="timer-name" value="soft"/>-->
+                <param name="dialplan" value="XML"/>
+                <param name="cid-name" value="${cid-name}"/>
+                <param name="cid-num" value="${cid-num}"/>
+                <param name="sample-rate" value="${sample-rate}"/>
+                <param name="codec-ms" value="${codec-ms}"/>
+            </settings>
+        </configuration>
+    </section>
+</document>
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/sofia.conf.xml (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/conf/sofia.conf.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/sofia.conf.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/conf/sofia.conf.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,45 @@
+<document type="freeswitch/xml">
+	<section name="configuration">
+		<configuration name="sofia.conf" description="sofia Endpoint">
+			<global_settings>
+				<param name="log-level" value="${log-level}"/>
+				<param name="auto-restart" value="${auto-restart}"/>
+				<param name="debug-presence" value="${debug-presence}"/>
+				<param name="rewrite-multicasted-fs-path" value="${rewrite-multicasted-fs-path}"/>
+			</global_settings>
+			<profiles>
+				<profile name="softphone">
+					<settings>
+                                         <param name="user-agent-string" value="${user-agent-string)"/>
+                                         <param name="debug" value="${debug}"/>
+                                         <param name="sip-trace" value="${sip-trace}"/>
+                                         <param name="context" value="${context}"/>
+                                         <param name="rfc2833-pt" value="${rfc2833-pt}"/>
+                                         <param name="sip-port" value="${sip-port}"/>
+                                         <param name="dialplan" value="${dialplan}"/>
+                                         <param name="dtmf-duration" value="${dtmf-duration}"/>
+                                         <param name="codec-prefs" value="${codec_prefs}"/>
+                                         <param name="use-rtp-timer" value="${use-rtp-timer}"/>
+                                         <param name="rtp-timer-name" value="${rtp-timer-name}"/>
+                                         <param name="rtp-ip" value="${rtp-ip}"/>
+                                         <param name="sip-ip" value="${sip-ip}"/>
+                                         <param name="hold-music" value="${hold-music}"/>
+                                         <param name="apply-nat-acl" value="${apply-nat-acl}"/>
+                                         <param name="manage-presence" value="${manage-presence}"/>
+                                         <param name="max-proceeding" value="${max-proceeding}"/>
+                                         <param name="inbound-codec-negotiation" value="${inbound-codec-negotiation}"/>
+                                         <param name="nonce-ttl" value="${nonce-ttl}"/>
+                                         <param name="auth-calls" value="${auth-calls}"/>
+                                         <param name="auth-all-packets" value="${auth-all-packets}"/>
+                                         <param name="ext-rtp-ip" value="${ext-rtp-ip}"/>
+                                         <param name="ext-sip-ip" value="${ext-sip-ip}"/>
+                                         <param name="rtp-timeout-sec" value="${rtp-timeout-sec}"/>
+                                         <param name="rtp-hold-timeout-sec" value="${rtp-hold-timeout-sec}"/>
+                                         <param name="disable-register" value="${disable-register}"/>
+                                         <param name="challenge-realm" value="${challenge-realm}"/>
+					</settings>
+				</profile>
+			</profiles>
+		</configuration>
+	</section>
+</document>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/fshost.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/fshost.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/fshost.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/fshost.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,359 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include <QtGui>
+#include "fshost.h"
+#include "call.h"
+#include "mod_qsettings/mod_qsettings.h"
+
+/* Declare it globally */
+FSHost g_FSHost;
+
+FSHost::FSHost(QObject *parent) :
+    QThread(parent)
+{
+    /* Initialize libs & globals */
+    qDebug() << "Initializing globals..." << endl;
+    switch_core_setrlimits();
+    switch_core_set_globals();
+
+    qRegisterMetaType<Call>("Call");
+
+}
+
+void FSHost::run(void)
+{
+    switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT;
+    const char *err = NULL;
+    switch_bool_t console = SWITCH_FALSE;
+    switch_status_t destroy_status;
+
+    /* Create directory structure for softphone with default configs */
+    QDir conf_dir = QDir(QDir::home());
+    if (!conf_dir.exists(".fscomm"))
+    {
+        conf_dir.mkpath(".fscomm/conf/accounts");
+        conf_dir.mkpath(".fscomm/sounds");
+        QFile::copy(":/sounds/test.wav", QString("%1/.fscomm/sounds/test.wav").arg(QDir::homePath()));
+        conf_dir.mkpath(".fscomm/templates");
+        QFile rootXML(":/confs/freeswitch.xml");
+        QString dest = QString("%1/.fscomm/conf/freeswitch.xml").arg(conf_dir.absolutePath());
+        rootXML.copy(dest);
+
+        QFile defaultAccount(":/confs/example.xml");
+        dest = QString("%1/.fscomm/conf/accounts/example.xml").arg(conf_dir.absolutePath());
+        defaultAccount.copy(dest);
+    }
+
+    /* Set all directories to the home user directory */
+    if (conf_dir.cd(".fscomm"))
+    {
+        SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(QString("%1/conf").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.conf_dir) {
+            emit coreLoadingError("Cannot allocate memory for conf_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.conf_dir, QString("%1/conf").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(strlen(QString("%1/log").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.log_dir) {
+            emit coreLoadingError("Cannot allocate memory for log_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.log_dir, QString("%1/log").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.run_dir = (char *) malloc(strlen(QString("%1/run").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.run_dir) {
+            emit coreLoadingError("Cannot allocate memory for run_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.run_dir, QString("%1/run").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(strlen(QString("%1/db").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.db_dir) {
+            emit coreLoadingError("Cannot allocate memory for db_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.db_dir, QString("%1/db").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(QString("%1/script").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.script_dir) {
+            emit coreLoadingError("Cannot allocate memory for script_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.script_dir, QString("%1/script").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(strlen(QString("%1/htdocs").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.htdocs_dir) {
+            emit coreLoadingError("Cannot allocate memory for htdocs_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.htdocs_dir, QString("%1/htdocs").arg(conf_dir.absolutePath()).toAscii().constData());
+    }
+
+    /* If you need to override configuration directories, you need to change them in the SWITCH_GLOBAL_dirs global structure */
+    qDebug() << "Initializing core..." << endl;
+    /* Initialize the core and load modules, that will startup FS completely */
+    if (switch_core_init(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
+        fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
+        emit coreLoadingError(err);
+    }
+
+    qDebug() << "Everything OK, Entering runtime loop ..." << endl;
+
+    if (switch_event_bind("FSHost", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, eventHandlerCallback, NULL) != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
+    }
+
+    /* Load our QSettings module */
+    if (mod_qsettings_load() != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't load mod_qsettings\n");
+    }
+
+    if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
+        fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
+        emit coreLoadingError(err);
+    }
+
+    emit ready();
+    /* Go into the runtime loop. If the argument is true, this basically sets runtime.running = 1 and loops while that is set
+     * If its false, it initializes the libedit for the console, then does the same thing
+     */
+    switch_core_runtime_loop(!console);
+    fflush(stdout);
+
+
+    switch_event_unbind_callback(eventHandlerCallback);
+    /* When the runtime loop exits, its time to shutdown */
+    destroy_status = switch_core_destroy();
+    if (destroy_status == SWITCH_STATUS_SUCCESS)
+    {
+        qDebug() << "We have properly shutdown the core." << endl;
+    }
+}
+
+switch_status_t FSHost::processAlegEvent(switch_event_t * event, QString uuid)
+{
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    Call * call = _active_calls.value(uuid);
+    /* Inbound call */
+    if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
+    {
+        switch(event->event_id) {
+        case SWITCH_EVENT_CHANNEL_ANSWER:
+            {
+                call->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+                _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
+                call->setState(FSCOMM_CALL_STATE_ANSWERED);
+                emit answered(uuid);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+            {
+                emit hungup(_active_calls.take(uuid));
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_STATE:
+            {
+                printf("CHANNEL_STATE Answer-State: %s | Channel-State: %s | %s | %s\n", switch_event_get_header_nil(event, "Answer-State"),switch_event_get_header_nil(event, "Channel-State"), uuid.toAscii().constData(), switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+                break;
+            }
+        default:
+            {
+                break;
+            }
+        }
+    }
+    /* Outbound call */
+    else
+    {
+        switch(event->event_id)
+        {
+        case SWITCH_EVENT_CHANNEL_BRIDGE:
+            {
+                _active_calls.value(uuid)->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+                _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+            {
+                if (call->getState() == FSCOMM_CALL_STATE_TRYING)
+                {
+                    emit callFailed(uuid);
+                    _active_calls.take(uuid);
+                }
+                break;
+            }
+        default:
+            printf("A leg: %s(%s)\n",switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
+            break;
+        }
+    }
+    return status;
+}
+
+switch_status_t FSHost::processBlegEvent(switch_event_t * event, QString buuid)
+{
+    QString uuid = _bleg_uuids.value(buuid);
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    Call * call = _active_calls.value(uuid);
+    /* Inbound call */
+    if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
+    {
+        qDebug() << " Inbound call";
+    }
+    /* Outbound call */
+    else
+    {
+        switch(event->event_id)
+        {
+        case SWITCH_EVENT_CHANNEL_ANSWER:
+            {
+                emit answered(uuid);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+            {
+                emit hungup(_active_calls.take(uuid));
+                _bleg_uuids.take(buuid);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_STATE:
+            {
+                if (QString(switch_event_get_header_nil(event, "Answer-State")) == "early")
+                {
+                    call->setState(FSCOMM_CALL_STATE_RINGING);
+                    emit ringing(uuid);
+                }
+                //printEventHeaders(event);
+                break;
+            }
+
+        default:
+            printf("B leg: %s(%s)\n",switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
+            break;
+        }
+    }
+    return status;
+}
+
+void FSHost::generalEventHandler(switch_event_t *event)
+{
+    QString uuid = switch_event_get_header_nil(event, "Unique-ID");
+
+    if (_bleg_uuids.contains(uuid))
+    {
+        if (processBlegEvent(event, uuid) == SWITCH_STATUS_SUCCESS)
+        {
+            return;
+        }
+    }
+    if (_active_calls.contains(uuid))
+    {
+        if (processAlegEvent(event, uuid) == SWITCH_STATUS_SUCCESS)
+        {
+            return;
+        }
+    }
+
+    /* This is how we identify new calls, inbound and outbound */
+    switch(event->event_id) {
+    case SWITCH_EVENT_CUSTOM:
+        {
+            if (strcmp(event->subclass_name, "portaudio::ringing") == 0 && !_active_calls.contains(uuid))
+            {
+                Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),
+                                      switch_event_get_header_nil(event, "Caller-Caller-ID-Name"),
+                                      switch_event_get_header_nil(event, "Caller-Caller-ID-Number"),
+                                      FSCOMM_CALL_DIRECTION_INBOUND,
+                                      uuid);
+                _active_calls.insert(uuid, call);
+                call->setState(FSCOMM_CALL_STATE_RINGING);
+                emit ringing(uuid);
+            }
+            else if (strcmp(event->subclass_name, "portaudio::makecall") == 0)
+            {
+                Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
+                                      switch_event_get_header_nil(event, "Caller-Destination-Number"),
+                                      FSCOMM_CALL_DIRECTION_OUTBOUND,
+                                      uuid);
+                _active_calls.insert(uuid, call);
+                call->setState(FSCOMM_CALL_STATE_TRYING);
+                emit newOutgoingCall(uuid);
+            }
+            else if (strcmp(event->subclass_name, "sofia::gateway_state") == 0)
+            {
+                QString state = switch_event_get_header_nil(event, "State");
+                QString gw = switch_event_get_header_nil(event, "Gateway");
+                if (state == "TRYING")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_TRYING);
+                else if (state == "REGISTER")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_REGISTER);
+                else if (state == "REGED")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_REGED);
+                else if (state == "UNREGED")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGED);
+                else if (state == "UNREGISTER")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGISTER);
+                else if (state =="FAILED")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_FAILED);
+                else if (state == "FAIL_WAIT")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_FAIL_WAIT);
+                else if (state == "EXPIRED")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_EXPIRED);
+                else if (state == "NOREG")
+                    emit gwStateChange(gw, FSCOMM_GW_STATE_NOREG);
+            }
+            else
+            {
+                //printf("We got a not treated custom event: %s\n", (!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
+            }
+            break;
+        }
+    default:
+        break;
+    }
+}
+
+switch_status_t FSHost::sendCmd(const char *cmd, const char *args, QString *res)
+{
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    switch_stream_handle_t stream = { 0 };
+    SWITCH_STANDARD_STREAM(stream);
+    qDebug() << "Sending command: " << cmd << args << endl;
+    status = switch_api_execute(cmd, args, NULL, &stream);
+    *res = switch_str_nil((char *) stream.data);
+
+    return status;
+}
+
+void FSHost::printEventHeaders(switch_event_t *event)
+{
+    switch_event_header_t *hp;
+    printf("Received event: %s(%s)\n", switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
+    for (hp = event->headers; hp; hp = hp->next) {
+        printf("%s=%s\n", hp->name, hp->value);
+    }
+    printf("\n\n");
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/fshost.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/fshost.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/fshost.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/fshost.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,106 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+#ifndef FSHOST_H
+#define FSHOST_H
+
+#include <QThread>
+#include <QHash>
+#include <switch.h>
+
+class Call;
+
+#define FSCOMM_GW_STATE_TRYING 0
+#define FSCOMM_GW_STATE_REGISTER 1
+#define FSCOMM_GW_STATE_REGED 2
+#define FSCOMM_GW_STATE_UNREGED 3
+#define FSCOMM_GW_STATE_UNREGISTER 4
+#define FSCOMM_GW_STATE_FAILED 5
+#define FSCOMM_GW_STATE_FAIL_WAIT 6
+#define FSCOMM_GW_STATE_EXPIRED 7
+#define FSCOMM_GW_STATE_NOREG 8
+
+static const char *fscomm_gw_state_names[] = {
+    "TRYING",
+    "REGISTER",
+    "REGED",
+    "UNREGED",
+    "UNREGISTER",
+    "FAILED",
+    "FAIL_WAIT",
+    "EXPIRED",
+    "NOREG"
+};
+
+class FSHost : public QThread
+{
+Q_OBJECT
+public:
+    explicit FSHost(QObject *parent = 0);
+    switch_status_t sendCmd(const char *cmd, const char *args, QString *res);
+    void generalEventHandler(switch_event_t *event);
+    Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); }
+    QString getGwStateName(int id) { return fscomm_gw_state_names[id]; }
+
+protected:
+    void run(void);
+
+signals:
+    void coreLoadingError(QString);
+    void ready(void);
+    void ringing(QString);
+    void answered(QString);
+    void newOutgoingCall(QString);
+    void callFailed(QString);
+    void hungup(Call*);
+    void gwStateChange(QString, int);
+
+private:
+    switch_status_t processBlegEvent(switch_event_t *, QString);
+    switch_status_t processAlegEvent(switch_event_t *, QString);
+    void printEventHeaders(switch_event_t *event);
+    QHash<QString, Call*> _active_calls;
+    QHash<QString, QString> _bleg_uuids;
+};
+
+extern FSHost g_FSHost;
+
+/*
+   Used to match callback from fs core. We dup the event and call the class
+   method callback to make use of the signal/slot infrastructure.
+*/
+static void eventHandlerCallback(switch_event_t *event)
+{
+    switch_event_t *clone = NULL;
+    if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) {
+        g_FSHost.generalEventHandler(clone);
+    }
+    switch_safe_free(clone);
+}
+
+#endif // FSHOST_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/main.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/main.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/main.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/main.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,51 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include <QtGui/QApplication>
+#include <QSplashScreen>
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    QCoreApplication::setOrganizationName("FreeSWITCH");
+    QCoreApplication::setOrganizationDomain("freeswitch.org");
+    QCoreApplication::setApplicationName("FSComm");
+
+    QPixmap image(":/images/splash.png");
+    QSplashScreen *splash = new QSplashScreen(image);
+    splash->show();
+    splash->showMessage("Loading, please wait...", Qt::AlignRight|Qt::AlignBottom, Qt::blue);
+
+    QObject::connect(&g_FSHost, SIGNAL(ready()), splash, SLOT(close()));
+    MainWindow w;    
+    QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(show()));
+    g_FSHost.start();
+    return a.exec();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/mainwindow.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,351 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include <QInputDialog>
+#include <QMessageBox>
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+#include <switch_version.h>
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow),
+    preferences(NULL)
+{
+    ui->setupUi(this);
+
+    dialpadMapper = new QSignalMapper(this);
+    connect(ui->dtmf0Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf1Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf2Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf3Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf4Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf5Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf6Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf7Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf8Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf9Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfABtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfBBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfCBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfDBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfAstBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfPoundBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    dialpadMapper->setMapping(ui->dtmf0Btn, QString("0"));
+    dialpadMapper->setMapping(ui->dtmf1Btn, QString("1"));
+    dialpadMapper->setMapping(ui->dtmf2Btn, QString("2"));
+    dialpadMapper->setMapping(ui->dtmf3Btn, QString("3"));
+    dialpadMapper->setMapping(ui->dtmf4Btn, QString("4"));
+    dialpadMapper->setMapping(ui->dtmf5Btn, QString("5"));
+    dialpadMapper->setMapping(ui->dtmf6Btn, QString("6"));
+    dialpadMapper->setMapping(ui->dtmf7Btn, QString("7"));
+    dialpadMapper->setMapping(ui->dtmf8Btn, QString("8"));
+    dialpadMapper->setMapping(ui->dtmf9Btn, QString("9"));
+    dialpadMapper->setMapping(ui->dtmfABtn, QString("A"));
+    dialpadMapper->setMapping(ui->dtmfBBtn, QString("B"));
+    dialpadMapper->setMapping(ui->dtmfCBtn, QString("C"));
+    dialpadMapper->setMapping(ui->dtmfDBtn, QString("D"));
+    dialpadMapper->setMapping(ui->dtmfAstBtn, QString("*"));
+    dialpadMapper->setMapping(ui->dtmfPoundBtn, QString("#"));
+    connect(dialpadMapper, SIGNAL(mapped(QString)), this, SLOT(dialDTMF(QString)));
+
+    connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
+    connect(&g_FSHost, SIGNAL(ringing(QString)), this, SLOT(ringing(QString)));
+    connect(&g_FSHost, SIGNAL(answered(QString)), this, SLOT(answered(QString)));
+    connect(&g_FSHost, SIGNAL(hungup(Call*)), this, SLOT(hungup(Call*)));
+    connect(&g_FSHost, SIGNAL(newOutgoingCall(QString)), this, SLOT(newOutgoingCall(QString)));
+    connect(&g_FSHost, SIGNAL(gwStateChange(QString,int)), this, SLOT(gwStateChanged(QString,int)));
+    /*connect(&g_FSHost, SIGNAL(coreLoadingError(QString)), this, SLOT(coreLoadingError(QString)));*/
+
+    connect(ui->newCallBtn, SIGNAL(clicked()), this, SLOT(makeCall()));
+    connect(ui->answerBtn, SIGNAL(clicked()), this, SLOT(paAnswer()));
+    connect(ui->hangupBtn, SIGNAL(clicked()), this, SLOT(paHangup()));
+    connect(ui->listCalls, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(callListDoubleClick(QListWidgetItem*)));
+    connect(ui->action_Preferences, SIGNAL(triggered()), this, SLOT(prefTriggered()));
+    connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close()));
+    connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(showAbout()));
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+    QString res;
+    g_FSHost.sendCmd("fsctl", "shutdown", &res);
+    g_FSHost.wait();
+}
+
+void MainWindow::prefTriggered()
+{
+    if (!preferences)
+        preferences = new PrefDialog();
+
+    preferences->raise();
+    preferences->show();
+    preferences->activateWindow();
+}
+
+void MainWindow::coreLoadingError(QString err)
+{
+    QMessageBox::warning(this, "Error Loading Core...", err, QMessageBox::Ok);
+    QApplication::exit(255);
+}
+
+void MainWindow::gwStateChanged(QString gw, int state)
+{
+    ui->statusBar->showMessage(tr("Account %1 is %2").arg(gw, g_FSHost.getGwStateName(state)));
+
+    /* TODO: This should be placed somewhere else when the config handler is here... */
+    QList<QTableWidgetItem *> match = ui->tableAccounts->findItems(gw, Qt::MatchExactly);
+    if (match.isEmpty())
+    {
+        /* Create the damn thing */
+        ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
+        QTableWidgetItem *gwField = new QTableWidgetItem(gw);
+        QTableWidgetItem *stField = new QTableWidgetItem(g_FSHost.getGwStateName(state));
+        ui->tableAccounts->setItem(0,0,gwField);
+        ui->tableAccounts->setItem(0,1,stField);
+        ui->tableAccounts->resizeColumnsToContents();
+        return;
+    }
+
+    QTableWidgetItem *gwField = match.at(0);
+    QTableWidgetItem *stField = ui->tableAccounts->item(gwField->row(),1);
+    stField->setText(g_FSHost.getGwStateName(state));
+    ui->tableAccounts->resizeColumnsToContents();
+
+}
+
+void MainWindow::dialDTMF(QString dtmf)
+{
+    QString result;
+    QString dtmf_string = QString("dtmf %1").arg(dtmf);
+    if (g_FSHost.sendCmd("pa", dtmf_string.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+}
+
+void MainWindow::callListDoubleClick(QListWidgetItem *item)
+{
+    Call *call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
+    QString switch_str = QString("switch %1").arg(call->getCallID());
+    QString result;
+    if (g_FSHost.sendCmd("pa", switch_str.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText(QString("Error switching to call %1").arg(call->getCallID()));
+        return;
+    }
+    ui->hangupBtn->setEnabled(true);
+}
+
+void MainWindow::makeCall()
+{
+    bool ok;
+    QString dialstring = QInputDialog::getText(this, tr("Make new call"),
+                                         tr("Number to dial:"), QLineEdit::Normal, NULL,&ok);
+
+    if (ok && !dialstring.isEmpty())
+    {
+        paCall(dialstring);
+    }
+}
+
+void MainWindow::fshostReady()
+{
+    ui->statusBar->showMessage("Ready");
+    ui->newCallBtn->setEnabled(true);
+    ui->textEdit->setEnabled(true);
+    ui->textEdit->setText("Ready to dial and receive calls!");
+}
+
+void MainWindow::paAnswer()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", "answer", &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+
+    ui->textEdit->setText("Talking...");
+    ui->hangupBtn->setEnabled(true);
+    ui->answerBtn->setEnabled(false);
+}
+
+void MainWindow::paCall(QString dialstring)
+{
+    QString result;
+
+    QString callstring = QString("call %1").arg(dialstring);
+
+    if (g_FSHost.sendCmd("pa", callstring.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+
+    ui->hangupBtn->setEnabled(true);
+}
+
+void MainWindow::paHangup()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", "hangup", &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+
+    ui->textEdit->setText("Click to dial number...");
+    ui->statusBar->showMessage("Call hungup");
+    ui->hangupBtn->setEnabled(false);
+}
+
+void MainWindow::newOutgoingCall(QString uuid)
+{
+    Call *call = g_FSHost.getCallByUUID(uuid);
+    ui->textEdit->setText(QString("Calling %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
+    QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Calling").arg(call->getCidName(), call->getCidNumber()));
+    item->setData(Qt::UserRole, uuid);
+    ui->listCalls->addItem(item);
+    ui->hangupBtn->setEnabled(true);
+}
+
+void MainWindow::ringing(QString uuid)
+{
+
+    Call *call = g_FSHost.getCallByUUID(uuid);
+    for (int i=0; i<ui->listCalls->count(); i++)
+    {
+        QListWidgetItem *item = ui->listCalls->item(i);
+        if (item->data(Qt::UserRole).toString() == uuid)
+        {
+            item->setText(tr("%1 - Ringing").arg(call->getCidNumber()));
+            ui->textEdit->setText(QString("Call from %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
+            return;
+        }
+    }
+
+    ui->textEdit->setText(QString("Call from %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
+    QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Ringing").arg(call->getCidName(), call->getCidNumber()));
+    item->setData(Qt::UserRole, uuid);
+    ui->listCalls->addItem(item);
+    ui->answerBtn->setEnabled(true);
+}
+
+void MainWindow::answered(QString uuid)
+{
+    Call *call = g_FSHost.getCallByUUID(uuid);
+    for (int i=0; i<ui->listCalls->count(); i++)
+    {
+        QListWidgetItem *item = ui->listCalls->item(i);
+        if (item->data(Qt::UserRole).toString() == uuid)
+        {
+            if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
+            {
+                item->setText(tr("%1 (%2) - Active").arg(call->getCidName(), call->getCidNumber()));
+                break;
+            }
+            else
+            {
+                item->setText(tr("%1 - Active").arg(call->getCidNumber()));
+                break;
+            }
+        }
+    }
+    ui->dtmf0Btn->setEnabled(true);
+    ui->dtmf1Btn->setEnabled(true);
+    ui->dtmf2Btn->setEnabled(true);
+    ui->dtmf3Btn->setEnabled(true);
+    ui->dtmf4Btn->setEnabled(true);
+    ui->dtmf5Btn->setEnabled(true);
+    ui->dtmf6Btn->setEnabled(true);
+    ui->dtmf7Btn->setEnabled(true);
+    ui->dtmf8Btn->setEnabled(true);
+    ui->dtmf9Btn->setEnabled(true);
+    ui->dtmfABtn->setEnabled(true);
+    ui->dtmfBBtn->setEnabled(true);
+    ui->dtmfCBtn->setEnabled(true);
+    ui->dtmfDBtn->setEnabled(true);
+    ui->dtmfAstBtn->setEnabled(true);
+    ui->dtmfPoundBtn->setEnabled(true);
+}
+
+void MainWindow::hungup(Call* call)
+{
+    for (int i=0; i<ui->listCalls->count(); i++)
+    {
+        QListWidgetItem *item = ui->listCalls->item(i);
+        if (item->data(Qt::UserRole).toString() == call->getUUID())
+        {
+            delete ui->listCalls->takeItem(i);
+            break;
+        }
+    }
+    ui->textEdit->setText(tr("Call with %1 (%2) hungup.").arg(call->getCidName(), call->getCidNumber()));
+    /* TODO: Will cause problems if 2 calls are received at the same time */
+    ui->answerBtn->setEnabled(false);
+    ui->hangupBtn->setEnabled(false);
+    ui->dtmf0Btn->setEnabled(false);
+    ui->dtmf1Btn->setEnabled(false);
+    ui->dtmf2Btn->setEnabled(false);
+    ui->dtmf3Btn->setEnabled(false);
+    ui->dtmf4Btn->setEnabled(false);
+    ui->dtmf5Btn->setEnabled(false);
+    ui->dtmf6Btn->setEnabled(false);
+    ui->dtmf7Btn->setEnabled(false);
+    ui->dtmf8Btn->setEnabled(false);
+    ui->dtmf9Btn->setEnabled(false);
+    ui->dtmfABtn->setEnabled(false);
+    ui->dtmfBBtn->setEnabled(false);
+    ui->dtmfCBtn->setEnabled(false);
+    ui->dtmfDBtn->setEnabled(false);
+    ui->dtmfAstBtn->setEnabled(false);
+    ui->dtmfPoundBtn->setEnabled(false);
+    delete call;
+}
+
+void MainWindow::changeEvent(QEvent *e)
+{
+    QMainWindow::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void MainWindow::showAbout()
+{
+    QString result;
+    g_FSHost.sendCmd("version", "", &result);
+
+    QMessageBox::about(this, tr("About FSComm"),
+                       tr("<h2>FSComm</h2>"
+                          "<p>Author: Jo&atilde;o Mesquita &lt;jmesquita@freeswitch.org>"
+                          "<p>FsComm is a softphone based on libfreeswitch."
+                          "<p>The FreeSWITCH&trade; images and name are trademark of"
+                          " Anthony Minessale II, primary author of FreeSWITCH&trade;."
+                          "<p>Compiled FSComm version: %1"
+                          "<p>%2").arg(SWITCH_VERSION_FULL, result));
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/mainwindow.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,82 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QListWidgetItem>
+#include <QSignalMapper>
+#include <switch.h>
+#include <fshost.h>
+#include <call.h>
+#include "preferences/prefdialog.h"
+
+namespace Ui {
+    class MainWindow;
+}
+
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+protected:
+    void changeEvent(QEvent *e);
+
+signals:
+    void dtmfDialed(QString);
+
+private slots:
+    void showAbout();
+    void prefTriggered();
+    void coreLoadingError(QString);
+    void gwStateChanged(QString, int);
+    void dialDTMF(QString);
+    void callListDoubleClick(QListWidgetItem *);
+    void makeCall();
+    void fshostReady();
+    void paAnswer();
+    void paCall(QString);
+    void paHangup();
+    void newOutgoingCall(QString);
+    void ringing(QString);
+    void answered(QString);
+    void hungup(Call*);
+
+private:
+    Ui::MainWindow *ui;
+    QSignalMapper *dialpadMapper;
+    PrefDialog *preferences;
+};
+
+#endif // MAINWINDOW_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.ui (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/mainwindow.ui) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.ui	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mainwindow.ui	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>670</width>
+    <height>541</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>FSComm - A FreeSWITCH Communicator</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout" name="horizontalLayout_4">
+    <item>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QTextEdit" name="textEdit">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPushButton" name="newCallBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>New Call</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QPushButton" name="answerBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Answer</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QPushButton" name="hangupBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Hangup</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QPushButton" name="dtmf1Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>1</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QPushButton" name="dtmf2Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QPushButton" name="dtmf3Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>3</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QPushButton" name="dtmf4Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>4</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QPushButton" name="dtmf5Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>5</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="QPushButton" name="dtmf6Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>6</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QPushButton" name="dtmf7Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>7</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QPushButton" name="dtmf8Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>8</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QPushButton" name="dtmf9Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>9</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QPushButton" name="dtmfAstBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>*</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QPushButton" name="dtmf0Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="QPushButton" name="dtmfPoundBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>#</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <widget class="QPushButton" name="dtmfABtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>A</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3">
+         <widget class="QPushButton" name="dtmfBBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>B</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="3">
+         <widget class="QPushButton" name="dtmfDBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>D</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="3">
+         <widget class="QPushButton" name="dtmfCBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>C</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>Active Calls</string>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QListWidget" name="listCalls"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox_2">
+        <property name="title">
+         <string>Active Accounts</string>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QTableWidget" name="tableAccounts">
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="alternatingRowColors">
+            <bool>false</bool>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::NoSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="showGrid">
+            <bool>false</bool>
+           </property>
+           <property name="cornerButtonEnabled">
+            <bool>true</bool>
+           </property>
+           <property name="rowCount">
+            <number>0</number>
+           </property>
+           <attribute name="horizontalHeaderVisible">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="horizontalHeaderCascadingSectionResizes">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderHighlightSections">
+            <bool>false</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Account</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Status</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>670</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="action_Preferences"/>
+    <addaction name="separator"/>
+    <addaction name="action_Exit"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+  <action name="action_Preferences">
+   <property name="text">
+    <string>&amp;Preferences</string>
+   </property>
+  </action>
+  <action name="action_Exit">
+   <property name="text">
+    <string>&amp;Exit</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/mod_qsettings)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings/mod_qsettings.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/mod_qsettings/mod_qsettings.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings/mod_qsettings.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings/mod_qsettings.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,142 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ *
+ * Description:
+ * Module to load configurations from Qt preference system QSettings
+ *
+ */
+#include <QString>
+#include <QtGui>
+#include <QDir>
+#include "mod_qsettings/mod_qsettings.h"
+
+switch_xml_t XMLBinding::getConfigXML(QString tmpl)
+{
+    switch_event_t *e;
+    switch_event_create_plain(&e, SWITCH_EVENT_REQUEST_PARAMS);
+    switch_assert(e);
+
+    if (QFile::exists(QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
+                          "Using template .fscomm/templates/%s.xml\n",
+                          tmpl.toAscii().constData());
+    }
+    else if(QFile::exists(QString(":/confs/%1.xml").arg(tmpl)))
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
+                          "Template %s.xml, doesn't exist on directory, copying embedded template.\n",
+                          tmpl.toAscii().constData());
+        QString dest = QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl);
+        QString orig = QString(":/confs/%1.xml").arg(tmpl);
+        QFile::copy(orig, dest);
+    }
+
+    QFile tmplFile(QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl));
+    if (!tmplFile.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Template %s could not be read!\n", tmpl.toAscii().constData());
+        return NULL;
+    }
+
+    /* Open template file and expand all strings based on QSettings */
+    QByteArray tmplContents(tmplFile.readAll());
+    tmplFile.close();
+
+    _settings->beginGroup("FreeSWITCH/conf");
+    _settings->beginGroup(tmpl);
+    foreach(QString k, _settings->childKeys())
+    {
+        switch_event_add_header_string(e, SWITCH_STACK_BOTTOM, k.toAscii().constData(), _settings->value(k).toByteArray().constData());
+    }
+    _settings->endGroup();
+    _settings->endGroup();
+
+    char *res = switch_event_expand_headers(e, tmplContents.data());
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Template %s as follows:\n%s", tmpl.toAscii().constData(), res);
+    switch_safe_free(e);
+    return switch_xml_parse_str(res, strlen(res));
+}
+
+static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params,
+                                  void *user_data)
+{
+    XMLBinding *binding = (XMLBinding *) user_data;
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are being requested -> section: %s | tag_name: %s | key_name: %s | key_value: %s!\n",
+                      section, tag_name, key_name, key_value);
+    if (!binding) {
+        return NULL;
+    }
+
+    return binding->getConfigXML(key_value);
+}
+
+static switch_status_t do_config(void)
+{
+    char *cf = "qsettings.conf";
+    switch_xml_t cfg, xml, bindings_tag;
+    XMLBinding *binding = NULL;
+
+    if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
+        return SWITCH_STATUS_TERM;
+    }
+
+    if (!(bindings_tag = switch_xml_child(cfg, "bindings"))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <bindings> tag!\n");
+        switch_xml_free(xml);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    QString bind_mask = switch_xml_attr_soft(bindings_tag, "value");
+    if (!bind_mask.isEmpty())
+    {
+        binding = new XMLBinding(bind_mask);
+    }
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding XML Fetch Function [%s]\n",
+                      binding->getBinding().isEmpty() ? "all" : binding->getBinding().toAscii().constData());
+    switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->getBinding().toAscii().constData()), binding);
+    binding = NULL;
+
+    switch_xml_free(xml);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t mod_qsettings_load(void)
+{
+
+    if (do_config() == SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sucessfully configured.\n");
+    } else {
+        return SWITCH_STATUS_FALSE;
+    }
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "We loaded mod_qsettings.\n");
+
+    return SWITCH_STATUS_SUCCESS;
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings/mod_qsettings.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/mod_qsettings/mod_qsettings.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings/mod_qsettings.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/mod_qsettings/mod_qsettings.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,50 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#ifndef MOD_QSETTINGS_H
+#define MOD_QSETTINGS_H
+
+#include <QString>
+#include <QSettings>
+#include <switch.h>
+
+switch_status_t mod_qsettings_load(void);
+
+class XMLBinding
+{
+public:
+    XMLBinding(QString binding) : _binding(binding), _settings(new QSettings) {}
+    QString getBinding(void) { return _binding; }
+    switch_xml_t getConfigXML(QString);
+private:
+    QString _binding;
+    QSettings* _settings;
+};
+
+#endif // MOD_QSETTINGS_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/accountdialog.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,54 @@
+#include <QSettings>
+#include "accountdialog.h"
+#include "ui_accountdialog.h"
+
+AccountDialog::AccountDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::AccountDialog)
+{
+    ui->setupUi(this);
+    _settings = new QSettings;
+    connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
+}
+
+AccountDialog::~AccountDialog()
+{
+    delete ui;
+}
+
+void AccountDialog::writeConfig()
+{
+    _settings->beginGroup("FreeSWITCH/conf/accounts");
+
+    _settings->beginGroup(ui->sofiaGwNameEdit->text());
+    _settings->setValue("username", ui->sofiaGwUsernameEdit->text());
+    _settings->setValue("realm", ui->sofiaGwRealmEdit->text());
+    _settings->setValue("from-user", ui->sofiaGwFromUserEdit->text());
+    _settings->setValue("from-domain", ui->sofiaGwFromDomainEdit->text());
+    _settings->setValue("password", ui->sofiaGwPasswordEdit->text());
+    _settings->setValue("extension", ui->sofiaGwExtensionEdit->text());
+    _settings->setValue("proxy", ui->sofiaGwProxyEdit->text());
+    _settings->setValue("register-proxy", ui->sofiaGwRegisterProxyEdit->text());
+    _settings->setValue("expire-seconds", ui->sofiaGwExpireSecondsSpin->value());
+    _settings->setValue("register", ui->sofiaGwRegisterCombo->currentText());
+    _settings->setValue("register-transport", ui->sofiaGwRegisterTransportCombo->currentText());
+    _settings->setValue("retry-seconds", ui->sofiaGwRetrySecondsSpin->value());
+    _settings->setValue("caller-id-in-from", ui->sofiaGwCallerIdInFromCombo->currentText());
+    _settings->setValue("contact-params", ui->sofiaGwContactParamsEdit->text());
+    _settings->setValue("ping", ui->sofiaGwPingSpin->value());
+    _settings->endGroup();
+
+    _settings->endGroup();
+}
+
+void AccountDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/accountdialog.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,29 @@
+#ifndef ACCOUNTDIALOG_H
+#define ACCOUNTDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class AccountDialog;
+}
+
+class QSettings;
+
+class AccountDialog : public QDialog {
+    Q_OBJECT
+public:
+    AccountDialog(QWidget *parent = 0);
+    ~AccountDialog();
+
+private slots:
+    void writeConfig();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::AccountDialog *ui;
+    QSettings *_settings;
+};
+
+#endif // ACCOUNTDIALOG_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.ui (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/accountdialog.ui) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.ui	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/accountdialog.ui	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AccountDialog</class>
+ <widget class="QDialog" name="AccountDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>495</width>
+    <height>573</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Account</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="sofiaGwNameEdit"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>username</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="sofiaGwUsernameEdit"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>realm</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="sofiaGwRealmEdit"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>from-user</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="sofiaGwFromUserEdit"/>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>from-domain</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLineEdit" name="sofiaGwFromDomainEdit"/>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>password</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QLineEdit" name="sofiaGwPasswordEdit"/>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>extension</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QLineEdit" name="sofiaGwExtensionEdit"/>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>proxy</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="QLineEdit" name="sofiaGwProxyEdit"/>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>register-proxy</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="QLineEdit" name="sofiaGwRegisterProxyEdit"/>
+   </item>
+   <item row="9" column="0">
+    <widget class="QLabel" name="label_10">
+     <property name="text">
+      <string>expire-seconds</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1">
+    <widget class="QSpinBox" name="sofiaGwExpireSecondsSpin">
+     <property name="value">
+      <number>60</number>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QLabel" name="label_11">
+     <property name="text">
+      <string>register</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1">
+    <widget class="QComboBox" name="sofiaGwRegisterCombo">
+     <item>
+      <property name="text">
+       <string>true</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>false</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="11" column="0">
+    <widget class="QLabel" name="label_12">
+     <property name="text">
+      <string>register-transport</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1">
+    <widget class="QComboBox" name="sofiaGwRegisterTransportCombo">
+     <item>
+      <property name="text">
+       <string>udp</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>tcp</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="12" column="0">
+    <widget class="QLabel" name="label_13">
+     <property name="text">
+      <string>retry-seconds</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="1">
+    <widget class="QSpinBox" name="sofiaGwRetrySecondsSpin">
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="0">
+    <widget class="QLabel" name="label_15">
+     <property name="text">
+      <string>contact-params</string>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="1">
+    <widget class="QLineEdit" name="sofiaGwContactParamsEdit"/>
+   </item>
+   <item row="14" column="0">
+    <widget class="QLabel" name="label_14">
+     <property name="text">
+      <string>caller-id-in-from</string>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="0">
+    <widget class="QLabel" name="label_16">
+     <property name="text">
+      <string>ping</string>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="1">
+    <widget class="QSpinBox" name="sofiaGwPingSpin">
+     <property name="value">
+      <number>25</number>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1">
+    <widget class="QComboBox" name="sofiaGwCallerIdInFromCombo">
+     <item>
+      <property name="text">
+       <string>false</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>true</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AccountDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AccountDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefdialog.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,60 @@
+#include <QtGui>
+#include "prefdialog.h"
+#include "ui_prefdialog.h"
+#include "prefportaudio.h"
+#include "prefsofia.h"
+#include "accountdialog.h"
+
+PrefDialog::PrefDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::PrefDialog)
+{
+    ui->setupUi(this);
+    _settings = new QSettings();
+    connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
+    connect(ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
+
+    _accDlg = NULL;
+    _mod_portaudio = new PrefPortaudio(ui, this);
+    _mod_sofia = new PrefSofia(ui, this);
+    readConfig();
+}
+
+PrefDialog::~PrefDialog()
+{
+    delete ui;
+}
+
+void PrefDialog::addAccountBtnClicked()
+{
+    if (!_accDlg)
+        _accDlg = new AccountDialog();
+
+    _accDlg->show();
+    _accDlg->raise();
+    _accDlg->activateWindow();
+}
+
+void PrefDialog::writeConfig()
+{    
+    _mod_portaudio->writeConfig();
+    /*_mod_sofia->writeConfig();*/
+}
+
+void PrefDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void PrefDialog::readConfig()
+{
+    _mod_portaudio->readConfig();
+    /*_mod_sofia->readConfig();*/
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefdialog.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,40 @@
+#ifndef PREFDIALOG_H
+#define PREFDIALOG_H
+
+#include <QDialog>
+#include <QDomDocument>
+#include <QSettings>
+#include <fshost.h>
+
+class PrefPortaudio;
+class PrefSofia;
+class AccountDialog;
+
+namespace Ui {
+    class PrefDialog;
+}
+
+class PrefDialog : public QDialog {
+    Q_OBJECT
+public:
+    PrefDialog(QWidget *parent = 0);
+    ~PrefDialog();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private slots:
+    void addAccountBtnClicked();
+    void writeConfig();
+
+private:
+    void readConfig();
+    QSettings *_settings;
+    AccountDialog *_accDlg;
+    Ui::PrefDialog *ui;
+    PrefPortaudio *_mod_portaudio;
+    PrefSofia *_mod_sofia;
+};
+
+
+#endif // PREFDIALOG_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.ui (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefdialog.ui) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.ui	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefdialog.ui	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,1057 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PrefDialog</class>
+ <widget class="QDialog" name="PrefDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>839</width>
+    <height>613</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Preferences</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="listSections">
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>120</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>96</width>
+       <height>84</height>
+      </size>
+     </property>
+     <property name="movement">
+      <enum>QListView::Static</enum>
+     </property>
+     <property name="flow">
+      <enum>QListView::LeftToRight</enum>
+     </property>
+     <property name="isWrapping" stdset="0">
+      <bool>true</bool>
+     </property>
+     <property name="spacing">
+      <number>12</number>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+     <item>
+      <property name="text">
+       <string>General</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_general.jpg</normaloff>:/images/pref_general.jpg</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Accounts</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_accounts.jpg</normaloff>:/images/pref_accounts.jpg</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Sofia</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>PortAudio</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="generalPage">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>User Information</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>CallerID Name:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="PaCallerIdNameEdit"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_14">
+            <property name="text">
+             <string>CallerID Number:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="PaCallerIdNumEdit"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="accountsPage">
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QTableWidget" name="sofiaGwListWidget">
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <column>
+          <property name="text">
+           <string>Enabled</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Name</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Username</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_7">
+         <item>
+          <widget class="QPushButton" name="sofiaGwAddBtn">
+           <property name="text">
+            <string>Add</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="sofiaGwRemBtn">
+           <property name="text">
+            <string>Remove</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="sofiaGwEditBtn">
+           <property name="text">
+            <string>Edit</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="sofiaPage">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QTabWidget" name="tabWidget">
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="tab">
+          <attribute name="title">
+           <string>General</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QGroupBox" name="groupBox">
+             <property name="title">
+              <string>Global</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>log-level</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QSpinBox" name="sofiaLogLevelSpin"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_2">
+                <property name="text">
+                 <string>auto-restart</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="sofiaAutoRestartCombo">
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_3">
+                <property name="text">
+                 <string>debug-presence</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QSpinBox" name="sofiaDebugPresenceSpin"/>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_15">
+                <property name="text">
+                 <string>rewrite-multicasted-fs-path</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QComboBox" name="sofiaRewriteMulticastedFsPathCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_6">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Profile</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_6">
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_4">
+                <property name="text">
+                 <string>user-agent-string</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QLineEdit" name="sofiaUserAgentStringEdit">
+                <property name="text">
+                 <string>FreeSWITCH/FSComm</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_26">
+                <property name="text">
+                 <string>hold-music</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="sofiaHoldMusicEdit">
+                <property name="text">
+                 <string>localstream://moh</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_16">
+                <property name="text">
+                 <string>context</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="sofiaContextEdit">
+                <property name="text">
+                 <string>public</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_19">
+                <property name="text">
+                 <string>dialplan</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="sofiaDialplanEdit">
+                <property name="text">
+                 <string>XML</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_2">
+          <attribute name="title">
+           <string>Network</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <widget class="QGroupBox" name="groupBox_2">
+             <property name="title">
+              <string>Softphone Profile</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_2">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_18">
+                <property name="text">
+                 <string>sip-port</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QSpinBox" name="sofiaSipPortSpin">
+                <property name="minimum">
+                 <number>1</number>
+                </property>
+                <property name="maximum">
+                 <number>65535</number>
+                </property>
+                <property name="value">
+                 <number>12345</number>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_22">
+                <property name="text">
+                 <string>use-rtp-timer</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="sofiaUseRtpTimerCombo">
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_24">
+                <property name="text">
+                 <string>rtp-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="sofiaRtpIpEdit">
+                <property name="text">
+                 <string>auto</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_25">
+                <property name="text">
+                 <string>sip-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="sofiaSipIpEdit">
+                <property name="text">
+                 <string>auto</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="label_27">
+                <property name="text">
+                 <string>apply-nat-acl</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <widget class="QLineEdit" name="sofiaApplyNatAclEdit">
+                <property name="text">
+                 <string>rfc1918</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="label_34">
+                <property name="text">
+                 <string>ext-rtp-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QLineEdit" name="sofiaExtRtpIpEdit">
+                <property name="text">
+                 <string>stun:stun.freeswitch.org</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="label_35">
+                <property name="text">
+                 <string>ext-sip-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QLineEdit" name="sofiaExtSipIpEdit">
+                <property name="text">
+                 <string>stun:stun.freeswitch.org</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_4">
+          <attribute name="title">
+           <string>Codecs</string>
+          </attribute>
+          <layout class="QFormLayout" name="formLayout_7">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_21">
+             <property name="text">
+              <string>codec-prefs</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="sofiaCodecPrefsEdit">
+             <property name="text">
+              <string>CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_30">
+             <property name="text">
+              <string>inbound-codec-negotiation</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="sofiaInboundCodecNegotiationCombo">
+             <item>
+              <property name="text">
+               <string>generous</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>greedy</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_3">
+          <attribute name="title">
+           <string>Advanced</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_6">
+           <item>
+            <widget class="QGroupBox" name="groupBox_7">
+             <property name="title">
+              <string>Profile</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_8">
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_17">
+                <property name="text">
+                 <string>rfc2833-pt</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QLineEdit" name="sofiaRfc2833PtEdit">
+                <property name="text">
+                 <string>101</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_5">
+                <property name="text">
+                 <string>debug</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QSpinBox" name="sofiaDebugSpin"/>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_6">
+                <property name="text">
+                 <string>sip-trace</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QComboBox" name="sofiaSipTraceCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_20">
+                <property name="text">
+                 <string>dtmf-duration</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QSpinBox" name="sofiaDtmfDurationSpin">
+                <property name="maximum">
+                 <number>1000</number>
+                </property>
+                <property name="value">
+                 <number>100</number>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="label_23">
+                <property name="text">
+                 <string>rtp-timer-name</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <widget class="QLineEdit" name="sofiaRtpTimerNameEdit">
+                <property name="text">
+                 <string>soft</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="label_28">
+                <property name="text">
+                 <string>manage-presence</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QComboBox" name="sofiaManagePresenceCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="label_29">
+                <property name="text">
+                 <string>max-proceeding</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QSpinBox" name="sofiaMaxProceedingEdit">
+                <property name="value">
+                 <number>3</number>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="0">
+               <widget class="QLabel" name="label_31">
+                <property name="text">
+                 <string>nonce-ttl</string>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="1">
+               <widget class="QSpinBox" name="sofiaNonceTtlSpin">
+                <property name="value">
+                 <number>60</number>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="0">
+               <widget class="QLabel" name="label_36">
+                <property name="text">
+                 <string>rtp-timeout-sec</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="1">
+               <widget class="QSpinBox" name="sofiaRtpTimeoutSecSpin">
+                <property name="maximum">
+                 <number>1000</number>
+                </property>
+                <property name="value">
+                 <number>300</number>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="0">
+               <widget class="QLabel" name="label_37">
+                <property name="text">
+                 <string>rtp-hold-timeout-sec</string>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="1">
+               <widget class="QSpinBox" name="sofiaRtpHoldTimeoutSecSpin">
+                <property name="maximum">
+                 <number>5000</number>
+                </property>
+                <property name="value">
+                 <number>1800</number>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="0">
+               <widget class="QLabel" name="label_32">
+                <property name="text">
+                 <string>auth-calls</string>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="1">
+               <widget class="QComboBox" name="sofiaAuthCallsCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="11" column="0">
+               <widget class="QLabel" name="label_33">
+                <property name="text">
+                 <string>auth-all-packets</string>
+                </property>
+               </widget>
+              </item>
+              <item row="11" column="1">
+               <widget class="QComboBox" name="sofiaAuthAllPacketsCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="12" column="0">
+               <widget class="QLabel" name="label_38">
+                <property name="text">
+                 <string>disable-register</string>
+                </property>
+               </widget>
+              </item>
+              <item row="12" column="1">
+               <widget class="QComboBox" name="sofiaDisableRegisterCombo">
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="13" column="0">
+               <widget class="QLabel" name="label_39">
+                <property name="text">
+                 <string>challenge-realm</string>
+                </property>
+               </widget>
+              </item>
+              <item row="13" column="1">
+               <widget class="QComboBox" name="sofiaChallengeRealmCombo">
+                <item>
+                 <property name="text">
+                  <string>auto_from</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>auto_to</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="portaudioPage">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Devices</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>indev</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="PaIndevCombo"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>outdev</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QComboBox" name="PaOutdevCombo"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaOutdevTestBtn">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>86</width>
+                <height>27</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Test</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>rindgev</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QComboBox" name="PaRingdevCombo"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaRingdevTestBtn">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>86</width>
+                <height>27</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Test</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="4" column="1">
+           <widget class="QPushButton" name="PaRefreshDevListBtn">
+            <property name="text">
+             <string>Refresh DevList</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QPushButton" name="PaLoopTestBtn">
+            <property name="text">
+             <string>Loop Test</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="PaSampleRateEdit">
+            <property name="text">
+             <string>16000</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="PaCodecMSEdit">
+            <property name="text">
+             <string>10</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_40">
+            <property name="text">
+             <string>Sample Rate</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_41">
+            <property name="text">
+             <string>Codec MS</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>Files</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>ring-file</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLineEdit" name="PaRingFileEdit">
+              <property name="text">
+               <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaRingFileBtn">
+              <property name="text">
+               <string>Open</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>ring-interval</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="PaRingIntervalSpin">
+            <property name="value">
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>hold-file</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLineEdit" name="PaHoldFileEdit">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaHoldFileBtn">
+              <property name="text">
+               <string>Open</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PrefDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>544</x>
+     <y>224</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>246</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PrefDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>544</x>
+     <y>230</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>246</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>listSections</sender>
+   <signal>currentRowChanged(int)</signal>
+   <receiver>stackedWidget</receiver>
+   <slot>setCurrentIndex(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>180</x>
+     <y>83</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>524</x>
+     <y>102</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefportaudio.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefportaudio.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefportaudio.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefportaudio.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,353 @@
+#include <QtGui>
+#include <fshost.h>
+#include "prefportaudio.h"
+
+PrefPortaudio::PrefPortaudio(Ui::PrefDialog *ui, QObject *parent) :
+        QObject(parent),
+        _ui(ui)
+{
+    _settings = new QSettings();
+    connect(_ui->PaRingFileBtn, SIGNAL(clicked()), this, SLOT(ringFileChoose()));
+    connect(_ui->PaHoldFileBtn, SIGNAL(clicked()), this, SLOT(holdFileChoose()));
+    connect(_ui->PaIndevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(indevChangeDev(int)));
+    connect(_ui->PaOutdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(outdevChangeDev(int)));
+    connect(_ui->PaRingdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(ringdevChangeDev(int)));
+    connect(_ui->PaRingdevTestBtn, SIGNAL(clicked()), this, SLOT(ringdevTest()));
+    connect(_ui->PaLoopTestBtn, SIGNAL(clicked()), this, SLOT(loopTest()));
+    connect(_ui->PaRefreshDevListBtn, SIGNAL(clicked()), this, SLOT(refreshDevList()));
+}
+
+void PrefPortaudio::ringdevTest()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", QString("play %1/.fscomm/sounds/test.wav 0").arg(QDir::homePath()).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error testing ringdev on mod_portaudio! %s\n",
+                          result.toAscii().constData());
+    }
+}
+
+void PrefPortaudio::loopTest()
+{
+    QString result;
+    _ui->PaLoopTestBtn->setEnabled(false);
+    if (g_FSHost.sendCmd("pa", "looptest", &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running looptest on mod_portaudio! %s\n",
+                          result.toAscii().constData());
+    }
+    _ui->PaLoopTestBtn->setEnabled(true);
+}
+
+void PrefPortaudio::refreshDevList()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", "rescan", &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error rescaning sound device on mod_portaudio! %s\n",
+                          result.toAscii().constData());
+    }
+    //clear combox
+    _ui->PaIndevCombo->clear();
+    _ui->PaOutdevCombo->clear();
+    _ui->PaRingdevCombo->clear();
+    getPaDevlist();
+}
+
+void PrefPortaudio::indevChangeDev(int index)
+{
+    QString result;
+    int dev = _ui->PaIndevCombo->itemData(index, Qt::UserRole).toInt();
+    if (g_FSHost.sendCmd("pa", QString("indev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting ringdev to #%d on mod_portaudio!\n", dev);
+        QMessageBox::critical(0, tr("Unable to change device."),
+                              tr("There was an error changing the ringdev.\nPlease report this bug."),
+                              QMessageBox::Ok);
+
+    }
+}
+
+void PrefPortaudio::ringdevChangeDev(int index)
+{
+    QString result;
+    int dev = _ui->PaRingdevCombo->itemData(index, Qt::UserRole).toInt();
+    if (g_FSHost.sendCmd("pa", QString("ringdev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting ringdev to #%d on mod_portaudio!\n", dev);
+        QMessageBox::critical(0, tr("Unable to change device."),
+                              tr("There was an error changing the ringdev.\nPlease report this bug."),
+                              QMessageBox::Ok);
+
+    }
+}
+
+void PrefPortaudio::outdevChangeDev(int index)
+{
+    QString result;
+    int dev = _ui->PaRingdevCombo->itemData(index, Qt::UserRole).toInt();
+    if (g_FSHost.sendCmd("pa", QString("outdev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting outdev to #%d on mod_portaudio!\n", dev);
+        QMessageBox::critical(0, tr("Unable to change device."),
+                              tr("There was an error changing the outdev.\nPlease report this bug."),
+                              QMessageBox::Ok);
+    }
+}
+
+void PrefPortaudio::holdFileChoose()
+{
+    QString fileName = QFileDialog::getOpenFileName(0,
+                                                    tr("Select file"),
+                                                    QDir::homePath(),
+                                                    NULL);
+    if (!fileName.isNull())
+        _ui->PaHoldFileEdit->setText(fileName);
+}
+
+void PrefPortaudio::ringFileChoose()
+{
+    QString fileName = QFileDialog::getOpenFileName(0,
+                                                    tr("Select file"),
+                                                    QDir::homePath(),
+                                                    NULL);
+    if (!fileName.isNull())
+        _ui->PaRingFileEdit->setText(fileName);
+}
+
+void PrefPortaudio::writeConfig()
+{
+    _settings->beginGroup("FreeSWITCH/conf");
+    _settings->beginGroup("portaudio.conf");
+
+    QString cid_name = _settings->value("cid-name").toString();
+    QString ncid_name = _ui->PaCallerIdNameEdit->text();
+
+    QString cid_num = _settings->value("cid-num").toString();
+    QString ncid_num = _ui->PaCallerIdNumEdit->text();
+
+    QString hold_file = _settings->value("hold-file").toString();
+    QString nhold_file =  _ui->PaHoldFileEdit->text();
+
+    QString ring_file = _settings->value("ring-file").toString();
+    QString nring_file = _ui->PaRingFileEdit->text();
+
+    int ring_interval = _settings->value("ring-interval").toInt();
+    int nring_interval = _ui->PaRingIntervalSpin->value();
+
+    QString sample_rate = _settings->value("sample-rate").toString();
+    QString nsample_rate = _ui->PaSampleRateEdit->text();
+
+    QString codec_ms = _settings->value("codec-ms").toString();
+    QString ncodec_ms = _ui->PaCodecMSEdit->text();
+
+    QString result;
+
+    if (cid_name != ncid_name ||
+        cid_num != ncid_num ||
+        hold_file != nhold_file ||
+        ring_file != nring_file ||
+        ring_interval != nring_interval ||
+        sample_rate != nsample_rate||
+        codec_ms != ncodec_ms)
+    {
+        if (g_FSHost.sendCmd("reload", "mod_portaudio", &result) == SWITCH_STATUS_SUCCESS)
+        {
+            _settings->setValue("cid-name", ncid_name);
+            _settings->setValue("cid-num", ncid_num);
+            _settings->setValue("ring-file", nring_file);
+            _settings->setValue("ring-interval", nring_interval);
+            _settings->setValue("hold-file", nhold_file);
+            _settings->setValue("sample-rate", nsample_rate);
+            _settings->setValue("codec-ms", ncodec_ms);
+        }
+        else
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error while issuing reload command to mod_portaudio!\n");
+            QMessageBox::critical(0, tr("Unable to save settings"),
+                                  tr("There was an error saving your settings.\nPlease report this bug."),
+                                  QMessageBox::Ok);
+        }
+    }
+
+    int nindev = _ui->PaIndevCombo->itemData(_ui->PaIndevCombo->currentIndex(), Qt::UserRole).toInt();
+    int indev = _settings->value("indev").toInt();
+    int noutdev = _ui->PaOutdevCombo->itemData(_ui->PaOutdevCombo->currentIndex(), Qt::UserRole).toInt();
+    int outdev = _settings->value("outdev").toInt();
+    int nringdev = _ui->PaRingdevCombo->itemData(_ui->PaRingdevCombo->currentIndex(), Qt::UserRole).toInt();
+    int ringdev = _settings->value("ringdev").toInt();
+
+    if (nindev != indev)
+    {
+        if (g_FSHost.sendCmd("pa", QString("indev #%1").arg(nindev).toAscii().constData(), &result) == SWITCH_STATUS_SUCCESS)
+        {
+            _settings->setValue("indev", nindev);
+        }
+        else
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting indev from #%d to #%d on mod_portaudio!\n",
+                              indev, nindev);
+            QMessageBox::critical(0, tr("Unable to save settings"),
+                                  tr("There was an error changing the indev.\nPlease report this bug."),
+                                  QMessageBox::Ok);
+        }
+    }
+
+    if (noutdev!= outdev)
+    {
+        _settings->setValue("outdev", noutdev);
+    }
+    if (nringdev != ringdev)
+    {
+        _settings->setValue("ringdev", nringdev);
+    }
+
+    _settings->endGroup();
+    _settings->endGroup();
+}
+
+void PrefPortaudio::readConfig()
+{
+    getPaDevlist();
+    _settings->beginGroup("FreeSWITCH/conf");
+
+    _settings->beginGroup("portaudio.conf");
+    _ui->PaCallerIdNameEdit->setText(_settings->value("cid-name").toString());
+    _ui->PaCallerIdNumEdit->setText(_settings->value("cid-num").toString());
+    _ui->PaHoldFileEdit->setText(_settings->value("hold-file").toString());
+    _ui->PaRingFileEdit->setText(_settings->value("ring-file").toString());
+    _ui->PaRingIntervalSpin->setValue(_settings->value("ring-interval").toInt());
+    _ui->PaSampleRateEdit->setText(_settings->value("sample-rate").toString());
+    _ui->PaCodecMSEdit->setText(_settings->value("codec-ms").toString());
+    _settings->endGroup();
+
+    _settings->endGroup();
+}
+
+void PrefPortaudio::getPaDevlist()
+{
+    QString result;
+    int errorLine, errorColumn;
+    QString errorMsg;
+
+    if (g_FSHost.sendCmd("pa", "devlist xml", &result) != SWITCH_STATUS_SUCCESS)
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error querying audio devices."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    if (!_xmlPaDevList.setContent(result, &errorMsg, &errorLine, &errorColumn))
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist.\n%1 (Line:%2, Col:%3).").arg(errorMsg,
+                                                                                                         errorLine,
+                                                                                                         errorColumn),
+                              QMessageBox::Ok);
+        return;
+    }
+    QDomElement root = _xmlPaDevList.documentElement();
+    if (root.tagName() != "xml")
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. Root tag is not <xml>."),
+                              QMessageBox::Ok);
+        return;
+    }
+    QDomElement devices = root.firstChildElement("devices");
+    if (devices.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There is no <devices> tag."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    QDomElement child = devices.firstChildElement();
+    if (child.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There is no <device> tag."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    while (!child.isNull())
+    {
+        if (child.tagName() == "device")
+        {
+            QString id, name, inputs, outputs;
+            id = child.attribute("id","-1");
+            name = child.attribute("name","Null");
+            inputs = child.attribute("inputs","0");
+            outputs = child.attribute("outputs","0");
+            if (inputs.toInt() != 0)
+                _ui->PaIndevCombo->addItem(name,id.toInt());
+            if (outputs.toInt() != 0)
+            {
+                _ui->PaOutdevCombo->addItem(name,id.toInt());
+                _ui->PaRingdevCombo->addItem(name,id.toInt());
+            }
+        }
+        child = child.nextSiblingElement();
+    }
+
+    QDomElement bindings = root.firstChildElement("bindings");
+    if (bindings.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There is no <bindings> tag."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    child = bindings.firstChildElement();
+    if (child.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There are no bindings."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    while (!child.isNull())
+    {
+        QString id = child.attribute("device","-1");
+        if (child.tagName() == "ring")
+        {
+            for(int itemId=0; itemId<_ui->PaRingdevCombo->count(); itemId++)
+            {
+                if (id == _ui->PaRingdevCombo->itemData(itemId,Qt::UserRole))
+                {
+                    //setCurrentIndex triggers currentIndexChanged signal, hmmm...
+                    _ui->PaRingdevCombo->setCurrentIndex(itemId);
+                    break;
+                }
+            }
+        }
+        else if (child.tagName() == "input")
+        {
+            for(int itemId=0; itemId<_ui->PaRingdevCombo->count(); itemId++)
+            {
+                if (id == _ui->PaIndevCombo->itemData(itemId,Qt::UserRole))
+                {
+                    _ui->PaIndevCombo->setCurrentIndex(itemId);
+                    break;
+                }
+            }
+        }
+        else if (child.tagName() == "output")
+            for(int itemId=0; itemId<_ui->PaOutdevCombo->count(); itemId++)
+            {
+                if (id == _ui->PaOutdevCombo->itemData(itemId,Qt::UserRole))
+                {
+                    _ui->PaOutdevCombo->setCurrentIndex(itemId);
+                    break;
+                }
+            }
+
+        child = child.nextSiblingElement();
+    }
+
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefportaudio.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefportaudio.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefportaudio.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefportaudio.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,34 @@
+#ifndef PREFPORTAUDIO_H
+#define PREFPORTAUDIO_H
+
+#include <QObject>
+#include <QDomDocument>
+#include "ui_prefdialog.h"
+
+class QSettings;
+
+class PrefPortaudio : public QObject
+{
+Q_OBJECT
+public:
+    explicit PrefPortaudio(Ui::PrefDialog *ui, QObject *parent = 0);
+    void writeConfig();
+    void readConfig();
+
+private slots:
+    void ringFileChoose();
+    void holdFileChoose();
+    void indevChangeDev(int);
+    void outdevChangeDev(int);
+    void ringdevChangeDev(int);
+    void ringdevTest();
+    void loopTest();
+    void refreshDevList();
+private:
+    void getPaDevlist(void);
+    QSettings *_settings;
+    Ui::PrefDialog *_ui;
+    QDomDocument _xmlPaDevList;
+};
+
+#endif // PREFPORTAUDIO_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefsofia.cpp (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefsofia.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefsofia.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefsofia.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,64 @@
+#include <QtGui>
+#include <fshost.h>
+#include "prefsofia.h"
+
+PrefSofia::PrefSofia(Ui::PrefDialog *ui, QObject *parent) :
+        QObject(parent),
+        _ui(ui)
+{
+    _settings = new QSettings();
+}
+
+void PrefSofia::readConfig()
+{
+    int guess_mask;
+    char guess_ip[80];
+    switch_find_local_ip(guess_ip, sizeof(guess_ip), &guess_mask, AF_INET);
+    _ui->sofiaRtpIpEdit->setText(QString(guess_ip));
+    _ui->sofiaSipIpEdit->setText(QString(guess_ip));
+}
+
+void PrefSofia::writeConfig()
+{
+    _settings->beginGroup("FreeSWITCH/conf");
+    _settings->beginGroup("sofia.conf");
+
+    /* General Settings */
+    _settings->setValue("log-level", _ui->sofiaLogLevelSpin->value());
+    _settings->setValue("auto-restart", _ui->sofiaAutoRestartCombo->currentText());
+    _settings->setValue("debug-presence", _ui->sofiaDebugPresenceSpin->value());
+    _settings->setValue("rewrite-multicasted-fs-path", _ui->sofiaRewriteMulticastedFsPathCombo->currentText());
+
+    /* Profile settings */
+    _settings->setValue("user-agent-string", _ui->sofiaUserAgentStringEdit->text());
+    _settings->setValue("debug", _ui->sofiaDebugSpin->value());
+    _settings->setValue("sip-trace", _ui->sofiaSipTraceCombo->currentText());
+    _settings->setValue("context", _ui->sofiaContextEdit->text());
+    _settings->setValue("rfc2833-pt", _ui->sofiaRfc2833PtEdit->text());
+    _settings->setValue("sip-port", _ui->sofiaSipPortSpin->value());
+    _settings->setValue("dialplan", _ui->sofiaDialplanEdit->text());
+    _settings->setValue("dtmf-duration", _ui->sofiaDtmfDurationSpin->value());
+    _settings->setValue("codec-prefs", _ui->sofiaCodecPrefsEdit->text());
+    _settings->setValue("use-rtp-timer", _ui->sofiaUseRtpTimerCombo->currentText());
+    _settings->setValue("rtp-timer-name", _ui->sofiaRtpTimerNameEdit->text());
+    _settings->setValue("rtp-ip", _ui->sofiaRtpIpEdit->text());
+    _settings->setValue("sip-ip", _ui->sofiaSipIpEdit->text());
+    _settings->setValue("hold-music", _ui->sofiaHoldMusicEdit->text());
+    _settings->setValue("apply-nat-acl", _ui->sofiaApplyNatAclEdit->text());
+    _settings->setValue("manage-presence", _ui->sofiaManagePresenceCombo->currentText());
+    _settings->setValue("max-proceeding", _ui->sofiaMaxProceedingEdit->text());
+    _settings->setValue("inbound-codec-negotiation", _ui->sofiaInboundCodecNegotiationCombo->currentText());
+    _settings->setValue("nonce-ttl", _ui->sofiaNonceTtlSpin->value());
+    _settings->setValue("auth-calls", _ui->sofiaAuthCallsCombo->currentText());
+    _settings->setValue("auth-all-packets", _ui->sofiaAuthAllPacketsCombo->currentText());
+    _settings->setValue("ext-rtp-ip", _ui->sofiaExtRtpIpEdit->text());
+    _settings->setValue("ext-sip-ip", _ui->sofiaExtSipIpEdit->text());
+    _settings->setValue("rtp-timeout-sec", _ui->sofiaRtpTimeoutSecSpin->value());
+    _settings->setValue("rtp-hold-timeout-sec", _ui->sofiaRtpHoldTimeoutSecSpin->value());
+    _settings->setValue("disable-register", _ui->sofiaDisableRegisterCombo->currentText());
+    _settings->setValue("challenge-realm", _ui->sofiaChallengeRealmCombo->currentText());
+
+
+    _settings->endGroup();
+    _settings->endGroup();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefsofia.h (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/preferences/prefsofia.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefsofia.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/preferences/prefsofia.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,23 @@
+#ifndef PREFSOFIA_H
+#define PREFSOFIA_H
+
+#include <QObject>
+#include "ui_prefdialog.h"
+
+class QSettings;
+
+class PrefSofia : public QObject
+{
+Q_OBJECT
+public:
+    explicit PrefSofia(Ui::PrefDialog *ui, QObject *parent = 0);
+    void writeConfig();
+    void readConfig();
+
+private:
+    QSettings *_settings;
+    Ui::PrefDialog *_ui;
+
+};
+
+#endif // PREFSOFIA_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/resources (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/resources)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/resources.qrc (from rev 16612, freeswitch/trunk/contrib/seven/fscomm/resources.qrc) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/resources.qrc	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/seven/fscomm/resources.qrc	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,20 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="splash.png">resources/splash.png</file>
+        <file alias="pref_sip.png">resources/pref_sip.png</file>
+        <file alias="pref_audio.gif">resources/pref_audio.gif</file>
+        <file alias="pref_general.jpg">resources/pref_general.jpg</file>
+        <file alias="pref_accounts.jpg">resources/pref_accounts.jpg</file>
+    </qresource>
+    <qresource prefix="/confs">
+        <file alias="freeswitch.xml">conf/freeswitch.xml</file>
+        <file alias="example.xml">conf/accounts/example.xml</file>
+        <file alias="event_socket.conf.xml">conf/event_socket.conf.xml</file>
+        <file alias="portaudio.conf.xml">conf/portaudio.conf.xml</file>
+        <file alias="sofia.conf.xml">conf/sofia.conf.xml</file>
+        <file alias="account.conf.xml">conf/account.conf.xml</file>
+    </qresource>
+    <qresource prefix="/sounds">
+        <file alias="test.wav">resources/test.wav</file>
+    </qresource>
+</RCC>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Parser.cs (from rev 16612, freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Parser.cs) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Parser.cs	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Parser.cs	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FreeSwitch.EventSocket
+{
+	public class Parser
+	{
+		private readonly StringBuilder _text = new StringBuilder();
+		private readonly Queue<string> _piecesToAppend = new Queue<string>();
+
+		public string Text
+		{
+			get { return _text.ToString(); }
+		}
+
+		public void Append(string text)
+		{
+			lock (_piecesToAppend)
+				_piecesToAppend.Enqueue(text);
+		}
+
+		internal static void ParseHeaders(PlainEventMsg msg, string header)
+		{
+			StringParser parser = new StringParser(header);
+			string name = parser.Read(':', true);
+			while (name != string.Empty)
+			{
+				switch (name)
+				{
+					case "Content-Length":
+						msg.ContentLength = int.Parse(parser.ReadLine(true));
+						break;
+					case "Content-Type":
+						msg.ContentType = parser.ReadLine(true);
+						break;
+					case "Reply-Text":
+						msg.Body = parser.ReadLine(true);
+						break;
+				}
+
+				// empty line == end of header
+				if (parser.EOL)
+					break;
+
+				name = parser.Read(':', true);
+			}
+		}
+
+		public PlainEventMsg ParseOne()
+		{
+			AppendPieces();
+
+			int index = 0;
+			PlainEventMsg msg = FindHeaders(ref index);
+			if (msg == null)
+				return null;
+
+			// no body
+			if (msg.ContentLength <= 0)
+			{
+				_text.Remove(0, index);
+				return msg;
+			}
+
+			// too few bytes.
+			if (_text.Length-index < msg.ContentLength)
+				return null;
+
+			// ignore empty line between header and body.
+			IgnoreEmptyLines(ref index);
+
+			int start = index;
+			FindEmptyLine(ref index);
+
+			int size = index - start + 2; // include \n\n
+
+			// Validate size.
+			//
+			// Someone suggested that the sizes are correct and that 
+			// the events was wrapped. Well. I've checked if the
+			// specified position is a \n\n, and it's not.
+			//
+			// Don't force me to check source code of another implementation
+			//
+			if (size != msg.ContentLength)
+			{
+				// Check if the buffer contains header + body only,
+				// then use the reported size, despite that our check failed.
+				if (_text.Length == msg.ContentLength + start)
+					size = msg.ContentLength;
+				// buffer contains more than one message.
+				else if (_text.Length > msg.ContentLength+start)
+				{
+					// Check if the reported size ends with a \n,
+					// in that case we have a container event.
+					if (_text[msg.ContentLength + start - 1] == '\n')
+						size = msg.ContentLength;
+				}
+			}
+
+			char[] body = new char[size];
+			_text.CopyTo(start, body, 0, size);
+			msg.Body = new string(body);
+			_text.Remove(0, index);
+			return msg;
+		}
+
+		private PlainEventMsg FindHeaders(ref int index)
+		{
+			IgnoreEmptyLines(ref index);
+
+			int start = index;
+			FindEmptyLine(ref index);
+			if (start == index)
+				return null; //got no header.
+
+			char[] headerBuffer = new char[index - start];
+			_text.CopyTo(start, headerBuffer, 0, index - start);
+			
+			PlainEventMsg eventMsg = new PlainEventMsg();
+			ParseHeaders(eventMsg, new string(headerBuffer));
+			return eventMsg;
+		}
+
+
+		private void IgnoreEmptyLines(ref int index)
+		{
+			while (index < _text.Length && _text[index] == '\n')
+				++index;
+		}
+
+		private void FindEmptyLine(ref int index)
+		{
+			int pos = index;
+			while (index < _text.Length-1)
+			{
+				if (_text[index] == '\n' && _text[index + 1] == '\n')
+					return;
+				++index;
+			}
+
+			index = pos;
+		}
+
+		private void AppendPieces()
+		{
+			lock (_piecesToAppend)
+			{
+				while (_piecesToAppend.Count > 0)
+					_text.Append(_piecesToAppend.Dequeue());
+			}
+		}
+
+		public void Clear()
+		{
+			_piecesToAppend.Clear();
+			_text.Length = 0;
+		}
+	}
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds (from rev 16612, freeswitch/trunk/debian/sounds)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/buildsounds.sh (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/buildsounds.sh) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/buildsounds.sh	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/buildsounds.sh	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+sounds_location=$1
+for rate in 32000 16000 8000
+do 
+    for i in ascii base256 conference currency digits ivr misc phonetic-ascii time voicemail zrtp
+    do
+	mkdir -p $sounds_location/$i/$rate
+	for f in `find $sounds_location/$i/48000 -name \*.wav`
+	do
+	    echo "generating" $sounds_location/$i/$rate/`basename $f`
+	    sox $f -r $rate $sounds_location/$i/$rate/`basename $f`
+	done
+    done
+done

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/changelog	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,5 @@
+freeswitch-sounds-en-us-callie (1.0.12-0ubuntu1) jaunty; urgency=low
+
+  * Initial: This is the initial working build of the en-us-callie sounds
+
+ -- William King <quentusrex@gmail.com>  Sun, 20 Sep 2009 06:56:46 -0700

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/control (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/control) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/control	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/control	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,61 @@
+Source: freeswitch-sounds-en-us-callie
+Maintainer: Freeswitch Debian Team <debian@freeswitch.org>
+Section: net
+Priority: extra
+Build-Depends: debhelper (>= 5), fakeroot, sox
+Standards-Version: 3.7.3
+
+Package: freeswitch-sounds-en-us-callie-8000
+Architecture: all
+Conflicts: freeswitch-sounds-en-us-callie
+Description: English language sounds for the FreeSWITCH(TM) (8000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-en-us-callie-16000
+Architecture: all
+Conflicts: freeswitch-sounds-en-us-callie
+Description: English language sounds for the FreeSWITCH(TM) (16000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-en-us-callie-32000
+Architecture: all
+Conflicts: freeswitch-sounds-en-us-callie
+Description: English language sounds for FreeSWITCH(TM) (32000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-en-us-callie-48000
+Architecture: all
+Description: English language sounds for the FreeSWITCH(TM) (48000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-en-us-callie
+Architecture: all
+Depends: sox, freeswitch-sounds-en-us-callie-48000
+Conflicts: freeswitch-sounds-en-us-callie-omega, freeswitch-sounds-en-us-callie-8000, freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-32000
+Description: English language files for FreeSWITCH(TM)
+ This package generates the 8k, 16k, and 32k from the installed 48k
+ sounds. You can select which ones you want.
+
+Package: freeswitch-sounds-en-us-callie-omega
+Architecture: all
+Depends: freeswitch-sounds-en-us-callie-48000, freeswitch-sounds-en-us-callie-32000, freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-8000
+Conflicts: freeswitch-sounds-en-us-callie
+Description: English language files for FreeSWITCH(TM)
+ This package depends on the pregenerated 8khz, 16khz, 32khz, and 48khz sounds
+ which are downloaded from binary data files.

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/copyright (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/copyright) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/copyright	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/copyright	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1 @@
+These files are licensed under the terms of the creative commons Attribution 3.0 license: http://creativecommons.org/licenses/by-sa/3.0/

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/files (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/files) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/files	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/files	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,6 @@
+freeswitch-sounds-en-us-callie-8000_1.0.12-0ubuntu1_all.deb net extra
+freeswitch-sounds-en-us-callie-16000_1.0.12-0ubuntu1_all.deb net extra
+freeswitch-sounds-en-us-callie-32000_1.0.12-0ubuntu1_all.deb net extra
+freeswitch-sounds-en-us-callie-48000_1.0.12-0ubuntu1_all.deb net extra
+freeswitch-sounds-en-us-callie_1.0.12-0ubuntu1_all.deb net extra
+freeswitch-sounds-en-us-callie-omega_1.0.12-0ubuntu1_all.deb net extra

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-16000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-16000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-16000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-16000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/en/us/callie/*/16000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-32000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-32000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-32000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-32000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/en/us/callie/*/32000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-48000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-48000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-48000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-48000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/en/us/callie/*/48000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-8000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-8000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-8000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/freeswitch-sounds-en-us-callie-8000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/en/us/callie/*/8000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/rules (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-en-us-callie/debian/rules) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/rules	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-en-us-callie/debian/rules	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
+
+# Uncomment this to turn on verbose mode.
+ export DH_VERBOSE=1
+export DH_OPTIONS
+export DH_COMPAT=4
+export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+
+
+build:
+	dh_testdir
+	mkdir -p debian/tmp/opt/freeswitch/sounds
+	cp -a en debian/tmp/opt/freeswitch/sounds/
+	./debian/buildsounds.sh debian/tmp/opt/freeswitch/sounds/en/us/callie
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	rm -f build-stamp 
+	rm -Rf debian/tmp
+
+install:
+	dh_testdir
+	dh_testroot
+	dh_installdirs -A --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_compress
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install 

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/buildsounds.sh (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/buildsounds.sh) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/buildsounds.sh	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/buildsounds.sh	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+sounds_location=$1
+for rate in 32000 16000 8000
+do 
+    mkdir -p $sounds_location/$rate
+    for f in `find $sounds_location/48000 -name \*.wav`
+    do
+	echo "generating" $sounds_location/$rate/`basename $f`
+	sox $f -r $rate $sounds_location/$rate/`basename $f`
+    done
+done

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/changelog (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/changelog) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/changelog	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/changelog	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,11 @@
+freeswitch-sounds-music (1.0.8-0ubuntu3) jaunty; urgency=low
+
+  * Fixed: empty binary files for some packages
+
+ -- William King <quentusrex@gmail.com>  Thu, 24 Sep 2009 15:54:17 -0700
+
+freeswitch-sounds-music (1.0.8-0ubuntu2) jaunty; urgency=low
+
+  * Initial: This is the initial working build of the music on hold
+
+ -- William King <quentusrex@gmail.com>  Sun, 20 Sep 2009 08:28:48 -0700

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/control (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/control) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/control	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/control	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,61 @@
+Source: freeswitch-sounds-music
+Maintainer: Freeswitch Debian Team <debian@freeswitch.org>
+Section: net
+Priority: extra
+Build-Depends: debhelper (>= 5), fakeroot, sox
+Standards-Version: 3.7.3
+
+Package: freeswitch-sounds-music-8000
+Architecture: all
+Conflicts: freeswitch-sounds-music
+Description: music for FreeSWITCH(TM) (8000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-music-16000
+Architecture: all
+Conflicts: freeswitch-sounds-music
+Description: music for FreeSWITCH(TM) (16000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-music-32000
+Architecture: all
+Conflicts: freeswitch-sounds-music
+Description: music for FreeSWITCH(TM) (32000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-music-48000
+Architecture: all
+Description: music for FreeSWITCH(TM) (48000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-music
+Architecture: all
+Depends: sox, freeswitch-sounds-music-48000
+Conflicts: freeswitch-sounds-music-omega, freeswitch-sounds-music-8000, freeswitch-sounds-music-16000, freeswitch-sounds-music-32000
+Description: Music for FreeSWITCH(TM)
+ This package generates the 8k, 16k, and 32k from the installed 48k
+ sounds. You can select which ones you want.
+
+Package: freeswitch-sounds-music-omega
+Architecture: all
+Depends: freeswitch-sounds-music-48000, freeswitch-sounds-music-32000, freeswitch-sounds-music-16000, freeswitch-sounds-music-8000
+Conflicts: freeswitch-sounds-music
+Description: Music for FreeSWITCH(TM)
+ This package depends on the pregenerated 8khz, 16khz, 32khz, and 48khz sounds
+ which are downloaded from binary data files.

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/copyright (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/copyright) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/copyright	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/copyright	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,13 @@
+MUSOPEN
+
+Musopen is an online music library of copyright free music (public domain music). 
+We want to give the world access to music, without the legal hassles so common today.
+There is a great deal of music that has expired copyrights, but almost no recordings
+of this music is in the public domain. We aim to record or obtain recordings that
+have no copyrights so that our visitors may listen, re-use, or in any way enjoy music.
+
+Put simply, our mission is to set music free.
+
+Musopen is a U.S. registered 501(c)(3) tax-deductible nonprofit charity.
+
+http://www.musopen.com

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/files (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/files) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/files	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/files	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,6 @@
+freeswitch-sounds-music-8000_1.0.8-0ubuntu3_all.deb net extra
+freeswitch-sounds-music-16000_1.0.8-0ubuntu3_all.deb net extra
+freeswitch-sounds-music-32000_1.0.8-0ubuntu3_all.deb net extra
+freeswitch-sounds-music-48000_1.0.8-0ubuntu3_all.deb net extra
+freeswitch-sounds-music_1.0.8-0ubuntu3_all.deb net extra
+freeswitch-sounds-music-omega_1.0.8-0ubuntu3_all.deb net extra

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-16000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-16000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-16000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-16000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/music/16000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-32000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-32000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-32000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-32000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/music/32000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-48000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-48000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-48000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-48000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/music/48000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-8000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-8000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-8000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/freeswitch-sounds-music-8000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/music/8000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/rules (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-music/debian/rules) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/rules	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-music/debian/rules	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
+
+# Uncomment this to turn on verbose mode.
+ export DH_VERBOSE=1
+export DH_OPTIONS
+export DH_COMPAT=4
+export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+
+
+build:
+	dh_testdir
+	mkdir -p debian/tmp/opt/freeswitch/sounds
+	cp -a music debian/tmp/opt/freeswitch/sounds/
+	./debian/buildsounds.sh debian/tmp/opt/freeswitch/sounds/music	
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	rm -f build-stamp 
+	rm -Rf debian/tmp
+
+install:
+	dh_testdir
+	dh_testroot
+	dh_installdirs -A --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_compress
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install 

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/buildsounds.sh (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/buildsounds.sh) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/buildsounds.sh	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/buildsounds.sh	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+sounds_location=$1
+for rate in 32000 16000 8000
+do 
+    for i in ascii base256 conference currency digits ivr misc phonetic-ascii time voicemail zrtp
+    do
+	mkdir -p $sounds_location/$i/$rate
+	for f in `find $sounds_location/$i/48000 -name \*.wav`
+	do
+	    echo "generating" $sounds_location/$i/$rate/`basename $f`
+	    sox $f -r $rate $sounds_location/$i/$rate/`basename $f`
+	done
+    done
+done

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/changelog	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,20 @@
+freeswitch-sounds-ru-ru-elena (1.0.12-0ubuntu3) jaunty; urgency=low
+
+  * Fixed: Empty binary package bug caused by the second ru folder being
+	capitalized. The sounds are in ru/RU/elena/*
+
+ -- William King <quentusrex@gmail.com>  Sun, 20 Sep 2009 08:21:58 -0700
+
+freeswitch-sounds-ru-ru-elena (1.0.12-0ubuntu2) jaunty; urgency=low
+
+  * Fixed: Fixed a copy/paste bug in the rules file which was trying to 
+	copy the en directory when it should have been copying the ru
+	directory.
+
+ -- William King <quentusrex@gmail.com>  Sun, 20 Sep 2009 07:59:20 -0700
+
+freeswitch-sounds-ru-ru-elena (1.0.12-0ubuntu1) jaunty; urgency=low
+
+  * Initial: This is the initial working build of the ru-ru-elena sounds
+
+ -- William King <quentusrex@gmail.com>  Sun, 20 Sep 2009 06:56:46 -0700

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/control (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/control) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/control	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/control	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,61 @@
+Source: freeswitch-sounds-ru-ru-elena
+Maintainer: Freeswitch Debian Team <debian@freeswitch.org>
+Section: net
+Priority: extra
+Build-Depends: debhelper (>= 5), fakeroot, sox
+Standards-Version: 3.7.3
+
+Package: freeswitch-sounds-ru-ru-elena-8000
+Architecture: all
+Conflicts: freeswitch-sounds-ru-ru-elena
+Description: English language sounds for the FreeSWITCH(TM) (8000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-ru-ru-elena-16000
+Architecture: all
+Conflicts: freeswitch-sounds-ru-ru-elena
+Description: English language sounds for the FreeSWITCH(TM) (16000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-ru-ru-elena-32000
+Architecture: all
+Conflicts: freeswitch-sounds-ru-ru-elena
+Description: English language sounds for FreeSWITCH(TM) (32000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-ru-ru-elena-48000
+Architecture: all
+Description: English language sounds for the FreeSWITCH(TM) (48000)
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+Package: freeswitch-sounds-ru-ru-elena
+Architecture: all
+Depends: sox, freeswitch-sounds-ru-ru-elena-48000
+Conflicts: freeswitch-sounds-ru-ru-elena-omega, freeswitch-sounds-ru-ru-elena-8000, freeswitch-sounds-ru-ru-elena-16000, freeswitch-sounds-ru-ru-elena-32000
+Description: English language files for FreeSWITCH(TM)
+ This package generates the 8k, 16k, and 32k from the installed 48k
+ sounds. You can select which ones you want.
+
+Package: freeswitch-sounds-ru-ru-elena-omega
+Architecture: all
+Depends: freeswitch-sounds-ru-ru-elena-48000, freeswitch-sounds-ru-ru-elena-32000, freeswitch-sounds-ru-ru-elena-16000, freeswitch-sounds-ru-ru-elena-8000
+Conflicts: freeswitch-sounds-ru-ru-elena
+Description: English language files for FreeSWITCH(TM)
+ This package depends on the pregenerated 8khz, 16khz, 32khz, and 48khz sounds
+ which are downloaded from binary data files.

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/copyright (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/copyright) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/copyright	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/copyright	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1 @@
+These files are licensed under the terms of the creative commons Attribution 3.0 license: http://creativecommons.org/licenses/by-sa/3.0/

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/files (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/files) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/files	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/files	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,6 @@
+freeswitch-sounds-ru-ru-elena-8000_1.0.12-0ubuntu3_all.deb net extra
+freeswitch-sounds-ru-ru-elena-16000_1.0.12-0ubuntu3_all.deb net extra
+freeswitch-sounds-ru-ru-elena-32000_1.0.12-0ubuntu3_all.deb net extra
+freeswitch-sounds-ru-ru-elena-48000_1.0.12-0ubuntu3_all.deb net extra
+freeswitch-sounds-ru-ru-elena_1.0.12-0ubuntu3_all.deb net extra
+freeswitch-sounds-ru-ru-elena-omega_1.0.12-0ubuntu3_all.deb net extra

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-16000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-16000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-16000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-16000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/ru/RU/elena/*/16000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-32000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-32000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-32000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-32000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/ru/RU/elena/*/32000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-48000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-48000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-48000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-48000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/ru/RU/elena/*/48000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-8000.install (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-8000.install) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-8000.install	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/freeswitch-sounds-ru-ru-elena-8000.install	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,2 @@
+opt/freeswitch/sounds/ru/RU/elena/*/8000/*
+

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/rules (from rev 16612, freeswitch/trunk/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/rules) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/rules	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/freeswitch-sounds-ru-RU-elena/debian/rules	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
+
+# Uncomment this to turn on verbose mode.
+ export DH_VERBOSE=1
+export DH_OPTIONS
+export DH_COMPAT=4
+export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+
+
+build:
+	dh_testdir
+	mkdir -p debian/tmp/opt/freeswitch/sounds
+	cp -a ru debian/tmp/opt/freeswitch/sounds/
+	./debian/buildsounds.sh debian/tmp/opt/freeswitch/sounds/ru/RU/elena	
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	rm -f build-stamp 
+	rm -Rf debian/tmp
+
+install:
+	dh_testdir
+	dh_testroot
+	dh_installdirs -A --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_compress
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install 

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/getsounds.sh (from rev 16612, freeswitch/trunk/debian/sounds/getsounds.sh) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/getsounds.sh	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/debian/sounds/getsounds.sh	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,30 @@
+#!/bin/bash
+sounds_en_us_callie="freeswitch-sounds-en-us-callie-48000-1.0.12.tar.gz"
+sounds_music="freeswitch-sounds-music-48000-1.0.8.tar.gz"
+sounds_ru_RU_elena="freeswitch-sounds-ru-RU-elena-48000-1.0.12.tar.gz"
+
+cd freeswitch-sounds-music
+if [ ! -f $sounds_music ]
+    then
+    wget http://files.freeswitch.org/$sounds_music
+fi
+tar zxvf $sounds_music
+cd ..
+
+
+cd freeswitch-sounds-en-us-callie
+if [ ! -f $sounds_en_us_callie ]
+    then
+    wget http://files.freeswitch.org/$sounds_en_us_callie
+fi
+tar zxvf $sounds_en_us_callie
+cd ..
+
+
+cd freeswitch-sounds-ru-RU-elena
+if [ ! -f $sounds_ru_RU_elena ]
+    then
+    wget http://files.freeswitch.org/$sounds_ru_RU_elena
+fi
+tar zxvf $sounds_ru_RU_elena
+cd ..
\ No newline at end of file

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm (from rev 16612, freeswitch/trunk/fscomm)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/FSComm.2008.vcproj (from rev 16612, freeswitch/trunk/fscomm/FSComm.2008.vcproj) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/FSComm.2008.vcproj	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/FSComm.2008.vcproj	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,821 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="FSComm"
+	ProjectGUID="{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"
+	RootNamespace="FSComm"
+	Keyword="Qt4VSv1.0"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="debug\"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189 -w34100 -w34189"
+				Optimization="4"
+				AdditionalIncludeDirectories="$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include;.;$(QTDIR)\include\ActiveQt;debug;&quot;$(QTDIR)\mkspecs\win32-msvc2008&quot;;..\src\include;$(QTDIR)\include\QtXml"
+				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
+				GeneratePreprocessedFile="0"
+				ExceptionHandling="1"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="false"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,_DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
+				AdditionalDependencies="$(QTDIR)\lib\qtmaind.lib $(QTDIR)\lib\QtGuid4.lib $(QTDIR)\lib\QtCored4.lib $(QTDIR)\lib\QtXml4.lib"
+				OutputFile="debug\FSComm.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=""
+				SubSystem="2"
+				LinkTimeCodeGeneration="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="release\"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189 -w34100 -w34189"
+				Optimization="2"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;.;&quot;$(QTDIR)\include\ActiveQt&quot;;release;&quot;$(QTDIR)\mkspecs\win32-msvc2008&quot;;..\src\include;&quot;$(QTDIR)\include\QtXml&quot;"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
+				GeneratePreprocessedFile="0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="false"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
+				AdditionalDependencies="$(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\QtGui4.lib $(QTDIR)\lib\QtCore4.lib $(QTDIR)\lib\QtXml4.lib"
+				OutputFile="release\FSComm.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="2"
+				LinkTimeCodeGeneration="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\account.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\preferences\accountdialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="call.cpp"
+				>
+			</File>
+			<File
+				RelativePath="fshost.cpp"
+				>
+			</File>
+			<File
+				RelativePath="main.cpp"
+				>
+			</File>
+			<File
+				RelativePath="mainwindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath="mod_qsettings\mod_qsettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\preferences\prefaccounts.cpp"
+				>
+			</File>
+			<File
+				RelativePath="preferences\prefdialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="preferences\prefportaudio.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\preferences\prefsofia.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\account.h"
+				>
+			</File>
+			<File
+				RelativePath="preferences\accountdialog.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC accountdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_accountdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\accountdialog.h -o debug\moc_accountdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.h"
+						Outputs="debug\moc_accountdialog.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC accountdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_accountdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\accountdialog.h -o release\moc_accountdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.h"
+						Outputs="release\moc_accountdialog.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="call.h"
+				>
+			</File>
+			<File
+				RelativePath="fshost.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC fshost.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_fshost.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 fshost.h -o debug\moc_fshost.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;fshost.h"
+						Outputs="debug\moc_fshost.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC fshost.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_fshost.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 fshost.h -o release\moc_fshost.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;fshost.h"
+						Outputs="release\moc_fshost.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mainwindow.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC mainwindow.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_mainwindow.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o debug\moc_mainwindow.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.h"
+						Outputs="debug\moc_mainwindow.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC mainwindow.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_mainwindow.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o release\moc_mainwindow.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.h"
+						Outputs="release\moc_mainwindow.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mod_qsettings\mod_qsettings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\preferences\prefaccounts.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefaccounts.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefaccounts.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefaccounts.h -o debug\moc_prefaccounts.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefaccounts.h"
+						Outputs="debug\moc_prefaccounts.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefaccounts.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefaccounts.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefaccounts.h -o release\moc_prefaccounts.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefaccounts.h"
+						Outputs="release\moc_prefaccounts.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefdialog.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefdialog.h -o debug\moc_prefdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.h"
+						Outputs="debug\moc_prefdialog.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefdialog.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefdialog.h -o release\moc_prefdialog.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.h"
+						Outputs="release\moc_prefdialog.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefportaudio.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefportaudio.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefportaudio.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefportaudio.h -o debug\moc_prefportaudio.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefportaudio.h"
+						Outputs="debug\moc_prefportaudio.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefportaudio.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefportaudio.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefportaudio.h -o release\moc_prefportaudio.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefportaudio.h"
+						Outputs="release\moc_prefportaudio.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefsofia.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefsofia.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_prefsofia.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefsofia.h -o debug\moc_prefsofia.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefsofia.h"
+						Outputs="debug\moc_prefsofia.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC prefportaudio.h"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_prefsofia.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 preferences\prefsofia.h -o release\moc_prefsofia.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefsofia.h"
+						Outputs="release\moc_prefsofia.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generated Files"
+			Filter="moc;h;cpp"
+			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"
+			>
+			<File
+				RelativePath="ui_accountdialog.h"
+				>
+			</File>
+			<File
+				RelativePath="ui_mainwindow.h"
+				>
+			</File>
+			<File
+				RelativePath="ui_prefdialog.h"
+				>
+			</File>
+			<Filter
+				Name="Debug"
+				>
+				<File
+					RelativePath="debug\moc_accountdialog.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="Debug\moc_fshost.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="debug\moc_mainwindow.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\debug\moc_prefaccounts.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="Debug\moc_prefdialog.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="debug\moc_prefportaudio.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="debug\moc_prefsofia.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="debug\qrc_resources.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Release"
+				>
+				<File
+					RelativePath="release\moc_accountdialog.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="release\moc_fshost.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="release\moc_mainwindow.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\release\moc_prefaccounts.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="release\moc_prefdialog.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="release\moc_prefportaudio.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="release\moc_prefsofia.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="release\qrc_resources.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Form Files"
+			Filter="ui"
+			UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}"
+			ParseFiles="false"
+			>
+			<File
+				RelativePath="preferences\accountdialog.ui"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC accountdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_accountdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\accountdialog.ui -o ui_accountdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.ui"
+						Outputs="ui_accountdialog.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC accountdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_accountdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\accountdialog.ui -o ui_accountdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;accountdialog.ui"
+						Outputs="ui_accountdialog.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mainwindow.ui"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC mainwindow.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_mainwindow.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe mainwindow.ui -o ui_mainwindow.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.ui"
+						Outputs="ui_mainwindow.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC mainwindow.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_mainwindow.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe mainwindow.ui -o ui_mainwindow.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;mainwindow.ui"
+						Outputs="ui_mainwindow.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="preferences\prefdialog.ui"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC prefdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_prefdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\prefdialog.ui -o ui_prefdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.ui"
+						Outputs="ui_prefdialog.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="UIC prefdialog.ui"
+						CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_prefdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe preferences\prefdialog.ui -o ui_prefdialog.h&#x0D;&#x0A;"
+						AdditionalDependencies="Rem;prefdialog.ui"
+						Outputs="ui_prefdialog.h"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="qrc;*"
+			UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}"
+			ParseFiles="false"
+			>
+			<File
+				RelativePath="conf\event_socket.conf.xml"
+				>
+			</File>
+			<File
+				RelativePath="conf\accounts\example.xml"
+				>
+			</File>
+			<File
+				RelativePath="conf\freeswitch.xml"
+				>
+			</File>
+			<File
+				RelativePath="conf\portaudio.conf.xml"
+				>
+			</File>
+			<File
+				RelativePath="resources\pref_audio.gif"
+				>
+			</File>
+			<File
+				RelativePath="resources\pref_sip.png"
+				>
+			</File>
+			<File
+				RelativePath="resources.qrc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="RCC resources.qrc"
+						CommandLine="$(QTDIR)\bin\rcc.exe -name resources resources.qrc -o debug\qrc_resources.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="$(QTDIR)\bin\rcc.exe;conf\accounts\example.xml;conf\event_socket.conf.xml;conf\freeswitch.xml;conf\portaudio.conf.xml;resources.qrc;resources\pref_audio.gif;resources\pref_sip.png;resources\splash.png"
+						Outputs="debug\qrc_resources.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="RCC resources.qrc"
+						CommandLine="$(QTDIR)\bin\rcc.exe -name resources resources.qrc -o release\qrc_resources.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="$(QTDIR)\bin\rcc.exe;conf\accounts\example.xml;conf\event_socket.conf.xml;conf\freeswitch.xml;conf\portaudio.conf.xml;resources.qrc;resources\pref_audio.gif;resources\pref_sip.png;resources\splash.png"
+						Outputs="release\qrc_resources.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="resources\splash.png"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/FSComm.pro (from rev 16612, freeswitch/trunk/fscomm/FSComm.pro) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/FSComm.pro	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/FSComm.pro	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,49 @@
+# #####################################
+# version check qt
+# #####################################
+contains(QT_VERSION, ^4\.[0-4]\..*) { 
+    message("Cannot build FsGui with Qt version $$QT_VERSION.")
+    error("Use at least Qt 4.5.")
+}
+QT += xml
+TARGET = fscomm
+macx:TARGET = FSComm
+TEMPLATE = app
+INCLUDEPATH = ../src/include \
+    ../libs/apr/include \
+    ../libs/libteletone/src
+LIBS = -L../.libs \
+    -lfreeswitch \
+    -lm
+!win32:!macx { 
+    # This is here to comply with the default freeswitch installation
+    QMAKE_LFLAGS += -Wl,-rpath,/usr/local/freeswitch/lib
+    LIBS += -lcrypt \
+        -lrt
+}
+SOURCES += main.cpp \
+    mainwindow.cpp \
+    fshost.cpp \
+    call.cpp \
+    mod_qsettings/mod_qsettings.cpp \
+    preferences/prefdialog.cpp \
+    preferences/prefportaudio.cpp \
+    preferences/prefsofia.cpp \
+    preferences/accountdialog.cpp \
+    preferences/prefaccounts.cpp \
+    account.cpp
+HEADERS += mainwindow.h \
+    fshost.h \
+    call.h \
+    mod_qsettings/mod_qsettings.h \
+    preferences/prefdialog.h \
+    preferences/prefportaudio.h \
+    preferences/prefsofia.h \
+    preferences/accountdialog.h \
+    preferences/prefaccounts.h \
+    account.h
+FORMS += mainwindow.ui \
+    preferences/prefdialog.ui \
+    preferences/accountdialog.ui
+RESOURCES += resources.qrc
+OTHER_FILES += conf/freeswitch.xml

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/account.cpp (from rev 16612, freeswitch/trunk/fscomm/account.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/account.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/account.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,31 @@
+#include <QtGui>
+#include "account.h"
+
+Account::Account(QString name) :
+    _name(name)
+{
+    _statusCode = QString();
+    _statusPhrase = QString();
+
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+    foreach(QString g, settings.childGroups())
+    {
+        settings.beginGroup(g);
+        if(settings.value("gateway/attrs/name").toString() == name)
+        {
+            _uuid = g;
+            settings.endGroup();
+            break;
+        }
+        settings.endGroup();
+    }
+}
+
+QString Account::getStateName()
+{
+    if (_statusPhrase.isEmpty())
+        return fscomm_gw_state_names[_state];
+
+    return QString("%1 - %2").arg(fscomm_gw_state_names[_state], _statusPhrase);
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/account.h (from rev 16612, freeswitch/trunk/fscomm/account.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/account.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/account.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,51 @@
+#ifndef ACCOUNT_H
+#define ACCOUNT_H
+
+#include <QString>
+
+#define FSCOMM_GW_STATE_TRYING 0
+#define FSCOMM_GW_STATE_REGISTER 1
+#define FSCOMM_GW_STATE_REGED 2
+#define FSCOMM_GW_STATE_UNREGED 3
+#define FSCOMM_GW_STATE_UNREGISTER 4
+#define FSCOMM_GW_STATE_FAILED 5
+#define FSCOMM_GW_STATE_FAIL_WAIT 6
+#define FSCOMM_GW_STATE_EXPIRED 7
+#define FSCOMM_GW_STATE_NOREG 8
+#define FSCOMM_GW_STATE_NOAVAIL 9
+
+
+static QString fscomm_gw_state_names[] = {
+    QString("Trying"),
+    QString("Registering"),
+    QString("Registered"),
+    QString("Un-Registered"),
+    QString("Un-Registering"),
+    QString("Failed"),
+    QString("Failed"),
+    QString("Expired"),
+    QString("Not applicable"),
+    QString("Not available")
+};
+
+class Account {
+public:
+    explicit Account(QString name);
+    void setName(QString name) { _name = name; }
+    QString getName() { return _name; }
+    void setState(int state) { _state = state; }
+    int getState() { return _state; }
+    QString getStateName();
+    QString getUUID() { return _uuid; }
+    void setStausCode(QString code) { _statusCode = code; }
+    void setStatusPhrase(QString phrase) { _statusPhrase = phrase; }
+
+private:
+    QString _name;
+    int _state;
+    QString _uuid;
+    QString _statusCode;
+    QString _statusPhrase;
+};
+
+#endif // ACCOUNT_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/call.cpp (from rev 16612, freeswitch/trunk/fscomm/call.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/call.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/call.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,86 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include "call.h"
+#include <QtGui>
+#include <fshost.h>
+
+Call::Call()
+{
+}
+
+Call::Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid) :
+        _call_id(call_id),
+        _cid_name(cid_name),
+        _cid_number(cid_number),
+        _direction(direction),
+        _uuid (uuid)
+{
+    _isActive = false;
+}
+
+switch_status_t Call::toggleRecord(bool startRecord)
+{
+    QDir conf_dir = QDir::home();
+    QString result;
+    switch_status_t status;
+
+    if (startRecord)
+    {
+        _recording_filename = QString("%1/.fscomm/recordings/%2_%3.wav").arg(
+                                         conf_dir.absolutePath(),
+                                         QDateTime::currentDateTime().toString("yyyyMMddhhmmss"),
+                                         _cid_number);
+        status = g_FSHost.sendCmd("uuid_record", QString("%1 start %2").arg(_uuid, _recording_filename).toAscii().data(),&result);
+    }
+    else
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stopping call recording on call [%s]\n",
+                          _uuid.toAscii().data());
+        status = g_FSHost.sendCmd("uuid_record", QString("%1 stop %2").arg(_uuid, _recording_filename).toAscii().data(),&result);
+    }
+
+    return status;
+}
+
+void Call::sendDTMF(QString digit)
+{
+    QString result;
+    QString dtmf_string = QString("dtmf %1").arg(digit);
+    if (g_FSHost.sendCmd("pa", dtmf_string.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not send DTMF digit %s on call[%s]", digit.toAscii().data(), _uuid.toAscii().data());
+        QMessageBox::critical(0, QWidget::tr("DTMF Error"), QWidget::tr("There was an error sending DTMF, please report this bug."), QMessageBox::Ok);
+    }
+}
+
+QTime Call::getCurrentStateTime()
+{
+    int now = QDateTime::fromTime_t(_answered_epoch).secsTo(QDateTime::currentDateTime());
+    return QTime::fromString(QString::number(now), "s");
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/call.h (from rev 16612, freeswitch/trunk/fscomm/call.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/call.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/call.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,85 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+#ifndef CALL_H
+#define CALL_H
+
+#include <QtCore>
+#include <QString>
+#include <switch.h>
+
+typedef enum {
+    FSCOMM_CALL_STATE_RINGING = 0,
+    FSCOMM_CALL_STATE_TRYING  = 1,
+    FSCOMM_CALL_STATE_ANSWERED = 2,
+    FSCOMM_CALL_STATE_FAILED = 3
+} fscomm_call_state_t;
+
+typedef enum {
+        FSCOMM_CALL_DIRECTION_INBOUND = 0,
+        FSCOMM_CALL_DIRECTION_OUTBOUND = 1
+} fscomm_call_direction_t;
+
+class Call {
+public:
+    Call();
+    Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid);
+    QString getCidName(void) { return _cid_name; }
+    QString getCidNumber(void) { return _cid_number; }
+    int getCallID(void) { return _call_id; }
+    QString getUUID(void) { return _uuid; }
+    void setbUUID(QString uuid) { _buuid = uuid; }
+    fscomm_call_direction_t getDirection() { return _direction; }
+    fscomm_call_state_t getState() { return _state; }
+    void setState(fscomm_call_state_t state) { _state = state; }
+    void setCause(QString cause) { _cause = cause; }
+    QString getCause() { return _cause; }
+    void setActive(bool isActive) { _isActive = isActive; }
+    bool isActive() { return _isActive == true; }
+    switch_status_t toggleRecord(bool);
+    void sendDTMF(QString digit);
+    void setAnsweredEpoch(qulonglong time) { _answered_epoch = time/1000000; }
+    QTime getCurrentStateTime();
+
+private:
+    int _call_id;
+    QString _cid_name;
+    QString _cid_number;
+    QString _cause;
+    fscomm_call_direction_t _direction;
+    QString _uuid;
+    QString _buuid;
+    bool _isActive;
+    QString _recording_filename;
+    fscomm_call_state_t _state;
+    qulonglong _answered_epoch;
+};
+
+Q_DECLARE_METATYPE(Call)
+
+#endif // CALL_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf (from rev 16612, freeswitch/trunk/fscomm/conf)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/accounts (from rev 16612, freeswitch/trunk/fscomm/conf/accounts)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/accounts/example.xml (from rev 16612, freeswitch/trunk/fscomm/conf/accounts/example.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/accounts/example.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/accounts/example.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,34 @@
+<include>
+  <!--<gateway name="default">-->
+  <!--/// account username *required* ///-->
+  <!--<param name="username" value="cluecon"/>-->
+  <!--/// auth realm: *optional* same as gateway name, if blank ///-->
+  <!--<param name="realm" value="asterlink.com"/>-->
+  <!--/// username to use in from: *optional* same as  username, if blank ///-->
+  <!--<param name="from-user" value="cluecon"/>-->
+  <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
+  <!--<param name="from-domain" value="asterlink.com"/>-->
+  <!--/// account password *required* ///-->
+  <!--<param name="password" value="cluecon"/>-->
+  <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
+  <!--<param name="extension" value="cluecon"/>-->
+  <!--/// proxy host: *optional* same as realm, if blank ///-->
+  <!--<param name="proxy" value="asterlink.com"/>-->
+  <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
+  <!--<param name="register-proxy" value="mysbc.com"/>-->
+  <!--/// expire in seconds: *optional* 3600, if blank ///-->
+  <!--<param name="expire-seconds" value="60"/>-->
+  <!--/// do not register ///-->
+  <!--<param name="register" value="false"/>-->
+  <!-- which transport to use for register -->
+  <!--<param name="register-transport" value="udp"/>-->
+  <!--How many seconds before a retry when a failure or timeout occurs -->
+  <!--<param name="retry-seconds" value="30"/>-->
+  <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
+  <!--<param name="caller-id-in-from" value="false"/>-->
+  <!--extra sip params to send in the contact-->
+  <!--<param name="contact-params" value="tport=tcp"/>-->
+  <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
+  <!--<param name="ping" value="25"/>-->
+  <!--</gateway>-->
+</include>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/freeswitch.xml (from rev 16612, freeswitch/trunk/fscomm/conf/freeswitch.xml) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/freeswitch.xml	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/conf/freeswitch.xml	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,309 @@
+<?xml version="1.0"?>
+<document type="freeswitch/xml">
+        <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
+        <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
+        <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
+        <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+        <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
+        <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
+        <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
+        <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.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="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
+
+        <section name="configuration" description="Various Configuration">
+                <configuration name="cdr_csv.conf" description="CDR CSV Format">
+                        <settings>
+                                <param name="default-template" value="example"/>
+                                <param name="rotate-on-hup" value="true"/>
+                                <param name="legs" value="a"/>
+                        </settings>
+                        <templates>
+                                <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"</template>
+                        </templates>
+                </configuration>
+
+                <configuration name="console.conf" description="Console Logger">
+                        <mappings>
+                                <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
+                        </mappings>
+                        <settings>
+                                <param name="colorize" value="true"/>
+                                <param name="loglevel" value="$${console_loglevel}"/>
+                        </settings>
+                </configuration>
+
+                <configuration name="enum.conf" description="ENUM Module">
+                        <settings>
+                                <param name="default-root" value="e164.org"/>
+                                <param name="default-isn-root" value="freenum.org"/>
+                                <param name="query-timeout" value="10"/>
+                                <param name="auto-reload" value="true"/>
+                        </settings>
+                        <routes>
+                                <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/softphone/$1"/>
+                        </routes>
+                </configuration>
+
+                <configuration name="qsettings.conf" description="configures our mod_qsettings">
+                        <bindings value="configuration" />
+                </configuration>
+
+                <configuration name="local_stream.conf" description="stream files from local dir">
+                        <directory name="moh/48000" path="$${base_dir}/sounds/music/48000">
+                                <param name="rate" value="48000"/>
+                                <param name="shuffle" value="true"/>
+                                <param name="channels" value="1"/>
+                                <param name="interval" value="10"/>
+                                <param name="timer-name" value="soft"/>
+                        </directory>
+                </configuration>
+
+                <configuration name="logfile.conf" description="File Logging">
+                        <settings>
+                                <param name="rotate-on-hup" value="true"/>
+                        </settings>
+                        <profiles>
+                                <profile name="default">
+                                        <settings>
+                                        </settings>
+                                        <mappings>
+                                                <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
+                                        </mappings>
+                                </profile>
+                        </profiles>
+                </configuration>
+
+                <configuration name="modules.conf" description="Modules">
+                        <modules>
+                                <load module="mod_console"/>
+                                <load module="mod_logfile"/>
+                                <load module="mod_enum"/>
+                                <load module="mod_cdr_csv"/>
+                                <load module="mod_sofia"/>
+                                <load module="mod_loopback"/>
+                                <load module="mod_commands"/>
+                                <load module="mod_dptools"/>
+                                <load module="mod_dialplan_xml"/>
+                                <load module="mod_voipcodecs"/>
+                                <load module="mod_ilbc"/>
+                                <load module="mod_speex"/>
+                                <load module="mod_celt"/>
+                                <load module="mod_siren"/>
+                                <load module="mod_sndfile"/>
+                                <load module="mod_tone_stream"/>
+                                <load module="mod_local_stream"/>
+                                <load module="mod_portaudio"/>
+                                <load module="mod_event_socket"/>
+                        </modules>
+                </configuration>
+
+                <configuration name="portaudio.conf" description="Soundcard Endpoint">
+                  <settings>
+                    <param name="indev" value=""/>
+                    <!-- device to use for output -->
+                    <param name="outdev" value=""/>
+                    <!--<param name="ringdev" value=""/>-->
+                    <param name="ring-file" value="tone_stream://%(2000,4000,440.0,480.0);loops=20"/>
+                    <param name="ring-interval" value="5"/>
+                    <param name="hold-file" value="$${hold_music}"/>
+                    <!--<param name="timer-name" value="soft"/>-->
+                    <param name="dialplan" value="XML"/>
+                    <param name="cid-name" value="$${outbound_caller_name}"/>
+                    <param name="cid-num" value="$${outbound_caller_number}"/>
+                    <param name="sample-rate" value="48000"/>
+                    <param name="codec-ms" value="10"/>
+                  </settings>
+                </configuration>
+
+                <configuration name="event_socket.conf" description="Socket Client">
+                      <settings>
+                            <param name="nat-map" value="false"/>
+                            <param name="listen-ip" value="127.0.0.1"/>
+                            <param name="listen-port" value="8022"/>
+                            <param name="password" value="ClueCon"/>
+                      </settings>
+                </configuration>
+
+                <configuration name="post_load_modules.conf" description="Modules">
+                        <modules>
+                        </modules>
+                </configuration>
+
+                <configuration name="sofia.conf" description="sofia Endpoint">
+                        <global_settings>
+                                <param name="log-level" value="0"/>
+                                <param name="auto-restart" value="true"/>
+                                <param name="debug-presence" value="0"/>
+                        </global_settings>
+                        <profiles>
+                                <profile name="softphone">
+                                        <settings>
+                                                <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
+                                                <param name="user-agent-string" value="FreeSWITCH/FSComm"/>
+                                                <!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
+                                                <param name="debug" value="0"/>
+                                                <param name="sip-trace" value="no"/>
+                                                <param name="context" value="public"/>
+                                                <param name="rfc2833-pt" value="101"/>
+                                                <!-- port to bind to for sip traffic -->
+                                                <param name="sip-port" value="12345"/>
+                                                <param name="dialplan" value="XML"/>
+                                                <param name="dtmf-duration" value="100"/>
+                                                <param name="codec-prefs" value="$${codec_prefs}"/>
+                                                <param name="use-rtp-timer" value="true"/>
+                                                <param name="rtp-timer-name" value="soft"/>
+                                                <!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
+                                                <param name="rtp-ip" value="$${local_ip_v4}"/>
+                                                <!-- ip address to bind to, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
+                                                <param name="sip-ip" value="$${local_ip_v4}"/>
+                                                <param name="hold-music" value="$${hold_music}"/>
+                                                <param name="apply-nat-acl" value="rfc1918"/>
+                                                <!--<param name="enable-timer" value="false"/>-->
+                                                <!--<param name="enable-100rel" value="true"/>-->
+                                                <!--<param name="minimum-session-expires" value="120"/>-->
+                                                <!--<param name="dtmf-type" value="info"/>-->
+                                                <param name="manage-presence" value="false"/>
+                                                <!--<param name="bitpacking" value="aal2"/> -->
+                                                <param name="max-proceeding" value="3"/>
+                                                <!--<param name="session-timeout" value="120"/>-->
+                                                <!--set to 'greedy' if you want your codec list to take precedence -->
+                                                <param name="inbound-codec-negotiation" value="generous"/>
+                                                <!-- if you want to send any special bind params of your own -->
+                                                <!--<param name="bind-params" value="transport=udp"/>-->
+                                                <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
+                                                <!--<param name="inbound-late-negotiation" value="true"/>-->
+                                                <!--<param name="accept-blind-reg" value="true"/> -->
+                                                <!--<param name="accept-blind-auth" value="true"/> -->
+                                                <!--<param name="suppress-cng" value="true"/> -->
+                                                <param name="nonce-ttl" value="60"/>
+                                                <!--<param name="NDLB-broken-auth-hash" value="true"/>-->
+                                                <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
+                                                <param name="auth-calls" value="false"/>
+                                                <param name="auth-all-packets" value="false"/>
+                                                <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
+                                                <param name="ext-sip-ip" value="$${external_sip_ip}"/>
+                                                <!-- rtp inactivity timeout -->
+                                                <param name="rtp-timeout-sec" value="300"/>
+                                                <param name="rtp-hold-timeout-sec" value="1800"/>
+                                                <!-- VAD choose one (out is a good choice); -->
+                                                <!-- <param name="vad" value="in"/> -->
+                                                <!-- <param name="vad" value="out"/> -->
+                                                <!-- <param name="vad" value="both"/> -->
+                                                <param name="disable-register" value="true"/>
+                                                <!--<param name="NDLB-force-rport" value="true"/>-->
+                                                <param name="challenge-realm" value="auto_from"/>
+                                                <!--<param name="disable-rtp-auto-adjust" value="true"/>-->
+                                                <!--<param name="inbound-use-callid-as-uuid" value="true"/>-->
+                                                <!--<param name="outbound-use-uuid-as-callid" value="true"/>-->
+                                                <!--<param name="auto-rtp-bugs" data="clear"/>-->
+                                        </settings>
+                                </profile>
+                        </profiles>
+                </configuration>
+
+                <configuration name="switch.conf" description="Core Configuration">
+                        <cli-keybindings>
+                                <key name="1" value="help"/>
+                                <key name="2" value="status"/>
+                                <key name="3" value="pa answer"/>
+                                <key name="4" value="pa hangup"/>
+                                <key name="5" value="sofia status"/>
+                                <key name="6" value="reloadxml"/>
+                                <key name="7" value="console loglevel 0"/>
+                                <key name="8" value="console loglevel 7"/>
+                                <key name="9" value="sofia status profile softphone"/>
+                                <key name="10" value="fsctl pause"/>
+                                <key name="11" value="fsctl resume"/>
+                                <key name="12" value="version"/>
+                        </cli-keybindings>
+                        <settings>
+                                <param name="colorize-console" value="true"/>
+                                <param name="max-sessions" value="20"/>
+                                <param name="sessions-per-second" value="5"/>
+                                <param name="loglevel" value="debug"/>
+                                <param name="crash-protection" value="false"/>
+                                <param name="dump-cores" value="yes"/>
+                                <param name="rtp-start-port" value="16384"/>
+                                <param name="rtp-end-port" value="16484"/>
+                        </settings>
+                </configuration>
+        </section>
+
+        <section name="dialplan" description="Regex/XML Dialplan">
+                <context name="default">
+                        <extension name="codec_and_sip_uri">
+                                <condition field="destination_number" expression="^sip:(.*):(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="{absolute_codec_string=$1}sofia/softphone/$2"/>
+                                </condition>
+                        </extension>
+                        <extension name="sip_uri">
+                                <condition field="destination_number" expression="^sip:(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="sofia/softphone/$1"/>
+                                </condition>
+                        </extension>
+                        <extension name="codec_and_number">
+                                <condition field="destination_number" expression="^(.*):(.*)@(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="{absolute_codec_string=$1}sofia/gateway/$3/$2"/>
+                                </condition>
+                        </extension>
+                        <extension name="number">
+                                <condition field="destination_number" expression="^(.*)@(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="sofia/gateway/$2/$1"/>
+                                </condition>
+                        </extension>
+                        <extension name="number">
+                                <condition field="destination_number" expression="^(.*)$">
+                                 <!-- Default gateway is set by FSComm when default account is selected -->
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
+                                </condition>
+                        </extension>
+                </context>
+                <context name="public">
+                        <extension name="public_extensions">
+                                <condition field="$${auto_answer}" expression="^true$"/>
+                                <condition field="destination_number" expression="^(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="portaudio/auto_answer"/>
+                                </condition>
+                        </extension>
+                        <extension name="public_extensions">
+                                <condition field="${sip_to_params}" expression="intercom=true"/>
+                                <condition field="${alert_info}" expression="Ring;Answer"/>
+                                <condition field="destination_number" expression="^(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="bridge" data="portaudio/auto_answer"/>
+                                </condition>
+                        </extension>
+                        <extension name="public_extensions">
+                                <condition field="destination_number" expression="^(.*)$">
+                                        <action application="export" data="origination_caller_id_number=${fscomm_caller_id_num}"/>
+                                        <action application="export" data="origination_caller_id_name=${fscomm_caller_id_name}"/>
+                                        <action application="info"/>
+                                        <action application="set" data="ringback=${us-ring}"/>
+                                        <action application="pre_answer"/>
+                                        <action application="bridge" data="portaudio"/>
+                                </condition>
+                        </extension>
+                </context>
+        </section>
+</document>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/fshost.cpp (from rev 16612, freeswitch/trunk/fscomm/fshost.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/fshost.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/fshost.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,506 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include <QtGui>
+#include "fshost.h"
+#include "mod_qsettings/mod_qsettings.h"
+
+/* Declare it globally */
+FSHost g_FSHost;
+
+FSHost::FSHost(QObject *parent) :
+    QThread(parent)
+{
+    /* Initialize libs & globals */
+    qDebug() << "Initializing globals..." << endl;
+    switch_core_setrlimits();
+    switch_core_set_globals();
+
+    qRegisterMetaType<QSharedPointer<Call> >("QSharedPointer<Call>");
+    qRegisterMetaType<QSharedPointer<Account> >("QSharedPointer<Account>");
+
+}
+
+void FSHost::createFolders()
+{
+    /* Create directory structure for softphone with default configs */
+    QDir conf_dir = QDir::home();
+    if (!conf_dir.exists(".fscomm"))
+        conf_dir.mkpath(".fscomm");
+    if (!conf_dir.exists(".fscomm/recordings"))
+        conf_dir.mkpath(".fscomm/recordings");
+    if (!conf_dir.exists(".fscomm/sounds")) {
+        conf_dir.mkpath(".fscomm/sounds");
+        QFile::copy(":/sounds/test.wav", QString("%1/.fscomm/sounds/test.wav").arg(QDir::homePath()));
+    }
+    if(!QFile::exists(QString("%1/.fscomm/conf/freeswitch.xml").arg(conf_dir.absolutePath()))) {
+        conf_dir.mkdir(".fscomm/conf");
+        QFile rootXML(":/confs/freeswitch.xml");
+        QString dest = QString("%1/.fscomm/conf/freeswitch.xml").arg(conf_dir.absolutePath());
+        rootXML.copy(dest);
+    }
+
+    /* Set all directories to the home user directory */
+    if (conf_dir.cd(".fscomm"))
+    {
+        SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(QString("%1/conf").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.conf_dir) {
+            emit coreLoadingError("Cannot allocate memory for conf_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.conf_dir, QString("%1/conf").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(strlen(QString("%1/log").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.log_dir) {
+            emit coreLoadingError("Cannot allocate memory for log_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.log_dir, QString("%1/log").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.run_dir = (char *) malloc(strlen(QString("%1/run").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.run_dir) {
+            emit coreLoadingError("Cannot allocate memory for run_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.run_dir, QString("%1/run").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(strlen(QString("%1/db").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.db_dir) {
+            emit coreLoadingError("Cannot allocate memory for db_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.db_dir, QString("%1/db").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(QString("%1/script").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.script_dir) {
+            emit coreLoadingError("Cannot allocate memory for script_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.script_dir, QString("%1/script").arg(conf_dir.absolutePath()).toAscii().constData());
+
+        SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(strlen(QString("%1/htdocs").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
+        if (!SWITCH_GLOBAL_dirs.htdocs_dir) {
+            emit coreLoadingError("Cannot allocate memory for htdocs_dir.");
+        }
+        strcpy(SWITCH_GLOBAL_dirs.htdocs_dir, QString("%1/htdocs").arg(conf_dir.absolutePath()).toAscii().constData());
+    }
+}
+
+void FSHost::run(void)
+{
+    switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT;
+    const char *err = NULL;
+    switch_bool_t console = SWITCH_FALSE;
+    switch_status_t destroy_status;
+
+    createFolders();
+
+    /* If you need to override configuration directories, you need to change them in the SWITCH_GLOBAL_dirs global structure */
+    qDebug() << "Initializing core..." << endl;
+    /* Initialize the core and load modules, that will startup FS completely */
+    if (switch_core_init(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
+        fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
+        emit coreLoadingError(err);
+    }
+
+    qDebug() << "Everything OK, Entering runtime loop ..." << endl;
+
+    if (switch_event_bind("FSHost", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, eventHandlerCallback, NULL) != SWITCH_STATUS_SUCCESS) {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
+    }
+
+    /* Load our QSettings module */
+    if (mod_qsettings_load() != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't load mod_qsettings\n");
+    }
+
+    if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
+        fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
+        emit coreLoadingError(err);
+    }
+
+    emit ready();
+    /* Go into the runtime loop. If the argument is true, this basically sets runtime.running = 1 and loops while that is set
+     * If its false, it initializes the libedit for the console, then does the same thing
+     */
+    switch_core_runtime_loop(!console);
+    fflush(stdout);
+
+
+    switch_event_unbind_callback(eventHandlerCallback);
+    /* When the runtime loop exits, its time to shutdown */
+    destroy_status = switch_core_destroy();
+    if (destroy_status == SWITCH_STATUS_SUCCESS)
+    {
+        qDebug() << "We have properly shutdown the core." << endl;
+    }
+}
+
+switch_status_t FSHost::processAlegEvent(switch_event_t * event, QString uuid)
+{
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    QSharedPointer<Call> call = _active_calls.value(uuid);
+
+    if (call.isNull())
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "We don't have a call object for A leg on event %s.\n", switch_event_name(event->event_id));
+        qDebug() << _active_calls.keys();
+        printEventHeaders(event);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    /* Inbound call */
+    if (call.data()->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
+    {
+        switch(event->event_id) {
+        case SWITCH_EVENT_CHANNEL_ANSWER:
+            {
+                QString answeredEpoch = switch_event_get_header_nil(event, "Caller-Channel-Answered-Time");
+                call.data()->setAnsweredEpoch(answeredEpoch.toLong());
+                call.data()->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+                _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
+                call.data()->setState(FSCOMM_CALL_STATE_ANSWERED);
+                emit answered(call);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+            {
+                emit hungup(_active_calls.take(uuid));
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_STATE:
+            {
+                qDebug() << QString("CHANNEL_STATE Answer-State: %1 | Channel-State: %2 | %3 | %4\n").arg(switch_event_get_header_nil(event, "Answer-State"),switch_event_get_header_nil(event, "Channel-State"), uuid.toAscii().constData(), switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+                break;
+            }
+        default:
+            {
+                break;
+            }
+        }
+    }
+    /* Outbound call */
+    else
+    {
+        switch(event->event_id)
+        {
+        case SWITCH_EVENT_CHANNEL_BRIDGE:
+            {
+                _active_calls.value(uuid).data()->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+                _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+            {
+                if (call.data()->getState() == FSCOMM_CALL_STATE_TRYING)
+                {
+                    QString cause = switch_event_get_header_nil(event, "Hangup-Cause");
+                    call.data()->setState(FSCOMM_CALL_STATE_FAILED);
+                    call.data()->setCause(cause);
+                    emit callFailed(call);
+                    _active_calls.take(uuid);
+                }
+                break;
+            }
+        default:
+            qDebug() << QString("A leg: %1(%2)\n").arg(switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
+            break;
+        }
+    }
+    return status;
+}
+
+switch_status_t FSHost::processBlegEvent(switch_event_t * event, QString buuid)
+{
+    QString uuid = _bleg_uuids.value(buuid);
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    QSharedPointer<Call> call = _active_calls.value(uuid);
+
+    if (call.isNull())
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "We don't have a call object for B leg on event %s.\n", switch_event_name(event->event_id));
+        qDebug() << _active_calls.keys();
+        printEventHeaders(event);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    /* Inbound call */
+    if (call.data()->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
+    {
+        qDebug() << " Inbound call";
+    }
+    /* Outbound call */
+    else
+    {
+        switch(event->event_id)
+        {
+        case SWITCH_EVENT_CHANNEL_ANSWER:
+            {
+                /* When do we get here? */
+                QString answeredEpoch = switch_event_get_header_nil(event, "Caller-Channel-Answered-Time");
+                call.data()->setAnsweredEpoch(answeredEpoch.toULongLong());
+                emit answered(call);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+            {
+                _active_calls.take(uuid);
+                emit hungup(call);
+                _bleg_uuids.take(buuid);
+                break;
+            }
+        case SWITCH_EVENT_CHANNEL_STATE:
+            {
+                if (QString(switch_event_get_header_nil(event, "Answer-State")) == "early")
+                {
+                    call.data()->setState(FSCOMM_CALL_STATE_RINGING);
+                    emit ringing(call);
+                }
+                else if (QString(switch_event_get_header_nil(event, "Answer-State")) == "answered")
+                {
+                    call.data()->setState(FSCOMM_CALL_STATE_ANSWERED);
+                    emit answered(call);
+                }
+                break;
+            }
+
+        default:
+            qDebug() << QString("B leg: %1(%2)\n").arg(switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
+            break;
+        }
+    }
+    return status;
+}
+
+void FSHost::generalEventHandler(switch_event_t *event)
+{
+    /*printEventHeaders(event);*/
+    QString uuid = switch_event_get_header_nil(event, "Unique-ID");
+
+    if (_bleg_uuids.contains(uuid))
+    {
+        if (processBlegEvent(event, uuid) == SWITCH_STATUS_SUCCESS)
+        {
+            return;
+        }
+    }
+    if (_active_calls.contains(uuid))
+    {
+        if (processAlegEvent(event, uuid) == SWITCH_STATUS_SUCCESS)
+        {
+            return;
+        }
+    }
+
+    /* This is how we identify new calls, inbound and outbound */
+    switch(event->event_id) {
+    case SWITCH_EVENT_CUSTOM:
+        {
+            if (strcmp(event->subclass_name, "portaudio::ringing") == 0 && !_active_calls.contains(uuid))
+            {
+                Call *callPtr = new Call(atoi(switch_event_get_header_nil(event, "call_id")),
+                                      switch_event_get_header_nil(event, "Caller-Caller-ID-Name"),
+                                      switch_event_get_header_nil(event, "Caller-Caller-ID-Number"),
+                                      FSCOMM_CALL_DIRECTION_INBOUND,
+                                      uuid);
+                QSharedPointer<Call> call(callPtr);
+                _active_calls.insert(uuid, call);
+                call.data()->setState(FSCOMM_CALL_STATE_RINGING);
+                emit ringing(call);
+            }
+            else if (strcmp(event->subclass_name, "portaudio::makecall") == 0)
+            {
+                Call *callPtr = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
+                                      switch_event_get_header_nil(event, "Caller-Destination-Number"),
+                                      FSCOMM_CALL_DIRECTION_OUTBOUND,
+                                      uuid);
+                QSharedPointer<Call> call(callPtr);
+                _active_calls.insert(uuid, call);
+                call.data()->setState(FSCOMM_CALL_STATE_TRYING);
+                emit newOutgoingCall(call);
+            }
+            else if (strcmp(event->subclass_name, "sofia::gateway_state") == 0)
+            {
+                QString state = switch_event_get_header_nil(event, "State");
+                QString gw = switch_event_get_header_nil(event, "Gateway");
+                QSharedPointer<Account> acc = _accounts.value(gw);
+                if (acc.isNull())
+                    return;
+
+                if (state == "TRYING") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_TRYING);
+                    emit accountStateChange(acc);
+                } else if (state == "REGISTER") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_REGISTER);
+                    emit accountStateChange(acc);
+                } else if (state == "REGED") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_REGED);
+                    emit accountStateChange(acc);
+                } else if (state == "UNREGED") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_UNREGED);
+                    emit accountStateChange(acc);
+                } else if (state == "UNREGISTER") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_UNREGISTER);
+                    emit accountStateChange(acc);
+                } else if (state =="FAILED") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_FAILED);
+                    emit accountStateChange(acc);
+                } else if (state == "FAIL_WAIT") {
+                    acc.data()->setState(FSCOMM_GW_STATE_FAIL_WAIT);
+                    emit accountStateChange(acc);
+                } else if (state == "EXPIRED") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_EXPIRED);
+                    emit accountStateChange(acc);
+                } else if (state == "NOREG") {
+                    acc.data()->setStatusPhrase(switch_event_get_header_nil(event, "Phrase"));
+                    acc.data()->setState(FSCOMM_GW_STATE_NOREG);
+                    emit accountStateChange(acc);
+                }
+            }
+            else if (strcmp(event->subclass_name, "sofia::gateway_add") == 0)
+            {
+                QString gw = switch_event_get_header_nil(event, "Gateway");
+                Account * accPtr = new Account(gw);
+                QSharedPointer<Account> acc = QSharedPointer<Account>(accPtr);
+                acc.data()->setState(FSCOMM_GW_STATE_NOAVAIL);
+                _accounts.insert(gw, acc);
+                emit newAccount(acc);
+            }
+            else if (strcmp(event->subclass_name, "sofia::gateway_delete") == 0)
+            {
+                QSharedPointer<Account> acc = _accounts.take(switch_event_get_header_nil(event, "Gateway"));
+                if (!acc.isNull())
+                    emit delAccount(acc);
+            }
+            else
+            {
+                printEventHeaders(event);
+            }
+            break;
+        }
+    default:
+        break;
+    }
+}
+
+void FSHost::accountReloadCmd(QSharedPointer<Account> acc)
+{
+    QString res;
+    QString arg = QString("profile softphone killgw %1").arg(acc.data()->getName());
+
+    connect(this, SIGNAL(delAccount(QSharedPointer<Account>)), this, SLOT(accountReloadSlot(QSharedPointer<Account>)));
+
+    if (g_FSHost.sendCmd("sofia", arg.toAscii().data() , &res) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not killgw %s from profile softphone.\n",
+                          acc.data()->getName().toAscii().data());
+    }
+    _reloading_Accounts.append(acc.data()->getName());
+}
+
+void FSHost::accountReloadSlot(QSharedPointer<Account> acc)
+{
+    if (_reloading_Accounts.contains(acc.data()->getName()))
+    {
+        _reloading_Accounts.takeAt(_reloading_Accounts.indexOf(acc.data()->getName(), 0));
+        QString res;
+        if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
+            return;
+        }
+        if (_reloading_Accounts.isEmpty())
+            disconnect(this, SLOT(accountReloadSlot(QSharedPointer<Account>)));
+    }
+}
+
+switch_status_t FSHost::sendCmd(const char *cmd, const char *args, QString *res)
+{
+    switch_status_t status = SWITCH_STATUS_FALSE;
+    switch_stream_handle_t stream = { 0 };
+    SWITCH_STANDARD_STREAM(stream);
+    qDebug() << "Sending command: " << cmd << args << endl;
+    status = switch_api_execute(cmd, args, NULL, &stream);
+    *res = switch_str_nil((char *) stream.data);
+    switch_safe_free(stream.data);
+
+    return status;
+}
+
+QSharedPointer<Account> FSHost::getAccountByUUID(QString uuid)
+{
+    foreach(QSharedPointer<Account> acc, _accounts.values())
+    {
+        if (acc.data()->getUUID() == uuid)
+            return acc;
+    }
+    return QSharedPointer<Account>();
+}
+
+QSharedPointer<Call> FSHost::getCurrentActiveCall()
+{
+    foreach(QSharedPointer<Call> call, _active_calls.values())
+    {
+        if (call.data()->isActive())
+            return call;
+    }
+    return QSharedPointer<Call>();
+}
+
+void FSHost::printEventHeaders(switch_event_t *event)
+{
+    switch_event_header_t *hp;
+    qDebug() << QString("Received event: %1(%2)\n").arg(switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
+    for (hp = event->headers; hp; hp = hp->next) {
+        qDebug() << hp->name << "=" << hp->value;
+    }
+    qDebug() << "\n\n";
+}
+
+QSharedPointer<Account> FSHost::getAccountByName(QString accStr)
+{
+    foreach(QSharedPointer<Account> acc, _accounts.values())
+    {
+        if (acc.data()->getName() == accStr)
+            return acc;
+    }
+    return QSharedPointer<Account>();
+}
+
+QSharedPointer<Account> FSHost::getCurrentDefaultAccount()
+{
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf/globals");
+    QString accString = settings.value("default_gateway").toString();
+    settings.endGroup();
+    return getAccountByName(accString);
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/fshost.h (from rev 16612, freeswitch/trunk/fscomm/fshost.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/fshost.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/fshost.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,99 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+#ifndef FSHOST_H
+#define FSHOST_H
+
+#include <QThread>
+#include <QHash>
+#include <QSharedPointer>
+#include <switch.h>
+#include "call.h"
+#include "account.h"
+
+class FSHost : public QThread
+{
+Q_OBJECT
+public:
+    explicit FSHost(QObject *parent = 0);
+    switch_status_t sendCmd(const char *cmd, const char *args, QString *res);
+    void generalEventHandler(switch_event_t *event);
+    QSharedPointer<Call> getCallByUUID(QString uuid) { return _active_calls.value(uuid); }
+    QSharedPointer<Call> getCurrentActiveCall();
+    QList<QSharedPointer<Account> > getAccounts() { return _accounts.values(); }
+    QSharedPointer<Account> getAccountByUUID(QString uuid);
+    QSharedPointer<Account> getCurrentDefaultAccount();
+    QSharedPointer<Account> getAccountByName(QString accStr);
+    void accountReloadCmd(QSharedPointer<Account> acc);
+
+protected:
+    void run(void);
+
+signals:
+    void coreLoadingError(QString);
+    void ready(void);
+    void ringing(QSharedPointer<Call>);
+    void answered(QSharedPointer<Call>);
+    void newOutgoingCall(QSharedPointer<Call>);
+    void callFailed(QSharedPointer<Call>);
+    void hungup(QSharedPointer<Call>);
+    void accountStateChange(QSharedPointer<Account>);
+    void newAccount(QSharedPointer<Account>);
+    void delAccount(QSharedPointer<Account>);
+
+private slots:
+    /* We need to wait for the gateway deletion before reloading it */
+    void accountReloadSlot(QSharedPointer<Account>);
+
+private:
+    switch_status_t processBlegEvent(switch_event_t *, QString);
+    switch_status_t processAlegEvent(switch_event_t *, QString);
+    void createFolders();
+    void printEventHeaders(switch_event_t *event);
+    QHash<QString, QSharedPointer<Call> > _active_calls;
+    QHash<QString, QSharedPointer<Account> > _accounts;
+    QHash<QString, QString> _bleg_uuids;
+    QList<QString> _reloading_Accounts;
+};
+
+extern FSHost g_FSHost;
+
+/*
+   Used to match callback from fs core. We dup the event and call the class
+   method callback to make use of the signal/slot infrastructure.
+*/
+static void eventHandlerCallback(switch_event_t *event)
+{
+    switch_event_t *clone = NULL;
+    if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) {
+        g_FSHost.generalEventHandler(clone);
+    }
+    switch_safe_free(clone);
+}
+
+#endif // FSHOST_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/main.cpp (from rev 16612, freeswitch/trunk/fscomm/main.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/main.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/main.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,51 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include <QtGui/QApplication>
+#include <QSplashScreen>
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    QCoreApplication::setOrganizationName("FreeSWITCH");
+    QCoreApplication::setOrganizationDomain("freeswitch.org");
+    QCoreApplication::setApplicationName("FSComm");
+
+    QPixmap image(":/images/splash.png");
+    QSplashScreen *splash = new QSplashScreen(image);
+    splash->show();
+    splash->showMessage("Loading, please wait...", Qt::AlignRight|Qt::AlignBottom, Qt::blue);
+
+    QObject::connect(&g_FSHost, SIGNAL(ready()), splash, SLOT(close()));
+    MainWindow w;    
+    QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(show()));
+    g_FSHost.start();
+    return a.exec();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.cpp (from rev 16612, freeswitch/trunk/fscomm/mainwindow.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,572 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#include <QInputDialog>
+#include <QMessageBox>
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+#include <switch_version.h>
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow),
+    preferences(NULL)
+{
+    ui->setupUi(this);
+
+    /* Setup the taskbar icon */
+    sysTray = new QSystemTrayIcon(QIcon(":/images/taskbar_icon"), this);
+    sysTray->setToolTip(tr("FSComm"));
+
+    /* Connect DTMF buttons */
+    dialpadMapper = new QSignalMapper(this);
+    connect(ui->dtmf0Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf1Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf2Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf3Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf4Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf5Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf6Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf7Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf8Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf9Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfABtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfBBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfCBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfDBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfAstBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfPoundBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    dialpadMapper->setMapping(ui->dtmf0Btn, QString("0"));
+    dialpadMapper->setMapping(ui->dtmf1Btn, QString("1"));
+    dialpadMapper->setMapping(ui->dtmf2Btn, QString("2"));
+    dialpadMapper->setMapping(ui->dtmf3Btn, QString("3"));
+    dialpadMapper->setMapping(ui->dtmf4Btn, QString("4"));
+    dialpadMapper->setMapping(ui->dtmf5Btn, QString("5"));
+    dialpadMapper->setMapping(ui->dtmf6Btn, QString("6"));
+    dialpadMapper->setMapping(ui->dtmf7Btn, QString("7"));
+    dialpadMapper->setMapping(ui->dtmf8Btn, QString("8"));
+    dialpadMapper->setMapping(ui->dtmf9Btn, QString("9"));
+    dialpadMapper->setMapping(ui->dtmfABtn, QString("A"));
+    dialpadMapper->setMapping(ui->dtmfBBtn, QString("B"));
+    dialpadMapper->setMapping(ui->dtmfCBtn, QString("C"));
+    dialpadMapper->setMapping(ui->dtmfDBtn, QString("D"));
+    dialpadMapper->setMapping(ui->dtmfAstBtn, QString("*"));
+    dialpadMapper->setMapping(ui->dtmfPoundBtn, QString("#"));
+    connect(dialpadMapper, SIGNAL(mapped(QString)), this, SLOT(sendDTMF(QString)));
+
+    /* Connect events related to FreeSWITCH */
+    connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
+    connect(&g_FSHost, SIGNAL(ringing(QSharedPointer<Call>)), this, SLOT(ringing(QSharedPointer<Call>)));
+    connect(&g_FSHost, SIGNAL(answered(QSharedPointer<Call>)), this, SLOT(answered(QSharedPointer<Call>)));
+    connect(&g_FSHost, SIGNAL(hungup(QSharedPointer<Call>)), this, SLOT(hungup(QSharedPointer<Call>)));
+    connect(&g_FSHost, SIGNAL(newOutgoingCall(QSharedPointer<Call>)), this, SLOT(newOutgoingCall(QSharedPointer<Call>)));
+    connect(&g_FSHost, SIGNAL(callFailed(QSharedPointer<Call>)), this, SLOT(callFailed(QSharedPointer<Call>)));
+    connect(&g_FSHost, SIGNAL(accountStateChange(QSharedPointer<Account>)), this, SLOT(accountStateChanged(QSharedPointer<Account>)));
+    connect(&g_FSHost, SIGNAL(newAccount(QSharedPointer<Account>)), this, SLOT(accountAdd(QSharedPointer<Account>)));
+    connect(&g_FSHost, SIGNAL(delAccount(QSharedPointer<Account>)), this, SLOT(accountDel(QSharedPointer<Account>)));
+    /*connect(&g_FSHost, SIGNAL(coreLoadingError(QString)), this, SLOT(coreLoadingError(QString)));*/
+
+    /* Connect call commands */
+    connect(ui->newCallBtn, SIGNAL(clicked()), this, SLOT(makeCall()));
+    connect(ui->answerBtn, SIGNAL(clicked()), this, SLOT(paAnswer()));
+    connect(ui->hangupBtn, SIGNAL(clicked()), this, SLOT(paHangup()));
+    connect(ui->recoredCallBtn, SIGNAL(toggled(bool)), SLOT(recordCall(bool)));
+    connect(ui->tableCalls, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(callTableDoubleClick(QTableWidgetItem*)));
+    connect(ui->action_Preferences, SIGNAL(triggered()), this, SLOT(prefTriggered()));
+    connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close()));
+    connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(showAbout()));
+    connect(ui->actionSetDefaultAccount, SIGNAL(triggered(bool)), this, SLOT(setDefaultAccount()));
+    connect(sysTray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(sysTrayActivated(QSystemTrayIcon::ActivationReason)));
+
+    /* Set the context menus */
+    ui->tableAccounts->addAction(ui->actionSetDefaultAccount);
+
+    /* Set other properties */
+    ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+
+    /* Set the call timer */
+    callTimer = new QTimer(this);
+    callTimer->setInterval(1000);
+    connect(callTimer, SIGNAL(timeout()), this, SLOT(updateCallTimers()));
+    callTimer->start();
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+    QString res;
+    g_FSHost.sendCmd("fsctl", "shutdown", &res);
+    g_FSHost.wait();
+}
+
+void MainWindow::updateCallTimers()
+{
+    for(int row=0; row<ui->tableCalls->rowCount(); row++)
+    {
+        QTableWidgetItem* item = ui->tableCalls->item(row, 2);
+        QSharedPointer<Call> call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
+        QTime time = call.data()->getCurrentStateTime();
+        item->setText(time.toString("hh:mm:ss"));
+        item->setTextAlignment(Qt::AlignRight);
+    }
+}
+
+void MainWindow::setDefaultAccount()
+{
+    QString accName = ui->tableAccounts->item(ui->tableAccounts->selectedRanges()[0].topRow(), 0)->text();
+
+    if (accName.isEmpty())
+        return;
+
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf/globals");
+    switch_core_set_variable("default_gateway", accName.toAscii().data());
+    settings.setValue("default_gateway", accName);
+    settings.endGroup();
+}
+
+void MainWindow::prefTriggered()
+{
+    if (!preferences)
+        preferences = new PrefDialog();
+
+    preferences->raise();
+    preferences->show();
+    preferences->activateWindow();
+}
+
+void MainWindow::coreLoadingError(QString err)
+{
+    QMessageBox::warning(this, "Error Loading Core...", err, QMessageBox::Ok);
+    QApplication::exit(255);
+}
+
+void MainWindow::accountAdd(QSharedPointer<Account> acc)
+{
+    ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
+    QTableWidgetItem *gwField = new QTableWidgetItem(acc.data()->getName());
+    QTableWidgetItem *stField = new QTableWidgetItem(acc.data()->getStateName());
+    ui->tableAccounts->setItem(ui->tableAccounts->rowCount()-1,0,gwField);
+    ui->tableAccounts->setItem(ui->tableAccounts->rowCount()-1,1,stField);
+    ui->tableAccounts->resizeColumnsToContents();
+    ui->tableAccounts->resizeRowsToContents();
+    ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+}
+
+void MainWindow::accountDel(QSharedPointer<Account> acc)
+{
+    foreach (QTableWidgetItem *i, ui->tableAccounts->findItems(acc.data()->getName(), Qt::MatchExactly))
+    {
+        if (i->text() == acc.data()->getName())
+        {
+            ui->tableAccounts->removeRow(i->row());
+            //ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()-1);
+            ui->tableAccounts->resizeColumnsToContents();
+            ui->tableAccounts->resizeRowsToContents();
+            ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+            break;
+        }
+    }
+}
+
+void MainWindow::accountStateChanged(QSharedPointer<Account> acc)
+{
+    ui->statusBar->showMessage(tr("Account %1 is %2").arg(acc.data()->getName(), acc.data()->getStateName()));
+    foreach (QTableWidgetItem *i, ui->tableAccounts->findItems(acc.data()->getName(), Qt::MatchExactly))
+    {
+        if (i->text() == acc.data()->getName())
+        {
+            ui->tableAccounts->item(i->row(), 1)->setText(acc.data()->getStateName());
+            ui->tableAccounts->resizeColumnsToContents();
+            ui->tableAccounts->resizeRowsToContents();
+            ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+            return;
+        }
+    }
+}
+
+void MainWindow::sendDTMF(QString dtmf)
+{
+    g_FSHost.getCurrentActiveCall().data()->sendDTMF(dtmf);
+}
+
+void MainWindow::callTableDoubleClick(QTableWidgetItem *item)
+{
+    QSharedPointer<Call> lastCall = g_FSHost.getCurrentActiveCall();
+    QSharedPointer<Call> call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
+    QString switch_str = QString("switch %1").arg(call.data()->getCallID());
+    QString result;
+    if (g_FSHost.sendCmd("pa", switch_str.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText(QString("Error switching to call %1").arg(call.data()->getCallID()));
+        return;
+    }
+    ui->hangupBtn->setEnabled(true);
+    /* Last call was hungup and we are switching */
+    if (!lastCall.isNull())
+        lastCall.data()->setActive(false);
+    call.data()->setActive(true);
+}
+
+void MainWindow::makeCall()
+{
+    bool ok;
+    QString dialstring = QInputDialog::getText(this, tr("Make new call"),
+                                         tr("Number to dial:"), QLineEdit::Normal, NULL,&ok);
+
+    QSharedPointer<Account> acc = g_FSHost.getCurrentDefaultAccount();
+    if (!acc.isNull()) {
+        QSettings settings;
+        settings.beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways/");
+        settings.beginGroup(acc.data()->getUUID());
+        settings.beginGroup("gateway/global_vars");
+        QString cidName = settings.value("caller_id_name").toString();
+        QString cidNum = settings.value("caller_id_num").toString();
+        settings.endGroup();
+        settings.endGroup();
+        settings.endGroup();
+
+        if (cidName.isEmpty()) {
+            settings.beginGroup("FreeSWITCH/conf/portaudio.conf/settings/params");
+            cidName = settings.value("cid-name").toString();
+            settings.endGroup();
+        }
+        if (cidNum.isEmpty()) {
+            settings.beginGroup("FreeSWITCH/conf/portaudio.conf/settings/params");
+            cidNum = settings.value("cid-num").toString();
+            settings.endGroup();
+        }
+
+        /* Set the vars for this call */
+        switch_core_set_variable("fscomm_caller_id_name", cidName.toAscii().data());
+        switch_core_set_variable("fscomm_caller_id_num", cidNum.toAscii().data());
+
+        qDebug() << "Name:" << cidName << "Num:" << cidNum;
+    }
+
+    if (ok && !dialstring.isEmpty())
+    {
+        paCall(dialstring);
+    }
+}
+
+void MainWindow::fshostReady()
+{
+    ui->statusBar->showMessage("Ready");
+    ui->newCallBtn->setEnabled(true);
+    ui->textEdit->setEnabled(true);
+    ui->textEdit->setText("Ready to dial and receive calls!");
+    sysTray->show();
+    sysTray->showMessage(tr("Status"), tr("FSComm has initialized!"), QSystemTrayIcon::Information, 5000);
+}
+
+void MainWindow::paAnswer()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", "answer", &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+
+    ui->textEdit->setText("Talking...");
+    ui->hangupBtn->setEnabled(true);
+    ui->answerBtn->setEnabled(false);
+}
+
+void MainWindow::paCall(QString dialstring)
+{
+    QString result;
+
+    QString callstring = QString("call %1").arg(dialstring);
+
+    if (g_FSHost.sendCmd("pa", callstring.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+
+    ui->hangupBtn->setEnabled(true);
+}
+
+void MainWindow::paHangup()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", "hangup", &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+
+    ui->textEdit->setText("Click to dial number...");
+    ui->statusBar->showMessage("Call hungup");
+    ui->hangupBtn->setEnabled(false);
+}
+
+void MainWindow::recordCall(bool pressed)
+{
+    QSharedPointer<Call> call = g_FSHost.getCurrentActiveCall();
+
+    if (call.isNull())
+    {
+        QMessageBox::warning(this,tr("Record call"),
+                             tr("<p>FSComm reports that there are no active calls to be recorded."
+                                "<p>Please report this bug."),
+                             QMessageBox::Ok);
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not record call because there is not current active call!.\n");
+        return;
+    }
+
+    if (call.data()->toggleRecord(pressed) != SWITCH_STATUS_SUCCESS)
+    {
+        QMessageBox::warning(this,tr("Record call"),
+                             tr("<p>Could not get active call to start/stop recording."
+                                "<p>Please report this bug."),
+                             QMessageBox::Ok);
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not record call [%s].\n", call.data()->getUUID().toAscii().data());
+        return;
+    }
+}
+
+void MainWindow::newOutgoingCall(QSharedPointer<Call> call)
+{
+    ui->textEdit->setText(QString("Calling %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+
+    ui->tableCalls->setRowCount(ui->tableCalls->rowCount()+1);
+    QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+    item0->setData(Qt::UserRole, call.data()->getUUID());
+    ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,0,item0);
+
+    QTableWidgetItem *item1 = new QTableWidgetItem(tr("Dialing..."));
+    item1->setData(Qt::UserRole, call.data()->getUUID());
+    ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,1,item1);
+
+    QTableWidgetItem *item2 = new QTableWidgetItem("00:00:00");
+    item2->setData(Qt::UserRole, call.data()->getUUID());
+    ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,2,item2);
+
+    ui->tableCalls->resizeColumnsToContents();
+    ui->tableCalls->resizeRowsToContents();
+    ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+
+    ui->hangupBtn->setEnabled(true);
+    call.data()->setActive(true);
+}
+
+void MainWindow::ringing(QSharedPointer<Call> call)
+{
+
+    for (int i=0; i<ui->tableCalls->rowCount(); i++)
+    {
+        QTableWidgetItem *item = ui->tableCalls->item(i, 1);
+        if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
+        {
+            item->setText(tr("Ringing"));
+            ui->textEdit->setText(QString("Call from %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+            return;
+        }
+    }
+
+    ui->textEdit->setText(QString("Call from %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+
+    ui->tableCalls->setRowCount(ui->tableCalls->rowCount()+1);
+    QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+    item0->setData(Qt::UserRole, call.data()->getUUID());
+    ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,0,item0);
+
+    QTableWidgetItem *item1 = new QTableWidgetItem(tr("Ringing"));
+    item1->setData(Qt::UserRole, call.data()->getUUID());
+    ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,1,item1);
+
+    QTableWidgetItem *item2 = new QTableWidgetItem("00:00:00");
+    item2->setData(Qt::UserRole, call.data()->getUUID());
+    ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,2,item2);
+
+    ui->tableCalls->resizeColumnsToContents();
+    ui->tableCalls->resizeRowsToContents();
+    ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+
+    ui->answerBtn->setEnabled(true);
+    call.data()->setActive(true);
+}
+
+void MainWindow::answered(QSharedPointer<Call> call)
+{
+    for (int i=0; i<ui->tableCalls->rowCount(); i++)
+    {
+        QTableWidgetItem *item = ui->tableCalls->item(i, 1);
+        if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
+        {
+            item->setText(tr("Answered"));
+            ui->tableCalls->resizeColumnsToContents();
+            ui->tableCalls->resizeRowsToContents();
+            ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+            break;
+        }
+    }
+    ui->recoredCallBtn->setEnabled(true);
+    ui->recoredCallBtn->setChecked(false);
+    ui->dtmf0Btn->setEnabled(true);
+    ui->dtmf1Btn->setEnabled(true);
+    ui->dtmf2Btn->setEnabled(true);
+    ui->dtmf3Btn->setEnabled(true);
+    ui->dtmf4Btn->setEnabled(true);
+    ui->dtmf5Btn->setEnabled(true);
+    ui->dtmf6Btn->setEnabled(true);
+    ui->dtmf7Btn->setEnabled(true);
+    ui->dtmf8Btn->setEnabled(true);
+    ui->dtmf9Btn->setEnabled(true);
+    ui->dtmfABtn->setEnabled(true);
+    ui->dtmfBBtn->setEnabled(true);
+    ui->dtmfCBtn->setEnabled(true);
+    ui->dtmfDBtn->setEnabled(true);
+    ui->dtmfAstBtn->setEnabled(true);
+    ui->dtmfPoundBtn->setEnabled(true);
+}
+
+void MainWindow::callFailed(QSharedPointer<Call> call)
+{
+    for (int i=0; i<ui->tableCalls->rowCount(); i++)
+    {
+        QTableWidgetItem *item = ui->tableCalls->item(i, 1);
+        if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
+        {
+            ui->tableCalls->removeRow(i);
+            ui->tableCalls->resizeColumnsToContents();
+            ui->tableCalls->resizeRowsToContents();
+            ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+            break;
+        }
+    }
+    ui->textEdit->setText(tr("Call with %1 (%2) failed with reason %3.").arg(call.data()->getCidName(),
+                                                                             call.data()->getCidNumber(),
+                                                                             call.data()->getCause()));
+    call.data()->setActive(false);
+    /* TODO: Will cause problems if 2 calls are received at the same time */
+    ui->recoredCallBtn->setEnabled(false);
+    ui->recoredCallBtn->setChecked(false);
+    ui->answerBtn->setEnabled(false);
+    ui->hangupBtn->setEnabled(false);
+    ui->dtmf0Btn->setEnabled(false);
+    ui->dtmf1Btn->setEnabled(false);
+    ui->dtmf2Btn->setEnabled(false);
+    ui->dtmf3Btn->setEnabled(false);
+    ui->dtmf4Btn->setEnabled(false);
+    ui->dtmf5Btn->setEnabled(false);
+    ui->dtmf6Btn->setEnabled(false);
+    ui->dtmf7Btn->setEnabled(false);
+    ui->dtmf8Btn->setEnabled(false);
+    ui->dtmf9Btn->setEnabled(false);
+    ui->dtmfABtn->setEnabled(false);
+    ui->dtmfBBtn->setEnabled(false);
+    ui->dtmfCBtn->setEnabled(false);
+    ui->dtmfDBtn->setEnabled(false);
+    ui->dtmfAstBtn->setEnabled(false);
+    ui->dtmfPoundBtn->setEnabled(false);
+
+}
+
+void MainWindow::hungup(QSharedPointer<Call> call)
+{
+    for (int i=0; i<ui->tableCalls->rowCount(); i++)
+    {
+        QTableWidgetItem *item = ui->tableCalls->item(i, 1);
+        if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
+        {
+            ui->tableCalls->removeRow(i);
+            ui->tableCalls->resizeColumnsToContents();
+            ui->tableCalls->resizeRowsToContents();
+            ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+            break;
+        }
+    }
+    call.data()->setActive(false);
+    ui->textEdit->setText(tr("Call with %1 (%2) hungup.").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+    /* TODO: Will cause problems if 2 calls are received at the same time */
+    ui->recoredCallBtn->setEnabled(false);
+    ui->recoredCallBtn->setChecked(false);
+    ui->answerBtn->setEnabled(false);
+    ui->hangupBtn->setEnabled(false);
+    ui->dtmf0Btn->setEnabled(false);
+    ui->dtmf1Btn->setEnabled(false);
+    ui->dtmf2Btn->setEnabled(false);
+    ui->dtmf3Btn->setEnabled(false);
+    ui->dtmf4Btn->setEnabled(false);
+    ui->dtmf5Btn->setEnabled(false);
+    ui->dtmf6Btn->setEnabled(false);
+    ui->dtmf7Btn->setEnabled(false);
+    ui->dtmf8Btn->setEnabled(false);
+    ui->dtmf9Btn->setEnabled(false);
+    ui->dtmfABtn->setEnabled(false);
+    ui->dtmfBBtn->setEnabled(false);
+    ui->dtmfCBtn->setEnabled(false);
+    ui->dtmfDBtn->setEnabled(false);
+    ui->dtmfAstBtn->setEnabled(false);
+    ui->dtmfPoundBtn->setEnabled(false);
+}
+
+void MainWindow::changeEvent(QEvent *e)
+{
+    QMainWindow::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void MainWindow::showAbout()
+{
+    QString result;
+    g_FSHost.sendCmd("version", "", &result);
+
+    QMessageBox::about(this, tr("About FSComm"),
+                       tr("<h2>FSComm</h2>"
+                          "<p>Author: Jo&atilde;o Mesquita &lt;jmesquita@freeswitch.org>"
+                          "<p>FsComm is a softphone based on libfreeswitch."
+                          "<p>The FreeSWITCH&trade; images and name are trademark of"
+                          " Anthony Minessale II, primary author of FreeSWITCH&trade;."
+                          "<p>Compiled FSComm version: %1"
+                          "<p>%2").arg(SWITCH_VERSION_FULL, result));
+}
+
+void MainWindow::sysTrayActivated(QSystemTrayIcon::ActivationReason reason)
+{
+    switch(reason)
+    {
+    case QSystemTrayIcon::Trigger:
+        {
+            if (this->isVisible())
+                this->hide();
+            else {
+                this->show();
+                this->activateWindow();
+                this->raise();
+            }
+            break;
+        }
+    default:
+        break;
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.h (from rev 16612, freeswitch/trunk/fscomm/mainwindow.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,92 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QTableWidgetItem>
+#include <QSignalMapper>
+#include <QSystemTrayIcon>
+#include <switch.h>
+#include <fshost.h>
+#include <call.h>
+#include <account.h>
+#include "preferences/prefdialog.h"
+
+namespace Ui {
+    class MainWindow;
+}
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+protected:
+    void changeEvent(QEvent *e);
+
+signals:
+    void dtmfDialed(QString);
+
+private slots:
+    void showAbout();
+    void prefTriggered();
+    void coreLoadingError(QString);
+    void sendDTMF(QString);
+    void callTableDoubleClick(QTableWidgetItem*);
+    void makeCall();
+    void fshostReady();
+    void paAnswer();
+    void paCall(QString);
+    void paHangup();
+    void newOutgoingCall(QSharedPointer<Call>);
+    void ringing(QSharedPointer<Call>);
+    void answered(QSharedPointer<Call>);
+    void hungup(QSharedPointer<Call>);
+    void callFailed(QSharedPointer<Call>);
+    void recordCall(bool);
+    void setDefaultAccount();
+    void accountAdd(QSharedPointer<Account>);
+    void accountDel(QSharedPointer<Account>);
+    void accountStateChanged(QSharedPointer<Account>);
+    void sysTrayActivated(QSystemTrayIcon::ActivationReason reason);
+    void updateCallTimers();
+
+private:
+    Ui::MainWindow *ui;
+    QSignalMapper *dialpadMapper;
+    PrefDialog *preferences;
+    QSystemTrayIcon *sysTray;
+    QTimer *callTimer;
+};
+
+#endif // MAINWINDOW_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.ui (from rev 16612, freeswitch/trunk/fscomm/mainwindow.ui) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.ui	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mainwindow.ui	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>716</width>
+    <height>541</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>FSComm - A FreeSWITCH Communicator</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout" name="horizontalLayout_4">
+    <item>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QTextEdit" name="textEdit">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPushButton" name="newCallBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>New Call</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="recoredCallBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Record</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QPushButton" name="answerBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Answer</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QPushButton" name="hangupBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Hangup</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QPushButton" name="dtmf1Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>1</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QPushButton" name="dtmf2Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QPushButton" name="dtmf3Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>3</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QPushButton" name="dtmf4Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>4</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QPushButton" name="dtmf5Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>5</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="QPushButton" name="dtmf6Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>6</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QPushButton" name="dtmf7Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>7</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QPushButton" name="dtmf8Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>8</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QPushButton" name="dtmf9Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>9</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QPushButton" name="dtmfAstBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>*</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QPushButton" name="dtmf0Btn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="QPushButton" name="dtmfPoundBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>#</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <widget class="QPushButton" name="dtmfABtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>A</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3">
+         <widget class="QPushButton" name="dtmfBBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>B</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="3">
+         <widget class="QPushButton" name="dtmfDBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>D</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="3">
+         <widget class="QPushButton" name="dtmfCBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>C</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>Active Calls</string>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QTableWidget" name="tableCalls">
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="showGrid">
+            <bool>false</bool>
+           </property>
+           <column>
+            <property name="text">
+             <string>To/From</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Status</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Time</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox_2">
+        <property name="title">
+         <string>Active Accounts</string>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QTableWidget" name="tableAccounts">
+           <property name="contextMenuPolicy">
+            <enum>Qt::ActionsContextMenu</enum>
+           </property>
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="alternatingRowColors">
+            <bool>false</bool>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="showGrid">
+            <bool>false</bool>
+           </property>
+           <property name="cornerButtonEnabled">
+            <bool>true</bool>
+           </property>
+           <property name="rowCount">
+            <number>0</number>
+           </property>
+           <attribute name="horizontalHeaderVisible">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="horizontalHeaderCascadingSectionResizes">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderHighlightSections">
+            <bool>false</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Account</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Status</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>716</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="action_Preferences"/>
+    <addaction name="separator"/>
+    <addaction name="action_Exit"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+  <action name="action_Preferences">
+   <property name="text">
+    <string>&amp;Preferences</string>
+   </property>
+  </action>
+  <action name="action_Exit">
+   <property name="text">
+    <string>&amp;Exit</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
+  <action name="actionSetDefaultAccount">
+   <property name="text">
+    <string>Set Default Account</string>
+   </property>
+   <property name="toolTip">
+    <string>Set the default account for dialing out.</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings (from rev 16612, freeswitch/trunk/fscomm/mod_qsettings)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings/mod_qsettings.cpp (from rev 16612, freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings/mod_qsettings.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings/mod_qsettings.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,293 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ *
+ * Description:
+ * Module to load configurations from Qt preference system QSettings
+ *
+ */
+#include <QString>
+#include <QtGui>
+#include <QDir>
+#include <QXmlStreamWriter>
+#include "mod_qsettings/mod_qsettings.h"
+
+switch_xml_t XMLBinding::getConfigXML(QString tmpl)
+{
+    _settings->beginGroup("FreeSWITCH/conf");
+    if (!_settings->childGroups().contains(tmpl))
+    {
+        _settings->endGroup();
+        return NULL;
+    }
+    _settings->beginGroup(tmpl);
+
+    QByteArray *finalXML = new QByteArray();
+    QXmlStreamWriter streamWriter(finalXML);
+
+    streamWriter.setAutoFormatting(true);
+    streamWriter.writeStartElement("document");
+    streamWriter.writeAttribute("type", "freeswitch/xml");
+
+    streamWriter.writeStartElement("section");
+    streamWriter.writeAttribute("name", "configuration");
+
+    streamWriter.writeStartElement("configuration");
+    streamWriter.writeAttribute("name", tmpl);
+    streamWriter.writeAttribute("description", "Configuration generated by QSettings");
+
+    foreach (QString group, _settings->childGroups())
+    {
+        parseGroup(&streamWriter, group);
+    }
+
+    streamWriter.writeEndElement();
+    streamWriter.writeEndElement();
+    streamWriter.writeEndElement();
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Config for %s requested. Providing the following XML:\n%s\n",
+                      tmpl.toAscii().constData(), finalXML->data());
+
+    _settings->endGroup();
+    _settings->endGroup();
+
+    return switch_xml_parse_str(finalXML->data(), strlen(finalXML->data()));
+}
+
+void XMLBinding::parseGroup(QXmlStreamWriter *streamWriter, QString group)
+{
+    if (group == "attrs")
+    {
+        _settings->beginGroup(group);
+        foreach (QString k, _settings->childKeys())
+        {
+            streamWriter->writeAttribute(k, _settings->value(k).toString());
+        }
+        _settings->endGroup();
+        return;
+    }
+
+    if (group == "params" || group == "customParams")
+    {
+        _settings->beginGroup(group);
+        foreach(QString param, _settings->childKeys())
+        {
+            streamWriter->writeStartElement("param");
+            streamWriter->writeAttribute("name", param);
+            streamWriter->writeAttribute("value", _settings->value(param).toString());
+            streamWriter->writeEndElement();
+        }
+        _settings->endGroup();
+        return;
+    }
+
+    if (group == "gateways")
+    {
+        streamWriter->writeStartElement(group);
+        _settings->beginGroup(group);
+        foreach (QString gw, _settings->childGroups())
+        {
+            _settings->beginGroup(gw);
+            foreach(QString g, _settings->childGroups())
+            {
+                parseGroup(streamWriter, g);
+            }
+            _settings->endGroup();
+        }
+        _settings->endGroup();
+        streamWriter->writeEndElement();
+        return;
+    }
+
+    _settings->beginGroup(group);
+    streamWriter->writeStartElement(group);
+
+    foreach (QString group2, _settings->childGroups())
+    {
+        parseGroup(streamWriter, group2);
+    }
+
+    streamWriter->writeEndElement();
+    _settings->endGroup();
+}
+
+static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params,
+                                  void *user_data)
+{
+    XMLBinding *binding = (XMLBinding *) user_data;
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are being requested -> section: %s | tag_name: %s | key_name: %s | key_value: %s!\n",
+                      section, tag_name, key_name, key_value);
+    if (!binding) {
+        return NULL;
+    }
+
+    return binding->getConfigXML(key_value);
+}
+
+static switch_status_t do_config(void)
+{
+    char *cf = "qsettings.conf";
+    switch_xml_t cfg, xml, bindings_tag;
+    XMLBinding *binding = NULL;
+
+    if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
+        return SWITCH_STATUS_TERM;
+    }
+
+    if (!(bindings_tag = switch_xml_child(cfg, "bindings"))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <bindings> tag!\n");
+        switch_xml_free(xml);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    QString bind_mask = switch_xml_attr_soft(bindings_tag, "value");
+    if (!bind_mask.isEmpty())
+    {
+        binding = new XMLBinding(bind_mask);
+    }
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding XML Fetch Function [%s]\n",
+                      binding->getBinding().isEmpty() ? "all" : binding->getBinding().toAscii().constData());
+    switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->getBinding().toAscii().constData()), binding);
+    binding = NULL;
+
+    switch_xml_free(xml);
+
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf");
+    if (settings.childGroups().isEmpty())
+    {
+        setQSettingsDefaults();
+    }
+    settings.endGroup();
+    setGlobals();
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+void setQSettingsDefaults()
+{
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf");
+
+    /* Globals config */
+    /* Sofia config */
+    settings.beginGroup("sofia.conf");
+
+    /* General Settings */
+    settings.beginGroup("global_settings/params");
+    settings.setValue("log-level", 0);
+    settings.setValue("auto-restart", "true");
+    settings.setValue("debug-presence", 0);
+    settings.endGroup();
+
+    /* Profile settings */
+    settings.beginGroup("profiles");
+    settings.beginGroup("profile");
+
+    settings.beginGroup("attrs");
+    settings.setValue("name", "softphone");
+    settings.endGroup();
+
+    settings.beginGroup("settings/params");
+    settings.setValue("user-agent-string", "FreeSWITCH/FSComm");
+    settings.setValue("debug", 0);
+    settings.setValue("sip-trace", "no");
+    settings.setValue("context", "public");
+    settings.setValue("rfc2833-pt", 101);
+    settings.setValue("sip-port", 12345);
+    settings.setValue("dialplan", "XML");
+    settings.setValue("dtmf-duration", 100);
+    settings.setValue("codec-prefs", "CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM");
+    settings.setValue("use-rtp-timer", "true");
+    settings.setValue("rtp-timer-name", "soft");
+    settings.setValue("rtp-ip", "auto");
+    settings.setValue("sip-ip", "auto");
+    settings.setValue("hold-music", "local_stream://moh");
+    settings.setValue("apply-nat-acl", "rfc1918");
+    settings.setValue("manage-presence", "false");
+    settings.setValue("max-proceeding", 3);
+    settings.setValue("inbound-codec-negotiation", "generous");
+    settings.setValue("nonce-ttl", 60);
+    settings.setValue("auth-calls", "false");
+    settings.setValue("auth-all-packets", "false");
+    settings.setValue("ext-rtp-ip", "stun:stun.freeswitch.org");
+    settings.setValue("ext-sip-ip", "stun:stun.freeswitch.org");
+    settings.setValue("rtp-timeout-sec", 300);
+    settings.setValue("rtp-hold-timeout-sec", 1800);
+    settings.setValue("disable-register", "true");
+    settings.setValue("challenge-realm", "auto_from");
+    settings.endGroup();
+
+    settings.endGroup();
+    settings.endGroup();
+    settings.endGroup();
+
+    /* PortAudio config */
+    settings.beginGroup("portaudio.conf/settings/params");
+    settings.setValue("cid-name", "FSComm");
+    settings.setValue("cid-num", "00000000");
+    settings.setValue("ring-file", "tone_stream://%(2000,4000,440.0,480.0);loops=20");
+    settings.setValue("dialplan", "XML");
+    settings.setValue("ring-interval", 5);
+    settings.setValue("hold-file", "local_stream://moh");
+    settings.setValue("sample-rate", 48000);
+    settings.setValue("codec-ms", 10);
+    settings.setValue("indev", "");
+    settings.setValue("outdev", "");
+    settings.setValue("ringdev", "");
+    settings.endGroup();
+
+    /* Finish configs */
+    settings.endGroup();
+}
+
+void setGlobals()
+{
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf/globals");
+    foreach (QString k, settings.childKeys())
+    {
+        switch_core_set_variable(k.toAscii().data(), settings.value(k).toByteArray().data());
+    }
+    settings.endGroup();
+}
+
+switch_status_t mod_qsettings_load(void)
+{
+
+    if (do_config() == SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sucessfully configured.\n");
+    } else {
+        return SWITCH_STATUS_FALSE;
+    }
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "We loaded mod_qsettings.\n");
+
+    return SWITCH_STATUS_SUCCESS;
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings/mod_qsettings.h (from rev 16612, freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings/mod_qsettings.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/mod_qsettings/mod_qsettings.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,55 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita@freeswitch.org>
+ *
+ */
+
+#ifndef MOD_QSETTINGS_H
+#define MOD_QSETTINGS_H
+
+#include <QString>
+#include <QSettings>
+#include <switch.h>
+
+class QXmlStreamWriter;
+
+class XMLBinding
+{
+public:
+    XMLBinding(QString binding) : _binding(binding), _settings(new QSettings) {}
+    QString getBinding(void) { return _binding; }
+    switch_xml_t getConfigXML(QString);
+private:
+    void parseGroup(QXmlStreamWriter *,QString);
+    QString _binding;
+    QSettings* _settings;
+};
+
+switch_status_t mod_qsettings_load(void);
+void setQSettingsDefaults(void);
+void setGlobals(void);
+
+#endif // MOD_QSETTINGS_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences (from rev 16612, freeswitch/trunk/fscomm/preferences)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.cpp (from rev 16612, freeswitch/trunk/fscomm/preferences/accountdialog.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,212 @@
+#include <QSettings>
+#include <QtGui>
+#include "accountdialog.h"
+#include "ui_accountdialog.h"
+#include "fshost.h"
+
+AccountDialog::AccountDialog(QString accId, QWidget *parent) :
+    QDialog(parent),
+    _accId(accId),
+    ui(new Ui::AccountDialog)
+{    
+    ui->setupUi(this);
+    _settings = new QSettings;
+    connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
+    connect(ui->sofiaExtraParamAddBtn, SIGNAL(clicked()), this, SLOT(addExtraParam()));
+    connect(ui->sofiaExtraParamRemBtn, SIGNAL(clicked()), this, SLOT(remExtraParam()));
+    connect(ui->clidSettingsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(clidSettingsComboChanged(int)));
+    connect(ui->codecSettingsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(codecSettingsComboChanged(int)));
+
+    ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
+    ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->codecPage));
+    ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->clidPage));
+}
+
+AccountDialog::~AccountDialog()
+{
+    delete ui;
+}
+
+void AccountDialog::codecSettingsComboChanged(int index)
+{
+    if (index == 0)
+        ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->codecPage));
+    else
+        ui->tabWidget->insertTab(1,ui->codecPage,tr("Codecs"));
+
+}
+
+void AccountDialog::clidSettingsComboChanged(int index)
+{
+    if (index == 0)
+        ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->clidPage));
+    else
+        ui->tabWidget->insertTab(1,ui->clidPage,tr("Caller ID"));
+}
+
+void AccountDialog::remExtraParam()
+{
+    QList<QTableWidgetSelectionRange> sel = ui->sofiaExtraParamTable->selectedRanges();
+
+    foreach(QTableWidgetSelectionRange range, sel)
+    {
+        int offset =0;
+        for(int row = range.topRow(); row<=range.bottomRow(); row++)
+        {
+            ui->sofiaExtraParamTable->removeRow(row-offset);
+            offset++;
+        }
+    }
+}
+
+void AccountDialog::addExtraParam()
+{
+    bool ok;
+    QString paramName = QInputDialog::getText(this, tr("Add parameter."),
+                                         tr("New parameter name:"), QLineEdit::Normal,
+                                         NULL, &ok);
+    if (!ok)
+        return;
+    QString paramVal = QInputDialog::getText(this, tr("Add parameter."),
+                                         tr("New parameter value:"), QLineEdit::Normal,
+                                         NULL, &ok);
+    if (!ok)
+        return;
+
+    QTableWidgetItem* paramNameItem = new QTableWidgetItem(paramName);
+    QTableWidgetItem* paramValItem = new QTableWidgetItem(paramVal);
+    ui->sofiaExtraParamTable->setRowCount(ui->sofiaExtraParamTable->rowCount()+1);
+    ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,0,paramNameItem);
+    ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,1,paramValItem);
+    ui->sofiaExtraParamTable->resizeColumnsToContents();
+    ui->sofiaExtraParamTable->resizeRowsToContents();
+    ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
+}
+
+void AccountDialog::readConfig()
+{
+    _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+    _settings->beginGroup(_accId);
+
+    _settings->beginGroup("gateway/attrs");
+    ui->sofiaGwNameEdit->setText(_settings->value("name").toString());
+    _settings->endGroup();
+
+    _settings->beginGroup("gateway/params");
+    ui->sofiaGwUsernameEdit->setText(_settings->value("username").toString());
+    ui->sofiaGwRealmEdit->setText(_settings->value("realm").toString());
+    ui->sofiaGwPasswordEdit->setText(_settings->value("password").toString());
+    ui->sofiaGwExpireSecondsSpin->setValue(_settings->value("expire-seconds").toInt());
+    ui->sofiaGwRegisterCombo->setCurrentIndex(ui->sofiaGwRegisterCombo->findText(_settings->value("register").toString(),
+                                                                                 Qt::MatchExactly));
+    ui->sofiaGwRegisterTransportCombo->setCurrentIndex(ui->sofiaGwRegisterTransportCombo->findText(_settings->value("register-transport").toString(),
+                                                                                                   Qt::MatchExactly));
+    ui->sofiaGwRetrySecondsSpin->setValue(_settings->value("retry-seconds").toInt());
+    _settings->endGroup();
+
+    _settings->beginGroup("gateway/customParams");
+    int row = 0;
+    ui->sofiaExtraParamTable->clearContents();
+    foreach(QString k, _settings->childKeys())
+    {
+        row++;
+        ui->sofiaExtraParamTable->setRowCount(row);
+        QTableWidgetItem *varName = new QTableWidgetItem(k);
+        QTableWidgetItem *varVal = new QTableWidgetItem(_settings->value(k).toString());
+        ui->sofiaExtraParamTable->setItem(row-1, 0,varName);
+        ui->sofiaExtraParamTable->setItem(row-1, 1,varVal);
+    }
+    _settings->endGroup();
+
+    _settings->endGroup();
+    _settings->endGroup();
+
+    ui->sofiaExtraParamTable->resizeColumnsToContents();
+    ui->sofiaExtraParamTable->resizeRowsToContents();
+    ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
+}
+
+void AccountDialog::writeConfig()
+{
+    QSharedPointer<Account> acc = g_FSHost.getAccountByUUID(_accId);
+    if (!acc.isNull())
+    {
+        g_FSHost.accountReloadCmd(acc);
+    }
+
+    _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+
+    _settings->beginGroup(_accId);
+
+    _settings->beginGroup("gateway/global_vars");
+    if (ui->clidSettingsCombo->currentIndex() == 0)
+    {
+        _settings->remove("caller_id_name");
+        _settings->remove("caller_id_num");
+    } else {
+        _settings->setValue("caller_id_name", ui->sofiaCallerIDName->text());
+        _settings->setValue("caller_id_num", ui->sofiaCallerIDNum->text());
+    }
+    _settings->endGroup();
+    
+    _settings->beginGroup("gateway/attrs");
+    _settings->setValue("name", ui->sofiaGwNameEdit->text());
+    _settings->endGroup();
+
+
+    _settings->beginGroup("gateway/params");
+    _settings->setValue("username", ui->sofiaGwUsernameEdit->text());
+    _settings->setValue("realm", ui->sofiaGwRealmEdit->text());
+    _settings->setValue("password", ui->sofiaGwPasswordEdit->text());
+    _settings->setValue("expire-seconds", ui->sofiaGwExpireSecondsSpin->value());
+    _settings->setValue("register", ui->sofiaGwRegisterCombo->currentText());
+    _settings->setValue("register-transport", ui->sofiaGwRegisterTransportCombo->currentText());
+    _settings->setValue("retry-seconds", ui->sofiaGwRetrySecondsSpin->value());    
+    _settings->endGroup();
+
+    _settings->beginGroup("gateway/customParams");
+    for (int i = 0; i< ui->sofiaExtraParamTable->rowCount(); i++)
+    {
+        _settings->setValue(ui->sofiaExtraParamTable->item(i, 0)->text(),
+                            ui->sofiaExtraParamTable->item(i, 1)->text());
+    }
+    _settings->endGroup();
+
+    _settings->endGroup();
+
+    _settings->endGroup();
+
+    emit gwAdded(_accId);
+}
+
+void AccountDialog::clear()
+{
+    ui->sofiaExtraParamTable->clearContents();
+    ui->sofiaExtraParamTable->setRowCount(0);
+
+    ui->sofiaGwNameEdit->clear();
+    ui->sofiaGwUsernameEdit->clear();
+    ui->sofiaGwRealmEdit->clear();
+    ui->sofiaGwPasswordEdit->clear();
+    ui->sofiaGwExpireSecondsSpin->setValue(60);
+    ui->sofiaGwRegisterCombo->setCurrentIndex(0);
+    ui->sofiaGwRegisterTransportCombo->setCurrentIndex(0);
+    ui->sofiaGwRetrySecondsSpin->setValue(30);
+}
+
+void AccountDialog::setAccId(QString accId)
+{
+    _accId = accId;
+}
+
+void AccountDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.h (from rev 16612, freeswitch/trunk/fscomm/preferences/accountdialog.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,40 @@
+#ifndef ACCOUNTDIALOG_H
+#define ACCOUNTDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class AccountDialog;
+}
+
+class QSettings;
+
+class AccountDialog : public QDialog {
+    Q_OBJECT
+public:
+    AccountDialog(QString accId, QWidget *parent = 0);
+    ~AccountDialog();
+    void clear();
+    void setAccId(QString);
+    void readConfig();
+
+signals:
+    void gwAdded(QString);
+
+private slots:
+    void writeConfig();
+    void addExtraParam();
+    void remExtraParam();
+    void codecSettingsComboChanged(int);
+    void clidSettingsComboChanged(int);
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    QString _accId;
+    Ui::AccountDialog *ui;
+    QSettings *_settings;
+};
+
+#endif // ACCOUNTDIALOG_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.ui (from rev 16612, freeswitch/trunk/fscomm/preferences/accountdialog.ui) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.ui	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/accountdialog.ui	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AccountDialog</class>
+ <widget class="QDialog" name="AccountDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>389</width>
+    <height>427</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Account</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Basic</string>
+      </attribute>
+      <layout class="QFormLayout" name="formLayout">
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+       </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Account Name</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="sofiaGwNameEdit"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Usernane</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="sofiaGwUsernameEdit"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Domain</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="sofiaGwRealmEdit"/>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Password</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="sofiaGwPasswordEdit">
+         <property name="toolTip">
+          <string>Account password </string>
+         </property>
+         <property name="echoMode">
+          <enum>QLineEdit::Password</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>Expire</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="sofiaGwExpireSecondsSpin">
+         <property name="toolTip">
+          <string>Seconds before account expires</string>
+         </property>
+         <property name="value">
+          <number>60</number>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Register</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QComboBox" name="sofiaGwRegisterCombo">
+         <property name="toolTip">
+          <string>Account must register or must not register</string>
+         </property>
+         <item>
+          <property name="text">
+           <string>true</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>false</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>Transport</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QComboBox" name="sofiaGwRegisterTransportCombo">
+         <property name="toolTip">
+          <string>What transport to use for this account</string>
+         </property>
+         <item>
+          <property name="text">
+           <string>udp</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>tcp</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_13">
+         <property name="text">
+          <string>Retry</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QSpinBox" name="sofiaGwRetrySecondsSpin">
+         <property name="toolTip">
+          <string>How many seconds to retry registration</string>
+         </property>
+         <property name="value">
+          <number>30</number>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Codec Settings</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>CallerID Settings</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QComboBox" name="codecSettingsCombo">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <item>
+          <property name="text">
+           <string>Global</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Custom</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QComboBox" name="clidSettingsCombo">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <item>
+          <property name="text">
+           <string>Global</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Custom</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="codecPage">
+      <attribute name="title">
+       <string>Codecs</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="clidPage">
+      <attribute name="title">
+       <string>CallerID</string>
+      </attribute>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>CallerID Name:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="sofiaCallerIDName"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>CallerID Number:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="sofiaCallerIDNum"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QTableWidget" name="sofiaExtraParamTable">
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <column>
+          <property name="text">
+           <string>Param Name</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Param Value</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QPushButton" name="sofiaExtraParamAddBtn">
+           <property name="text">
+            <string>+</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="sofiaExtraParamRemBtn">
+           <property name="text">
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AccountDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>266</x>
+     <y>417</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AccountDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>334</x>
+     <y>417</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefaccounts.cpp (from rev 16612, freeswitch/trunk/fscomm/preferences/prefaccounts.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefaccounts.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefaccounts.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,168 @@
+#include <QtGui>
+#include "prefaccounts.h"
+#include "accountdialog.h"
+#include "fshost.h"
+
+PrefAccounts::PrefAccounts(Ui::PrefDialog *ui) :
+        _ui(ui)
+{
+    _settings = new QSettings();
+    _accDlg = NULL;
+    connect(_ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
+    connect(_ui->sofiaGwRemBtn, SIGNAL(clicked()), this, SLOT(remAccountBtnClicked()));
+    connect(_ui->sofiaGwEditBtn, SIGNAL(clicked()), this, SLOT(editAccountBtnClicked()));
+
+    _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
+}
+
+void PrefAccounts::addAccountBtnClicked()
+{
+    if (!_accDlg)
+    {
+        QString uuid;
+        if (g_FSHost.sendCmd("create_uuid", "", &uuid) != SWITCH_STATUS_SUCCESS)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create UUID for account. Reason: %s\n", uuid.toAscii().constData());
+            return;
+        }
+        _accDlg = new AccountDialog(uuid);
+        connect(_accDlg, SIGNAL(gwAdded(QString)), this, SLOT(readConfig()));
+    }
+    else
+    {
+        QString uuid;
+        if (g_FSHost.sendCmd("create_uuid", "", &uuid) != SWITCH_STATUS_SUCCESS)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create UUID for account. Reason: %s\n", uuid.toAscii().constData());
+            return;
+        }
+        _accDlg->setAccId(uuid);
+        _accDlg->clear();
+    }
+
+    _accDlg->show();
+    _accDlg->raise();
+    _accDlg->activateWindow();
+}
+
+void PrefAccounts::editAccountBtnClicked()
+{
+    QList<QTableWidgetSelectionRange> selList = _ui->accountsTable->selectedRanges();
+
+    if (selList.isEmpty())
+        return;
+    QTableWidgetSelectionRange range = selList[0];
+
+    QString uuid = _ui->accountsTable->item(range.topRow(),0)->data(Qt::UserRole).toString();
+
+    if (!_accDlg)
+    {
+        _accDlg = new AccountDialog(uuid);
+        connect(_accDlg, SIGNAL(gwAdded(QString)), this, SLOT(readConfig()));
+    }
+    else
+    {
+        _accDlg->setAccId(uuid);
+    }
+
+    _accDlg->readConfig();
+
+    _accDlg->show();
+    _accDlg->raise();
+    _accDlg->activateWindow();
+}
+
+void PrefAccounts::remAccountBtnClicked()
+{
+    QList<QTableWidgetSelectionRange> sel = _ui->accountsTable->selectedRanges();
+    int offset =0;
+
+    foreach(QTableWidgetSelectionRange range, sel)
+    {
+        for(int row = range.topRow(); row<=range.bottomRow(); row++)
+        {
+            QTableWidgetItem *item = _ui->accountsTable->item(row-offset,0);
+
+            _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+            _settings->remove(item->data(Qt::UserRole).toString());
+            _settings->endGroup();
+            /* Fire event to remove account */
+            switch_event_t *event;
+            if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FSCOMM_EVENT_ACC_REMOVED) == SWITCH_STATUS_SUCCESS) {
+                QSharedPointer<Account> acc = g_FSHost.getAccountByUUID(item->data(Qt::UserRole).toString());
+                if (!acc.isNull())
+                {
+                    QString res;
+                    QString arg = QString("profile softphone killgw %1").arg(acc.data()->getName());
+
+                    if (g_FSHost.sendCmd("sofia", arg.toAscii().data() , &res) != SWITCH_STATUS_SUCCESS)
+                    {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not killgw %s from profile softphone.\n",
+                                          acc.data()->getName().toAscii().data());
+                    }
+                }
+            }
+            _ui->accountsTable->removeRow(row-offset);
+            offset++;
+        }
+    }
+
+    if (offset > 0)
+        readConfig(false);
+}
+
+void PrefAccounts::writeConfig()
+{
+    return;
+}
+
+void PrefAccounts::readConfig(bool reload)
+{
+
+    _ui->accountsTable->clearContents();
+    _ui->accountsTable->setRowCount(0);
+
+    _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+    
+    foreach(QString accId, _settings->childGroups())
+    {
+        _settings->beginGroup(accId);
+        _settings->beginGroup("gateway/attrs");
+        QTableWidgetItem *item0 = new QTableWidgetItem(_settings->value("name").toString());
+        item0->setData(Qt::UserRole, accId);
+        _settings->endGroup();
+        _settings->beginGroup("gateway/params");
+        QTableWidgetItem *item1 = new QTableWidgetItem(_settings->value("username").toString());
+        item1->setData(Qt::UserRole, accId);
+        _settings->endGroup();
+        _settings->endGroup();
+        _ui->accountsTable->setRowCount(_ui->accountsTable->rowCount()+1);
+        _ui->accountsTable->setItem(_ui->accountsTable->rowCount()-1, 0, item0);
+        _ui->accountsTable->setItem(_ui->accountsTable->rowCount()-1, 1, item1);
+    }
+    _ui->accountsTable->resizeRowsToContents();
+    _ui->accountsTable->resizeColumnsToContents();
+    _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
+
+    _settings->endGroup();
+
+    if (reload)
+    {
+        QString res;
+        if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
+            return;
+        }
+    }
+
+    if (_ui->accountsTable->rowCount() == 1)
+    {
+        QString default_gateway = _settings->value(QString("/FreeSWITCH/conf/sofia.conf/profiles/profile/gateways/%1/gateway/attrs/name").arg(_ui->accountsTable->item(0,0)->data(Qt::UserRole).toString())).toString();
+        _settings->beginGroup("FreeSWITCH/conf/globals");
+        _settings->setValue("default_gateway", default_gateway);
+        _settings->endGroup();
+        switch_core_set_variable("default_gateway", default_gateway.toAscii().data());
+    }
+
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefaccounts.h (from rev 16612, freeswitch/trunk/fscomm/preferences/prefaccounts.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefaccounts.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefaccounts.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,32 @@
+#ifndef PREFACCOUNTS_H
+#define PREFACCOUNTS_H
+
+#include <QObject>
+#include "ui_prefdialog.h"
+
+#define FSCOMM_EVENT_ACC_REMOVED "fscomm::acc_removed"
+
+class QSettings;
+class AccountDialog;
+
+class PrefAccounts : public QObject {
+    Q_OBJECT
+public:
+    explicit PrefAccounts(Ui::PrefDialog *ui);
+    void writeConfig();
+
+public slots:
+    void readConfig(bool reload=true);
+
+private slots:
+    void addAccountBtnClicked();
+    void editAccountBtnClicked();
+    void remAccountBtnClicked();
+
+private:
+    Ui::PrefDialog *_ui;
+    AccountDialog *_accDlg;
+    QSettings *_settings;
+};
+
+#endif // PREFACCOUNTS_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.cpp (from rev 16612, freeswitch/trunk/fscomm/preferences/prefdialog.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,51 @@
+#include <QtGui>
+#include "prefdialog.h"
+#include "ui_prefdialog.h"
+#include "prefportaudio.h"
+#include "prefsofia.h"
+#include "prefaccounts.h"
+
+PrefDialog::PrefDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::PrefDialog)
+{
+    ui->setupUi(this);
+    _settings = new QSettings();
+    connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
+
+    _pref_accounts = new PrefAccounts(ui);
+    _mod_portaudio = new PrefPortaudio(ui, this);
+    _mod_sofia = new PrefSofia(ui, this);
+    readConfig();
+}
+
+PrefDialog::~PrefDialog()
+{
+    delete ui;
+}
+
+void PrefDialog::writeConfig()
+{    
+    _mod_portaudio->writeConfig();
+    _mod_sofia->writeConfig();
+
+}
+
+void PrefDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void PrefDialog::readConfig()
+{
+    _pref_accounts->readConfig();
+    _mod_portaudio->readConfig();
+    _mod_sofia->readConfig();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.h (from rev 16612, freeswitch/trunk/fscomm/preferences/prefdialog.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,39 @@
+#ifndef PREFDIALOG_H
+#define PREFDIALOG_H
+
+#include <QDialog>
+#include <QDomDocument>
+#include <QSettings>
+#include <fshost.h>
+
+class PrefPortaudio;
+class PrefSofia;
+class PrefAccounts;
+
+namespace Ui {
+    class PrefDialog;
+}
+
+class PrefDialog : public QDialog {
+    Q_OBJECT
+public:
+    PrefDialog(QWidget *parent = 0);
+    ~PrefDialog();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private slots:
+    void writeConfig();
+
+private:
+    void readConfig();
+    QSettings *_settings;
+    PrefAccounts *_pref_accounts;
+    Ui::PrefDialog *ui;
+    PrefPortaudio *_mod_portaudio;
+    PrefSofia *_mod_sofia;
+};
+
+
+#endif // PREFDIALOG_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.ui (from rev 16612, freeswitch/trunk/fscomm/preferences/prefdialog.ui) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.ui	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefdialog.ui	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,1074 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PrefDialog</class>
+ <widget class="QDialog" name="PrefDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>839</width>
+    <height>613</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Preferences</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="listSections">
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>120</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>96</width>
+       <height>84</height>
+      </size>
+     </property>
+     <property name="movement">
+      <enum>QListView::Static</enum>
+     </property>
+     <property name="flow">
+      <enum>QListView::LeftToRight</enum>
+     </property>
+     <property name="isWrapping" stdset="0">
+      <bool>true</bool>
+     </property>
+     <property name="spacing">
+      <number>12</number>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+     <item>
+      <property name="text">
+       <string>General</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_general.jpg</normaloff>:/images/pref_general.jpg</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Accounts</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_accounts.jpg</normaloff>:/images/pref_accounts.jpg</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Sofia</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>PortAudio</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="generalPage">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>User Information</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>CallerID Name:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="PaCallerIdNameEdit"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_14">
+            <property name="text">
+             <string>CallerID Number:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="PaCallerIdNumEdit"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="accountsPage">
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QTableWidget" name="accountsTable">
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <column>
+          <property name="text">
+           <string>Name</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Username</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_7">
+         <item>
+          <widget class="QPushButton" name="sofiaGwAddBtn">
+           <property name="text">
+            <string>Add</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="sofiaGwRemBtn">
+           <property name="text">
+            <string>Remove</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="sofiaGwEditBtn">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="text">
+            <string>Edit</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="sofiaPage">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QTabWidget" name="tabWidget">
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="tab">
+          <attribute name="title">
+           <string>General</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QGroupBox" name="groupBox">
+             <property name="title">
+              <string>Global</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>log-level</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QSpinBox" name="sofiaLogLevelSpin"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_2">
+                <property name="text">
+                 <string>auto-restart</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="sofiaAutoRestartCombo">
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_3">
+                <property name="text">
+                 <string>debug-presence</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QSpinBox" name="sofiaDebugPresenceSpin"/>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_15">
+                <property name="text">
+                 <string>rewrite-multicasted-fs-path</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QComboBox" name="sofiaRewriteMulticastedFsPathCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_6">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Profile</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_6">
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_4">
+                <property name="text">
+                 <string>user-agent-string</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QLineEdit" name="sofiaUserAgentStringEdit">
+                <property name="text">
+                 <string>FreeSWITCH/FSComm</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_26">
+                <property name="text">
+                 <string>hold-music</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="sofiaHoldMusicEdit">
+                <property name="text">
+                 <string>localstream://moh</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_16">
+                <property name="text">
+                 <string>context</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="sofiaContextEdit">
+                <property name="text">
+                 <string>public</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_19">
+                <property name="text">
+                 <string>dialplan</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="sofiaDialplanEdit">
+                <property name="text">
+                 <string>XML</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_2">
+          <attribute name="title">
+           <string>Network</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <widget class="QGroupBox" name="groupBox_2">
+             <property name="title">
+              <string>Softphone Profile</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_2">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_18">
+                <property name="text">
+                 <string>sip-port</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QSpinBox" name="sofiaSipPortSpin">
+                <property name="minimum">
+                 <number>1</number>
+                </property>
+                <property name="maximum">
+                 <number>65535</number>
+                </property>
+                <property name="value">
+                 <number>12345</number>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_22">
+                <property name="text">
+                 <string>use-rtp-timer</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="sofiaUseRtpTimerCombo">
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_24">
+                <property name="text">
+                 <string>rtp-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="sofiaRtpIpEdit">
+                <property name="text">
+                 <string>auto</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_25">
+                <property name="text">
+                 <string>sip-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="sofiaSipIpEdit">
+                <property name="text">
+                 <string>auto</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="label_27">
+                <property name="text">
+                 <string>apply-nat-acl</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <widget class="QLineEdit" name="sofiaApplyNatAclEdit">
+                <property name="text">
+                 <string>rfc1918</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="label_34">
+                <property name="text">
+                 <string>ext-rtp-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QLineEdit" name="sofiaExtRtpIpEdit">
+                <property name="text">
+                 <string>stun:stun.freeswitch.org</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="label_35">
+                <property name="text">
+                 <string>ext-sip-ip</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QLineEdit" name="sofiaExtSipIpEdit">
+                <property name="text">
+                 <string>stun:stun.freeswitch.org</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_4">
+          <attribute name="title">
+           <string>Codecs</string>
+          </attribute>
+          <layout class="QFormLayout" name="formLayout_7">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_21">
+             <property name="text">
+              <string>codec-prefs</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="sofiaCodecPrefsEdit">
+             <property name="text">
+              <string>CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_30">
+             <property name="text">
+              <string>inbound-codec-negotiation</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="sofiaInboundCodecNegotiationCombo">
+             <item>
+              <property name="text">
+               <string>generous</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>greedy</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_3">
+          <attribute name="title">
+           <string>Advanced</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_6">
+           <item>
+            <widget class="QGroupBox" name="groupBox_7">
+             <property name="title">
+              <string>Profile</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_8">
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_17">
+                <property name="text">
+                 <string>rfc2833-pt</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QLineEdit" name="sofiaRfc2833PtEdit">
+                <property name="text">
+                 <string>101</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_5">
+                <property name="text">
+                 <string>debug</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QSpinBox" name="sofiaDebugSpin"/>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_6">
+                <property name="text">
+                 <string>sip-trace</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QComboBox" name="sofiaSipTraceCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="label_20">
+                <property name="text">
+                 <string>dtmf-duration</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QSpinBox" name="sofiaDtmfDurationSpin">
+                <property name="maximum">
+                 <number>1000</number>
+                </property>
+                <property name="value">
+                 <number>100</number>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="label_23">
+                <property name="text">
+                 <string>rtp-timer-name</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <widget class="QLineEdit" name="sofiaRtpTimerNameEdit">
+                <property name="text">
+                 <string>soft</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="label_28">
+                <property name="text">
+                 <string>manage-presence</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QComboBox" name="sofiaManagePresenceCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="label_29">
+                <property name="text">
+                 <string>max-proceeding</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QSpinBox" name="sofiaMaxProceedingEdit">
+                <property name="value">
+                 <number>3</number>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="0">
+               <widget class="QLabel" name="label_31">
+                <property name="text">
+                 <string>nonce-ttl</string>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="1">
+               <widget class="QSpinBox" name="sofiaNonceTtlSpin">
+                <property name="value">
+                 <number>60</number>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="0">
+               <widget class="QLabel" name="label_36">
+                <property name="text">
+                 <string>rtp-timeout-sec</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="1">
+               <widget class="QSpinBox" name="sofiaRtpTimeoutSecSpin">
+                <property name="maximum">
+                 <number>1000</number>
+                </property>
+                <property name="value">
+                 <number>300</number>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="0">
+               <widget class="QLabel" name="label_37">
+                <property name="text">
+                 <string>rtp-hold-timeout-sec</string>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="1">
+               <widget class="QSpinBox" name="sofiaRtpHoldTimeoutSecSpin">
+                <property name="maximum">
+                 <number>5000</number>
+                </property>
+                <property name="value">
+                 <number>1800</number>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="0">
+               <widget class="QLabel" name="label_32">
+                <property name="text">
+                 <string>auth-calls</string>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="1">
+               <widget class="QComboBox" name="sofiaAuthCallsCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="11" column="0">
+               <widget class="QLabel" name="label_33">
+                <property name="text">
+                 <string>auth-all-packets</string>
+                </property>
+               </widget>
+              </item>
+              <item row="11" column="1">
+               <widget class="QComboBox" name="sofiaAuthAllPacketsCombo">
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="12" column="0">
+               <widget class="QLabel" name="label_38">
+                <property name="text">
+                 <string>disable-register</string>
+                </property>
+               </widget>
+              </item>
+              <item row="12" column="1">
+               <widget class="QComboBox" name="sofiaDisableRegisterCombo">
+                <item>
+                 <property name="text">
+                  <string>true</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>false</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="13" column="0">
+               <widget class="QLabel" name="label_39">
+                <property name="text">
+                 <string>challenge-realm</string>
+                </property>
+               </widget>
+              </item>
+              <item row="13" column="1">
+               <widget class="QComboBox" name="sofiaChallengeRealmCombo">
+                <item>
+                 <property name="text">
+                  <string>auto_from</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>auto_to</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="portaudioPage">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Devices</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>indev</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="PaIndevCombo"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>outdev</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QComboBox" name="PaOutdevCombo"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaOutdevTestBtn">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>86</width>
+                <height>27</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Test</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>rindgev</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QComboBox" name="PaRingdevCombo"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaRingdevTestBtn">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>86</width>
+                <height>27</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Test</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="3" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <item>
+             <widget class="QPushButton" name="PaLoopTestBtn">
+              <property name="text">
+               <string>Loop Test</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaRefreshDevListBtn">
+              <property name="text">
+               <string>Refresh DevList</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_40">
+            <property name="text">
+             <string>Sample Rate</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="PaSampleRateEdit">
+            <property name="text">
+             <string>16000</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_41">
+            <property name="text">
+             <string>Codec MS</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="PaCodecMSEdit">
+            <property name="text">
+             <string>10</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Files</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>ring-file</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLineEdit" name="PaRingFileEdit">
+              <property name="text">
+               <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaRingFileBtn">
+              <property name="text">
+               <string>Open</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>ring-interval</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="PaRingIntervalSpin">
+            <property name="value">
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>hold-file</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLineEdit" name="PaHoldFileEdit">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="PaHoldFileBtn">
+              <property name="text">
+               <string>Open</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PrefDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>544</x>
+     <y>224</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>246</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PrefDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>544</x>
+     <y>230</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>246</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>listSections</sender>
+   <signal>currentRowChanged(int)</signal>
+   <receiver>stackedWidget</receiver>
+   <slot>setCurrentIndex(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>180</x>
+     <y>83</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>524</x>
+     <y>102</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefportaudio.cpp (from rev 16612, freeswitch/trunk/fscomm/preferences/prefportaudio.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefportaudio.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefportaudio.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,353 @@
+#include <QtGui>
+#include <fshost.h>
+#include "prefportaudio.h"
+
+PrefPortaudio::PrefPortaudio(Ui::PrefDialog *ui, QObject *parent) :
+        QObject(parent),
+        _ui(ui)
+{
+    _settings = new QSettings();
+    connect(_ui->PaRingFileBtn, SIGNAL(clicked()), this, SLOT(ringFileChoose()));
+    connect(_ui->PaHoldFileBtn, SIGNAL(clicked()), this, SLOT(holdFileChoose()));
+    connect(_ui->PaIndevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(indevChangeDev(int)));
+    connect(_ui->PaOutdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(outdevChangeDev(int)));
+    connect(_ui->PaRingdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(ringdevChangeDev(int)));
+    connect(_ui->PaRingdevTestBtn, SIGNAL(clicked()), this, SLOT(ringdevTest()));
+    connect(_ui->PaLoopTestBtn, SIGNAL(clicked()), this, SLOT(loopTest()));
+    connect(_ui->PaRefreshDevListBtn, SIGNAL(clicked()), this, SLOT(refreshDevList()));
+}
+
+void PrefPortaudio::ringdevTest()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", QString("play %1/.fscomm/sounds/test.wav 0").arg(QDir::homePath()).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error testing ringdev on mod_portaudio! %s\n",
+                          result.toAscii().constData());
+    }
+}
+
+void PrefPortaudio::loopTest()
+{
+    QString result;
+    _ui->PaLoopTestBtn->setEnabled(false);
+    if (g_FSHost.sendCmd("pa", "looptest", &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running looptest on mod_portaudio! %s\n",
+                          result.toAscii().constData());
+    }
+    _ui->PaLoopTestBtn->setEnabled(true);
+}
+
+void PrefPortaudio::refreshDevList()
+{
+    QString result;
+    if (g_FSHost.sendCmd("pa", "rescan", &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error rescaning sound device on mod_portaudio! %s\n",
+                          result.toAscii().constData());
+    }
+    //clear combox
+    _ui->PaIndevCombo->clear();
+    _ui->PaOutdevCombo->clear();
+    _ui->PaRingdevCombo->clear();
+    getPaDevlist();
+}
+
+void PrefPortaudio::indevChangeDev(int index)
+{
+    QString result;
+    int dev = _ui->PaIndevCombo->itemData(index, Qt::UserRole).toInt();
+    if (g_FSHost.sendCmd("pa", QString("indev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting ringdev to #%d on mod_portaudio!\n", dev);
+        QMessageBox::critical(0, tr("Unable to change device."),
+                              tr("There was an error changing the ringdev.\nPlease report this bug."),
+                              QMessageBox::Ok);
+
+    }
+}
+
+void PrefPortaudio::ringdevChangeDev(int index)
+{
+    QString result;
+    int dev = _ui->PaRingdevCombo->itemData(index, Qt::UserRole).toInt();
+    if (g_FSHost.sendCmd("pa", QString("ringdev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting ringdev to #%d on mod_portaudio!\n", dev);
+        QMessageBox::critical(0, tr("Unable to change device."),
+                              tr("There was an error changing the ringdev.\nPlease report this bug."),
+                              QMessageBox::Ok);
+
+    }
+}
+
+void PrefPortaudio::outdevChangeDev(int index)
+{
+    QString result;
+    int dev = _ui->PaRingdevCombo->itemData(index, Qt::UserRole).toInt();
+    if (g_FSHost.sendCmd("pa", QString("outdev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting outdev to #%d on mod_portaudio!\n", dev);
+        QMessageBox::critical(0, tr("Unable to change device."),
+                              tr("There was an error changing the outdev.\nPlease report this bug."),
+                              QMessageBox::Ok);
+    }
+}
+
+void PrefPortaudio::holdFileChoose()
+{
+    QString fileName = QFileDialog::getOpenFileName(0,
+                                                    tr("Select file"),
+                                                    QDir::homePath(),
+                                                    NULL);
+    if (!fileName.isNull())
+        _ui->PaHoldFileEdit->setText(fileName);
+}
+
+void PrefPortaudio::ringFileChoose()
+{
+    QString fileName = QFileDialog::getOpenFileName(0,
+                                                    tr("Select file"),
+                                                    QDir::homePath(),
+                                                    NULL);
+    if (!fileName.isNull())
+        _ui->PaRingFileEdit->setText(fileName);
+}
+
+void PrefPortaudio::writeConfig()
+{
+    _settings->beginGroup("FreeSWITCH/conf");
+    _settings->beginGroup("portaudio.conf/settings/params");
+
+    QString cid_name = _settings->value("cid-name").toString();
+    QString ncid_name = _ui->PaCallerIdNameEdit->text();
+
+    QString cid_num = _settings->value("cid-num").toString();
+    QString ncid_num = _ui->PaCallerIdNumEdit->text();
+
+    QString hold_file = _settings->value("hold-file").toString();
+    QString nhold_file =  _ui->PaHoldFileEdit->text();
+
+    QString ring_file = _settings->value("ring-file").toString();
+    QString nring_file = _ui->PaRingFileEdit->text();
+
+    int ring_interval = _settings->value("ring-interval").toInt();
+    int nring_interval = _ui->PaRingIntervalSpin->value();
+
+    QString sample_rate = _settings->value("sample-rate").toString();
+    QString nsample_rate = _ui->PaSampleRateEdit->text();
+
+    QString codec_ms = _settings->value("codec-ms").toString();
+    QString ncodec_ms = _ui->PaCodecMSEdit->text();
+
+    QString result;
+
+    if (cid_name != ncid_name ||
+        cid_num != ncid_num ||
+        hold_file != nhold_file ||
+        ring_file != nring_file ||
+        ring_interval != nring_interval ||
+        sample_rate != nsample_rate||
+        codec_ms != ncodec_ms)
+    {
+        if (g_FSHost.sendCmd("reload", "mod_portaudio", &result) == SWITCH_STATUS_SUCCESS)
+        {
+            _settings->setValue("cid-name", ncid_name);
+            _settings->setValue("cid-num", ncid_num);
+            _settings->setValue("ring-file", nring_file);
+            _settings->setValue("ring-interval", nring_interval);
+            _settings->setValue("hold-file", nhold_file);
+            _settings->setValue("sample-rate", nsample_rate);
+            _settings->setValue("codec-ms", ncodec_ms);
+        }
+        else
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error while issuing reload command to mod_portaudio!\n");
+            QMessageBox::critical(0, tr("Unable to save settings"),
+                                  tr("There was an error saving your settings.\nPlease report this bug."),
+                                  QMessageBox::Ok);
+        }
+    }
+
+    int nindev = _ui->PaIndevCombo->itemData(_ui->PaIndevCombo->currentIndex(), Qt::UserRole).toInt();
+    int indev = _settings->value("indev").toInt();
+    int noutdev = _ui->PaOutdevCombo->itemData(_ui->PaOutdevCombo->currentIndex(), Qt::UserRole).toInt();
+    int outdev = _settings->value("outdev").toInt();
+    int nringdev = _ui->PaRingdevCombo->itemData(_ui->PaRingdevCombo->currentIndex(), Qt::UserRole).toInt();
+    int ringdev = _settings->value("ringdev").toInt();
+
+    if (nindev != indev)
+    {
+        if (g_FSHost.sendCmd("pa", QString("indev #%1").arg(nindev).toAscii().constData(), &result) == SWITCH_STATUS_SUCCESS)
+        {
+            _settings->setValue("indev", nindev);
+        }
+        else
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting indev from #%d to #%d on mod_portaudio!\n",
+                              indev, nindev);
+            QMessageBox::critical(0, tr("Unable to save settings"),
+                                  tr("There was an error changing the indev.\nPlease report this bug."),
+                                  QMessageBox::Ok);
+        }
+    }
+
+    if (noutdev!= outdev)
+    {
+        _settings->setValue("outdev", noutdev);
+    }
+    if (nringdev != ringdev)
+    {
+        _settings->setValue("ringdev", nringdev);
+    }
+
+    _settings->endGroup();
+    _settings->endGroup();
+}
+
+void PrefPortaudio::readConfig()
+{
+    getPaDevlist();
+    _settings->beginGroup("FreeSWITCH/conf");
+
+    _settings->beginGroup("portaudio.conf/settings/params");
+    _ui->PaCallerIdNameEdit->setText(_settings->value("cid-name").toString());
+    _ui->PaCallerIdNumEdit->setText(_settings->value("cid-num").toString());
+    _ui->PaHoldFileEdit->setText(_settings->value("hold-file").toString());
+    _ui->PaRingFileEdit->setText(_settings->value("ring-file").toString());
+    _ui->PaRingIntervalSpin->setValue(_settings->value("ring-interval").toInt());
+    _ui->PaSampleRateEdit->setText(_settings->value("sample-rate").toString());
+    _ui->PaCodecMSEdit->setText(_settings->value("codec-ms").toString());
+    _settings->endGroup();
+
+    _settings->endGroup();
+}
+
+void PrefPortaudio::getPaDevlist()
+{
+    QString result;
+    int errorLine, errorColumn;
+    QString errorMsg;
+
+    if (g_FSHost.sendCmd("pa", "devlist xml", &result) != SWITCH_STATUS_SUCCESS)
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error querying audio devices."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    if (!_xmlPaDevList.setContent(result, &errorMsg, &errorLine, &errorColumn))
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist.\n%1 (Line:%2, Col:%3).").arg(errorMsg,
+                                                                                                         errorLine,
+                                                                                                         errorColumn),
+                              QMessageBox::Ok);
+        return;
+    }
+    QDomElement root = _xmlPaDevList.documentElement();
+    if (root.tagName() != "xml")
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. Root tag is not <xml>."),
+                              QMessageBox::Ok);
+        return;
+    }
+    QDomElement devices = root.firstChildElement("devices");
+    if (devices.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There is no <devices> tag."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    QDomElement child = devices.firstChildElement();
+    if (child.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There is no <device> tag."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    while (!child.isNull())
+    {
+        if (child.tagName() == "device")
+        {
+            QString id, name, inputs, outputs;
+            id = child.attribute("id","-1");
+            name = child.attribute("name","Null");
+            inputs = child.attribute("inputs","0");
+            outputs = child.attribute("outputs","0");
+            if (inputs.toInt() != 0)
+                _ui->PaIndevCombo->addItem(name,id.toInt());
+            if (outputs.toInt() != 0)
+            {
+                _ui->PaOutdevCombo->addItem(name,id.toInt());
+                _ui->PaRingdevCombo->addItem(name,id.toInt());
+            }
+        }
+        child = child.nextSiblingElement();
+    }
+
+    QDomElement bindings = root.firstChildElement("bindings");
+    if (bindings.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There is no <bindings> tag."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    child = bindings.firstChildElement();
+    if (child.isNull())
+    {
+        QMessageBox::critical(0, tr("PortAudio error" ),
+                              tr("Error parsing output xml from pa devlist. There are no bindings."),
+                              QMessageBox::Ok);
+        return;
+    }
+
+    while (!child.isNull())
+    {
+        QString id = child.attribute("device","-1");
+        if (child.tagName() == "ring")
+        {
+            for(int itemId=0; itemId<_ui->PaRingdevCombo->count(); itemId++)
+            {
+                if (id == _ui->PaRingdevCombo->itemData(itemId,Qt::UserRole))
+                {
+                    //setCurrentIndex triggers currentIndexChanged signal, hmmm...
+                    _ui->PaRingdevCombo->setCurrentIndex(itemId);
+                    break;
+                }
+            }
+        }
+        else if (child.tagName() == "input")
+        {
+            for(int itemId=0; itemId<_ui->PaRingdevCombo->count(); itemId++)
+            {
+                if (id == _ui->PaIndevCombo->itemData(itemId,Qt::UserRole))
+                {
+                    _ui->PaIndevCombo->setCurrentIndex(itemId);
+                    break;
+                }
+            }
+        }
+        else if (child.tagName() == "output")
+            for(int itemId=0; itemId<_ui->PaOutdevCombo->count(); itemId++)
+            {
+                if (id == _ui->PaOutdevCombo->itemData(itemId,Qt::UserRole))
+                {
+                    _ui->PaOutdevCombo->setCurrentIndex(itemId);
+                    break;
+                }
+            }
+
+        child = child.nextSiblingElement();
+    }
+
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefportaudio.h (from rev 16612, freeswitch/trunk/fscomm/preferences/prefportaudio.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefportaudio.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefportaudio.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,34 @@
+#ifndef PREFPORTAUDIO_H
+#define PREFPORTAUDIO_H
+
+#include <QObject>
+#include <QDomDocument>
+#include "ui_prefdialog.h"
+
+class QSettings;
+
+class PrefPortaudio : public QObject
+{
+Q_OBJECT
+public:
+    explicit PrefPortaudio(Ui::PrefDialog *ui, QObject *parent = 0);
+    void writeConfig();
+    void readConfig();
+
+private slots:
+    void ringFileChoose();
+    void holdFileChoose();
+    void indevChangeDev(int);
+    void outdevChangeDev(int);
+    void ringdevChangeDev(int);
+    void ringdevTest();
+    void loopTest();
+    void refreshDevList();
+private:
+    void getPaDevlist(void);
+    QSettings *_settings;
+    Ui::PrefDialog *_ui;
+    QDomDocument _xmlPaDevList;
+};
+
+#endif // PREFPORTAUDIO_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefsofia.cpp (from rev 16612, freeswitch/trunk/fscomm/preferences/prefsofia.cpp) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefsofia.cpp	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefsofia.cpp	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,129 @@
+#include <QtGui>
+#include <fshost.h>
+#include "prefsofia.h"
+
+PrefSofia::PrefSofia(Ui::PrefDialog *ui, QObject *parent) :
+        QObject(parent),
+        _ui(ui)
+{
+}
+
+void PrefSofia::readConfig()
+{
+    QSettings settings;
+    int guess_mask;
+    char guess_ip[80];
+    switch_find_local_ip(guess_ip, sizeof(guess_ip), &guess_mask, AF_INET);
+    _ui->sofiaRtpIpEdit->setText(QString(guess_ip));
+    _ui->sofiaSipIpEdit->setText(QString(guess_ip));
+
+    settings.beginGroup("FreeSWITCH/conf");
+    settings.beginGroup("sofia.conf");
+
+    /* General Settings */
+    settings.beginGroup("global_settings/params");
+    _ui->sofiaLogLevelSpin->setValue(settings.value("log-level").toInt());
+    _ui->sofiaAutoRestartCombo->setCurrentIndex(_ui->sofiaAutoRestartCombo->findText(settings.value("auto-restart").toString()));
+    _ui->sofiaDebugPresenceSpin->setValue(settings.value("debug-presence").toInt());
+    _ui->sofiaRewriteMulticastedFsPathCombo->setCurrentIndex(_ui->sofiaRewriteMulticastedFsPathCombo->findText(settings.value("rewrite-multicasted-fs-path").toString()));
+    settings.endGroup();
+
+    /* Profile settings */
+    settings.beginGroup("profiles");
+    settings.beginGroup("profile");
+
+
+    settings.beginGroup("settings/params");
+    _ui->sofiaUserAgentStringEdit->setText(settings.value("user-agent-string").toString());
+    _ui->sofiaDebugSpin->setValue(settings.value("debug").toInt());
+    _ui->sofiaSipTraceCombo->setCurrentIndex(_ui->sofiaSipTraceCombo->findText(settings.value("sip-trace").toString()));
+    _ui->sofiaContextEdit->setText(settings.value("context").toString());
+    _ui->sofiaRfc2833PtEdit->setText(settings.value("rfc2833-pt").toString());
+    _ui->sofiaSipPortSpin->setValue(settings.value("sip-port").toInt());
+    _ui->sofiaDialplanEdit->setText(settings.value("dialplan").toString());
+    _ui->sofiaDtmfDurationSpin->setValue(settings.value("dtmf-duration").toInt());
+    _ui->sofiaCodecPrefsEdit->setText(settings.value("codec-prefs").toString());
+    _ui->sofiaUseRtpTimerCombo->setCurrentIndex(_ui->sofiaUseRtpTimerCombo->findText(settings.value("use-rtp-timer").toString()));
+    _ui->sofiaRtpTimerNameEdit->setText(settings.value("rtp-timer-name").toString());
+    _ui->sofiaRtpIpEdit->setText(settings.value("rtp-ip").toString());
+    _ui->sofiaSipIpEdit->setText(settings.value("sip-ip").toString());
+    _ui->sofiaHoldMusicEdit->setText(settings.value("hold-music").toString());
+    _ui->sofiaApplyNatAclEdit->setText(settings.value("apply-nat-acl").toString());
+    _ui->sofiaManagePresenceCombo->setCurrentIndex(_ui->sofiaManagePresenceCombo->findText(settings.value("manage-presence").toString()));
+    _ui->sofiaMaxProceedingEdit->setValue(settings.value("max-proceeding").toInt());
+    _ui->sofiaInboundCodecNegotiationCombo->setCurrentIndex(_ui->sofiaInboundCodecNegotiationCombo->findText(settings.value("inbound-codec-negotiation").toString()));
+    _ui->sofiaNonceTtlSpin->setValue(settings.value("nonce-ttl").toInt());
+    _ui->sofiaAuthCallsCombo->setCurrentIndex(_ui->sofiaAuthCallsCombo->findText(settings.value("auth-calls").toString()));
+    _ui->sofiaAuthAllPacketsCombo->setCurrentIndex(_ui->sofiaAuthAllPacketsCombo->findText(settings.value("auth-all-packets").toString()));
+    _ui->sofiaExtRtpIpEdit->setText(settings.value("ext-rtp-ip").toString());
+    _ui->sofiaExtSipIpEdit->setText(settings.value("ext-sip-ip").toString());
+    _ui->sofiaRtpTimeoutSecSpin->setValue(settings.value("rtp-timeout-sec").toInt());
+    _ui->sofiaRtpHoldTimeoutSecSpin->setValue(settings.value("rtp-hold-timeout-sec").toInt());
+    _ui->sofiaDisableRegisterCombo->setCurrentIndex(_ui->sofiaDisableRegisterCombo->findText(settings.value("disable-register").toString()));
+    _ui->sofiaChallengeRealmCombo->setCurrentIndex(_ui->sofiaChallengeRealmCombo->findText(settings.value("challenge-realm").toString()));
+    settings.endGroup();
+
+    settings.endGroup();
+    settings.endGroup();
+    settings.endGroup();
+    settings.endGroup();
+
+}
+
+void PrefSofia::writeConfig()
+{
+    QSettings settings;
+    settings.beginGroup("FreeSWITCH/conf");
+    settings.beginGroup("sofia.conf");
+
+    /* General Settings */
+    settings.beginGroup("global_settings/params");
+    settings.setValue("log-level", _ui->sofiaLogLevelSpin->value());
+    settings.setValue("auto-restart", _ui->sofiaAutoRestartCombo->currentText());
+    settings.setValue("debug-presence", _ui->sofiaDebugPresenceSpin->value());
+    settings.setValue("rewrite-multicasted-fs-path", _ui->sofiaRewriteMulticastedFsPathCombo->currentText());
+    settings.endGroup();
+
+    /* Profile settings */
+    settings.beginGroup("profiles");
+    settings.beginGroup("profile");
+
+    settings.beginGroup("attrs");
+    settings.setValue("name", "softphone");
+    settings.endGroup();
+
+    settings.beginGroup("settings/params");
+    settings.setValue("user-agent-string", _ui->sofiaUserAgentStringEdit->text());
+    settings.setValue("debug", _ui->sofiaDebugSpin->value());
+    settings.setValue("sip-trace", _ui->sofiaSipTraceCombo->currentText());
+    settings.setValue("context", _ui->sofiaContextEdit->text());
+    settings.setValue("rfc2833-pt", _ui->sofiaRfc2833PtEdit->text());
+    settings.setValue("sip-port", _ui->sofiaSipPortSpin->value());
+    settings.setValue("dialplan", _ui->sofiaDialplanEdit->text());
+    settings.setValue("dtmf-duration", _ui->sofiaDtmfDurationSpin->value());
+    settings.setValue("codec-prefs", _ui->sofiaCodecPrefsEdit->text());
+    settings.setValue("use-rtp-timer", _ui->sofiaUseRtpTimerCombo->currentText());
+    settings.setValue("rtp-timer-name", _ui->sofiaRtpTimerNameEdit->text());
+    settings.setValue("rtp-ip", _ui->sofiaRtpIpEdit->text());
+    settings.setValue("sip-ip", _ui->sofiaSipIpEdit->text());
+    settings.setValue("hold-music", _ui->sofiaHoldMusicEdit->text());
+    settings.setValue("apply-nat-acl", _ui->sofiaApplyNatAclEdit->text());
+    settings.setValue("manage-presence", _ui->sofiaManagePresenceCombo->currentText());
+    settings.setValue("max-proceeding", _ui->sofiaMaxProceedingEdit->text());
+    settings.setValue("inbound-codec-negotiation", _ui->sofiaInboundCodecNegotiationCombo->currentText());
+    settings.setValue("nonce-ttl", _ui->sofiaNonceTtlSpin->value());
+    settings.setValue("auth-calls", _ui->sofiaAuthCallsCombo->currentText());
+    settings.setValue("auth-all-packets", _ui->sofiaAuthAllPacketsCombo->currentText());
+    settings.setValue("ext-rtp-ip", _ui->sofiaExtRtpIpEdit->text());
+    settings.setValue("ext-sip-ip", _ui->sofiaExtSipIpEdit->text());
+    settings.setValue("rtp-timeout-sec", _ui->sofiaRtpTimeoutSecSpin->value());
+    settings.setValue("rtp-hold-timeout-sec", _ui->sofiaRtpHoldTimeoutSecSpin->value());
+    settings.setValue("disable-register", _ui->sofiaDisableRegisterCombo->currentText());
+    settings.setValue("challenge-realm", _ui->sofiaChallengeRealmCombo->currentText());
+    settings.endGroup();
+
+    settings.endGroup();
+    settings.endGroup();
+    settings.endGroup();
+    settings.endGroup();
+}

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefsofia.h (from rev 16612, freeswitch/trunk/fscomm/preferences/prefsofia.h) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefsofia.h	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/preferences/prefsofia.h	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,20 @@
+#ifndef PREFSOFIA_H
+#define PREFSOFIA_H
+
+#include <QObject>
+#include "ui_prefdialog.h"
+
+class PrefSofia : public QObject
+{
+Q_OBJECT
+public:
+    explicit PrefSofia(Ui::PrefDialog *ui, QObject *parent = 0);
+    void writeConfig();
+    void readConfig();
+
+private:
+    Ui::PrefDialog *_ui;
+
+};
+
+#endif // PREFSOFIA_H

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/resources (from rev 16612, freeswitch/trunk/fscomm/resources)

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/resources.qrc (from rev 16612, freeswitch/trunk/fscomm/resources.qrc) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/resources.qrc	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/fscomm/resources.qrc	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1,16 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="splash.png">resources/splash.png</file>
+        <file alias="pref_sip.png">resources/pref_sip.png</file>
+        <file alias="pref_audio.gif">resources/pref_audio.gif</file>
+        <file alias="pref_general.jpg">resources/pref_general.jpg</file>
+        <file alias="pref_accounts.jpg">resources/pref_accounts.jpg</file>
+        <file alias="taskbar_icon.png">resources/taskbar_icon.png</file>
+    </qresource>
+    <qresource prefix="/confs">
+        <file alias="freeswitch.xml">conf/freeswitch.xml</file>
+    </qresource>
+    <qresource prefix="/sounds">
+        <file alias="test.wav">resources/test.wav</file>
+    </qresource>
+</RCC>

Copied: freeswitch/branches/joshrivers/mod_managed_working_branch/libs/broadvoice/test-data/readme.txt (from rev 16612, freeswitch/trunk/libs/broadvoice/test-data/readme.txt) (0 => 16614)

--- freeswitch/branches/joshrivers/mod_managed_working_branch/libs/broadvoice/test-data/readme.txt	                        (rev 0)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/libs/broadvoice/test-data/readme.txt	2010-02-12 00:54:22 UTC (rev 16614)
@@ -0,0 +1 @@
+Test data is located at http://files.freeswitch.org/broadvoice/test-data.tar.gz