[Freeswitch-branches] [commit] r8663 - in freeswitch/branches/lukedashjr/syslibs: freeswitch freeswitch/build freeswitch/build/config freeswitch/conf/autoload_configs freeswitch/conf/dialplan freeswitch/conf/lang/en freeswitch/conf/lang/en/demo freeswitch/conf/sip_profiles freeswitch/debian freeswitch/scripts/contrib/jpalley/telegraph freeswitch/scripts/contrib/jpalley/telegraph/trunk freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/templates freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model freeswitch/scripts/contrib/jpalley/telegraph/trunk/test freeswitch/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands freeswitch/src freeswitch/src/include freeswitch/src/mod/applications/mod_commands freeswitch/src/mod/applications/mod_conference freeswitch/src/mod/applications/mod_dptools freeswitch/src/mod/applications/mod_fifo freeswitch/src/mod/applications/mod_voicemail freeswitch/src/mod/endpoints/mod_alsa freeswitch/src/mod/endpoints/mod_portaudio freeswitch/src/mod/endpoints/mod_sofia freeswitch/src/mod/endpoints/mod_woomera freeswitch/src/mod/formats/mod_local_stream freeswitch/src/mod/formats/mod_shout freeswitch/src/mod/formats/mod_sndfile freeswitch/src/mod/languages/mod_java freeswitch/src/mod/languages/mod_java/src/org/freeswitch/swig freeswitch/src/mod/languages/mod_lua freeswitch/src/mod/languages/mod_mono freeswitch/src/mod/languages/mod_mono_managed freeswitch/src/mod/languages/mod_mono_managed/Properties freeswitch/src/mod/languages/mod_mono_managed/swig freeswitch/src/mod/languages/mod_perl freeswitch/src/mod/languages/mod_spidermonkey freeswitch/src/mod/xml_int/mod_xml_cdr freeswitch/src/mod/xml_int/mod_xml_rpc libs/sofia-sip libs/sofia-sip/libsofia-sip-ua/docs libs/sofia-sip/libsofia-sip-ua/http libs/sofia-sip/libsofia-sip-ua/iptsec libs/sofia-sip/libsofia-sip-ua/msg libs/sofia-sip/libsofia-sip-ua/nea libs/sofia-sip/libsofia-sip-ua/nta libs/sofia-sip/libsofia-sip-ua/nua libs/sofia-sip/libsofia-sip-ua/sdp libs/sofia-sip/libsofia-sip-ua/sip libs/sofia-sip/libsofia-sip-ua/soa libs/sofia-sip/libsofia-sip-ua/sresolv libs/sofia-sip/libsofia-sip-ua/stun libs/sofia-sip/libsofia-sip-ua/su libs/sofia-sip/libsofia-sip-ua/su/sofia-sip libs/sofia-sip/libsofia-sip-ua/tport libs/sofia-sip/open_c/group libs/sofia-sip/tests libs/sofia-sip/win32/libsofia-sip-ua libs/sofia-sip/win32/tests/test_nua libs/xmlrpc-c libs/xmlrpc-c/Windows libs/xmlrpc-c/Windows/xmlrpc-c libs/xmlrpc-c/doc libs/xmlrpc-c/examples libs/xmlrpc-c/examples/cpp libs/xmlrpc-c/include libs/xmlrpc-c/include/xmlrpc-c libs/xmlrpc-c/lib libs/xmlrpc-c/lib/abyss libs/xmlrpc-c/lib/abyss/example libs/xmlrpc-c/lib/abyss/example/conf libs/xmlrpc-c/lib/abyss/example/htdocs libs/xmlrpc-c/lib/abyss/src libs/xmlrpc-c/lib/curl_transport libs/xmlrpc-c/lib/expat libs/xmlrpc-c/lib/expat/gennmtab libs/xmlrpc-c/lib/expat/xmlparse libs/xmlrpc-c/lib/expat/xmltok libs/xmlrpc-c/lib/expat/xmlwf libs/xmlrpc-c/lib/libutil libs/xmlrpc-c/lib/libwww_transport libs/xmlrpc-c/lib/util libs/xmlrpc-c/lib/util/include libs/xmlrpc-c/lib/wininet_transport libs/xmlrpc-c/src libs/xmlrpc-c/src/cpp libs/xmlrpc-c/src/cpp/test libs/xmlrpc-c/src/test libs/xmlrpc-c/src/test/data libs/xmlrpc-c/tools libs/xmlrpc-c/tools/lib libs/xmlrpc-c/tools/lib/include libs/xmlrpc-c/tools/perl_packetsocket libs/xmlrpc-c/tools/turbocharger libs/xmlrpc-c/tools/xml-rpc-api2cpp libs/xmlrpc-c/tools/xmlrpc libs/xmlrpc-c/tools/xmlrpc_cpp_proxy libs/xmlrpc-c/tools/xmlrpc_pstream libs/xmlrpc-c/tools/xmlrpc_transport

Freeswitch SVN lukedashjr at freeswitch.org
Mon May 26 12:59:59 EDT 2008


Author: lukedashjr
Date: Mon May 26 12:59:57 2008
New Revision: 8663

Added:
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/README
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/README
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/Rakefile
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/Rakefile
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/routes.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/routes.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/voice_events.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/voice_events.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/voice_events_controller_generator.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/voice_events_controller_generator.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/templates/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/templates/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/templates/model.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/templates/model.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/voice_model_generator.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_model/voice_model_generator.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/init.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/init.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/install.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/install.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/logger_overide.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/logger_overide.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/script_base.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/script_base.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/telegraph.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/telegraph.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/router.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/router.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/voice_events_base.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/voice_events_base.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/action_controller_extensions.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/action_controller_extensions.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/dispatcher.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/dispatcher.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/interface.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/interface.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/request.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/request.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/response.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/response.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/template.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/template.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_events_server.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_events_server.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_channel_model.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_channel_model.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_conference_model.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_conference_model.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_connector.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_connector.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_sip_model.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_sip_model.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_interface.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_interface.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_server.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_server.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/telegraph.yml
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/telegraph.yml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/voice_events
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/voice_events
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/lib/voice_view
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/voice_view
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/license.txt
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/license.txt
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/test/
      - copied from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/test/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/test/ami_test.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/test/ami_test.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/jpalley/telegraph/trunk/test/rai_test.rb
      - copied unchanged from r8662, /freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/test/rai_test.rb
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/
      - copied from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/freeswitch.i
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/freeswitch.i
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/freeswitch_mono.cpp
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.cpp
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/freeswitch_mono.h
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/freeswitch_wrap.cxx
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_wrap.cxx
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/mod_mono.cpp
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/mod_mono.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.vcproj
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/runswig.cmd
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/runswig.cmd
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono/switch_platform.i
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono/switch_platform.i
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/
      - copied from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/ApiFunction.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/ApiFunction.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/AppFunction.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/AppFunction.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/Demo.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/Demo.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/Extensions.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/Extensions.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/Loader.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/Loader.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/Log.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/Log.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/MonoSession.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/MonoSession.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/Properties/
      - copied from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/Properties/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/Properties/AssemblyInfo.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/Properties/AssemblyInfo.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/mod_mono_managed.csproj
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/mod_mono_managed.csproj
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/
      - copied from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/Api.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/Api.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/CoreSession.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/CoreSession.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/Event.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/Event.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/IvrMenu.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/IvrMenu.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/MonoSession.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/MonoSession.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_FILE.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_FILE.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_HashElem.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_HashElem.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_apr_pool_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_apr_pool_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_char_enum_switch_management_action_t_p_char_switch_size_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_char_enum_switch_management_action_t_p_char_switch_size_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_switch_event_t_p_void__p_switch_xml.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_switch_event_t_p_void__p_switch_xml.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_q_const__char_p_switch_core_session_p_switch_stream_handle__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_q_const__char_p_switch_core_session_p_switch_stream_handle__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_q_const__switch_log_node_t_enum_switch_log_level_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_q_const__switch_log_node_t_enum_switch_log_level_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_enum_switch_asr_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_enum_switch_asr_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_p_char_p_enum_switch_asr_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_p_char_p_enum_switch_asr_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_int_p_q_const__char_p_enum_switch_asr_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_int_p_q_const__char_p_enum_switch_asr_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_p_q_const__char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_p_q_const__char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_void_unsigned_int_p_enum_switch_asr_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_asr_handle_p_void_unsigned_int_p_enum_switch_asr_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_codec__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_codec__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_codec_enum_switch_codec_flag_t_p_q_const__switch_codec_settings__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_codec_enum_switch_codec_flag_t_p_q_const__switch_codec_settings__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_codec_p_switch_codec_p_void_unsigned_long_unsigned_long_p_void_p_unsigned_long_p_unsigned_long_p_unsigned_int__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_codec_p_switch_codec_p_void_unsigned_long_unsigned_long_p_void_p_unsigned_long_p_unsigned_long_p_unsigned_int__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_int__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_int__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_char_enum_switch_say_type_t_enum_switch_say_method_t_p_switch_input_args_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_char_enum_switch_say_type_t_enum_switch_say_method_t_p_switch_input_args_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_p_switch_frame_enum_switch_io_flag_t_int__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_p_switch_frame_enum_switch_io_flag_t_int__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_q_const__char__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_q_const__char__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t_enum_switch_dtmf_direction_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t_enum_switch_dtmf_direction_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_core_session_message__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_core_session_message__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_event__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_event__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_profile_p_p_switch_core_session_p_p_apr_pool_t_enum_switch_originate_flag_t__switch_call_cause_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_profile_p_p_switch_core_session_p_p_apr_pool_t_enum_switch_originate_flag_t__switch_call_cause_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_profile_p_switch_core_session_enum_switch_originate_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_profile_p_switch_core_session_enum_switch_originate_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_enum_switch_io_flag_t_int__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_enum_switch_io_flag_t_int__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_p_void__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_p_void__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_void_enum_switch_input_type_t_p_void_unsigned_int__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_p_void_enum_switch_input_type_t_p_void_unsigned_int__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_t_p_void_p_switch_caller_profile_t__p_switch_caller_extension.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_core_session_t_p_void_p_switch_caller_profile_t__p_switch_caller_extension.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char_p_char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char_p_char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle_p_p_char_p_p_char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_directory_handle_p_p_char_p_p_char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_event__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_event__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_p_q_const__char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_p_q_const__char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_q_const__char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_q_const__char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_p_q_const__char__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_p_q_const__char__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_p_unsigned_int_long_long_int__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_p_unsigned_int_long_long_int__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_p_void_p_switch_size_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_file_handle_p_void_p_switch_size_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__switch_bool_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__switch_bool_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_rtp_p_switch_socket_t_p_void_switch_size_t_p_switch_sockaddr_t__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_rtp_p_switch_socket_t_p_void_switch_size_t_p_switch_sockaddr_t__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_scheduler_task__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_scheduler_task__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_double__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_double__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_int__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_int__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_enum_switch_speech_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_enum_switch_speech_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_q_const__char__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_q_const__char__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_enum_switch_speech_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_enum_switch_speech_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_enum_switch_speech_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_enum_switch_speech_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_enum_switch_speech_flag_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsigned_long_p_enum_switch_speech_flag_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_stream_handle_p_q_const__char_v_______switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_stream_handle_p_q_const__char_v_______switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_stream_handle_p_unsigned_char_switch_size_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_stream_handle_p_unsigned_char_switch_size_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_timer__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_timer__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_timer_enum_switch_bool_t__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_switch_timer_enum_switch_bool_t__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_void__void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_void__void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_void__switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_f_void__switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_float.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_float.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_in_addr.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_in_addr.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_int.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_int.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_apr_pool_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_apr_pool_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_char.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_char.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_p_char.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_p_char.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_real_pcre.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_real_pcre.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_sqlite3.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_sqlite3.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_sqlite3_stmt.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_sqlite3_stmt.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_audio_resampler_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_audio_resampler_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_buffer.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_buffer.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_channel.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_channel.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_core_port_allocator.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_core_port_allocator.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_core_session.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_core_session.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_core_session_message.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_core_session_message.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_event.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_event.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_frame.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_frame.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_hash.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_hash.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_digit_stream.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_digit_stream.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_digit_stream_parser.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_digit_stream_parser.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_menu.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_menu.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_menu_xml_ctx.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_ivr_menu_xml_ctx.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_media_bug.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_media_bug.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_network_list.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_network_list.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_rtp.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_rtp.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_xml.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_switch_xml.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_p_void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_real_pcre.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_real_pcre.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_short.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_short.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_sqlite3.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_sqlite3.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_sqlite3_stmt.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_sqlite3_stmt.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_asr_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_asr_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_buffer.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_buffer.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_call_cause_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_call_cause_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_channel.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_channel.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_core_port_allocator.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_core_port_allocator.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_core_session.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_core_session.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_event_types_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_event_types_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_file_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_file_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_frame_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_frame_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_hash.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_hash.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_action_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_action_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_digit_stream.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_digit_stream.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_digit_stream_parser.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_digit_stream_parser.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_menu.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_menu.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_menu_action_function_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_menu_action_function_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_menu_xml_ctx.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ivr_menu_xml_ctx.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_loadable_module_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_loadable_module_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_media_bug.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_media_bug.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_mutex_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_mutex_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_network_list.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_network_list.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_pollfd_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_pollfd_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_rtp.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_rtp.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_size_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_size_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_sockaddr_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_sockaddr_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_socket_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_socket_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_speech_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_speech_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ssize_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_ssize_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_time_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_switch_time_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_time_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_time_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_char.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_char.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_int.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_int.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_long.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_long.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_short.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_unsigned_short.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_void.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/SWIGTYPE_p_void.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/Stream.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/Stream.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/freeswitch.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/freeswitch.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/freeswitchPINVOKE.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/freeswitchPINVOKE.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/freeswitchPINVOKE_fixed.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/freeswitchPINVOKE_fixed.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/input_callback_state_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/input_callback_state_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/session_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/session_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_abc_type_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_abc_type_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_api_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_api_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_app_log.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_app_log.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_application_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_application_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_application_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_application_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_asr_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_asr_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_asr_handle.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_asr_handle.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_asr_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_asr_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_audio_col_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_audio_col_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_audio_resampler_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_audio_resampler_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_bind_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_bind_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_bitpack_mode_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_bitpack_mode_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_bitpack_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_bitpack_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_bool_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_bool_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_call_cause_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_call_cause_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_caller_application.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_caller_application.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_caller_extension.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_caller_extension.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_caller_profile.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_caller_profile.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_caller_profile_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_caller_profile_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_channel_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_channel_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_channel_state_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_channel_state_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_channel_timetable.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_channel_timetable.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_chat_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_chat_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_codec.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_codec.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_codec_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_codec_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_codec_implementation.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_codec_implementation.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_codec_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_codec_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_codec_settings.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_codec_settings.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_codec_type_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_codec_type_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_config.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_config.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_core_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_core_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_core_session_message.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_core_session_message.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_core_session_message_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_core_session_message_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_core_session_message_types_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_core_session_message_types_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_core_thread_session.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_core_thread_session.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_core_time_duration.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_core_time_duration.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_dialplan_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_dialplan_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_directories.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_directories.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_directory_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_directory_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_directory_handle.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_directory_handle.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_directory_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_directory_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_dtmf_direction_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_dtmf_direction_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_dtmf_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_dtmf_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_eavesdrop_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_eavesdrop_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_endpoint_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_endpoint_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_event.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_event.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_event_header.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_event_header.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_event_node.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_event_node.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_event_subclass.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_event_subclass.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_event_types_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_event_types_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_file_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_file_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_file_handle.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_file_handle.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_file_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_file_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_frame.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_frame.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_frame_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_frame_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_input_args_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_input_args_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_input_type_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_input_type_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_kill_channel.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_kill_channel.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_outgoing_channel.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_outgoing_channel.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_read_frame.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_read_frame.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_receive_event.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_receive_event.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_receive_message.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_receive_message.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_recv_dtmf.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_recv_dtmf.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_resurrect_session.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_resurrect_session.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_send_dtmf.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_send_dtmf.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_state_change.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_state_change.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_video_read_frame.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_video_read_frame.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_video_write_frame.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_video_write_frame.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_write_frame.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hook_write_frame.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_event_hooks.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_event_hooks.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_routine_name_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_routine_name_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_io_routines.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_io_routines.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_ivr_action_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_ivr_action_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_ivr_menu_flags.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_ivr_menu_flags.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_ivr_option_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_ivr_option_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_loadable_module_function_table_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_loadable_module_function_table_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_log_level_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_log_level_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_log_node_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_log_node_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_management_action_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_management_action_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_management_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_management_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_media_bug_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_media_bug_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_media_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_media_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_module_interface_name_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_module_interface_name_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_originate_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_originate_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_port_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_port_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_priority_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_priority_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_rtp_crypto_direction_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_rtp_crypto_direction_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_rtp_crypto_key.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_rtp_crypto_key.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_rtp_crypto_key_type_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_rtp_crypto_key_type_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_rtp_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_rtp_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_rtp_hdr_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_rtp_hdr_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_say_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_say_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_say_method_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_say_method_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_say_type_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_say_type_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_scheduler_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_scheduler_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_scheduler_task.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_scheduler_task.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_session_ctl_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_session_ctl_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_signal_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_signal_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_speech_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_speech_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_speech_handle.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_speech_handle.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_speech_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_speech_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_stack_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_stack_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_state_handler_name_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_state_handler_name_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_state_handler_table.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_state_handler_table.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_status_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_status_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_stream_handle.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_stream_handle.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_text_channel_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_text_channel_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_timer.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_timer.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_timer_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_timer_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_timer_func_name_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_timer_func_name_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_timer_interface.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_timer_interface.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_unicast_conninfo.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_unicast_conninfo.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_unicast_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_unicast_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_vad_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_vad_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_xml.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_xml.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_xml_flag_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_xml_flag_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swig/switch_xml_section_t.cs
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swig/switch_xml_section_t.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_mono_managed/swigStringFix.exe
      - copied unchanged from r8662, /freeswitch/trunk/src/mod/languages/mod_mono_managed/swigStringFix.exe
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Makefile.srcdir.in
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Makefile.srcdir.in
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Makefile.version
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Makefile.version
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/CleanAll.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/CleanAll.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/CleanWin32.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/CleanWin32.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ReadMeOld.txt
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/ReadMeOld.txt
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/UsingProxyDSP.txt
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/UsingProxyDSP.txt
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/abyss.2008.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.2008.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/abyss.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/abyss.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/configwin32.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/configwin32.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/curllink.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/curllink.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/delsln.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/delsln.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/diffcfg.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/diffcfg.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/gennmtab.2008.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.2008.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/gennmtab.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/gennmtab.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/mkvers.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/mkvers.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/mkvers1.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/mkvers1.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/transport_config.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/transport_config.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/updcfg.bat
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/updcfg.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/win32_config.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/win32_config.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlhttpsys.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlhttpsys.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlparse.2008.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.2008.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlparse.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlparse.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc-c/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc-c/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc-c/config.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc-c/config.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.2008.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.2008.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_config.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_config.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_cpp_proxy.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_cpp_proxy.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_misc.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc_misc.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpccpp.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpccpp.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmltok.2008.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.2008.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmltok.dsp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmltok.vcproj
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/common.mk
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/common.mk
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/config.mk.in
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/config.mk.in
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/dll-common.make
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/dll-common.make
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/INSTALL
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/doc/INSTALL
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/dylib-common.make
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/dylib-common.make
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/asynch_client.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/asynch_client.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/pstream_client.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/pstream_client.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/pstream_inetd_server.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/pstream_inetd_server.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_inetd_server.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/xmlrpc_inetd_server.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_loop_server.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/cpp/xmlrpc_loop_server.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/interrupted_client.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/interrupted_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/interrupted_server.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/interrupted_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_inetd_server.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_inetd_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_socket_server.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/examples/xmlrpc_socket_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss_opensslsock.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss_opensslsock.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss_unixsock.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss_unixsock.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss_winsock.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss_winsock.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base64.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/base64.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/c_util.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/c_util.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_global.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/client_global.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_transport.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/client_transport.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/config.h.in
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/config.h.in
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/inttypes.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/inttypes.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/packetsocket.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/packetsocket.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/select_int.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/select_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_pstream.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/server_pstream.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/sleep_int.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/sleep_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/time_int.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/time_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/util.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/util_int.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/irix-common.make
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/irix-common.make
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/HISTORY
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/HISTORY
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/conf/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/conf/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/conf/abyss.conf
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/conf/abyss.conf
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/conf/mime.types
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/conf/mime.types
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/htdocs/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/htdocs/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/htdocs/index.htm
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/htdocs/index.htm
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/example/htdocs/pwrabyss.gif
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/example/htdocs/pwrabyss.gif
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/abyss_info.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/abyss_info.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/channel.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/channel.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/channel.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/channel.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/chanswitch.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/chanswitch.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/chanswitch.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/chanswitch.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conn.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/conn.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/data.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/data.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/date.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/date.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/date.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/date.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/file.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/file.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/handler.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/handler.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/handler.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/handler.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/http.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/http.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/init.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/init.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/response.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/response.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/server.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/session.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/session.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/session.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/session.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket_openssl.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_openssl.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket_unix.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket_unix.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket_win.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket_win.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/thread.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/thread.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/thread_pthread.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/thread_pthread.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/thread_windows.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/thread_windows.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/trace.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/trace.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/nametab.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmltok/nametab.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/Makefile
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/asprintf.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/error.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/error.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/make_printable.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/memblock.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/memblock.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/select.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/select.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/sleep.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/sleep.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/time.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/time.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libutil/utf8.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/libutil/utf8.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/cmdline_parser_cpp.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/cmdline_parser_cpp.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/assertx.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/assertx.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/c_util.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/c_util.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/cmdline_parser.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/cmdline_parser.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/girmath.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/girmath.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/girstring.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/girstring.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/int.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/stdargx.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/stdargx.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/string_parser.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/string_parser.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/unistdx.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/include/unistdx.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/string_parser.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/string_parser.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/stripcaseeq.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/missing
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/missing
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/base64.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/base64.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/curl.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/curl.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/env_wrap.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/env_wrap.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/env_wrap.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/env_wrap.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/girerr.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/girerr.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/libwww.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/libwww.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/packetsocket.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/packetsocket.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/pstream.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/pstream.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/server_pstream.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/server_pstream.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/Makefile
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/registry.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/registry.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/registry.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/registry.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/server_abyss.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/server_abyss.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/server_abyss.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/server_abyss.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/server_pstream.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/server_pstream.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/server_pstream.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/server_pstream.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/test.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/test.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/testclient.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/testclient.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/testclient.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/testclient.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/testclient_dummy.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/testclient_dummy.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/tools.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/tools.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/test/tools.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/test/tools.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/wininet.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/cpp/wininet.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/double.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/double.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/double.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/double.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/method.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/method.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/method.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/method.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/parse_value.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/parse_value.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/parse_value.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/parse_value.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/registry.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/registry.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/registry.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/registry.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/resource.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/resource.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/system_method.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/system_method.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/system_method.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/system_method.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/Makefile
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/abyss.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/abyss.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/abyss.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/abyss.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/client_dummy.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/client_dummy.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/data/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/data/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/data/req_no_params.xml
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/data/req_no_params.xml
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/data/req_out_of_order.xml
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/data/req_out_of_order.xml
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/data/req_value_name.xml
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/data/req_value_name.xml
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/data/sample_add_call.xml
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/data/sample_add_call.xml
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/method_registry.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/method_registry.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/method_registry.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/method_registry.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/serialize_value.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/serialize_value.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/serialize_value.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/test/serialize_value.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/trace.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/trace.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/version.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/version.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_build.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_build.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_client_global.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_client_global.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_decompose.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_decompose.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_server_info.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_server_info.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_string.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/src/xmlrpc_string.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/common.mk
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/common.mk
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/lib/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/lib/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/lib/Makefile
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/lib/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/lib/dumpvalue.c
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/lib/include/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/lib/include/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/lib/include/dumpvalue.h
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/lib/include/dumpvalue.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/perl_packetsocket/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/perl_packetsocket/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/perl_packetsocket/PacketSocket.pm
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/perl_packetsocket/PacketSocket.pm
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/Makefile
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/proxyClass.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/proxyClass.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/proxyClass.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/proxyClass.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/systemProxy.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/systemProxy.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/systemProxy.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/systemProxy.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcMethod.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcMethod.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcMethod.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcMethod.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcType.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcType.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcType.hpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpcType.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpc_cpp_proxy.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_cpp_proxy/xmlrpc_cpp_proxy.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_pstream/
      - copied from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_pstream/
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_pstream/Makefile
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_pstream/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_pstream/test
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_pstream/test
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_pstream/xmlrpc_pstream.html
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_pstream/xmlrpc_pstream.html
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/transport_config.make
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/transport_config.make
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/unix-common.make
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/unix-common.make
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/xmlrpc-c-config.main
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc-c-config.main
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/xmlrpc-c-config.test.main
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc-c-config.test.main
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/xmlrpc_amconfig.h.in
      - copied unchanged from r8662, /freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in
Modified:
   freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.2008.sln
   freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.sln
   freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am
   freeswitch/branches/lukedashjr/syslibs/freeswitch/build/config/config.sub
   freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/ivr.conf.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/modules.conf.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/voicemail.conf.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/dialplan/default.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/demo/demo-ivr.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/en.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/external.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/internal.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/nat.xml
   freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in
   freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/changelog
   freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/control
   freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/files
   freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/rules
   freeswitch/branches/lukedashjr/syslibs/freeswitch/freeswitch.spec
   freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/g711.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_channel.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_console.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_core.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_cpp.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_event.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_ivr.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_log.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_module_interfaces.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_rtp.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_stun.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_types.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_utils.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_xml.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_commands/mod_commands.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_dptools/mod_dptools.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_fifo/mod_fifo.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_voicemail/mod_voicemail.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_alsa/mod_alsa.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/mod_portaudio.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_presence.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_reg.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_woomera/mod_woomera.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_local_stream/mod_local_stream.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_shout/mod_shout.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/mod_sndfile.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/freeswitch_java.cpp
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_lua/mod_lua.cpp
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl_wrap.cpp
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_channel.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_console.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_session.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_cpp.cpp
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_event.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_bridge.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_play_say.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_loadable_module.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_log.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_odbc.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_pcm.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c
   freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_utils.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/.update
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/RELEASE
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/configure.ac
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/conformance.docs
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/stun/stun.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_port.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/open_c/group/test_nua.mmp
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/tests/Makefile.am
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/   (props changed)
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/GNUmakefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/README
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/   (props changed)
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ConfigureWin32.bat
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ReadMeWin32.txt
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/UsingCURLinWin32.txt
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/cpptest.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/rpctest.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/transport_config_win32.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsw
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_asynch_client.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server_w32httpsys.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_sync_client.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_auth_client.dsp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_win32_config.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/configure.in
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/COPYING
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/HISTORY
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/TODO
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/auth_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/sample_add_client_complex.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_client.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_server.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/gen_sample_add_xml.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/synch_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_asynch_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_loop_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_cgi.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_w32httpsys.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_server_validatee.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_int.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_simple.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girerr.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girmem.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/oldcppwrapper.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/registry.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/timeout.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/transport.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xml.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xmlparser.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/   (props changed)
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conf.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conn.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/data.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/file.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/http.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/main.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/server.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/socket.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/token.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/token.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/trace.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/curl_transport/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/expat.html
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmldef.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmltok.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmltok.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmltok_impl.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmltok/xmltok_ns.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmlwf/xmlfile.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/expat/xmlwf/xmlwf.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libwww_transport/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/libwww_transport/xmlrpc_libwww_transport.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/casprintf.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/cmdline_parser.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/getoptx.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/bool.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/casprintf.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/cmdline_parser.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/mallocvar.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/include/pthreadx.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/util/pthreadx_win32.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/wininet_transport/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/wininet_transport/xmlrpc_wininet_transport.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/mkinstalldirs
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/XmlRpcCpp.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/client.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/client_simple.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/girmem.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/outcome.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/param_list.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/registry.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/server_abyss.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/value.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/cpp/xml.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/cgi.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/parse_xml.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/serialize.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/server_abyss.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/test.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/test.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/value.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/xml_data.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/test/xml_data.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_array.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_authcookie.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_client.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_data.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_datetime.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_expat.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_libxml2.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_parse.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_serialize.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_server_abyss.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_server_cgi.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_server_w32httpsys.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/src/xmlrpc_struct.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/turbocharger/mod_gzip.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/DataType.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/DataType.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcClass.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcClass.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcFunction.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/XmlRpcFunction.hpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.html
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_transport/Makefile
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/version.h
   freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/xmlrpc_config.h.in

Log:
MERGE to: http://svn.freeswitch.org/svn/freeswitch/trunk@8662

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.2008.sln
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.2008.sln	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.2008.sln	Mon May 26 12:59:57 2008
@@ -125,6 +125,8 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{8E2E8798-8B6F-4A55-8E4F-4E6FDE40ED26}"
 	ProjectSection(SolutionItems) = preProject
+		conf\sip_profiles\external.xml = conf\sip_profiles\external.xml
+		conf\sip_profiles\internal.xml = conf\sip_profiles\internal.xml
 		conf\sip_profiles\nat.xml = conf\sip_profiles\nat.xml
 	EndProjectSection
 EndProject
@@ -505,11 +507,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.2008.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0D108721-EAE8-4BAF-8102-D8960EC93647} = {0D108721-EAE8-4BAF-8102-D8960EC93647}
+		{B535402E-38D2-4D54-8360-423ACBD17192} = {B535402E-38D2-4D54-8360-423ACBD17192}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94}
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.2008.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"
@@ -585,13 +588,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.2008.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "libs\win32\xmlrpc\xmlrpc.2008.vcproj", "{A3FE0076-B366-429D-A238-D7304DA7D3C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.2008.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2008.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2008.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
@@ -859,6 +855,14 @@
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abyss", "libs\xmlrpc-c\Windows\abyss.2008.vcproj", "{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "libs\xmlrpc-c\Windows\xmlrpc.2008.vcproj", "{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlparse", "libs\xmlrpc-c\Windows\xmlparse.2008.vcproj", "{0D108721-EAE8-4BAF-8102-D8960EC93647}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\xmlrpc-c\Windows\xmltok.2008.vcproj", "{B535402E-38D2-4D54-8360-423ACBD17192}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -1121,18 +1125,6 @@
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.ActiveCfg = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.ActiveCfg = Release|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.Build.0 = Debug|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|x64.ActiveCfg = Debug|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.ActiveCfg = Release|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.Build.0 = Release|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|x64.ActiveCfg = Release|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|Win32.Build.0 = Debug|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|x64.ActiveCfg = Debug|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|Win32.ActiveCfg = Release|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|Win32.Build.0 = Release|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|x64.ActiveCfg = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1433,6 +1425,30 @@
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.Build.0 = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64.ActiveCfg = Release|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|Win32.Build.0 = Debug|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|x64.ActiveCfg = Debug|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|Win32.ActiveCfg = Release|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|Win32.Build.0 = Release|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|x64.ActiveCfg = Release|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|Win32.Build.0 = Debug|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|x64.ActiveCfg = Debug|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|Win32.ActiveCfg = Release|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|Win32.Build.0 = Release|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|x64.ActiveCfg = Release|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|Win32.Build.0 = Debug|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|x64.ActiveCfg = Debug|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.ActiveCfg = Release|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.Build.0 = Release|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x64.ActiveCfg = Release|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|Win32.Build.0 = Debug|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|x64.ActiveCfg = Debug|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.ActiveCfg = Release|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.Build.0 = Release|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1505,8 +1521,6 @@
 		{49C34584-B6DA-448F-83CF-27584DC9FC90} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
@@ -1514,6 +1528,10 @@
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{0D108721-EAE8-4BAF-8102-D8960EC93647} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{B535402E-38D2-4D54-8360-423ACBD17192} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.sln
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.sln	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/Freeswitch.sln	Mon May 26 12:59:57 2008
@@ -3,19 +3,19 @@
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}
-		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
+		{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"
@@ -25,34 +25,34 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}"
@@ -73,8 +73,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}"
@@ -88,22 +88,22 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
@@ -112,10 +112,10 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"
@@ -127,22 +127,22 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}"
@@ -156,35 +156,36 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}"
 	ProjectSection(ProjectDependencies) = postProject
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94}
+		{B535402E-38D2-4D54-8360-423ACBD17192} = {B535402E-38D2-4D54-8360-423ACBD17192}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}
+		{0D108721-EAE8-4BAF-8102-D8960EC93647} = {0D108721-EAE8-4BAF-8102-D8960EC93647}
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}"
@@ -193,8 +194,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}"
@@ -232,37 +233,30 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75}
 		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
+		{5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "libs\win32\xmlrpc\xmlrpc.vcproj", "{A3FE0076-B366-429D-A238-D7304DA7D3C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}
+		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}"
@@ -274,70 +268,70 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}"
@@ -410,16 +404,16 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}"
@@ -436,8 +430,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
 		{829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B}
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}"
@@ -447,27 +441,27 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\libopenmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C}
-		{819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE}
-		{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}
 		{FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}
+		{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}
+		{819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE}
+		{CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
 	ProjectSection(ProjectDependencies) = postProject
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
@@ -832,26 +826,26 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_tone_stream", "src\mod\formats\mod_tone_stream\mod_tone_stream.vcproj", "{1A789A98-71EF-4EBD-8007-FC9ED585D32E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvoipcodecs", "libs\voipcodecs\libvoipcodecs.vcproj", "{CF70F278-3364-4395-A2E1-23501C9B8AD2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voipcodecs", "src\mod\codecs\mod_voipcodecs\mod_voipcodecs.vcproj", "{9EED03C8-8315-4214-8D13-8FF5FA46D93C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {CF70F278-3364-4395-A2E1-23501C9B8AD2}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\openmrcp\aprtoolkit\aprtoolkit.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey_curl\mod_spidermonkey_curl.vcproj", "{2CCED6DC-26FF-40F2-9585-E9E1049A4599}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applications\mod_fsv\mod_fsv.vcproj", "{4AE157CF-F2DD-4B5D-A1EE-4AC173B4F9AC}"
@@ -864,6 +858,14 @@
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abyss", "libs\xmlrpc-c\Windows\abyss.vcproj", "{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\xmlrpc-c\Windows\xmltok.vcproj", "{B535402E-38D2-4D54-8360-423ACBD17192}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "libs\xmlrpc-c\Windows\xmlrpc.vcproj", "{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlparse", "libs\xmlrpc-c\Windows\xmlparse.vcproj", "{0D108721-EAE8-4BAF-8102-D8960EC93647}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -1126,18 +1128,6 @@
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.ActiveCfg = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.ActiveCfg = Release|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.Build.0 = Debug|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|x64.ActiveCfg = Debug|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.ActiveCfg = Release|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.Build.0 = Release|Win32
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|x64.ActiveCfg = Release|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|Win32.Build.0 = Debug|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|x64.ActiveCfg = Debug|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|Win32.ActiveCfg = Release|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|Win32.Build.0 = Release|Win32
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|x64.ActiveCfg = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1438,6 +1428,30 @@
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.Build.0 = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64.ActiveCfg = Release|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|Win32.Build.0 = Debug|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Debug|x64.ActiveCfg = Debug|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|Win32.ActiveCfg = Release|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|Win32.Build.0 = Release|Win32
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}.Release|x64.ActiveCfg = Release|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|Win32.Build.0 = Debug|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Debug|x64.ActiveCfg = Debug|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.ActiveCfg = Release|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.Build.0 = Release|Win32
+		{B535402E-38D2-4D54-8360-423ACBD17192}.Release|x64.ActiveCfg = Release|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|Win32.Build.0 = Debug|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Debug|x64.ActiveCfg = Debug|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|Win32.ActiveCfg = Release|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|Win32.Build.0 = Release|Win32
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA}.Release|x64.ActiveCfg = Release|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|Win32.Build.0 = Debug|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Debug|x64.ActiveCfg = Debug|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.ActiveCfg = Release|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.Build.0 = Release|Win32
+		{0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1495,8 +1509,6 @@
 		{49C34584-B6DA-448F-83CF-27584DC9FC90} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
@@ -1505,6 +1517,10 @@
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{B535402E-38D2-4D54-8360-423ACBD17192} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{0D108721-EAE8-4BAF-8102-D8960EC93647} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/Makefile.am	Mon May 26 12:59:57 2008
@@ -276,8 +276,8 @@
 	$(MAKE) -j modules
 
 sofia-reconf:
+	cd libs/sofia-sip && sh ./autogen.sh
 	cd libs/sofia-sip && $(MAKE) clean
-	cd libs/sofia-sip && autoreconf -fi
 	cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared
 
 current: update-clean

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/build/config/config.sub
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/build/config/config.sub	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/build/config/config.sub	Mon May 26 12:59:57 2008
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -276,6 +276,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -323,7 +324,7 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -367,11 +368,15 @@
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -442,6 +447,14 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -474,8 +487,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -667,6 +680,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -682,6 +703,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -808,6 +833,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -909,6 +942,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -920,6 +957,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1009,6 +1049,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1214,7 +1258,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1366,6 +1410,9 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
         spu-*)
 		os=-elf
 		;;
@@ -1406,6 +1453,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in	Mon May 26 12:59:57 2008
@@ -29,7 +29,7 @@
 LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS)
 
 ALL_CFLAGS   = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
-ALL_CXXFLAGS   = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURC $(OUR_CFLAGS)
+ALL_CXXFLAGS   = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
 
 COMPILE      = $(CC) $(ALL_CFLAGS) $(DEFS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/ivr.conf.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/ivr.conf.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/ivr.conf.xml	Mon May 26 12:59:57 2008
@@ -5,7 +5,7 @@
     <menu name="demo_ivr"
           greet-long="phrase:demo_ivr_main_menu"
           greet-short="phrase:demo_ivr_main_menu_short"
-          invalid-sound="voicemail/vm-hello.wav"
+          invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav"
           exit-sound="voicemail/vm-goodbye.wav"
           timeout ="10000"
 	  inter-digit-timeout="2000"
@@ -23,7 +23,7 @@
     <menu name="demo_ivr_submenu"
         greet-long="phrase:demo_ivr_sub_menu"
         greet-short="phrase:demo_ivr_sub_menu_short"
-        invalid-sound="voicemail/vm-hello.wav"
+        invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav"
         exit-sound="voicemail/vm-goodbye.wav"
         timeout="15000"
         max-failures="3">

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/modules.conf.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/modules.conf.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/modules.conf.xml	Mon May 26 12:59:57 2008
@@ -76,6 +76,7 @@
     <!-- <load module="mod_perl"/> -->
     <!-- <load module="mod_python"/> -->
     <!-- <load module="mod_java"/> -->
+    <!-- <load module="mod_lua"/> -->
 
     <!-- ASR /TTS -->
     <!-- <load module="mod_cepstral"/> -->

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/voicemail.conf.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/voicemail.conf.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/autoload_configs/voicemail.conf.xml	Mon May 26 12:59:57 2008
@@ -12,7 +12,6 @@
       <param name="tone-spec" value="%(1000, 0, 640)"/>
       <param name="callback-dialplan" value="XML"/>
       <param name="callback-context" value="default"/>
-      <param name="terminator-key" value="#"/>
       <param name="play-new-messages-key" value="1"/>
       <param name="play-saved-messages-key" value="2"/>
       <param name="main-menu-key" value="0"/>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/dialplan/default.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/dialplan/default.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/dialplan/default.xml	Mon May 26 12:59:57 2008
@@ -71,6 +71,16 @@
       </condition>
     </extension>
 
+    <extension name="eavesdrop">
+      <condition field="destination_number" expression="^779$">
+	<action application="answer"/>
+	<action application="set" data="eavesdrop_indicate_failed=tone_stream://%(500, 0, 320)"/>
+	<action application="set" data="eavesdrop_indicate_new=tone_stream://%(500, 0, 620)"/>
+	<action application="set" data="eavesdrop_indicate_idle=tone_stream://%(250, 0, 920)"/>
+	<action application="eavesdrop" data="all"/>
+      </condition>
+    </extension>
+
     <extension name="call_return">
       <condition field="destination_number" expression="^\*69$|^869$">
 	<action application="transfer" data="${db(select/call_return/${caller_id_number})}"/>
@@ -136,9 +146,10 @@
 	<action application="answer"/>
 	<action application="sleep" data="1000"/>
 	<action application="voicemail" data="check default $${domain} ${dialed_ext}"/>
-	<anti-action application="bind_meta_app" data="1 a a execute_extension::dx XML features"/>
-	<anti-action application="bind_meta_app" data="2 a a record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
-	<anti-action application="bind_meta_app" data="3 a a execute_extension::cf XML features"/>
+	<!-- bind_meta_app can have these args <key> [a|b|ab] [a|b|o|s] <app> -->
+	<anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/>
+	<anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
+	<anti-action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/>
 	<anti-action application="set" data="transfer_ringback=${us-ring}"/>
 	<anti-action application="set" data="call_timeout=30"/>
 	<!-- <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> -->
@@ -199,6 +210,8 @@
     <!-- a sample IVR  -->
     <extension name="ivr_demo">
       <condition field="destination_number" expression="5000">
+        <action application="answer"/>
+        <action application="sleep" data="2000"/>
 	<action application="ivr" data="demo_ivr"/>
       </condition>
     </extension>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/demo/demo-ivr.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/demo/demo-ivr.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/demo/demo-ivr.xml	Mon May 26 12:59:57 2008
@@ -15,8 +15,6 @@
     <input pattern="(.*)">
       <match>
         <!-- string together several existing sound files to create one long greeting -->
-        <action function="execute" data="answer"/>
-        <action function="execute" data="sleep(1000)"/>
         <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
         <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/en.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/en.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/lang/en/en.xml	Mon May 26 12:59:57 2008
@@ -1,6 +1,6 @@
 <include>
   <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie">
-    <X-PRE-PROCESS cmd="include" data="demo/demo*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+    <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
     <!--voicemail_en_tts is purely implemented with tts, we need a files based implementation too -->
     <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
   </language>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/external.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/external.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/external.xml	Mon May 26 12:59:57 2008
@@ -26,6 +26,7 @@
     <param name="use-rtp-timer" value="true"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="false"/>
+    <param name="aggressive-nat-detection" value="true"/>
     <param name="inbound-codec-negotiation" value="generous"/>
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/internal.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/internal.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/internal.xml	Mon May 26 12:59:57 2008
@@ -36,6 +36,7 @@
     <param name="sip-ip" value="$${local_ip_v4}"/>
     <param name="hold-music" value="$${hold_music}"/>
     <param name="apply-nat-acl" value="rfc1918"/>
+    <param name="aggressive-nat-detection" value="true"/>
     <!--<param name="enable-timer" value="false"/>-->
     <!--<param name="enable-100rel" value="false"/>-->
     <!--<param name="apply-inbound-acl" value="rfc1918"/>-->
@@ -97,6 +98,8 @@
     <!--<param name="disable-transcoding" value="true"/>-->
     <!-- Used for when phones respond to a challenged ACK with method INVITE in the hash -->
     <!--<param name="NDLB-broken-auth-hash" value="true"/>-->
+    <!-- add a ;received="<ip>:<port>" to the contact when replying to register for nat handling -->
+    <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
     <param name="auth-calls" value="true"/>
     <!-- on authed calls, authenticate *all* the packets not just invite -->
     <param name="auth-all-packets" value="false"/>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/nat.xml
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/nat.xml	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/conf/sip_profiles/nat.xml	Mon May 26 12:59:57 2008
@@ -17,6 +17,7 @@
     <param name="hold-music" value="$${hold_music}"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="false"/>
+    <param name="aggressive-nat-detection" value="true"/>
     <param name="inbound-codec-negotiation" value="generous"/>
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in	Mon May 26 12:59:57 2008
@@ -3,11 +3,11 @@
 
 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.0.rc6], BUG-REPORT-ADDRESS)
+AC_INIT([freeswitch], [1.0.pre4], BUG-REPORT-ADDRESS)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [0])
-AC_SUBST(SWITCH_VERSION_MICRO, [rc6])
-AC_SUBST(SWITCH_VERSION_REVISION, [8500])
+AC_SUBST(SWITCH_VERSION_MICRO, [pre4])
+#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
 AC_SUBST(SOUNDS_VERSION, [1.0.1])
 
 AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
@@ -16,6 +16,7 @@
 AM_INIT_AUTOMAKE(libfreeswitch,0.1)
 AC_CONFIG_SRCDIR([src/switch.c])
 AC_CONFIG_HEADER([src/include/switch_private.h])
+AC_CONFIG_HEADER([libs/xmlrpc-c/xmlrpc_amconfig.h])
 
 AC_PREFIX_DEFAULT(/usr/local/freeswitch)
 # AC_PREFIX_DEFAULT does not get expanded until too late so we need to do this to use prefix in this script
@@ -328,7 +329,15 @@
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h])
+AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h])
+
+# for xmlrpc-c config.h
+if test x"$ac_cv_header_wchar_h" = xyes; then
+  HAVE_WCHAR_H_DEFINE=1
+else
+  HAVE_WCHAR_H_DEFINE=0
+fi
+AC_SUBST(HAVE_WCHAR_H_DEFINE)
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -344,9 +353,11 @@
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep])
 AC_CHECK_FUNCS([sched_setscheduler setpriority setrlimit setgroups initgroups])
+AC_CHECK_FUNCS([wcsncmp setgroups asprintf setenv pselect gettimeofday localtime_r gmtime_r strcasecmp stricmp _stricmp])
 
 AC_CHECK_LIB(rt, clock_gettime, [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])])
 AC_CHECK_LIB(rt, clock_nanosleep, [AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define if you have clock_nanosleep()])])
+AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
 
 AC_CHECK_DECL([RLIMIT_MEMLOCK],
 	[AC_DEFINE([HAVE_RLIMIT_MEMLOCK],[1],[RLIMIT_MEMLOCK constant for setrlimit])],,
@@ -399,6 +410,45 @@
 	AC_DEFINE([USE_SCHED_SETSCHEDULER],[1],[Enable round-robin scheduler using sched_setscheduler])
 fi
 
+#
+# xmlrpc-c checks
+#
+
+
+HAVE_LIBWWW_SSL_DEFINE=0
+AC_SUBST(HAVE_LIBWWW_SSL_DEFINE)
+
+DIRECTORY_SEPARATOR="/"
+AC_SUBST(DIRECTORY_SEPARATOR)
+
+va_list_is_array=no
+AC_MSG_CHECKING(whether va_list is an array)
+AC_TRY_COMPILE([
+#include <stdarg.h>
+], [va_list list1, list2; list1 = list2;], , 
+va_list_is_array=yes)
+AC_MSG_RESULT($va_list_is_array)
+if test x"$va_list_is_array" = xyes; then
+  VA_LIST_IS_ARRAY_DEFINE=1
+else
+  VA_LIST_IS_ARRAY_DEFINE=0
+fi
+AC_SUBST(VA_LIST_IS_ARRAY_DEFINE)
+
+AC_MSG_CHECKING(whether compiler has __attribute__)
+AC_TRY_COMPILE(, [int x __attribute__((__unused__));],
+compiler_has_attribute=yes,
+compiler_has_attribute=no)
+AC_MSG_RESULT($compiler_has_attribute)
+if test x"$compiler_has_attribute" = xyes; then
+    ATTR_UNUSED="__attribute__((__unused__))"
+else
+    ATTR_UNUSED=
+fi
+AC_SUBST(ATTR_UNUSED)
+
+
+
 
 AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
 
@@ -629,6 +679,15 @@
 			PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print \" \".join(flags);'`"
 			PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print \" \".join(libs);'`"
 			PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print \"python\" + sysconfig.get_config_var(\"VERSION\");'`"
+			PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_config_var(\"LIBDIR\");'`"
+
+			# handle python being installed into /usr/local
+			AC_MSG_CHECKING([python libdir])
+			if test -z "`echo $PYTHON_LIBDIR | grep "/usr/lib"`" ; then
+				PYTHON_LDFLAGS="-L$PYTHON_LIBDIR $PYTHON_LDFLAGS"
+				LIBS="-L$PYTHON_LIBDIR $LIBS"
+			fi
+			AC_MSG_RESULT([$PYTHON_LIBDIR])
 
 			# check libpython
 			AC_CHECK_LIB([$PYTHON_LIB], [main], [has_libpython="yes"], [has_libpython="no"])
@@ -689,6 +748,8 @@
                 build/getsounds.sh
                 build/getlib.sh
                 build/modmake.rules
+                libs/xmlrpc-c/include/xmlrpc-c/config.h
+                libs/xmlrpc-c/xmlrpc_config.h
                 scripts/gentls_cert])
 
 AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/changelog
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/changelog	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/changelog	Mon May 26 12:59:57 2008
@@ -1,11 +1,13 @@
 freeswitch (1.0~rc6-1) unstable; urgency=low
 
-   * Changed to not allow pass_2833 on transcoded calls (it never worked, now it will tell you)
+   * Changed to not allow pass_2833 on transcoded calls 
+     (it never worked, now it will tell you)
    * Enhanced sofia sip nat handling
    * Fix libedit build on solaris
    * Fix session timers in mod_sofia
    * Fix conference fire-call
-   * Change: add var_event down into the endpoints so chans with no parents can still pass options
+   * Change: add var_event down into the endpoints so chans 
+     with no parents can still pass options
    * Added enable-post-var param to xml_rpc
    * Fix mod_lua build on solaris
    * Many fixes found by Klockwork (www.klocwork.com)
@@ -15,7 +17,7 @@
    * Fixed att_xfer issue
    * Fix sip now includes the Allow-Events header in more places
 
--- Michael Jerris <mike at jerris.com>  Tue, 13 May 2008 02:01:00 -0400
+ -- Michael Jerris <mike at jerris.com>  Tue, 13 May 2008 02:01:00 -0400
 
 freeswitch (1.0~rc5-1) unstable; urgency=low
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/control
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/control	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/control	Mon May 26 12:59:57 2008
@@ -15,77 +15,58 @@
  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.
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: Development Package for the FreeSwitch open source telephony platform
-Homepage: http://www.freeswitch.org/
-
 
 Package: freeswitch-spidermonkey
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: A Javascript engine for freeswitch
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-perl
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: A perl engine for freeswitch
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-lua
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: A lua engine for freeswitch
-Homepage: http://www.freeswitch.org/
-
-
-
 
 Package: freeswitch-codec-passthru-g7231
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: Pass through g723.1 Codec support for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-codec-passthru-amr
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: Pass through AMR Codec support for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-codec-passthru-g729
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: Pass through g729 Codec support for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/
-
-
-
 
 Package: freeswitch-lang-en
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: English language files for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-lang-de
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: German language files for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-lang-fr
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: French language files for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/
 
 Package: freeswitch-lang-it
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch
 Description: Italian language files for the FreeSWITCH open source telephony platform
-Homepage: http://www.freeswitch.org/

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/files
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/files	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/files	Mon May 26 12:59:57 2008
@@ -1,10 +1,12 @@
-freeswitch_1.0~rc5-1_i386.deb net extra
-freeswitch-spidermonkey_1.0~rc5-1_i386.deb net extra
-freeswitch-dev_1.0~rc5-1_i386.deb net extra
-freeswitch-codec-passthru-g7231_1.0~rc5-1_i386.deb net extra
-freeswitch-codec-passthru-amr_1.0~rc5-1_i386.deb net extra
-freeswitch-codec-passthru-g729_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-en_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-de_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-fr_1.0~rc5-1_i386.deb net extra
-freeswitch-lang-it_1.0~rc5-1_i386.deb net extra
+freeswitch_1.0~rc6-1_i386.deb net extra
+freeswitch-dev_1.0~rc6-1_i386.deb net extra
+freeswitch-spidermonkey_1.0~rc6-1_i386.deb net extra
+freeswitch-perl_1.0~rc6-1_i386.deb net extra
+freeswitch-lua_1.0~rc6-1_i386.deb net extra
+freeswitch-codec-passthru-g7231_1.0~rc6-1_i386.deb net extra
+freeswitch-codec-passthru-amr_1.0~rc6-1_i386.deb net extra
+freeswitch-codec-passthru-g729_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-en_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-de_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-fr_1.0~rc6-1_i386.deb net extra
+freeswitch-lang-it_1.0~rc6-1_i386.deb net extra

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/rules
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/rules	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/debian/rules	Mon May 26 12:59:57 2008
@@ -71,7 +71,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) clean megaclean
+	-$(MAKE) update-clean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub build/config/config.sub
 endif

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/freeswitch.spec
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/freeswitch.spec	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/freeswitch.spec	Mon May 26 12:59:57 2008
@@ -5,7 +5,7 @@
 Summary:      FreeSWITCH open source telephony platform
 License:      MPL
 Group:        Productivity/Telephony/Servers
-Version:      1.0.rc5
+Version:      1.0.rc6
 Release:      1
 URL:          http://www.freeswitch.org/
 Packager:     Michal Bielicki
@@ -115,29 +115,27 @@
 
 %description spidermonkey
 
-%package lang-en
-Summary:	Provides english language dependand modules and sounds for the FreeSwitch Open Source telephone platform.
-Group:          System/Libraries
-Requires:        %{name} = %{version}-%{release}
+%package lua
+Summary:	Lua support for the FreeSWITCH open source telephony platform
+Group:		System/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-%description lang-en
-English language phrases module and directory structure for say module and voicemail
+%description	lua
 
-%package lang-de
-Summary:        Provides german language dependand modules and sounds for the FreeSwitch Open Source telephone platform.
-Group:          System/Libraries
-Requires:        %{name} = %{version}-%{release}
+%package	perl
+Summary:	Perl support for the FreeSWITCH open source telephony platform
+Group:		System/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-%description lang-de
-German language phrases module and directory structure for say module and voicemail
+%description	perl
 
-%package lang-fr
-Summary:        Provides french language dependand modules and sounds for the FreeSwitch Open Source telephone platform.
+%package lang-en
+Summary:	Provides english language dependand modules and sounds for the FreeSwitch Open Source telephone platform.
 Group:          System/Libraries
 Requires:        %{name} = %{version}-%{release}
 
-%description lang-fr
-French language phrases module and directory structure for say module and voicemail
+%description lang-en
+English language phrases module and directory structure for say module and voicemail
 
 %prep
 %setup -q
@@ -163,15 +161,16 @@
 ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap"
 EVENT_HANDLERS_MODULES="event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv"
 FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream"
-LANGUAGES_MODULES=
+LANGUAGES_MODULES="languages/mod_perl languages/mod_lua"
 LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog"
-SAY_MODULES="say/mod_say_en say/mod_say_fr say/mod_say_de"
+SAY_MODULES="say/mod_say_en"
 TIMERS_MODULES=
 DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl"
 XML_INT_MODULES="xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr"
 MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES"
 
 export MODULES=$MYMODULES
+rm modules.conf
 touch modules.conf
 for i in $MODULES; do echo $i >> modules.conf; done
 export VERBOSE=yes
@@ -179,8 +178,13 @@
 export PKG_CONFIG_PATH=/usr/bin/pkg-config:$PKG_CONFIG_PATH
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
 
-./bootstrap.sh
-%configure -C \
+if test ! -f Makefile.in 
+then 
+   bootstrap.sh
+fi
+
+
+	%configure -C \
                 --prefix=%{prefix} \
 		--bindir=%{prefix}/bin \
 		--libdir=%{prefix}/lib \
@@ -205,6 +209,12 @@
 %{__make}
 
 %install
+# delete unsupported langugages for now
+rm -rf conf/lang/de
+rm -rf conf/lang/fr
+rm -rf $RPM_BUILD_ROOT%{prefix}/conf/lang/de
+rm -rf $RPM_BUILD_ROOT%{prefix}/conf/lang/fr
+
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 
 # Create a log dir
@@ -275,8 +285,8 @@
 %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles
 %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat
 %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/dialplan/extensions
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/default
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/outbound
+%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal
+%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/external
 %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/jingle_profiles
 %ifos linux
 %config(noreplace) %attr(0644, freeswitch, daemon) /etc/monit.d/freeswitch.monitrc
@@ -286,6 +296,7 @@
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.ttml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.conf
+%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/acl.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/alsa.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/conference.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/console.conf.xml
@@ -321,8 +332,8 @@
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/default/*
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/mrcp_profiles/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/default/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/outbound/*.xml
+%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal/*.xml
+%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/external/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/jingle_profiles/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/htdocs/*
@@ -397,6 +408,19 @@
 %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/spidermonkey.conf.xml
 
+%files lua
+%defattr(-,freeswitch,daemon)
+%{prefix}/mod/mod_lua*.so*
+%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs
+%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/lua.conf.xml
+
+%files perl
+%defattr(-,freeswitch,daemon)
+%{prefix}/mod/mod_perl*.so*
+%{prefix}/perl/*
+%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs
+%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/perl.conf.xml
+
 %files devel
 %defattr(-, freeswitch, daemon)
 %{prefix}/lib/*.a
@@ -414,25 +438,13 @@
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/en/vm/*.xml
 %{prefix}/mod/mod_say_en.so*
 
-%files lang-de
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de/demo
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de/vm
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/demo/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/vm/*.xml
-%{prefix}/mod/mod_say_de.so*
-
-%files lang-fr
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr/demo
-%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr/vm
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/demo/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/vm/*.xml
-%{prefix}/mod/mod_say_fr.so*
-
 %changelog
+* Thu May 22 2008 - michal.bielicki at voiceworks.pl
+- disabled beta class language stuff
+- bumped revision up to rc6
+- added mod_lua
+- added mod_perl
+- Only bootstrap if no Makfile.in exists
 * Mon Feb 04 2008 - michal.bielicki at voiceworks.pl
 - More fixes to specfile
 - First go at SFE files

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs	Mon May 26 12:59:57 2008
@@ -89,9 +89,8 @@
 
         public override CommandReply CreateReply(string dataToParse)
         {
-            dataToParse = dataToParse.Replace(" ", string.Empty);
-            string[] nameValue = dataToParse.Split(':');
-            if (nameValue[0].ToLower() == "success")
+            string[] nameValue = dataToParse.Split(' ');
+            if (nameValue[0].Length > 0 && nameValue[0][0] == '+')
                 return new OriginateReply(true, nameValue[1]);
             else
             {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/g711.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/g711.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/g711.h	Mon May 26 12:59:57 2008
@@ -369,7 +369,7 @@
 uint8_t alaw_to_ulaw(uint8_t alaw);
 
 /*! \brief Transcode from u-law to A-law, using the procedure defined in G.711.
-    \param alaw The u-law sample to transcode.
+    \param ulaw The u-law sample to transcode.
     \return The best matching A-law value.
 */
 uint8_t ulaw_to_alaw(uint8_t ulaw);

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_channel.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_channel.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_channel.h	Mon May 26 12:59:57 2008
@@ -44,6 +44,8 @@
 	switch_time_t profile_created;
 	switch_time_t created;
 	switch_time_t answered;
+	switch_time_t progress;
+	switch_time_t progress_media;
 	switch_time_t hungup;
 	switch_time_t transferred;
 	struct switch_channel_timetable *next;
@@ -225,8 +227,6 @@
 /*!
  * Start iterating over the entries in the channel variable list.
  * @param channel the channel to intterate the variales for
- * @param pool The pool to allocate the switch_hash_index_t iterator. If this
- *          pool is NULL, then an internal, non-thread-safe iterator is used.
  * @remark  Use switch_hash_next and switch_hash_this with this function to iterate all the channel variables
  */
 SWITCH_DECLARE(switch_event_header_t *) switch_channel_variable_first(switch_channel_t *channel);

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_console.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_console.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_console.h	Mon May 26 12:59:57 2008
@@ -58,18 +58,22 @@
 */
 SWITCH_DECLARE(void) switch_console_loop(void);
 
+#ifndef SWIG
 /*!
   \brief A method akin to printf that allows you to redirect output to a specific console "channel"
 */
 SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, const char *file, const char *func, int line,
 										   const char *fmt, ...) PRINTF_FUNCTION(5, 6);
+#endif
 
 SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen);
 
+#ifndef SWIG
 /*!
   \brief A method akin to printf for dealing with api streams
 */
 SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3);
+#endif
 
 SWITCH_END_EXTERN_C
 #endif

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_core.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_core.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_core.h	Mon May 26 12:59:57 2008
@@ -124,6 +124,7 @@
   \param session the session to add the bug to
   \param callback a callback for events
   \param user_data arbitrary user data
+  \param stop_time absolute time at which the bug is automatically removed
   \param flags flags to choose the stream
   \param new_bug pointer to assign new bug to
   \return SWITCH_STATUS_SUCCESS if the operation was a success
@@ -214,22 +215,29 @@
   \brief Initilize the port allocator
   \param start the starting port
   \param end the ending port
-  \param inc the amount to increment each port
+  \param flags flags to change allocator behaviour (e.g. only even/odd portnumbers)
   \param new_allocator new pointer for the return value
   \return SWITCH_STATUS_SUCCESS if the operation was a success
 */
 SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(_In_ switch_port_t start,
-															   _In_ switch_port_t end,
-															   _In_ switch_port_flag_t flags,
-															   _Out_ switch_core_port_allocator_t **new_allocator);
+								   _In_ switch_port_t end,
+								   _In_ switch_port_flag_t flags,
+								   _Out_ switch_core_port_allocator_t **new_allocator);
 
 /*!
   \brief Get a port from the port allocator
   \param alloc the allocator object
-  \param port a pointer to the port
+  \param port_ptr a pointer to the port
   \return SUCCESS
 */
 SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(_In_ switch_core_port_allocator_t *alloc, _Out_ switch_port_t *port_ptr);
+
+/*!
+  \brief Return unused port to the port allocator
+  \param alloc the allocator object
+  \param port the port
+  \return SUCCESS
+*/
 SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_free_port(_In_ switch_core_port_allocator_t *alloc, _In_ switch_port_t port);
 
 /*!
@@ -724,11 +732,12 @@
 /*! 
   \brief Request an outgoing session spawned from an existing session using a desired endpoing module
   \param session the originating session
+  \param var_event - NEEDDESC -
   \param endpoint_name the name of the module to use for the new session
   \param caller_profile the originator's caller profile
   \param new_session a NULL pointer to aim at the newly created session
   \param pool optional existing memory pool to donate to the session
-  \paeam flags flags to use
+  \param flags flags to use
   \return the cause code of the attempted call
 */
 SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(_In_opt_ switch_core_session_t *session,
@@ -800,24 +809,49 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_private_event(_In_ switch_core_session_t *session, _Out_ switch_event_t **event);
 
+
+/*!
+  \brief Flush the private event queue of a session
+  \param session the session to flush
+  \return SWITCH_STATUS_SUCCESS if the events have been flushed
+*/
 SWITCH_DECLARE(uint32_t) switch_core_session_flush_private_events(switch_core_session_t *session);
 
+
 /*! 
   \brief Read a frame from a session
   \param session the session to read from
   \param frame a NULL pointer to a frame to aim at the newly read frame
-  \param timeout number of milliseconds to wait for data
+  \param flags - NEEDDESC -
   \param stream_id which logical media channel to use
   \return SWITCH_STATUS_SUCCESS a the frame was read
 */
 SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(_In_ switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
 
+/*! 
+  \brief Read a video frame from a session
+  \param session the session to read from
+  \param frame a NULL pointer to a frame to aim at the newly read frame
+  \param flags - NEEDDESC -
+  \param stream_id which logical media channel to use
+  \return SWITCH_STATUS_SUCCESS a if the frame was read
+*/
 SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(_In_ switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
+
+/*! 
+  \brief Write a video frame to a session
+  \param session the session to write to
+  \param frame a pointer to a frame to write
+  \param flags - NEEDDESC -
+  \param stream_id which logical media channel to use
+  \return SWITCH_STATUS_SUCCESS a if the frame was written
+*/
 SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(_In_ switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 
 /*! 
   \brief Reset the buffers and resampler on a session
   \param session the session to reset
+  \param flush_dtmf flush all queued dtmf events too
 */
 SWITCH_DECLARE(void) switch_core_session_reset(_In_ switch_core_session_t *session, switch_bool_t flush_dtmf);
 
@@ -825,7 +859,7 @@
   \brief Write a frame to a session
   \param session the session to write to
   \param frame the frame to write
-  \param timeout number of milliseconds to wait for data
+  \param flags - NEEDDESC -
   \param stream_id which logical media channel to use
   \return SWITCH_STATUS_SUCCESS a the frame was written
 */
@@ -834,7 +868,7 @@
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(_In_ switch_core_session_t *session,
 																		 const char *file, const char *func, int line, switch_signal_t sig);
-/*! 
+/*!
   \brief Send a signal to a channel
   \param session session to send signal to
   \param sig signal to send
@@ -1498,13 +1532,14 @@
 
 /*! 
   \brief Change user and/or group of the running process
-  \long Several possible combinations:
-  - user only (group NULL): switch to user and his primary group (and supplementary groups, if supported)
-  - user and group: switch to user and specified group (only)
-  - group only (user NULL): switch group only
   \param user name of the user to switch to (or NULL)
   \param group name of the group to switch to (or NULL)
   \return 0 on success, -1 otherwise
+
+  Several possible combinations:
+  - user only (group NULL): switch to user and his primary group (and supplementary groups, if supported)
+  - user and group: switch to user and specified group (only)
+  - group only (user NULL): switch group only
 */
 SWITCH_DECLARE(int32_t) change_user_group(const char *user, const char *group);
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_cpp.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_cpp.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_cpp.h	Mon May 26 12:59:57 2008
@@ -192,14 +192,14 @@
 	SWITCH_DECLARE(void) setPrivate(char *var, void *val);
 	SWITCH_DECLARE(void *)getPrivate(char *var);
 	SWITCH_DECLARE(const char *)getVariable(char *var);
-	SWITCH_DECLARE(switch_status_t) process_callback_result(char *ret);	
+	SWITCH_DECLARE(switch_status_t) process_callback_result(char *result);	
 	SWITCH_DECLARE(void) say(const char *tosay, const char *module_name, const char *say_type, const char *say_method);
 	SWITCH_DECLARE(void) sayPhrase(const char *phrase_name, const char *phrase_data = "", const char *phrase_lang = NULL);
 
 	/** \brief Record to a file
-	 * \param filename 
+	 * \param file_name 
 	 * \param <[max_len]> maximum length of the recording in seconds
-     * \param <[silence_threshold]> energy level audio must fall below 
+	 * \param <[silence_threshold]> energy level audio must fall below 
 	 *        to be considered silence (500 is a good starting point).
 	 * \param <[silence_secs]> seconds of silence to interrupt the record.
 	 */
@@ -214,12 +214,13 @@
 
 	/** \brief Originate a call to a destination
 	 *
-	 * \param a_leg_sessoin - the session where the call is originating from 
-     *                        and also the session in which _this_ session was 
-     *                        created
+	 * \param a_leg_session - the session where the call is originating from 
+	 *                        and also the session in which _this_ session was 
+	 *                        created
 	 * \param dest - a string representing destination, eg, sofia/mydomain.com/foo at bar.com
+	 * \param timeout - time to wait for call to be answered
 	 * \return an int status code indicating success or failure
-     *
+	 *
 	 */
 	SWITCH_DECLARE(int) originate(CoreSession *a_leg_session, 
 				  char *dest, 
@@ -227,12 +228,12 @@
 
 
 	/** \brief set a DTMF callback function
-     * 
-     * The DTMF callback function will be set and persist
-     * for the life of the session, and be called when a dtmf
-     * is pressed by user during streamfile(), collectDigits(), and 
-     * certain other methods are executing.
-     *
+	 * 
+	 * The DTMF callback function will be set and persist
+	 * for the life of the session, and be called when a dtmf
+	 * is pressed by user during streamfile(), collectDigits(), and 
+	 * certain other methods are executing.
+	 *
 	 */
 	SWITCH_DECLARE(void) setDTMFCallback(void *cbfunc, char *funcargs);
 
@@ -240,14 +241,14 @@
 	SWITCH_DECLARE(void) set_tts_parms(char *tts_name, char *voice_name);
 
 	/**
-     * For timeout milliseconds, call the dtmf function set previously
+	 * For timeout milliseconds, call the dtmf function set previously
 	 * by setDTMFCallback whenever a dtmf or event is received
 	 */
 	SWITCH_DECLARE(int) collectDigits(int timeout);
 
 	/** 
-     * Collect up to maxdigits digits worth of digits
-     * and store them in dtmf_buf.  In the case of mod_python, the 
+	 * Collect up to maxdigits digits worth of digits
+	 * and store them in dtmf_buf.  In the case of mod_python, the 
 	 * dtmf_buf parameter is configured to act as a _return_ value,
 	 * (see mod_python.i).  This does NOT call any callbacks upon
 	 * receiving dtmf digits.  For that, use collectDigits.
@@ -268,12 +269,12 @@
 	
 	/** \brief Play a file into channel and collect dtmfs
 	 * 
-     * See API docs in switch_ivr.h: switch_play_and_get_digits(..)
-     *
-     * NOTE: this does not call any dtmf callbacks set by 
-     *       setDTMFCallback(..) as it uses its own internal callback
-     *       handler.
-     */
+	 * See API docs in switch_ivr.h: switch_play_and_get_digits(..)
+	 *
+	 * NOTE: this does not call any dtmf callbacks set by 
+	 *       setDTMFCallback(..) as it uses its own internal callback
+	 *       handler.
+	 */
 	SWITCH_DECLARE(char *) playAndGetDigits(int min_digits, 
 						 int max_digits, 
 						 int max_tries, 
@@ -287,7 +288,7 @@
 	 *
 	 * \param file - the path to the .wav/.mp3 to be played
 	 * \param starting_sample_count - the index of the sample to 
-     *                                start playing from
+	 *                                start playing from
 	 * \return an int status code indicating success or failure
 	 *
 	 */

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_event.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_event.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_event.h	Mon May 26 12:59:57 2008
@@ -167,6 +167,7 @@
 */
 SWITCH_DECLARE(char *) switch_event_get_body(switch_event_t *event);
 
+#ifndef SWIG
 /*!
   \brief Add a header to an event
   \param event the event to add the header to
@@ -177,7 +178,7 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack,
 														const char *header_name, const char *fmt, ...) PRINTF_FUNCTION(4, 5);
-
+#endif
 /*!
   \brief Add a string header to an event
   \param event the event to add the header to
@@ -262,6 +263,7 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str, switch_bool_t encode);
 
+#ifndef SWIG
 /*!
   \brief Render a XML representation of an event sutable for printing or network transport
   \param event the event to render
@@ -270,6 +272,7 @@
   \note the body supplied by this function will supersede an existing body the event may have
 */
 SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2, 3);
+#endif
 
 /*!
   \brief Determine if the event system has been initilized
@@ -277,6 +280,7 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_event_running(void);
 
+#ifndef SWIG
 /*!
   \brief Add a body to an event
   \param event the event to add to body to
@@ -285,6 +289,7 @@
   \note the body parameter can be shadowed by the switch_event_reserve_subclass_detailed function
 */
 SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2, 3);
+#endif
 SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in);
 
 SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(_In_z_ char *file, _In_z_ char *func, _In_ int line, 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_ivr.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_ivr.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_ivr.h	Mon May 26 12:59:57 2008
@@ -207,15 +207,41 @@
   \brief Record a session to disk
   \param session the session to record
   \param file the path to the file
+  \param limit stop recording after this amount of time (in ms, 0 = never stop)
   \param fh file handle to use (NULL for builtin one)
   \return SWITCH_STATUS_SUCCESS if all is well
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, uint32_t limit, switch_file_handle_t *fh);
+
+/*!
+  \brief Eavesdrop on a another session
+  \param session our session
+  \param uuid the uuid of the session to spy on
+  \param require_group - NEEDDESC -
+  \param flags - NEEDDESC -
+  \return SWITCH_STATUS_SUCESS if all is well
+*/
 SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session_t *session, 
 															 const char *uuid, 
 															 const char *require_group, 
 															 switch_eavesdrop_flag_t flags);
+
+/*!
+  \brief - NEEDDESC -
+  \param session the session to displace
+  \param file
+  \param limit
+  \param flags
+  \return SWITCH_STATUS_SUCCESS if all is well
+*/
 SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_t *session, const char *file, uint32_t limit, const char *flags);
+
+/*!
+  \brief Stop displacing a session
+  \param session the session
+  \param file - NEEDDESC -
+  \return SWITCH_STATUS_SUCCESS if all is well
+*/
 SWITCH_DECLARE(switch_status_t) switch_ivr_stop_displace_session(switch_core_session_t *session, const char *file);
 
 /*!
@@ -244,6 +270,7 @@
 /*!
   \brief Start generating DTMF inband
   \param session the session to generate on
+  \param read_stream - NEEDDESC -
   \return SWITCH_STATUS_SUCCESS if all is well
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_generate_session(switch_core_session_t *session, switch_bool_t read_stream);
@@ -256,7 +283,7 @@
 SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_generate_session(switch_core_session_t *session);
 
 /*!
-  \brief XXX DESCRIBE ME
+  \brief - NEEDDESC -
   \param session the session to act on
   \return SWITCH_STATUS_SUCCESS if all is well - maybe more XXX FIXME
 */
@@ -464,6 +491,7 @@
   \brief Signal the session with a protocol specific hold message.
   \param uuid the uuid of the session to hold
   \param message optional message
+  \param moh play music-on-hold
   \return SWITCH_STATUS_SUCCESS if all is well
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_hold_uuid(const char *uuid, const char *message, switch_bool_t moh);
@@ -479,6 +507,7 @@
   \brief Signal the session with a protocol specific hold message.
   \param session the session to hold
   \param message optional message
+  \param moh play music-on-hold
   \return SWITCH_STATUS_SUCCESS if all is well
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_hold(switch_core_session_t *session, const char *message, switch_bool_t moh);
@@ -638,8 +667,13 @@
  *\param name A pointer to the name of this menu.
  *\param greeting_sound Optional pointer to a main sound (press 1 for this 2 for that).
  *\param short_greeting_sound Optional pointer to a shorter main sound for subsequent loops.
- *\param exit_sound Optional pointer to a sound to play upon exiting the menu.
  *\param invalid_sound Optional pointer to a sound to play after invalid input.
+ *\param exit_sound Optional pointer to a sound to play upon exiting the menu.
+ *\param confirm_macro - NEEDDESC -
+ *\param confirm_key   - NEEDDESC -
+ *\param confirm_attempts - NEEDDESC -
+ *\param inter_timeout - NEEDDESC -
+ *\param digit_len     - NEEDDESC -
  *\param timeout A number of milliseconds to pause before looping.
  *\param max_failures Maximum number of failures to withstand before hangingup This resets everytime you enter the menu.
  *\param pool memory pool (NULL to create one).
@@ -738,7 +772,8 @@
 SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang,
 														switch_input_args_t *args);
 SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms);
-SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid);
+SWITCH_DECLARE(switch_status_t) switch_ivr_find_bridged_uuid(const char *uuid, char *b_uuid, switch_size_t blen);
+SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg);
 SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session);
 SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t *session, switch_core_session_t *peer_session);
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_log.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_log.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_log.h	Mon May 26 12:59:57 2008
@@ -82,13 +82,14 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void);
 
-
+#ifndef SWIG
 /*! 
   \brief Write log data to the logging engine
   \param channel the log channel to write to
   \param file the current file
   \param func the current function
   \param line the current line
+  \param userdata ununsed
   \param level the current log level
   \param fmt desired format
   \param ... variable args
@@ -98,7 +99,7 @@
 									   _In_z_ const char *func, _In_ int line,
 									   _In_opt_z_ const char *userdata, _In_ switch_log_level_t level,
 									   _In_z_ _Printf_format_string_ const char *fmt, ...) PRINTF_FUNCTION(7, 8);
-
+#endif
 /*! 
   \brief Shut down  the logging engine
   \note to be called at application termination by the core

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_module_interfaces.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_module_interfaces.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_module_interfaces.h	Mon May 26 12:59:57 2008
@@ -92,7 +92,7 @@
 	switch_size_t data_len;
 	switch_size_t alloc_len;
 	switch_size_t alloc_chunk;
-	switch_event_t *event;
+	switch_event_t *param_event;
 };
 
 struct switch_io_event_hooks;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_rtp.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_rtp.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_rtp.h	Mon May 26 12:59:57 2008
@@ -293,6 +293,7 @@
   \param datalen a pointer to the datalen
   \param payload_type the IANA payload of the packet
   \param flags flags
+  \param io_flags i/o flags
   \return the number of bytes read
 */
 SWITCH_DECLARE(switch_status_t) switch_rtp_read(switch_rtp_t *rtp_session, void *data, uint32_t * datalen,
@@ -301,10 +302,17 @@
 /*! 
   \brief Queue RFC2833 DTMF data into an RTP Session
   \param rtp_session the rtp session to use
-  \param digits the digit string to queue
-  \param duration the duration of the dtmf
+  \param dtmf the dtmf digits to queue
+  \return SWITCH_STATUS_SUCCESS on success
 */
 SWITCH_DECLARE(switch_status_t) switch_rtp_queue_rfc2833(switch_rtp_t *rtp_session, const switch_dtmf_t *dtmf);
+
+/*! 
+  \brief Queue RFC2833 DTMF data into an RTP Session - NEEDDESC -
+  \param rtp_session the rtp session to use
+  \param dtmf the dtmf digits to queue
+  \return SWITCH_STATUS_SUCCESS on success
+*/
 SWITCH_DECLARE(switch_status_t) switch_rtp_queue_rfc2833_in(switch_rtp_t *rtp_session, const switch_dtmf_t *dtmf);
 
 /*!
@@ -329,6 +337,7 @@
   \param datalen a pointer to the datalen
   \param payload_type the IANA payload of the packet
   \param flags flags
+  \param io_flags i/o flags
   \return the number of bytes read
 */
 SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read(switch_rtp_t *rtp_session,
@@ -338,9 +347,10 @@
   \brief Read data from a given RTP session without copying
   \param rtp_session the RTP session to read from
   \param frame a frame to populate with information
+  \param io_flags i/o flags
   \return the number of bytes read
 */
-SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, switch_io_flag_t io_flagsm);
+SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, switch_io_flag_t io_flags);
 
 /*!
   \brief Enable VAD on an RTP Session
@@ -376,7 +386,6 @@
   \param m set mark bit or not
   \param payload the IANA payload number
   \param ts then number of bytes to increment the timestamp by
-  \param ssrc the ssrc
   \param flags frame flags
   \return the number of bytes written
 */

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_stun.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_stun.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_stun.h	Mon May 26 12:59:57 2008
@@ -226,6 +226,7 @@
 /*!
   \brief Increment an attribute pointer to the next attribute in it's packet
   \param attribute the pointer to increment
+  \param end pointer to the end of the buffer
   \return true or false depending on if there are any more attributes
 */
 #define switch_stun_packet_next_attribute(attribute, end) (attribute && (attribute = (switch_stun_packet_attribute_t *) (attribute->value +  switch_stun_attribute_padded_length(attribute))) && ((void *)attribute < end) && attribute->length && ((void *)(attribute +  switch_stun_attribute_padded_length(attribute)) < end))

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_types.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_types.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_types.h	Mon May 26 12:59:57 2008
@@ -140,6 +140,7 @@
 #define SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE "exec_after_bridge_app"
 #define SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE "exec_after_bridge_arg"
 #define SWITCH_MAX_FORWARDS_VARIABLE "max_forwards"
+#define SWITCH_DISABLE_APP_LOG_VARIABLE "disable_app_log"
 #define SWITCH_SPEECH_KEY "speech"
 #define SWITCH_UUID_BRIDGE "uuid_bridge"
 #define SWITCH_BITS_PER_BYTE 8

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_utils.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_utils.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_utils.h	Mon May 26 12:59:57 2008
@@ -154,8 +154,8 @@
  */
 #define is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119)
 
-#define end_of(_s) *(_s + strlen(_s) - 1)
-#define end_of_p(_s) (_s + strlen(_s) - 1)
+#define end_of(_s) *(*_s == '\0' ? _s : _s + strlen(_s) - 1)
+#define end_of_p(_s) (*_s == '\0' ? _s : _s + strlen(_s) - 1)
 /*!
   \brief Test for the existance of a flag on an arbitary object
   \param obj the object to test

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_xml.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_xml.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/include/switch_xml.h	Mon May 26 12:59:57 2008
@@ -189,8 +189,17 @@
 ///\brief Converts an switch_xml structure back to xml. Returns a string of xml data that
 ///\ must be freed.
 ///\param xml the xml node
+///\param prn_header add <?xml version..> header too
 ///\return the xml text string
 SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml, switch_bool_t prn_header);
+
+///\brief Converts an switch_xml structure back to xml using the buffer passed in the parameters.
+///\param xml the xml node
+///\param buf buffer to use
+///\param buflen size of buffer
+///\param offset offset to start at
+///\param prn_header add <?xml version..> header too
+///\return the xml text string
 SWITCH_DECLARE(char *) switch_xml_toxml_buf(switch_xml_t xml, char *buf, switch_size_t buflen, switch_size_t offset, switch_bool_t prn_header);
 
 ///\brief returns a NULL terminated array of processing instructions for the given

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_commands/mod_commands.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_commands/mod_commands.c	Mon May 26 12:59:57 2008
@@ -114,9 +114,9 @@
 	char *host = NULL;
 	const char *err = NULL;
 
-	if (stream->event && (host = switch_event_get_header(stream->event, "http-host"))) {
+	if (stream->param_event && (host = switch_event_get_header(stream->param_event, "http-host"))) {
 		stream->write_function(stream,  "Content-Type: text/xml\r\n\r\n");
-		if ((path_info = switch_event_get_header(stream->event, "http-path-info"))) {
+		if ((path_info = switch_event_get_header(stream->param_event, "http-path-info"))) {
 			cmd = path_info;
 			delim = '/';
 		}
@@ -200,9 +200,9 @@
 	char *host = NULL;
 	const char *err = NULL;
 
-	if (stream->event && (host = switch_event_get_header(stream->event, "http-host"))) {
+	if (stream->param_event && (host = switch_event_get_header(stream->param_event, "http-host"))) {
 		stream->write_function(stream,  "Content-Type: text/xml\r\n\r\n");
-		if ((path_info = switch_event_get_header(stream->event, "http-path-info"))) {
+		if ((path_info = switch_event_get_header(stream->param_event, "http-path-info"))) {
 			cmd = path_info;
 			delim = '/';
 		}
@@ -522,8 +522,8 @@
 
 	switch_core_measure_time(switch_core_uptime(), &duration);
 
-	if (stream->event) {
-		http = switch_event_get_header(stream->event, "http-host");
+	if (stream->param_event) {
+		http = switch_event_get_header(stream->param_event, "http-host");
 	}
 
 	if (http || (cmd && strstr(cmd, "html"))) {
@@ -1943,8 +1943,8 @@
 		}
 	}
 
-	if (stream->event) {
-		holder.http = switch_event_get_header(stream->event, "http-host");
+	if (stream->param_event) {
+		holder.http = switch_event_get_header(stream->param_event, "http-host");
 	}
 
 	holder.print_title = 1;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_conference/mod_conference.c	Mon May 26 12:59:57 2008
@@ -3663,8 +3663,8 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
-	if (stream->event) {
-		http = switch_event_get_header(stream->event, "http-host");
+	if (stream->param_event) {
+		http = switch_event_get_header(stream->param_event, "http-host");
 	}
 
 	if (http) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_dptools/mod_dptools.c	Mon May 26 12:59:57 2008
@@ -217,10 +217,35 @@
 	}
 }
 
-#define INTERCEPT_SYNTAX "<uuid>"
+#define INTERCEPT_SYNTAX "[-bleg] <uuid>"
 SWITCH_STANDARD_APP(intercept_function)
 {
-	switch_ivr_intercept_session(session, data);
+	int argc;
+	char *argv[4] = { 0 };
+	char *mydata;
+	char *uuid;
+	switch_bool_t bleg = SWITCH_FALSE;
+
+	if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) {
+		if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) {
+			if (!strcasecmp(argv[0], "-bleg")) {
+				if (argv[1]) {
+					uuid = argv[1];
+					bleg = SWITCH_TRUE;
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX);
+					return;
+				}
+			} else {
+				uuid = argv[0];
+			}
+			
+			switch_ivr_intercept_session(session, uuid, bleg);
+		}
+		return;
+	}
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX);
 }
 
 #define MAX_SPY 3000
@@ -1233,6 +1258,19 @@
   dtmf handler function you can hook up to be executed when a digit is dialed during playback 
    if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
 */
+static switch_status_t bridge_on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
+{
+	char *str = (char *) buf;
+	
+	if (str && input && itype == SWITCH_INPUT_TYPE_DTMF) {
+		switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
+		if (strchr(str, dtmf->digit)) {
+			return SWITCH_STATUS_BREAK;
+		}
+	}
+	return SWITCH_STATUS_SUCCESS;
+}
+
 static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
 {
 	switch (itype) {
@@ -1810,7 +1848,29 @@
 			if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
 				switch_ivr_signal_bridge(session, peer_session);
 			} else {
-				switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
+				switch_channel_t *channel = switch_core_session_get_channel(session);
+				switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
+				char *a_key = (char *)switch_channel_get_variable(channel, "bridge_terminate_key");
+				char *b_key = (char *)switch_channel_get_variable(peer_channel, "bridge_terminate_key");
+				int ok = 0;
+				switch_input_callback_function_t func = NULL;
+				
+				if (a_key) {
+					a_key = switch_core_session_strdup(session, a_key);
+					ok++;
+				}
+				if (b_key) {
+					b_key = switch_core_session_strdup(session, b_key);
+					ok++;
+				}
+				if (ok) {
+					func = bridge_on_dtmf;
+				} else {
+					a_key = NULL;
+					b_key = NULL;
+				}
+
+				switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, a_key);
 			}
 		}
 	end:

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_fifo/mod_fifo.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_fifo/mod_fifo.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_fifo/mod_fifo.c	Mon May 26 12:59:57 2008
@@ -740,13 +740,13 @@
 			pop = NULL;
 			
             if (moh && do_wait) {
-				switch_status_t status = switch_ivr_play_file(session, NULL, moh, &args);
+				switch_status_t moh_status = switch_ivr_play_file(session, NULL, moh, &args);
 				memset(&args, 0, sizeof(args));
                 args.read_frame_callback = consumer_read_frame_callback;
                 args.user_data = node_list;
                 switch_ivr_play_file(session, NULL, moh, &args);
 				
-				if (!SWITCH_READ_ACCEPTABLE(status)) {
+				if (!SWITCH_READ_ACCEPTABLE(moh_status)) {
 					break;
 				}
             }
@@ -1153,13 +1153,13 @@
             if (!x) {
                 stream->write_function(stream, "none\n");
             }
-        } else {
-            if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) {
-				len = node_consumer_wait_count(node);
-            }
+        } else if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) {
+			len = node_consumer_wait_count(node);
             switch_mutex_lock(node->mutex);
             stream->write_function(stream, "%s:%d:%d:%d\n", argv[1], node->consumer_count, node->caller_count, len);
             switch_mutex_unlock(node->mutex);
+		} else {
+			stream->write_function(stream, "none\n");
         }
     }
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_voicemail/mod_voicemail.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_voicemail/mod_voicemail.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/applications/mod_voicemail/mod_voicemail.c	Mon May 26 12:59:57 2008
@@ -952,8 +952,10 @@
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path);
 			}
             if (switch_channel_ready(channel)) {
+                /* TODO Rel 1.0 : Add Playback of Prompt <message is too short, please rerecord your message>, then go back at record_file */
                 goto record_file;
             } else {
+                status = SWITCH_STATUS_BREAK;
                 goto end;
             }
         } else {
@@ -1741,7 +1743,9 @@
 	switch_file_handle_t fh = { 0 };
 	switch_input_args_t args = { 0 };
 	char *email_vm = NULL;
+    char *email_vm_notify = NULL;
 	int send_mail = 0;
+    int send_mail_only = 0;
 	cc_t cc = { 0 };
 	char *read_flags = NORMAL_FLAG_STRING;
 	int priority = 3;
@@ -1804,8 +1808,12 @@
 
 						if (!strcasecmp(var, "vm-mailto")) {
 							email_vm = switch_core_session_strdup(session, val);
+                        } else if (!strcasecmp(var, "vm-mailto-notify")) {
+                            email_vm_notify = switch_core_session_strdup(session, val);
 						} else if (!strcasecmp(var, "email-addr")) {
 							email_addr = val;
+                        } else if (!strcasecmp(var, "vm-email-only")) {
+                            send_mail_only = switch_true(val);
 						} else if (!strcasecmp(var, "vm-email-all-messages")) {
 							send_mail = switch_true(val);
 						} else if (!strcasecmp(var, "vm-delete-file")) {
@@ -1944,7 +1952,7 @@
 		}
 	}
 
-	if (!send_mail && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
+	if (!send_mail_only && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
 		char *usql;
 		switch_event_t *event;
 		char *mwi_id = NULL;
@@ -1979,7 +1987,7 @@
 
 end:
 
-	if (send_mail && !switch_strlen_zero(email_vm)) {
+	if (send_mail && !switch_strlen_zero(email_vm) && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
 		switch_event_t *event;
 		char *from;
 		char *body;
@@ -2080,10 +2088,13 @@
 		} else {
 			switch_simple_email(email_vm, from, header_string, body, NULL);
 		}
+        if (!switch_strlen_zero(email_vm_notify)) {
+            switch_simple_email(email_vm_notify, from, header_string, body, NULL);
+        }
 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm);
 		switch_safe_free(body);
-		if (email_delete) {
+		if (email_delete && send_mail_only) {
 			if (unlink(file_path) != 0) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path);
 			}
@@ -2417,8 +2428,8 @@
 	struct holder holder;
 	char *ref = NULL;
 
-	if (stream->event) {
-		ref = switch_event_get_header(stream->event, "http-referer");
+	if (stream->param_event) {
+		ref = switch_event_get_header(stream->param_event, "http-referer");
 	}
 
 	sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' and file_path like '%%%s'", user, domain, file);
@@ -2516,7 +2527,7 @@
 		strcmp(argv[10], URGENT_FLAG_STRING) ? "normal" : "urgent", create_date, heard, duration_str);
 
 	switch_snprintf(title_b4, sizeof(title_b4), "%s <%s> %s", argv[5], argv[6], rss_date);
-	switch_url_encode(title_b4, title_aft, sizeof(title_aft)-1);
+	switch_url_encode(title_b4, title_aft, sizeof(title_aft));
 
 	holder->stream->write_function(holder->stream,
 		"<br><object width=550 height=15 \n"
@@ -2766,13 +2777,13 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
-	if (stream->event) {
-		host = switch_event_get_header(stream->event, "http-host");
-		port = switch_event_get_header(stream->event, "http-port");
-		uri = switch_event_get_header(stream->event, "http-uri");
-		user = switch_event_get_header(stream->event, "freeswitch-user");
-		domain = switch_event_get_header(stream->event, "freeswitch-domain");
-		path_info = switch_event_get_header(stream->event, "http-path-info");
+	if (stream->param_event) {
+		host = switch_event_get_header(stream->param_event, "http-host");
+		port = switch_event_get_header(stream->param_event, "http-port");
+		uri = switch_event_get_header(stream->param_event, "http-uri");
+		user = switch_event_get_header(stream->param_event, "freeswitch-user");
+		domain = switch_event_get_header(stream->param_event, "freeswitch-domain");
+		path_info = switch_event_get_header(stream->param_event, "http-path-info");
 	}
 
 	if (!switch_strlen_zero(cmd)) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_alsa/mod_alsa.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_alsa/mod_alsa.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_alsa/mod_alsa.c	Mon May 26 12:59:57 2008
@@ -1532,8 +1532,8 @@
 	char cmd_buf[1024] = "";
 	char *http = NULL;
 
-	if (stream->event) {
-		http = switch_event_get_header(stream->event, "http-host");
+	if (stream->param_event) {
+		http = switch_event_get_header(stream->param_event, "http-host");
 	}
 
 	
@@ -1553,7 +1553,7 @@
 #if 0
 		switch_event_header_t *hp;
 		stream->write_function(stream, "<pre>");
-		for (hp = stream->event->headers; hp; hp = hp->next) {
+		for (hp = stream->param_event->headers; hp; hp = hp->next) {
 			stream->write_function(stream, "[%s]=[%s]\n", hp->name, hp->value);
 		}
 		stream->write_function(stream, "</pre>");
@@ -1561,8 +1561,8 @@
 
 		stream->write_function(stream, "Content-type: text/html\n\n");
 
-		wcmd = switch_str_nil(switch_event_get_header(stream->event, "wcmd"));
-		action = switch_event_get_header(stream->event, "action");
+		wcmd = switch_str_nil(switch_event_get_header(stream->param_event, "wcmd"));
+		action = switch_event_get_header(stream->param_event, "action");
 
 		if (action) {
 			if (strlen(action) == 1) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/mod_portaudio.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/mod_portaudio.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_portaudio/mod_portaudio.c	Mon May 26 12:59:57 2008
@@ -1538,19 +1538,19 @@
 		"pa dtmf <digit string>\n"
 		"pa flags [on|off] [ear] [mouth]\n"
 		"pa devlist\n"
-		"pa indev [#<num>|<partial name>\n"
-		"pa outdev [#<num>|<partial name>\n"
-		"pa ringdev [#<num>|<partial name>\n" "--------------------------------------------------------------------------------\n";
+		"pa indev #<num>|<partial name>\n"
+		"pa outdev #<num>|<partial name>\n"
+		"pa ringdev #<num>|<partial name>\n" "--------------------------------------------------------------------------------\n";
 
-	if (stream->event) {
-		http = switch_event_get_header(stream->event, "http-host");
+	if (stream->param_event) {
+		http = switch_event_get_header(stream->param_event, "http-host");
 	}
 
 	if (http) {
 		stream->write_function(stream, "Content-type: text/html\n\n");
 
-		wcmd = switch_str_nil(switch_event_get_header(stream->event, "wcmd"));
-		action = switch_event_get_header(stream->event, "action");
+		wcmd = switch_str_nil(switch_event_get_header(stream->param_event, "wcmd"));
+		action = switch_event_get_header(stream->param_event, "action");
 
 		if (action) {
 			if (strlen(action) == 1) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.c	Mon May 26 12:59:57 2008
@@ -1497,6 +1497,7 @@
 	char *p;
 	sofia_profile_t *profile = NULL;
 	const char *exclude_contact = NULL;
+	char *reply = "";
 
 	if (!cmd) {
 		stream->write_function(stream, "%s", "");
@@ -1543,11 +1544,13 @@
 		if (profile) {
 			struct cb_helper cb;
 			switch_stream_handle_t mystream = { 0 };
+			
 			if (!domain || !strchr(domain, '.')) {
 				domain = profile->name;
 			}
 
 			SWITCH_STANDARD_STREAM(mystream);
+			switch_assert(mystream.data);
 			cb.profile = profile;
 			cb.stream = &mystream;
 			
@@ -1561,19 +1564,20 @@
 			switch_assert(sql);
 			sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, contact_callback, &cb);
 			switch_safe_free(sql);
-			if (mystream.data) {
-				char *str = mystream.data;
-				*(str + (strlen(str) - 1)) = '\0';
+			reply = (char *) mystream.data;
+			if (!switch_strlen_zero(reply) && end_of(reply) == ',') {
+				end_of(reply) = '\0';
 			}
-			stream->write_function(stream, "%s", mystream.data);
+			stream->write_function(stream, "%s", reply);
+			reply = NULL;
 			switch_safe_free(mystream.data);
-			goto end;
 		}
 	}
 	
-	stream->write_function(stream, "%s", "");
+	if (reply) {
+		stream->write_function(stream, "%s", reply);
+	}
 
-end:
 	switch_safe_free(data);
 
 	if (profile) {
@@ -1856,7 +1860,7 @@
 			tech_pvt->dest_to = switch_core_session_sprintf(nsession, "sip:%s@%s", dest_to, host);
 		}
 	}
-
+	
 
 	if (!tech_pvt->dest_to) {
 		tech_pvt->dest_to = tech_pvt->dest;
@@ -1886,6 +1890,8 @@
 	cause = SWITCH_CAUSE_SUCCESS;
 
 	if (session) {
+		switch_channel_t *o_channel = switch_core_session_get_channel(session);
+
 		switch_ivr_transfer_variable(session, nsession, SOFIA_REPLACES_HEADER);
 		switch_ivr_transfer_variable(session, nsession, "sip_auto_answer");
 		switch_ivr_transfer_variable(session, nsession, SOFIA_SIP_HEADER_PREFIX_T);
@@ -1903,6 +1909,19 @@
 			tech_pvt->bte = ctech_pvt->te;
 			tech_pvt->bcng_pt = ctech_pvt->cng_pt;
 		}
+
+		if (switch_channel_test_flag(o_channel, CF_PROXY_MEDIA)) {
+			const char *r_sdp = switch_channel_get_variable(o_channel, SWITCH_R_SDP_VARIABLE);
+
+			if (switch_stristr("m=video", r_sdp)) {
+				sofia_glue_tech_choose_video_port(tech_pvt, 1);
+				tech_pvt->video_rm_encoding = "PROXY-VID";
+				tech_pvt->video_rm_rate = 90000;
+				tech_pvt->video_codec_ms = 0;
+				switch_channel_set_flag(tech_pvt->channel, CF_VIDEO);
+				switch_set_flag(tech_pvt, TFLAG_VIDEO);
+			}
+		}
 	}
 
 	goto done;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/mod_sofia.h	Mon May 26 12:59:57 2008
@@ -145,7 +145,9 @@
 	PFLAG_WORKER_RUNNING = (1 << 17),
 	PFLAG_UNREG_OPTIONS_FAIL = (1 << 18),
 	PFLAG_DISABLE_TIMER = (1 << 19),
-	PFLAG_DISABLE_100REL = (1 << 20)
+	PFLAG_DISABLE_100REL = (1 << 20),
+	PFLAG_AGGRESSIVE_NAT_DETECTION = (1 << 21),
+	PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22)
 } PFLAGS;
 
 typedef enum {
@@ -555,7 +557,7 @@
 switch_call_cause_t sofia_glue_sip_cause_to_freeswitch(int status);
 void sofia_glue_do_xfer_invite(switch_core_session_t *session);
 uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, 
-								  sofia_regtype_t regtype, char *key, uint32_t keylen, switch_event_t **v_event);
+								  sofia_regtype_t regtype, char *key, uint32_t keylen, switch_event_t **v_event, const char *is_nat);
 extern switch_endpoint_interface_t *sofia_endpoint_interface;
 void sofia_presence_set_chat_hash(private_object_t *tech_pvt, sip_t const *sip);
 switch_status_t sofia_on_hangup(switch_core_session_t *session);
@@ -634,4 +636,6 @@
 switch_status_t sofia_glue_tech_proxy_remote_addr(private_object_t *tech_pvt);
 void sofia_presence_event_thread_start(void);
 void sofia_reg_expire_call_id(sofia_profile_t *profile, const char *call_id);
+switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, int force);
+switch_status_t sofia_glue_tech_set_video_codec(private_object_t *tech_pvt, int force);
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia.c	Mon May 26 12:59:57 2008
@@ -549,6 +549,7 @@
 							TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)),
 							TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)),
 							NTATAG_UDP_MTU(65536),
+							NTATAG_SERVER_RPORT(2),
 							TAG_IF(tportlog, TPTAG_LOG(1)),
 							TAG_END());	/* Last tag should always finish the sequence */
 
@@ -591,6 +592,7 @@
 		node->nua = nua_create(profile->s_root,	/* Event loop */
 								sofia_event_callback,	/* Callback for processing events */
 								profile,	/* Additional data to pass to callback */
+								NTATAG_SERVER_RPORT(2),
 								NUTAG_URL(node->url), TAG_END());	/* Last tag should always finish the sequence */
 
 		nua_set_params(node->nua,
@@ -1122,6 +1124,10 @@
 						switch_set_flag(profile, TFLAG_LATE_NEGOTIATION);
 					} else if (!strcasecmp(var, "inbound-proxy-media") && switch_true(val)) {
 						switch_set_flag(profile, TFLAG_PROXY_MEDIA);
+					} else if (!strcasecmp(var, "NDLB-received-in-nat-reg-contact") && switch_true(val)) {
+						profile->pflags |= PFLAG_RECIEVED_IN_NAT_REG_CONTACT;
+					} else if (!strcasecmp(var, "aggressive-nat-detection") && switch_true(val)) {
+						profile->pflags |= PFLAG_AGGRESSIVE_NAT_DETECTION;
 					} else if (!strcasecmp(var, "rfc2833-pt")) {
 						profile->te = (switch_payload_t) atoi(val);
 					} else if (!strcasecmp(var, "cng-pt")) {
@@ -2049,6 +2055,7 @@
 							goto done;
 						}
 					}
+
 					if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
 						&& (other_session = switch_core_session_locate(uuid))) {
 						other_channel = switch_core_session_get_channel(other_session);
@@ -2084,9 +2091,7 @@
 							}
 							if (switch_channel_get_state(channel) == CS_HIBERNATE) {
 								switch_set_flag_locked(tech_pvt, TFLAG_READY);
-								if (switch_channel_get_state(channel) == CS_NEW) {
-									switch_channel_set_state(channel, CS_INIT);
-								}
+								switch_channel_set_state(channel, CS_INIT);
 								switch_set_flag(tech_pvt, TFLAG_SDP);
 							}
 							goto done;
@@ -2652,7 +2657,7 @@
 	int is_auth = 0, calling_myself = 0;
 	su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua));
 	int network_port = 0;
-	char *sticky = NULL, *is_nat = NULL;
+	char *is_nat = NULL;
 
 	if (sess_count >= sess_max || !(profile->pflags & PFLAG_RUNNING)) {
 		nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END());
@@ -2664,12 +2669,26 @@
 		nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END());
 		return;
 	}
-
 	
 	get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr);
 	network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port);
-	
-	if (profile->nat_acl_count) {
+
+	if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) {
+		if (sip && sip->sip_via) {
+			const char *port = sip->sip_via->v_port;
+			const char *host = sip->sip_via->v_host;
+			
+			if (host && sip->sip_via->v_received) {
+				is_nat = "via received";
+			} else if (host && strcmp(network_ip, host)) {
+				is_nat = "via host";
+			} else if (port && atoi(port) != network_port) {
+				is_nat = "via port";
+			}
+		}
+	}
+
+	if (!is_nat && profile->nat_acl_count) {
 		uint32_t x = 0;
 		int ok = 1;
 		char *last_acl = NULL;
@@ -2692,7 +2711,6 @@
 			}
 		}
 	}
-	
 
 	if (profile->acl_count) {
 		uint32_t x = 0;
@@ -2723,33 +2741,28 @@
 			}
 		}
 	}
-
 	
 	if (!is_auth && 
 		((profile->pflags & PFLAG_AUTH_CALLS) || (!(profile->pflags & PFLAG_BLIND_AUTH) && (sip->sip_proxy_authorization || sip->sip_authorization)))) {
 		if (!strcmp(network_ip, profile->sipip) && network_port == profile->sip_port) {
 			calling_myself++;
 		} else {
-			if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event)) {
+			if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event, NULL)) {
 				if (v_event) {
 					switch_event_destroy(&v_event);
 				}
-				switch_safe_free(sticky);
 				return;
 			}
-			switch_safe_free(sticky);
 		}
 		is_auth++;
 	}
 
-	
 	if (!(sip->sip_contact && sip->sip_contact->m_url)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n");
 		nua_respond(nh, 400, "Missing Contact Header", TAG_END());
 		return;
 	}
 
-	
 	if (!sofia_endpoint_interface || !(session = switch_core_session_request(sofia_endpoint_interface, NULL))) {
 		nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END());
 		return;
@@ -2761,6 +2774,8 @@
 		switch_core_session_destroy(&session);
 		return;
 	}
+
+
 	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
 
 	tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip);
@@ -3194,7 +3209,7 @@
 
 		if (is_nat) {
 			switch_set_flag(tech_pvt, TFLAG_NAT);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on acl %s\n", is_nat);
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on %s\n", is_nat);
 			switch_channel_set_variable(channel, "sip_nat_detected", "true");
 		}
 		

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_glue.c	Mon May 26 12:59:57 2008
@@ -35,8 +35,6 @@
 #include "mod_sofia.h"
 #include <switch_stun.h>
 
-switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt);
-switch_status_t sofia_glue_tech_set_video_codec(private_object_t *tech_pvt, int force);
 
 void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32_t port, const char *sr, int force)
 {
@@ -222,7 +220,7 @@
 	if (switch_test_flag(tech_pvt, TFLAG_VIDEO)) {
 		if (!switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED) && !switch_channel_test_flag(tech_pvt->channel, CF_EARLY_MEDIA) && 
 			!tech_pvt->local_sdp_video_port) {
-			sofia_glue_tech_choose_video_port(tech_pvt);
+			sofia_glue_tech_choose_video_port(tech_pvt, 0);
 		}
 
 		if ((v_port = tech_pvt->adv_sdp_video_port)) {
@@ -518,14 +516,16 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
-switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt)
+switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, int force)
 {
 	char *ip = tech_pvt->profile->rtpip;
 	switch_port_t sdp_port;
 	char tmp[50];
 	
-	if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->adv_sdp_video_port) {
-		return SWITCH_STATUS_SUCCESS;
+	if (!force) {
+		if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->local_sdp_video_port) {
+			return SWITCH_STATUS_SUCCESS;
+		}
 	}
 
 	if (tech_pvt->local_sdp_video_port) {
@@ -714,7 +714,8 @@
 	const char *err;
 	char rip[128] = "";
 	char rp[128] = "";
-	char *p, *ip_ptr = NULL, *port_ptr = NULL;
+	char rvp[128] = "";
+	char *p, *ip_ptr = NULL, *port_ptr = NULL, *vid_port_ptr = NULL;
 	int x;
 
 	if (switch_strlen_zero(tech_pvt->remote_sdp_str)) {
@@ -728,6 +729,10 @@
 	if ((p = (char *)switch_stristr("m=audio ", tech_pvt->remote_sdp_str))) {
 		port_ptr = p + 8;
 	}
+
+	if ((p = (char *)switch_stristr("m=video ", tech_pvt->remote_sdp_str))) {
+		vid_port_ptr = p + 8;
+	}
 	
 	if (!(ip_ptr && port_ptr)) {
 		return SWITCH_STATUS_FALSE;
@@ -747,12 +752,46 @@
 		p++;
 	}
 
+	p = vid_port_ptr;
+	x = 0;
+	while(x < sizeof(rvp) && p && *p && (*p >= '0' && *p <= '9')) {
+		rvp[x++] = *p;
+		p++;
+	}
+
+
 	if (switch_strlen_zero(tech_pvt->remote_sdp_audio_ip) || !tech_pvt->remote_sdp_audio_port) {
 		tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, rip);
 		tech_pvt->remote_sdp_audio_port = (switch_port_t) atoi(rp);
 	}
 
-	if (!strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) {
+	if (*rvp) {
+		tech_pvt->remote_sdp_video_ip = switch_core_session_strdup(tech_pvt->session, rip);
+		tech_pvt->remote_sdp_video_port = (switch_port_t) atoi(rvp);
+	}
+	
+	if (tech_pvt->remote_sdp_video_ip && tech_pvt->remote_sdp_video_port) {
+		if (!strcmp(tech_pvt->remote_sdp_video_ip, rip) && atoi(rvp) == tech_pvt->remote_sdp_video_port) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n", 
+							  tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
+		} else {
+			switch_set_flag_locked(tech_pvt, TFLAG_VIDEO);
+			switch_channel_set_flag(tech_pvt->channel, CF_VIDEO);
+			if (switch_rtp_ready(tech_pvt->video_rtp_session)) {
+				if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) !=
+					SWITCH_STATUS_SUCCESS) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err);
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n",
+									  tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port);
+					/* Reactivate the NAT buster flag. */
+					switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_AUTOADJ);
+				}
+			}
+		}
+	}
+
+	if (tech_pvt->remote_sdp_audio_ip && !strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", 
 						  tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
 		return SWITCH_STATUS_SUCCESS;
@@ -777,14 +816,14 @@
 void sofia_glue_tech_patch_sdp(private_object_t *tech_pvt)
 {
 	switch_size_t len;
-	char *p, *q, *ip_ptr = NULL, *port_ptr = NULL;
+	char *p, *q, *ip_ptr = NULL, *port_ptr = NULL, *vport_ptr = NULL;
 	int x;
 
 	if (switch_strlen_zero(tech_pvt->local_sdp_str)) {
 		return;
 	}
 
-	len = strlen(tech_pvt->local_sdp_str) + 256;
+	len = strlen(tech_pvt->local_sdp_str) + 384;
 	
 	if ((p = (char *)switch_stristr("c=IN IP4 ", tech_pvt->local_sdp_str))) {
 		ip_ptr = p + 9;
@@ -798,6 +837,10 @@
 	if ((p = (char *)switch_stristr("m=audio ", tech_pvt->local_sdp_str))) {
 		port_ptr = p + 8;
 	}
+
+	if ((p = (char *)switch_stristr("m=video ", tech_pvt->local_sdp_str))) {
+		vport_ptr = p + 8;
+	}
 	
 	if (!(ip_ptr && port_ptr)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n", 
@@ -805,6 +848,13 @@
 		return;
 	}
 
+	if (vport_ptr) {
+		sofia_glue_tech_choose_video_port(tech_pvt, 1);
+		tech_pvt->video_rm_encoding = "PROXY-VID";
+		tech_pvt->video_rm_rate = 90000;
+		tech_pvt->video_codec_ms = 0;
+	}
+
 	if (switch_strlen_zero(tech_pvt->adv_sdp_audio_ip) || !tech_pvt->adv_sdp_audio_port) {
 		if (sofia_glue_tech_choose_port(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s I/O Error\n", switch_channel_get_name(tech_pvt->channel));
@@ -840,6 +890,16 @@
 			while(p && *p && (*p >= '0' && *p <= '9')) {
 				p++;
 			}
+		} else if (vport_ptr && tech_pvt->adv_sdp_video_port &&  p == vport_ptr) {
+			char port_buf[25] = "";
+			
+			switch_snprintf(port_buf, sizeof(port_buf), "%u", tech_pvt->adv_sdp_video_port);
+			strncpy(q, port_buf, strlen(port_buf));
+			q += strlen(port_buf);
+			x = 0;
+			while(p && *p && (*p >= '0' && *p <= '9')) {
+				p++;
+			}
 		}
 
 		*q++ = *p++;
@@ -868,7 +928,7 @@
 	uint32_t session_timeout = 0;
 	const char *val;
 	const char *rep;
-	char *sticky;
+	char *sticky = NULL;
 
 	rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);
 
@@ -1001,19 +1061,15 @@
 								  SIPTAG_CONTACT_STR(invite_contact),
 								  TAG_END());
 
-
-		if (switch_test_flag(tech_pvt, TFLAG_NAT) ||
-			(val = switch_channel_get_variable(channel, "sip-force-contact")) || 
-			((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) {
+		
+		if (strstr(tech_pvt->dest, ";nat") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) {
+			switch_set_flag(tech_pvt, TFLAG_NAT);
 			tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str);
 			sticky = tech_pvt->record_route;
 			session_timeout = SOFIA_NAT_SESSION_TIMEOUT;
 			switch_channel_set_variable(channel, "sip_nat_detected", "true");
 		}
-
-
-
-
+		
 		/* TODO: We should use the new tags for making an rpid and add profile options to turn this on/off */
 		if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) {
 			priv = "name";
@@ -1104,7 +1160,6 @@
 		sofia_glue_tech_patch_sdp(tech_pvt);
 	}
 
-
 	nua_invite(tech_pvt->nh,
 			   NUTAG_AUTOANSWER(0),
 			   NUTAG_SESSION_TIMER(session_timeout),
@@ -1112,6 +1167,7 @@
 			   TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)),
 			   TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
 			   TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),
+			   TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)),
 			   SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
 			   SOATAG_REUSE_REJECTED(1),
 			   SOATAG_ORDERED_USER(1),
@@ -1544,14 +1600,16 @@
 		}
 	}
 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n",
-					  switch_channel_get_name(tech_pvt->channel),
-					  tech_pvt->local_sdp_audio_ip,
-					  tech_pvt->local_sdp_audio_port,
-					  tech_pvt->remote_sdp_audio_ip,
-					  tech_pvt->remote_sdp_audio_port,
-					  tech_pvt->agreed_pt,
-					  tech_pvt->read_codec.implementation->microseconds_per_frame / 1000);
+	if (!switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n",
+						  switch_channel_get_name(tech_pvt->channel),
+						  tech_pvt->local_sdp_audio_ip,
+						  tech_pvt->local_sdp_audio_port,
+						  tech_pvt->remote_sdp_audio_ip,
+						  tech_pvt->remote_sdp_audio_port,
+						  tech_pvt->agreed_pt,
+						  tech_pvt->read_codec.implementation->microseconds_per_frame / 1000);
+	}
 
 	switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port);
 	switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip);
@@ -1571,13 +1629,23 @@
 		}
         goto video;
 	}
-
+	
 	if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) {
 		if ((status = sofia_glue_tech_proxy_remote_addr(tech_pvt)) != SWITCH_STATUS_SUCCESS) {
 			goto end;
 		}
 		flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_PROXY_MEDIA | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT);
 		timer_name = NULL;
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PROXY AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n",
+						  switch_channel_get_name(tech_pvt->channel),
+						  tech_pvt->local_sdp_audio_ip,
+						  tech_pvt->local_sdp_audio_port,
+						  tech_pvt->remote_sdp_audio_ip,
+						  tech_pvt->remote_sdp_audio_port,
+						  tech_pvt->agreed_pt,
+						  tech_pvt->read_codec.implementation->microseconds_per_frame / 1000);
+
 	} else {
 		timer_name = tech_pvt->profile->timer_name;
 	}
@@ -1687,13 +1755,17 @@
 
 		sofia_glue_check_video_codecs(tech_pvt);
 
-		if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) {
+		if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding && tech_pvt->remote_sdp_video_port) {
 			if (!tech_pvt->local_sdp_video_port) {
-				sofia_glue_tech_choose_video_port(tech_pvt);
+				sofia_glue_tech_choose_video_port(tech_pvt, 1);
 			}
 
 			flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | 
 										 SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE);
+
+			if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) {
+				flags |= SWITCH_RTP_FLAG_PROXY_MEDIA;
+			}
 			sofia_glue_tech_set_video_codec(tech_pvt, 0);
 
 			/* set video timer to 10ms so it can co-exist with audio */
@@ -1709,7 +1781,8 @@
 														 &err, 
 														 switch_core_session_get_pool(tech_pvt->session));
 
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%sVIDEO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
+							  switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) ? "PROXY " : "",
 							  switch_channel_get_name(tech_pvt->channel),
 							  tech_pvt->local_sdp_audio_ip,
 							  tech_pvt->local_sdp_video_port,
@@ -2130,7 +2203,8 @@
 			int framerate = 0;
 			const switch_codec_implementation_t *mimp = NULL;
 			int vmatch = 0, i;
-
+			switch_channel_set_variable(tech_pvt->channel, "video_possible", "true");
+			
 			connection = sdp->sdp_connection;
 			if (m->m_connections) {
 				connection = m->m_connections;
@@ -2152,7 +2226,7 @@
 				if (!(rm_encoding = map->rm_encoding)) {
 					rm_encoding = "";
 				}
-
+				
 				for (i = 0; i < tech_pvt->num_codecs; i++) {
 					const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
 
@@ -2204,6 +2278,7 @@
 		}
 	}
 
+
 	switch_set_flag_locked(tech_pvt, TFLAG_SDP);
 
 	return match;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_presence.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_presence.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_presence.c	Mon May 26 12:59:57 2008
@@ -274,23 +274,21 @@
 	switch_safe_free(sql);
 
 	
-	if (h.total) {
-		sql = switch_mprintf("select sip_user,sip_host,contact,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", 
-							 stream.data, user, host);
+
+	sql = switch_mprintf("select sip_user,sip_host,contact,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", 
+						 stream.data, user, host);
 	
 
 		
-		switch_assert (sql != NULL);
-		sofia_glue_execute_sql_callback(profile,
-										SWITCH_FALSE,
-										profile->ireg_mutex,
-										sql,
-										sofia_presence_mwi_callback2,
-										&h);
-		
-		switch_safe_free(sql);
-	}
-
+	switch_assert (sql != NULL);
+	sofia_glue_execute_sql_callback(profile,
+									SWITCH_FALSE,
+									profile->ireg_mutex,
+									sql,
+									sofia_presence_mwi_callback2,
+									&h);
+	
+	switch_safe_free(sql);
 
 	switch_safe_free(stream.data);
 
@@ -1136,7 +1134,7 @@
 	char *sub_to_user = argv[0];
 	char *sub_to_host = argv[1];
 	char *event = "message-summary";
-	char *contact = argv[2];
+	char *contact, *o_contact = argv[2];
 	char *body = argv[3];
 	char *id = NULL;
 	nua_handle_t *nh;
@@ -1145,7 +1143,7 @@
 	
 	id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host);
 
-	contact = sofia_glue_get_url_from_contact(contact, 0);
+	contact = sofia_glue_get_url_from_contact(o_contact, 1);
 	
 	nh = nua_handle(h->profile->nua, NULL,
 					NUTAG_URL(contact),
@@ -1156,8 +1154,10 @@
 	
 	nua_notify(nh,
 			   NUTAG_NEWSUB(1),
+			   TAG_IF(strstr(o_contact, ";nat"), NUTAG_PROXY(contact)),
 			   SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END());
-
+	
+	switch_safe_free(contact);
 	switch_safe_free(id);
 	
 	return 0;
@@ -1189,40 +1189,97 @@
 		switch_event_t *sevent;
 		int sub_state;
 		int sent_reply = 0;
+		su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua));
+		int network_port = 0;
+		char network_ip[80];
+		const char *contact_host, *contact_user;
+		char *port;
+		char new_port[25] = "";
+		char *is_nat = NULL;
+
+		if (!(contact && sip->sip_contact->m_url)) {
+			nua_respond(nh, 481, "INVALID SUBSCRIPTION", TAG_END());
+			return;
+		}
+
+		get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr);
+		network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port);
 
 		tl_gets(tags,
 				NUTAG_SUBSTATE_REF(sub_state), TAG_END());
 
 		event = sip_header_as_string(profile->home, (void *) sip->sip_event);
 
-		if (contact) {
-			char *port = (char *) contact->m_url->url_port;
-			char new_port[25] = "";
-
-			display = contact->m_display;
-
-			if (switch_strlen_zero(display)) {
-				if (from) {
-					display = from->a_display;
-					if (switch_strlen_zero(display)) {
-						display = "\"user\"";
-					}
+		port = (char *) contact->m_url->url_port;
+		contact_host = sip->sip_contact->m_url->url_host;
+		contact_user = sip->sip_contact->m_url->url_user;
+			
+		display = contact->m_display;
+
+		if (switch_strlen_zero(display)) {
+			if (from) {
+				display = from->a_display;
+				if (switch_strlen_zero(display)) {
+					display = "\"user\"";
 				}
-			} else {
-				display = "\"user\"";
 			}
-
-			if (port) {
-				switch_snprintf(new_port, sizeof(new_port), ":%s", port);
+		} else {
+			display = "\"user\"";
+		}
+			
+		if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) {
+			if (sip && sip->sip_via) {
+				const char *v_port = sip->sip_via->v_port;
+				const char *v_host = sip->sip_via->v_host;
+					
+				if (v_host && sip->sip_via->v_received) {
+					is_nat = "via received";
+				} else if (v_host && strcmp(network_ip, v_host)) {
+					is_nat = "via host";
+				} else if (v_port && atoi(v_port) != network_port) {
+					is_nat = "via port";
+				}
 			}
+		}
 			
-			if (contact->m_url->url_params) {
-				contact_str = switch_mprintf("%s <sip:%s@%s%s;%s>",
-											 display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params);
-			} else {
-				contact_str = switch_mprintf("%s <sip:%s@%s%s>", display, contact->m_url->url_user, contact->m_url->url_host, new_port);
+		if (!is_nat && profile->nat_acl_count) {
+			uint32_t x = 0;
+			int ok = 1;
+			char *last_acl = NULL;
+				
+			if (!switch_strlen_zero(contact_host)) {
+				for (x = 0 ; x < profile->nat_acl_count; x++) {
+					last_acl = profile->nat_acl[x];
+					if (!(ok = switch_check_network_list_ip(contact_host, last_acl))) {
+						break;
+					}
+				}
+					
+				if (ok) {
+					is_nat = last_acl;
+				}
 			}
 		}
+			
+			
+		if (is_nat) {
+			contact_host = network_ip;
+			switch_snprintf(new_port, sizeof(new_port), ":%d", network_port);
+			port = NULL;
+		}
+
+
+		if (port) {
+			switch_snprintf(new_port, sizeof(new_port), ":%s", port);
+		}
+			
+		if (contact->m_url->url_params) {
+			contact_str = switch_mprintf("%s <sip:%s@%s%s;%s>%s",
+										 display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, is_nat ? ";nat" : "");
+		} else {
+			contact_str = switch_mprintf("%s <sip:%s@%s%s>%s", display, contact->m_url->url_user, contact_host, new_port, is_nat ? ";nat" : "");
+		}
+		
 
 		if (to) {
 			to_str = switch_mprintf("sip:%s@%s", to->a_url->url_user, to->a_url->url_host);	//, to->a_url->url_port);
@@ -1336,14 +1393,25 @@
 	
 		switch_mutex_unlock(profile->ireg_mutex);
 
+
 		if (status < 200) {
-			nua_respond(nh, SIP_202_ACCEPTED,
+			char *sticky = NULL;
+			
+			if (is_nat) {
+				sticky = switch_mprintf("sip:%s@%s:%d", contact_user, network_ip, network_port);
+			}
+
+			nua_respond(nh, SIP_202_ACCEPTED,						
 						NUTAG_WITH_THIS(nua),
 						SIPTAG_SUBSCRIPTION_STATE_STR(sstr), 
+						TAG_IF(sticky, NUTAG_PROXY(sticky)),
 						//SIPTAG_FROM(sip->sip_to),
 						//SIPTAG_TO(sip->sip_from),
 						//SIPTAG_CONTACT_STR(contact_str),
 						TAG_END());
+
+			switch_safe_free(sticky);
+
 		}
 		
 		sent_reply++;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_reg.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_reg.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_sofia/sofia_reg.c	Mon May 26 12:59:57 2008
@@ -333,7 +333,7 @@
 	
 
 	if (now) {
-		switch_snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%NATHACK%%'");
+		switch_snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%AUTO-NAT%%'");
 		sofia_glue_execute_sql_callback(profile,
 										SWITCH_TRUE,
 										NULL,
@@ -414,7 +414,7 @@
 }
 
 uint8_t sofia_reg_handle_register(nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sip_t const *sip, sofia_regtype_t regtype, char *key,
-								  uint32_t keylen, switch_event_t **v_event)
+								  uint32_t keylen, switch_event_t **v_event, const char *is_nat)
 {
 	sip_to_t const *to = NULL;
 	sip_expires_t const *expires = NULL;
@@ -439,6 +439,7 @@
 	const char *reg_desc = "Registered";
 	const char *call_id = NULL;
 	char *force_user;
+	char received_data[128] = "";
 
 	/* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */
 	switch_assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL);
@@ -465,8 +466,16 @@
 	if (contact->m_url) {
 		const char *port = contact->m_url->url_port;
 		char new_port[25] = "";
+		const char *contact_host = contact->m_url->url_host;
 		display = contact->m_display;
-
+		
+		if (is_nat) {
+			reg_desc = "Registered(AUTO-NAT)";
+			contact_host = network_ip;
+			switch_snprintf(new_port, sizeof(new_port), ":%d", network_port);
+			port = NULL;
+		}
+		
 		if (switch_strlen_zero(display)) {
 			if (to) {
 				display = to->a_display;
@@ -480,11 +489,19 @@
 			switch_snprintf(new_port, sizeof(new_port), ":%s", port);
 		}
 
+		if (is_nat && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) {
+			switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", network_ip, network_port);
+		}
+
 		if (contact->m_url->url_params) {
-			switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>",
-							display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params);
+			switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>%s%s",
+							display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, 
+							received_data,
+							is_nat ? ";nat" : "");
 		} else {
-			switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>", display, contact->m_url->url_user, contact->m_url->url_host, new_port);
+			switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>%s%s", display, contact->m_url->url_user, contact_host, new_port, 
+							received_data,
+							is_nat ? ";nat" : "");
 		}
 	}
 
@@ -526,18 +543,23 @@
 			}
 			
 			if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) {
+
+				if (*received_data && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) {
+					switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", network_ip, network_port);
+				}
+
 				if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || 
 					!strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) {
 					if (contact->m_url->url_params) {
-						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>",
-										display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params);
+						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>%s;nat",
+										display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params, received_data);
 					} else {
-						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port);
+						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>%s;nat", display, contact->m_url->url_user, network_ip, network_port, received_data);
 					}
 					if (strstr(v_contact_str, "tls")) {
 						reg_desc = "Registered(TLSHACK)";
 					} else {
-						reg_desc = "Registered(NATHACK)";
+						reg_desc = "Registered(AUTO-NAT)";
 						exptime = 20;
 					}
 					nat_hack = 1;
@@ -609,8 +631,6 @@
 		sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','%q', '%q', %ld, '%q')", call_id,
 							 to_user, to_host, contact_str, reg_desc,
 							 rpid, (long) switch_timestamp(NULL) + (long) exptime * 2, agent);
-
-		
 		if (sql) {
 			sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
 		}
@@ -698,38 +718,52 @@
 
 	if (regtype == REG_REGISTER) {
 		char *new_contact = NULL;
+		char new_port[30] = "";
+		char exp_param[128] = "";
+		
+		if (exptime) {
+			switch_snprintf(exp_param, sizeof(exp_param), ";expires=%ld", exptime);
+		}
+			
+
+		if (contact->m_url->url_port) {
+			switch_snprintf(new_port, sizeof(new_port), ":%s", contact->m_url->url_port);
+		}
+
+		if (contact->m_url->url_params) {
+			new_contact = switch_mprintf("%s <sip:%s@%s%s;%s>%s",
+										 display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params,
+										 exp_param);
+		} else {
+			new_contact = switch_mprintf("%s <sip:%s@%s%s>%s",
+										 display, contact->m_url->url_user, contact->m_url->url_host, new_port,
+										 exp_param);
+		}
+			
+		nua_respond(nh,
+					SIP_200_OK, 
+					SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END());
+		switch_safe_free(new_contact);
 
 		if (exptime) {
-			if (nat_hack) {
-				new_contact = switch_mprintf("%s;expires=%ld;received=\"%s:%d\"", contact_str, (long)exptime, network_ip, network_port);
-			} else {
-				new_contact = switch_mprintf("%s;expires=%ld", contact_str, (long)exptime);
-			}
-			nua_respond(nh, 
-						SIP_200_OK, 
-						SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END());
-			switch_safe_free(new_contact);
 			if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) {
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, to_host);
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", "%s", profile->name);
 				switch_event_fire(&event);
-			}
-		} else {
-			nua_respond(nh, 
-						SIP_200_OK, 
-						SIPTAG_CONTACT(contact), NUTAG_WITH_THIS(nua), TAG_END());
-			
-			if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", contact_str);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", call_id);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime);
-				switch_event_fire(&s_event);
+			} else {
+				if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) {
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", contact_str);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", call_id);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime);
+					switch_event_fire(&s_event);
+				}
 			}
 		}
+		
 
 		return 1;
 	}
@@ -747,6 +781,7 @@
 	su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua));
 	sofia_regtype_t type = REG_REGISTER;
 	int network_port = 0;
+	char *is_nat = NULL;
 
 	get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr);
 	network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port);
@@ -765,6 +800,45 @@
 		goto end;
 	}
 
+	if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) {
+		if (sip && sip->sip_via) {
+			const char *port = sip->sip_via->v_port;
+			const char *host = sip->sip_via->v_host;
+			
+			if (host && sip->sip_via->v_received) {
+				is_nat = "via received";
+			} else if (host && strcmp(network_ip, host)) {
+				is_nat = "via host";
+			} else if (port && atoi(port) != network_port) {
+				is_nat = "via port";
+			}
+		}
+	}
+
+	if (!is_nat && profile->nat_acl_count) {
+		uint32_t x = 0;
+		int ok = 1;
+		char *last_acl = NULL;
+		const char *contact_host = NULL;
+
+		if (sip && sip->sip_contact && sip->sip_contact->m_url) {
+			contact_host = sip->sip_contact->m_url->url_host;
+		}
+
+		if (!switch_strlen_zero(contact_host)) {
+			for (x = 0 ; x < profile->nat_acl_count; x++) {
+				last_acl = profile->nat_acl[x];
+				if (!(ok = switch_check_network_list_ip(contact_host, last_acl))) {
+					break;
+				}
+			}
+			
+			if (ok) {
+				is_nat = last_acl;
+			}
+		}
+	}
+
 	if (profile->reg_acl_count) {
 		uint32_t x = 0;
 		int ok = 1;
@@ -796,7 +870,7 @@
 		goto end;
 	}
 
-	sofia_reg_handle_register(nua, profile, nh, sip, type, key, sizeof(key), &v_event);
+	sofia_reg_handle_register(nua, profile, nh, sip, type, key, sizeof(key), &v_event, is_nat);
 
 	if (v_event) {
 		switch_event_fire(&v_event);

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_woomera/mod_woomera.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_woomera/mod_woomera.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_woomera/mod_woomera.c	Mon May 26 12:59:57 2008
@@ -471,7 +471,7 @@
 
 static void woomera_printf(woomera_profile * profile, switch_socket_t * socket, char *fmt, ...)
 {
-	char *stuff;
+	char *stuff = NULL;
 	size_t res = 0, len = 0;
 
 	va_list ap;
@@ -479,13 +479,13 @@
 #ifndef vasprintf
 	stuff = (char *) malloc(10240);
 	switch_assert(stuff);
-	vsnprintf(stuff, 10240, fmt, ap);
+	res = vsnprintf(stuff, 10240, fmt, ap);
 #else
 	res = vasprintf(&stuff, fmt, ap);
 	switch_assert(stuff);
 #endif
 	va_end(ap);
-	if (res == -1) {
+	if (res < 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Out of memory\n");
 	} else {
 		if (profile && globals.debug) {
@@ -494,10 +494,11 @@
 		}
 		len = strlen(stuff);
 		switch_socket_send(socket, stuff, &len);
+	}
 
+	if (stuff) {
 		free(stuff);
 	}
-
 }
 
 static char *woomera_message_header(woomera_message * wmsg, char *key)

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_local_stream/mod_local_stream.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_local_stream/mod_local_stream.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_local_stream/mod_local_stream.c	Mon May 26 12:59:57 2008
@@ -120,10 +120,9 @@
 
 		if (switch_dir_open(&source->dir_handle, source->location, source->pool) != SWITCH_STATUS_SUCCESS) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't open directory: %s\n", source->location);
-			return NULL;
+			goto done;
 		}
 
-		//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open directory: %s\n", source->location);
 		switch_yield(1000000);
 
 		while(RUNNING) {
@@ -181,11 +180,11 @@
 			
 			if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n");
-				return NULL;
+				switch_dir_close(source->dir_handle);
+				source->dir_handle = NULL;
+				goto done;
 			}
 
-			//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing [%s] rate: %dhz\n", fname, source->rate);
-
 			while (RUNNING) {
 				switch_core_timer_next(&timer);
 				olen = source->samples;
@@ -231,6 +230,9 @@
 		source->dir_handle = NULL;
 	}
 
+done:
+	switch_buffer_destroy(&audio_buffer);
+
 	if (fd > -1) {
 		close(fd);
 	}
@@ -252,7 +254,7 @@
 		return SWITCH_STATUS_FALSE;
 	}
 	
-	alt_path = switch_mprintf("%s%s%d", path, SWITCH_PATH_SEPARATOR, handle->samplerate);
+	alt_path = switch_mprintf("%s/%d", path, handle->samplerate);
 
 	switch_mutex_lock(globals.mutex);
 	if ((source = switch_core_hash_find(globals.source_hash, alt_path))) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_shout/mod_shout.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_shout/mod_shout.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_shout/mod_shout.c	Mon May 26 12:59:57 2008
@@ -1017,7 +1017,7 @@
                                    argv[1], argv[4], argv[5], argv[7], argv[8] ? argv[8] : "N/A", argv[9] ? argv[9] : "N/A", argv[10], argv[11]);
     
     snprintf(title_b4, sizeof(title_b4), "%s <%s>", argv[4], argv[5]);
-    switch_url_encode(title_b4, title_aft, sizeof(title_aft)-1);
+    switch_url_encode(title_b4, title_aft, sizeof(title_aft));
 
     mp3 = switch_mprintf("http://%s:%s%s/mp3/%s/%s.mp3", holder->host, holder->port, holder->uri, argv[0], argv[5]);
     m3u = switch_mprintf("http://%s:%s%s/m3u/mp3/%s/%s.mp3.m3u", holder->host, holder->port, holder->uri, argv[0], argv[5]);
@@ -1032,7 +1032,7 @@
 
 void do_telecast(switch_stream_handle_t *stream)
 {
-    char *path_info = switch_event_get_header(stream->event, "http-path-info");
+    char *path_info = switch_event_get_header(stream->param_event, "http-path-info");
     char *uuid = strdup(path_info + 4);
     switch_core_session_t *tsession;
     char *fname = "stream.mp3";
@@ -1042,7 +1042,7 @@
     }
 
     if (!(tsession = switch_core_session_locate(uuid))) {
-        char *ref = switch_event_get_header(stream->event, "http-referer");
+        char *ref = switch_event_get_header(stream->param_event, "http-referer");
         stream->write_function(stream,"Content-type: text/html\r\n\r\n<h2>Not Found!</h2>\n"
                                "<META http-equiv=\"refresh\" content=\"1;URL=%s\">",  ref);
     } else {
@@ -1140,7 +1140,7 @@
 
 void do_broadcast(switch_stream_handle_t *stream)
 {
-    char *path_info = switch_event_get_header(stream->event, "http-path-info");
+    char *path_info = switch_event_get_header(stream->param_event, "http-path-info");
     char *file;
     lame_global_flags *gfp = NULL;
     switch_file_handle_t fh = {0};
@@ -1254,9 +1254,9 @@
     struct holder holder;
     char *errmsg;
 
-    holder.host = switch_event_get_header(stream->event, "http-host");
-    holder.port = switch_event_get_header(stream->event, "http-port");
-    holder.uri = switch_event_get_header(stream->event, "http-uri");
+    holder.host = switch_event_get_header(stream->param_event, "http-host");
+    holder.port = switch_event_get_header(stream->param_event, "http-port");
+    holder.uri = switch_event_get_header(stream->param_event, "http-uri");
     holder.stream = stream;
     
     stream->write_function(stream, "Content-type: text/html\r\n\r\n");
@@ -1286,11 +1286,11 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
-    if (stream->event) {
-        host = switch_event_get_header(stream->event, "http-host");
-        port = switch_event_get_header(stream->event, "http-port");
-        uri = switch_event_get_header(stream->event, "http-uri");
-        path_info = switch_event_get_header(stream->event, "http-path-info");
+    if (stream->param_event) {
+        host = switch_event_get_header(stream->param_event, "http-host");
+        port = switch_event_get_header(stream->param_event, "http-port");
+        uri = switch_event_get_header(stream->param_event, "http-uri");
+        path_info = switch_event_get_header(stream->param_event, "http-path-info");
     }
 
     if (!path_info) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/mod_sndfile.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/mod_sndfile.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/formats/mod_sndfile/mod_sndfile.c	Mon May 26 12:59:57 2008
@@ -149,7 +149,7 @@
 	switch_zmalloc(alt_path, alt_len);
 	
 	switch_copy_string(alt_path, path, alt_len);
-	if ((last = strrchr(alt_path, *SWITCH_PATH_SEPARATOR))) {
+	if ((last = strrchr(alt_path, '/'))) {
 		next = ++last;
 		ldup = strdup(last);
 		switch_assert(ldup);
@@ -158,7 +158,18 @@
 			path = alt_path;
 		}
 	}
-	
+#ifdef WIN32
+	else if ((last = strrchr(alt_path, '\\'))) {
+		next = ++last;
+		ldup = strdup(last);
+		switch_assert(ldup);
+		switch_snprintf(next, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup);
+		if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) {
+			path = alt_path;
+		}
+	}
+#endif
+
 	if (!context->handle) {
 		if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle));
@@ -323,18 +334,22 @@
 			char *p;
 			struct format_map *map = switch_core_permanent_alloc(sizeof(*map));
 			switch_assert(map);
-
+	
 			map->ext = switch_core_permanent_strdup(info.extension);
 			map->uext = switch_core_permanent_strdup(info.extension);
 			map->format = info.format;
-			for (p = map->ext; *p; p++) {
-				*p = (char) tolower(*p);
+			if (map->ext) {
+				for (p = map->ext; *p; p++) {
+					*p = (char) tolower(*p);
+				}
+				switch_core_hash_insert(globals.format_hash, map->ext, map);
 			}
-			for (p = map->uext; *p; p++) {
-				*p = (char) toupper(*p);
+			if (map->uext) {
+				for (p = map->uext; *p; p++) {
+					*p = (char) toupper(*p);
+				}
+				switch_core_hash_insert(globals.format_hash, map->uext, map);
 			}
-			switch_core_hash_insert(globals.format_hash, map->ext, map);
-			switch_core_hash_insert(globals.format_hash, map->uext, map);
 			supported_formats[len++] = (char *) info.extension;
 		}
 		format = info.format;

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/freeswitch_java.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/freeswitch_java.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/freeswitch_java.cpp	Mon May 26 12:59:57 2008
@@ -215,7 +215,7 @@
         const char *callbackResultUTF = env->GetStringUTFChars(callbackResult, NULL);
         if (callbackResultUTF)
         {
-            status = process_callback_result((char*) callbackResultUTF, &cb_state, session);
+            status = process_callback_result((char*) callbackResultUTF);
             env->ReleaseStringUTFChars(callbackResult, callbackResultUTF);
         }
         else
@@ -303,7 +303,7 @@
         callbackResultUTF = env->GetStringUTFChars(callbackResult, NULL);
         if (callbackResultUTF)
         {
-            status = process_callback_result((char*) callbackResultUTF, &cb_state, session);
+            status = process_callback_result((char*) callbackResultUTF);
             env->ReleaseStringUTFChars(callbackResult, callbackResultUTF);
         }
         else

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java	Mon May 26 12:59:57 2008
@@ -117,8 +117,8 @@
     return freeswitchJNI.CoreSession_getVariable(swigCPtr, this, var);
   }
 
-  public SWIGTYPE_p_switch_status_t process_callback_result(String ret) {
-    return new SWIGTYPE_p_switch_status_t(freeswitchJNI.CoreSession_process_callback_result(swigCPtr, this, ret), true);
+  public SWIGTYPE_p_switch_status_t process_callback_result(String result) {
+    return new SWIGTYPE_p_switch_status_t(freeswitchJNI.CoreSession_process_callback_result(swigCPtr, this, result), true);
   }
 
   public void say(String tosay, String module_name, String say_type, String say_method) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_lua/mod_lua.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_lua/mod_lua.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_lua/mod_lua.cpp	Mon May 26 12:59:57 2008
@@ -113,13 +113,13 @@
 }
 
 
-static void lua_parse_and_execute(lua_State *L, char *input_code)
+static int lua_parse_and_execute(lua_State *L, char *input_code)
 {
 	int error = 0;
 
 	if (switch_strlen_zero(input_code)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No code to execute!\n");
-		return;
+		return 1;
 	}
 
 	if (*input_code == '~') {
@@ -172,6 +172,8 @@
 		}
 		lua_pop(L, 1);	/* pop error message from the stack */
 	}
+
+	return error;
 }
 
 static void *SWITCH_THREAD_FUNC lua_thread_run(switch_thread_t *thread, void *obj)
@@ -298,13 +300,15 @@
 	lua_State *L = lua_init();
 	char code[1024] = "";
 	char *mycmd;
+	int error;
+
 	if (switch_strlen_zero(data)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no args specified!\n");
         return;
     }
 
 	snprintf(code, sizeof(code), "~session = freeswitch.Session(\"%s\");", switch_core_session_get_uuid(session));
-	lua_parse_and_execute(L, code);
+	error = lua_parse_and_execute(L, code);
 
 	mycmd = strdup((char *)data);
 	switch_assert(mycmd);
@@ -312,10 +316,11 @@
 	lua_parse_and_execute(L, mycmd);
 	lua_uninit(L);
 	free(mycmd);
+
 }
 
 SWITCH_STANDARD_API(luarun_api_function) {
-
+	
 	if (switch_strlen_zero(cmd)) {
 		stream->write_function(stream, "-ERR no args specified!\n");
 	} else {
@@ -331,7 +336,8 @@
 
 	lua_State *L = lua_init();
 	char *mycmd;
-	
+	int error;
+
 	if (switch_strlen_zero(cmd)) {
 		stream->write_function(stream, "");
 	} else {
@@ -340,11 +346,17 @@
 		switch_assert(mycmd);
 		mod_lua_conjure_stream(L, stream, "stream", 1);
 
-		if (stream->event) {
-			mod_lua_conjure_event(L, stream->event, "env", 1);
+		if (stream->param_event) {
+			mod_lua_conjure_event(L, stream->param_event, "env", 1);
 		}
 
-		lua_parse_and_execute(L, mycmd);
+		if ((error = lua_parse_and_execute(L, mycmd))) {
+			if (switch_event_get_header(stream->param_event, "http-host")) {
+				stream->write_function(stream, "Content-Type: text/html\n\n<H2>Error Executing Script</H2>");
+			} else {
+				stream->write_function(stream, "-ERR encounterd\n");
+			}
+		}
 		lua_uninit(L);
 		free(mycmd);
 	}

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl.c	Mon May 26 12:59:57 2008
@@ -266,8 +266,8 @@
 	if (cmd) {
 		if (stream) {
 			mod_perl_conjure_stream(my_perl, stream, "stream");
-			if (stream->event) {
-				mod_perl_conjure_event(my_perl, stream->event, "env");
+			if (stream->param_event) {
+				mod_perl_conjure_event(my_perl, stream->param_event, "env");
 			}
 		}
 		//Perl_safe_eval(my_perl, cmd);
@@ -497,7 +497,7 @@
 
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	SWITCH_ADD_APP(app_interface, "perl", NULL, NULL, perl_function, NULL, SAF_NONE);
+	SWITCH_ADD_APP(app_interface, "perl", NULL, NULL, perl_function, NULL, SAF_SUPPORT_NOMEDIA);
 	SWITCH_ADD_API(api_interface, "perlrun", "run a script", perlrun_api_function, "<script>");
 	SWITCH_ADD_API(api_interface, "perl", "run a script", perl_api_function, "<script>");
 	/* indicate that the module should continue to be loaded */

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl_wrap.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl_wrap.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_perl/mod_perl_wrap.cpp	Mon May 26 12:59:57 2008
@@ -4675,7 +4675,7 @@
     dXSARGS;
     
     if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: CoreSession_process_callback_result(self,ret);");
+      SWIG_croak("Usage: CoreSession_process_callback_result(self,result);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 |  0 );
     if (!SWIG_IsOK(res1)) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	Mon May 26 12:59:57 2008
@@ -196,7 +196,7 @@
 	if (argc > 1) {
 		char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
 		char *hval = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		switch_event_add_header(ro->stream->event, SWITCH_STACK_BOTTOM, hname, "%s", hval);
+		switch_event_add_header(ro->stream->param_event, SWITCH_STACK_BOTTOM, hname, "%s", hval);
 		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
 		return JS_TRUE;
 	}
@@ -217,7 +217,7 @@
 
 	if (argc > 0) {
 		char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *val = switch_event_get_header(ro->stream->event, hname);
+		char *val = switch_event_get_header(ro->stream->param_event, hname);
 		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val));
 		return JS_TRUE;
 	}
@@ -243,14 +243,14 @@
 	if (!strcasecmp(how, "xml")) {
 		switch_xml_t xml;
 		char *xmlstr;
-		if ((xml = switch_event_xmlize(ro->stream->event, SWITCH_VA_NONE))) {
+		if ((xml = switch_event_xmlize(ro->stream->param_event, SWITCH_VA_NONE))) {
             xmlstr = switch_xml_toxml(xml, SWITCH_FALSE);
 			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xmlstr));
 			return JS_TRUE;
         } 
 	} else {
 		char *buf;
-		switch_event_serialize(ro->stream->event, &buf, SWITCH_TRUE);
+		switch_event_serialize(ro->stream->param_event, &buf, SWITCH_TRUE);
 		if (buf) {
 			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf));
 			free(buf);
@@ -2174,8 +2174,15 @@
 	CHANNEL_SANITY_CHECK();
 
 	if (argc > 1) {
-		cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		cause = switch_channel_str2cause(cause_name);
+		if(JSVAL_IS_INT(argv[0])) {
+			int32 i = 0;
+			JS_ValueToInt32(cx, argv[0], &i);
+			cause = i;
+		}
+		else {
+			cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
+			cause = switch_channel_str2cause(cause_name);
+		}
 	}
 
 	switch_channel_hangup(channel, cause);
@@ -2424,7 +2431,7 @@
 enum session_tinyid {
 	SESSION_NAME, SESSION_STATE,
 	PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST,
-	SESSION_UUID, SESSION_CAUSE
+	SESSION_UUID, SESSION_CAUSE, SESSION_CAUSECODE
 };
 
 static JSFunctionSpec session_methods[] = {
@@ -2469,6 +2476,7 @@
 	{"destination", PROFILE_DEST, JSPROP_READONLY | JSPROP_PERMANENT},
 	{"uuid", SESSION_UUID, JSPROP_READONLY | JSPROP_PERMANENT},
 	{"cause", SESSION_CAUSE, JSPROP_READONLY | JSPROP_PERMANENT},
+	{"causecode", SESSION_CAUSECODE, JSPROP_READONLY | JSPROP_PERMANENT},
 	{0}
 };
 
@@ -2501,6 +2509,11 @@
 				*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause)));
 			}
 			break;
+		case SESSION_CAUSECODE:
+			if (jss) {
+				*vp = INT_TO_JSVAL(jss->cause);
+			}
+			break;
 		default:
 			*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
 		}
@@ -2511,6 +2524,9 @@
 	case SESSION_CAUSE:
 		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(switch_channel_get_cause(channel))));
 		break;
+	case SESSION_CAUSECODE:
+		*vp = INT_TO_JSVAL(switch_channel_get_cause(channel));
+		break;
 	case SESSION_NAME:
 		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel)));
 		break;
@@ -3406,8 +3422,8 @@
 	struct request_obj ro = {0};
 	char *path_info = NULL;
 
-    if (stream->event) {
-		path_info = switch_event_get_header(stream->event, "http-path-info");
+    if (stream->param_event) {
+		path_info = switch_event_get_header(stream->param_event, "http-path-info");
 	}
 
 	if (switch_strlen_zero(cmd) && path_info) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c	Mon May 26 12:59:57 2008
@@ -56,9 +56,9 @@
  * and the default curl activity is to print to stdout, something not as desirable
  * so we have a dummy function here
  */
-static void httpCallBack()
+static size_t httpCallBack(char *buffer, size_t size, size_t nitems, void *outstream)
 {
-	return;
+	return size * nitems;
 }
 
 static switch_status_t my_on_hangup(switch_core_session_t *session)
@@ -130,10 +130,10 @@
 
 			xml_text_escaped = malloc(need_bytes);
 			switch_assert(xml_text_escaped);
-			memset(xml_text_escaped, 0, sizeof(xml_text_escaped));
+			memset(xml_text_escaped, 0, need_bytes);
 			if (globals.encode == 1) {
 				headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");
-				switch_url_encode(xml_text, xml_text_escaped, need_bytes - 1);
+				switch_url_encode(xml_text, xml_text_escaped, need_bytes);
 			} else {
 				headers = curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded");
 				switch_b64_encode((unsigned char *)xml_text, need_bytes / 3, (unsigned char *)xml_text_escaped, need_bytes);

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj	Mon May 26 12:59:57 2008
@@ -39,7 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\Windows&quot;"
 				PreprocessorDefinitions="ABYSS_WIN32"
 				UsePrecompiledHeader="0"
 			/>
@@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\Windows&quot;"
 				PreprocessorDefinitions="ABYSS_WIN32"
 				UsePrecompiledHeader="0"
 			/>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c	Mon May 26 12:59:57 2008
@@ -36,19 +36,20 @@
 #endif
 
 #include <xmlrpc-c/base.h>
-#ifdef ABYSS_WIN32
-#undef strcasecmp
-#endif
 #include <xmlrpc-c/abyss.h>
 #include <xmlrpc-c/server.h>
 #include <xmlrpc-c/server_abyss.h>
 #include "token.h" /* NOTE: From xmlrpc-c's internals */
+#include "http.h"
+#include "session.h"
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_xml_rpc_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown);
 SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime);
 SWITCH_MODULE_DEFINITION(mod_xml_rpc, mod_xml_rpc_load, mod_xml_rpc_shutdown, mod_xml_rpc_runtime);
 
+static abyss_bool HTTPWrite(TSession *s,char *buffer,uint32_t len);
+
 static struct {
 	uint16_t port;
 	uint8_t running;
@@ -147,7 +148,8 @@
 
 static abyss_bool http_directory_auth(TSession *r, char *domain_name) 
 {
-    char *p, *x;
+    char *p;
+	char *x;
     char z[256], t[80];
 	char user[512];
 	char *pass;
@@ -160,13 +162,13 @@
     p = RequestHeaderValue(r, "authorization");
 
     if (p) {
-        NextToken(&p);
+        NextToken((const char **)&p);
         x = GetToken(&p);
         if (x) {
             if (!strcasecmp(x, "basic")) {
 
 
-                NextToken(&p);
+                NextToken((const char **)&p);
 				switch_b64_decode(p, user, sizeof(user));
 				if ((pass = strchr(user, ':'))) {
 					*pass++ = '\0';
@@ -177,7 +179,7 @@
 						*domain_name++ = '\0';
 						at++;
 					} else {
-						domain_name = r->host;
+						domain_name = (char *)r->requestInfo.host;
 						if (!strncasecmp(domain_name, "www.", 3)) {
 							domain_name += 4;
 						}
@@ -192,7 +194,7 @@
 				Base64Encode(z, t);
 				
 				if (!strcmp(p, t)) {
-					r->user=strdup(user);
+					r->requestInfo.user=strdup(user);
 					goto authed;
 				}
 				
@@ -239,7 +241,7 @@
 				}
 				
 				if (!(mypass1 && mypass2)) {
-					r->user=strdup(user);
+					r->requestInfo.user=strdup(user);
 					goto authed;
 				} else {
 					if (mypass1) {
@@ -251,7 +253,7 @@
 						Base64Encode(z, t);
 				
 						if (!strcmp(p, t)) {
-							r->user=strdup(box ? box : user);
+							r->requestInfo.user=strdup(box ? box : user);
 							goto authed;
 						}
 					}
@@ -265,7 +267,7 @@
 						Base64Encode(z, t);
 				
 						if (!strcmp(p, t)) {
-							r->user=strdup(box ? box : user);
+							r->requestInfo.user=strdup(box ? box : user);
 							goto authed;
 						}
 					}
@@ -280,7 +282,7 @@
 							Base64Encode(z, t);
 					
 							if (!strcmp(p, t)) {
-								r->user=strdup(box);
+								r->requestInfo.user=strdup(box);
 								goto authed;
 							}
 						}
@@ -295,7 +297,7 @@
 							Base64Encode(z, t);
 					
 							if (!strcmp(p, t)) {
-								r->user=strdup(box);
+								r->requestInfo.user=strdup(box);
 								goto authed;
 							}
 						}
@@ -305,7 +307,7 @@
 
 			authed:
 				
-				ResponseAddField(r, "freeswitch-user", r->user);
+				ResponseAddField(r, "freeswitch-user", r->requestInfo.user);
 				ResponseAddField(r, "freeswitch-domain", domain_name);
 				
 				if (x_domain_root) {
@@ -334,8 +336,8 @@
 	char *domain_name, *e;
 	abyss_bool ret = FALSE;
 
-	if (!strncmp(r->uri, "/domains/", 9)) {
-		domain_name = strdup(r->uri + 9);
+	if (!strncmp(r->requestInfo.uri, "/domains/", 9)) {
+		domain_name = strdup(r->requestInfo.uri + 9);
 		switch_assert(domain_name);
 		
 		if ((e = strchr(domain_name, '/'))) {
@@ -344,7 +346,7 @@
 
 		if (!strcmp(domain_name, "this")) {
 			free(domain_name);
-			domain_name = strdup(r->host);
+			domain_name = strdup(r->requestInfo.host);
 		}
 
 		ret = !http_directory_auth(r, domain_name);
@@ -355,8 +357,8 @@
 		const char *list[2] = {"index.html", "index.txt"};
 		int x;
 
-		if (!strncmp(r->uri, "/pub", 4)) {
-			char *p = r->uri;
+		if (!strncmp(r->requestInfo.uri, "/pub", 4)) {
+			char *p = (char *)r->requestInfo.uri;
 			char *new_uri = p + 4;
 			if (!new_uri) {
 				new_uri = "/";
@@ -388,11 +390,11 @@
 				}
 			}
 
-			r->uri = strdup(new_uri);
+			r->requestInfo.uri = strdup(new_uri);
 			free(p);
 
 		} else {
-			if (globals.realm && strncmp(r->uri, "/pub", 4)) {
+			if (globals.realm && strncmp(r->requestInfo.uri, "/pub", 4)) {
 				ret = !http_directory_auth(r, NULL);
 			}
 		}
@@ -400,6 +402,39 @@
 	return ret;
 }
 
+
+static abyss_bool HTTPWrite(TSession *s,char *buffer,uint32_t len)
+{
+    if (s->chunkedwrite && s->chunkedwritemode)
+		{
+			char t[16];
+
+			if (ConnWrite(s->conn,t,sprintf(t,"%x"CRLF,len)))
+				if (ConnWrite(s->conn,buffer,len))
+					return ConnWrite(s->conn,CRLF,2);
+
+			return FALSE;
+		}
+
+    return ConnWrite(s->conn,buffer,len);
+}
+
+static abyss_bool HTTPWriteEnd(TSession *s)
+{
+    if (!s->chunkedwritemode)
+        return TRUE;
+
+    if (s->chunkedwrite)
+		{
+			/* May be one day trailer dumping will be added */
+			s->chunkedwritemode=FALSE;
+			return ConnWrite(s->conn,"0"CRLF CRLF,5);
+		}
+
+    s->requestInfo.keepalive=FALSE;
+    return TRUE;
+}
+
 abyss_bool handler_hook(TSession * r)
 {
 	//char *mime = "text/html";
@@ -419,14 +454,17 @@
 	stream.write_function = http_stream_write;
 	stream.raw_write_function = http_stream_raw_write;
 
-	if ((command = strstr(r->uri, "/api/"))) {
+	if (!r || !r->requestInfo.uri) {
+		return FALSE;
+	}
+
+	if ((command = strstr(r->requestInfo.uri, "/api/"))) {
 		command += 5;
-	} else if ((command = strstr(r->uri, "/webapi/"))) {
+	} else if ((command = strstr(r->requestInfo.uri, "/webapi/"))) {
 		command += 8;
 		html++;
 	} else {
-		ret = FALSE;
-		goto end;
+		return FALSE;
 	}
 
 	if ((path_info = strchr(command, '/'))) {
@@ -481,41 +519,40 @@
 
  auth:
 
-	if (switch_event_create(&stream.event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) {
+	if (switch_event_create(&stream.param_event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) {
 		const char * const content_length = RequestHeaderValue(r, "content-length");
 			
 		if (fs_user)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "FreeSWITCH-User", "%s", fs_user);
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "FreeSWITCH-User", "%s", fs_user);
 		if (fs_domain)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Domain", "%s", fs_domain);
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Domain", "%s", fs_domain);
 		if (path_info)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-Path-Info", "%s", path_info);
-		if (r->uri)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-URI", "%s", r->uri);
-		if (r->query)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", r->query);
-		if (r->host)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-HOST", "%s", r->host);
-		if (r->from)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-FROM", "%s", r->from);
-		if (r->useragent)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-USER-AGENT", "%s", r->useragent);
-		if (r->referer)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-REFERER", "%s", r->referer);
-		if (r->requestline)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-REQUESTLINE", "%s", r->requestline);
-		if (r->user)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-USER", "%s", r->user);
-		if (r->port)
-			switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-PORT", "%u", r->port);
-		if (r->query || content_length) {
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-Path-Info", "%s", path_info);
+		switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-URI", "%s", r->requestInfo.uri);
+		if (r->requestInfo.query)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", r->requestInfo.query);
+		if (r->requestInfo.host)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-HOST", "%s", r->requestInfo.host);
+		if (r->requestInfo.from)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-FROM", "%s", r->requestInfo.from);
+		if (r->requestInfo.useragent)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-USER-AGENT", "%s", r->requestInfo.useragent);
+		if (r->requestInfo.referer)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-REFERER", "%s", r->requestInfo.referer);
+		if (r->requestInfo.requestline)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-REQUESTLINE", "%s", r->requestInfo.requestline);
+		if (r->requestInfo.user)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-USER", "%s", r->requestInfo.user);
+		if (r->requestInfo.port)
+			switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-PORT", "%u", r->requestInfo.port);
+		if (r->requestInfo.query || content_length) {
 			char *q, *qd;
 			char *next;
-			char *query = r->query;
+			char *query = (char *)r->requestInfo.query;
 			char *name, *val;
 			char qbuf[8192] = "";
 			
-			if (r->method == m_post && content_length) {
+			if (r->requestInfo.method == m_post && content_length) {
 				int len = atoi(content_length);
 				int qlen = 0;
 				
@@ -541,13 +578,13 @@
 						if (qlen >= len) {
 							break;
 						}
-					} while ((succeeded = ConnRead(r->conn, r->server->timeout)));
+					} while ((succeeded = ConnRead(r->conn, 2000)));
 					
 					query = qbuf;
 				}
 			}
 			if (query) {
-				switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", query);
+				switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", query);
 
 				qd = strdup(query);
 				switch_assert(qd != NULL);
@@ -573,7 +610,7 @@
 					name = q;
 					if ((val = strchr(name, '='))) {
 						*val++ = '\0';
-						switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, name, "%s", val);
+						switch_event_add_header(stream.param_event, SWITCH_STACK_BOTTOM, name, "%s", val);
 					}
 					q = next;
 				} while (q != NULL);
@@ -593,9 +630,16 @@
 	//HTTPWrite(r, "<pre>\n\n", 7);
 
 	/* generation of the date field */
-	if (DateToString(&r->date, buf)) {
-		ResponseAddField(r,"Date", buf);
+	{
+		const char * dateValue;
+
+		DateToString(r->date, &dateValue);
+
+		if (dateValue) {
+			ResponseAddField(r, "Date", dateValue);
+		}
 	}
+
 	
 	/* Generation of the server field */
 	ResponseAddField(r,"Server", "FreeSWITCH-" SWITCH_VERSION_FULL "-mod_xml_rpc");
@@ -620,17 +664,24 @@
 	}
 
 
-	if (switch_api_execute(command, r->query, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
+	if (switch_api_execute(command, r->requestInfo.query, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
 		ResponseStatus(r, 200);
-		r->done = TRUE;
+		r->responseStarted = TRUE;
+		//r->done = TRUE;
 	} else {
 		ResponseStatus(r, 404);
 		ResponseError(r);
 	} 
 	
-	SocketClose(&(r->conn->socket));
+	//SocketClose(&(r->conn->socket));
+	
 	HTTPWriteEnd(r);
-	ConnClose(r->conn);
+	//if(r->conn->channelP)
+	//ConnKill(r->conn);
+	//ChannelInterrupt(r->conn->channelP);
+	//ConnClose(r->conn);
+	//ChannelDestroy(r->conn->channelP);
+	r->requestInfo.keepalive = 0;
 
  end:
 
@@ -755,15 +806,19 @@
 	ServerCreate(&globals.abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile);
 
 	xmlrpc_server_abyss_set_handler(&env, &globals.abyssServer, "/RPC2", registryP);
+	ServerInit(&globals.abyssServer);
 
+#if 0
 	if (ServerInit(&globals.abyssServer) != TRUE) {
 		globals.running = 0;
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start HTTP Port %d\n", globals.port);
 		return SWITCH_STATUS_TERM;
 	}
+#endif
 
 	ServerAddHandler(&globals.abyssServer, handler_hook);
 	ServerAddHandler(&globals.abyssServer, auth_hook);
+	ServerSetKeepaliveTimeout(&globals.abyssServer, 1);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting HTTP Port %d, DocRoot [%s]\n", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir);
 	ServerRun(&globals.abyssServer);
 	globals.running = 0;
@@ -773,8 +828,9 @@
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown)
 {
-	globals.abyssServer.running = 0;
-	shutdown(globals.abyssServer.listensock, 2);
+	//globals.abyssServer.running = 0;
+	//shutdown(globals.abyssServer.listensock, 2);
+	ServerTerminate(&globals.abyssServer);
 	while(globals.running) {
 		switch_yield(100000);
 	}

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj	Mon May 26 12:59:57 2008
@@ -22,15 +22,63 @@
 			CharacterSet="2"
 			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\Windows&quot;"
 				PreprocessorDefinitions="ABYSS_WIN32"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;&quot;..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;"
 			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -39,15 +87,63 @@
 			CharacterSet="2"
 			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\Windows&quot;"
 				PreprocessorDefinitions="ABYSS_WIN32"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;&quot;..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;"
 			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_channel.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_channel.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_channel.c	Mon May 26 12:59:57 2008
@@ -130,9 +130,10 @@
 	uint8_t x;
 	const char *str = "UNKNOWN";
 
-	for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) ; x++) {
+	for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) -1 ; x++) {
 		if (CAUSE_CHART[x].cause == cause) {
 			str = CAUSE_CHART[x].name;
+			break;
 		}
 	}
 
@@ -147,9 +148,10 @@
 	if (*str > 47 && *str < 58) {
 		cause = atoi(str);
 	} else {
-		for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) && CAUSE_CHART[x].name; x++) {
+		for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) - 1 && CAUSE_CHART[x].name; x++) {
 			if (!strcasecmp(CAUSE_CHART[x].name, str)) {
 				cause = CAUSE_CHART[x].cause;
+				break;
 			}
 		}
 	}
@@ -1139,6 +1141,8 @@
 	if (channel->caller_profile && channel->caller_profile->times) {
 		channel->caller_profile->times->transferred = caller_profile->times->profile_created;
 		caller_profile->times->answered = channel->caller_profile->times->answered;
+		caller_profile->times->progress = channel->caller_profile->times->progress;
+		caller_profile->times->progress_media = channel->caller_profile->times->progress_media;
 		caller_profile->times->created = channel->caller_profile->times->created;
 		caller_profile->times->hungup = channel->caller_profile->times->hungup;
 	} else {
@@ -1368,6 +1372,11 @@
 	if (!switch_channel_test_flag(channel, CF_RING_READY)) {
 		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
 		switch_channel_set_flag(channel, CF_RING_READY);
+		if (channel->caller_profile && channel->caller_profile->times) {
+			switch_mutex_lock(channel->profile_mutex);
+			channel->caller_profile->times->progress = switch_timestamp_now();
+			switch_mutex_unlock(channel->profile_mutex);
+		}
 		return SWITCH_STATUS_SUCCESS;
 	}
 
@@ -1392,6 +1401,12 @@
 			switch_event_fire(&event);
 		}
 
+		if (channel->caller_profile && channel->caller_profile->times) {
+			switch_mutex_lock(channel->profile_mutex);
+			channel->caller_profile->times->progress_media = switch_timestamp_now();
+			switch_mutex_unlock(channel->profile_mutex);
+		}
+
 		/* if we're the child of another channel and the other channel is in a blocking read they will never realize we have answered so send 
 		a SWITCH_SIG_BREAK to interrupt any blocking reads on that channel
 		*/
@@ -1875,7 +1890,7 @@
 
 			encode_buf = tmp;
 		}
-		switch_url_encode(prof[x], encode_buf, encode_len - 1);
+		switch_url_encode(prof[x], encode_buf, encode_len);
 		stream.write_function(&stream, "%s=%s&", prof_names[x], encode_buf);
 	}
 
@@ -1895,7 +1910,7 @@
 				encode_buf = tmp;
 			}
 
-			switch_url_encode((char *) val, encode_buf, encode_len - 1);
+			switch_url_encode((char *) val, encode_buf, encode_len);
 			stream.write_function(&stream, "%s=%s&", (char *) var, encode_buf);
 
 		}
@@ -1920,10 +1935,10 @@
 	switch_caller_profile_t *caller_profile, *ocp;
 	switch_app_log_t *app_log, *ap;
 	char *last_app = NULL, *last_arg = NULL;
-	char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = "";
-	int32_t duration = 0, legbillsec = 0, billsec = 0, mduration = 0, billmsec = 0, legbillmsec = 0;
-	switch_time_t uduration = 0, legbillusec = 0, billusec = 0;
-	time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created;
+	char start[80] = "", answer[80] = "", progress[80] = "", progress_media[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = "";
+	int32_t duration = 0, legbillsec = 0, billsec = 0, mduration = 0, billmsec = 0, legbillmsec = 0, progressmsec = 0, progress_mediamsec = 0;
+	switch_time_t uduration = 0, legbillusec = 0, billusec = 0, progresssec = 0, progressusec = 0, progress_mediasec = 0, progress_mediausec = 0;
+	time_t tt_created = 0, tt_answered = 0, tt_progress = 0, tt_progress_media = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created, mtt_progress = 0 , mtt_progress_media = 0;
 
 	if (!(caller_profile = switch_channel_get_caller_profile(channel)) || !channel->variables) {
 		return SWITCH_STATUS_FALSE;
@@ -1966,6 +1981,18 @@
 			switch_channel_set_variable(channel, "answer_stamp", answer);
 		}
 
+		if (caller_profile->times->progress) {
+			switch_time_exp_lt(&tm, caller_profile->times->progress);
+			switch_strftime(progress, &retsize, sizeof(progress), fmt, &tm);
+			switch_channel_set_variable(channel, "progress_stamp", progress);
+		}
+
+		if (caller_profile->times->progress_media) {
+			switch_time_exp_lt(&tm, caller_profile->times->progress_media);
+			switch_strftime(progress_media, &retsize, sizeof(progress_media), fmt, &tm);
+			switch_channel_set_variable(channel, "progress_media_stamp", progress_media);
+		}
+
 		switch_time_exp_lt(&tm, caller_profile->times->hungup);
 		switch_strftime(end, &retsize, sizeof(end), fmt, &tm);
 		switch_channel_set_variable(channel, "end_stamp", end);
@@ -1991,6 +2018,20 @@
 		switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered);
 		switch_channel_set_variable(channel, "answer_uepoch", tmp);		
 
+		tt_progress = (time_t) (caller_profile->times->progress / 1000000);
+		mtt_progress = (time_t) (caller_profile->times->progress / 1000);
+		switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress);
+		switch_channel_set_variable(channel, "answer_epoch", tmp);
+		switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress);
+		switch_channel_set_variable(channel, "answer_uepoch", tmp);		
+
+		tt_progress_media = (time_t) (caller_profile->times->progress_media / 1000000);
+		mtt_progress_media = (time_t) (caller_profile->times->progress_media / 1000);
+		switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress_media);
+		switch_channel_set_variable(channel, "answer_epoch", tmp);
+		switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media);
+		switch_channel_set_variable(channel, "answer_uepoch", tmp);		
+
 
 		tt_hungup = (time_t) (caller_profile->times->hungup / 1000000);
 		mtt_hungup = (time_t) (caller_profile->times->hungup / 1000);
@@ -2012,6 +2053,20 @@
 			legbillmsec = (int32_t)(mtt_hungup - mtt_prof_created);
 			legbillusec = caller_profile->times->hungup - caller_profile->times->profile_created;
 		}
+
+		if (caller_profile->times->progress) {
+			progresssec = (int32_t)(tt_progress - tt_created);
+			progressmsec = (int32_t)(mtt_progress - mtt_created);
+			progressusec = caller_profile->times->progress - caller_profile->times->created;
+		}
+
+		if (caller_profile->times->progress_media) {
+			progress_mediasec = (int32_t)(tt_progress - tt_created);
+			progress_mediamsec = (int32_t)(mtt_progress - mtt_created);
+			progress_mediausec = caller_profile->times->progress - caller_profile->times->created;
+		}
+
+
 	}
 
 	switch_channel_set_variable(channel, "last_app", last_app);
@@ -2024,6 +2079,12 @@
 	switch_snprintf(tmp, sizeof(tmp), "%d", billsec);
 	switch_channel_set_variable(channel, "billsec", tmp);
 
+	switch_snprintf(tmp, sizeof(tmp), "%d", progresssec);
+	switch_channel_set_variable(channel, "progresssec", tmp);
+
+	switch_snprintf(tmp, sizeof(tmp), "%d", progress_mediasec);
+	switch_channel_set_variable(channel, "progress_mediasec", tmp);
+
 	switch_snprintf(tmp, sizeof(tmp), "%d", legbillsec);
 	switch_channel_set_variable(channel, "flow_billsec", tmp);
 
@@ -2033,6 +2094,12 @@
 	switch_snprintf(tmp, sizeof(tmp), "%d", billmsec);
 	switch_channel_set_variable(channel, "billmsec", tmp);
 
+	switch_snprintf(tmp, sizeof(tmp), "%d", progressmsec);
+	switch_channel_set_variable(channel, "progressmsec", tmp);
+
+	switch_snprintf(tmp, sizeof(tmp), "%d", progressusec);
+	switch_channel_set_variable(channel, "progress_mediamsec", tmp);
+
 	switch_snprintf(tmp, sizeof(tmp), "%d", legbillmsec);
 	switch_channel_set_variable(channel, "flow_billmsec", tmp);
 
@@ -2042,6 +2109,12 @@
 	switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, billusec);
 	switch_channel_set_variable(channel, "billusec", tmp);
 
+	switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progressusec);
+	switch_channel_set_variable(channel, "progressusec", tmp);
+
+	switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progress_mediausec);
+	switch_channel_set_variable(channel, "progress_mediausec", tmp);
+
 	switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, legbillusec);
 	switch_channel_set_variable(channel, "flow_billusec", tmp);
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_console.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_console.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_console.c	Mon May 26 12:59:57 2008
@@ -525,7 +525,7 @@
 		if (h.words == 0) {
 			stream.write_function(&stream, 
 								  "select distinct a1 from complete where "
-								  "a1 not in (select name from interfaces) and ");
+								  "a1 not in (select name from interfaces) %s ", argc ? "and" : "");
 		} else {
 			stream.write_function(&stream, 
 								  "select distinct a%d from complete where ", h.words + 1);

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_session.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_session.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_core_session.c	Mon May 26 12:59:57 2008
@@ -329,6 +329,9 @@
 
 			if (switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
 				switch_channel_set_flag(peer_channel, CF_PROXY_MEDIA);
+				if (switch_channel_test_flag(channel, CF_VIDEO)) {
+					switch_channel_set_flag(peer_channel, CF_VIDEO);
+				}
 			}
 
 			if (profile) {
@@ -1013,22 +1016,25 @@
 														 const switch_application_interface_t *application_interface, const char *arg) {
 	switch_app_log_t *log, *lp;
 	switch_event_t *event;
+	const char *var;
 
 	if (!arg) {
 		arg = "";
 	}
 
-	log = switch_core_session_alloc(session, sizeof(*log));
+	if (!(var = switch_channel_get_variable(session->channel, SWITCH_DISABLE_APP_LOG_VARIABLE)) || (!(switch_true(var)))) {
+		log = switch_core_session_alloc(session, sizeof(*log));
 
-	log->app = switch_core_session_strdup(session, application_interface->interface_name);
-	log->arg = switch_core_session_strdup(session, arg);
+		log->app = switch_core_session_strdup(session, application_interface->interface_name);
+		log->arg = switch_core_session_strdup(session, arg);
 
-	for(lp = session->app_log; lp && lp->next; lp = lp->next);
+		for(lp = session->app_log; lp && lp->next; lp = lp->next);
 
-	if (lp) {
-		lp->next = log;
-	} else {
-		session->app_log = log;
+		if (lp) {
+			lp->next = log;
+		} else {
+			session->app_log = log;
+		}
 	}
 	
 	if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_cpp.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_cpp.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_cpp.cpp	Mon May 26 12:59:57 2008
@@ -1036,7 +1036,7 @@
 }
 
 
-SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
+SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *result)
 {
 	
     switch_file_handle_t *fh = NULL;	   
@@ -1044,7 +1044,7 @@
 	this_check(SWITCH_STATUS_FALSE);
 	sanity_check(SWITCH_STATUS_FALSE);
 	
-    if (switch_strlen_zero(ret)) {
+    if (switch_strlen_zero(result)) {
 		return SWITCH_STATUS_SUCCESS;	
     }
 
@@ -1076,10 +1076,10 @@
     }
 
 
-    if (!strncasecmp(ret, "speed", 4)) {
+    if (!strncasecmp(result, "speed", 4)) {
 		char *p;
 
-		if ((p = strchr(ret, ':'))) {
+		if ((p = strchr(result, ':'))) {
 			p++;
 			if (*p == '+' || *p == '-') {
 				int step;
@@ -1096,28 +1096,28 @@
 
 		return SWITCH_STATUS_FALSE;
 
-    } else if (!strcasecmp(ret, "pause")) {
+    } else if (!strcasecmp(result, "pause")) {
 		if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) {
 			switch_clear_flag(fh, SWITCH_FILE_PAUSE);
 		} else {
 			switch_set_flag(fh, SWITCH_FILE_PAUSE);
 		}
 		return SWITCH_STATUS_SUCCESS;
-    } else if (!strcasecmp(ret, "stop")) {
+    } else if (!strcasecmp(result, "stop")) {
 		return SWITCH_STATUS_FALSE;
-    } else if (!strcasecmp(ret, "restart")) {
+    } else if (!strcasecmp(result, "restart")) {
 		unsigned int pos = 0;
 		fh->speed = 0;
 		switch_core_file_seek(fh, &pos, 0, SEEK_SET);
 		return SWITCH_STATUS_SUCCESS;
-    } else if (!strncasecmp(ret, "seek", 4)) {
+    } else if (!strncasecmp(result, "seek", 4)) {
 		switch_codec_t *codec;
 		unsigned int samps = 0;
 		unsigned int pos = 0;
 		char *p;
 		codec = switch_core_session_get_read_codec(session);
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n");
-		if ((p = strchr(ret, ':'))) {
+		if ((p = strchr(result, ':'))) {
 			p++;
 			if (*p == '+' || *p == '-') {
 				int step;
@@ -1146,7 +1146,7 @@
 		return SWITCH_STATUS_SUCCESS;
     }
 
-    if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {
+    if (!strcmp(result, "true") || !strcmp(result, "undefined")) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n");
 		return SWITCH_STATUS_SUCCESS;
     }

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_event.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_event.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_event.c	Mon May 26 12:59:57 2008
@@ -770,7 +770,7 @@
 
 		/* handle any bad things in the string like newlines : etc that screw up the serialized format */
 		if (encode) {
-			switch_url_encode(hp->value, encode_buf, encode_len - 1);
+			switch_url_encode(hp->value, encode_buf, encode_len);
 		} else {
 			switch_snprintf(encode_buf, encode_len, "[%s]", hp->value);
 		}
@@ -1319,7 +1319,7 @@
 
 			encode_buf = tmp;
 		}
-		switch_url_encode(prof[x], encode_buf, encode_len - 1);
+		switch_url_encode(prof[x], encode_buf, encode_len);
 		stream.write_function(&stream, "%s=%s&", prof_names[x], encode_buf);
 	}
 
@@ -1348,7 +1348,7 @@
 					encode_buf = tmp;
 				}
 
-				switch_url_encode((char *) val, encode_buf, encode_len - 1);
+				switch_url_encode((char *) val, encode_buf, encode_len);
 				stream.write_function(&stream, "%s=%s&", (char *) var, encode_buf);
 
 			}

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr.c	Mon May 26 12:59:57 2008
@@ -440,12 +440,22 @@
 	switch_event_t *event;
 	switch_unicast_conninfo_t *conninfo = NULL;
 	switch_codec_t *read_codec = switch_core_session_get_read_codec(session);
+	uint32_t rate;
+	uint32_t bpf;
 
 	if (switch_channel_test_flag(channel, CF_CONTROLLED)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that is under control already.\n");
 		return SWITCH_STATUS_FALSE;
 	}
 
+	if (!read_codec || !read_codec->implementation) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that have no read codec.\n");
+		return SWITCH_STATUS_FALSE;
+	}
+
+	rate = read_codec->implementation->actual_samples_per_second;
+	bpf = read_codec->implementation->bytes_per_frame;
+
 	if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Careful, Channel is unanswered. Pre-answering...\n");
 		switch_channel_pre_answer(channel);
@@ -457,7 +467,7 @@
 		switch_event_fire(&event);
 	}
 
-	while (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_CONTROLLED)) {
+	while (read_codec && switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_CONTROLLED)) {
 
 		if ((status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, stream_id)) == SWITCH_STATUS_SUCCESS) {
 			if (!SWITCH_READ_ACCEPTABLE(status)) {
@@ -479,14 +489,14 @@
 					switch_size_t len = 0;
 					uint32_t flags = 0;
 					switch_byte_t decoded[SWITCH_RECOMMENDED_BUFFER_SIZE];
-					uint32_t rate = read_codec->implementation->actual_samples_per_second;
 					uint32_t dlen = sizeof(decoded);
 					switch_status_t tstatus;
 					switch_byte_t *sendbuf = NULL;
 					uint32_t sendlen = 0;
 
 					if (switch_test_flag(read_frame, SFF_CNG)) {
-						sendlen = read_codec->implementation->bytes_per_frame;
+						sendlen = bpf;
+						switch_assert(sendlen <= SWITCH_RECOMMENDED_BUFFER_SIZE);
 						memset(decoded, 255, sendlen);
 						sendbuf = decoded;
 						tstatus = SWITCH_STATUS_SUCCESS;
@@ -557,6 +567,7 @@
 		}
 
 	}
+
 	switch_channel_clear_flag(channel, CF_CONTROLLED);
 
 	if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNPARK) == SWITCH_STATUS_SUCCESS) {
@@ -1582,6 +1593,19 @@
 			switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created);
 			switch_xml_set_txt_d(time_tag, tmp);
 
+			if (!(time_tag = switch_xml_add_child_d(x_times, "progress_time", t_off++))) {
+				goto error;
+			}
+			switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress);
+			switch_xml_set_txt_d(time_tag, tmp);
+
+
+			if (!(time_tag = switch_xml_add_child_d(x_times, "progress_media_time", t_off++))) {
+				goto error;
+			}
+			switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media);
+			switch_xml_set_txt_d(time_tag, tmp);
+
 			if (!(time_tag = switch_xml_add_child_d(x_times, "answered_time", t_off++))) {
 				goto error;
 			}
@@ -1689,6 +1713,7 @@
 	return status;
 }
 
+
 /* For Emacs:
  * Local Variables:
  * mode:c

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_bridge.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_bridge.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_bridge.c	Mon May 26 12:59:57 2008
@@ -929,11 +929,43 @@
 	return status;
 }
 
-SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid)
+SWITCH_DECLARE(switch_status_t) switch_ivr_find_bridged_uuid(const char *uuid, char *b_uuid, switch_size_t blen)
+{
+	switch_core_session_t *rsession;
+	switch_status_t status = SWITCH_STATUS_FALSE;
+
+	switch_assert(uuid);
+	
+	if ((rsession = switch_core_session_locate(uuid))) {
+		switch_channel_t *rchannel = switch_core_session_get_channel(rsession);
+		const char *brto;
+
+		if ((brto = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE))) {
+			switch_copy_string(b_uuid, brto, blen);
+			status = SWITCH_STATUS_SUCCESS;
+		}
+		switch_core_session_rwunlock(rsession);
+	}
+	
+	return status;
+
+}
+
+SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg)
 {
 	switch_core_session_t *rsession, *bsession = NULL;
 	switch_channel_t *channel, *rchannel, *bchannel;
 	const char *buuid;
+	char brto[SWITCH_UUID_FORMATTED_LENGTH + 1] = "";
+
+	if (bleg) {
+		if (switch_ivr_find_bridged_uuid(uuid, brto, sizeof(brto)) == SWITCH_STATUS_SUCCESS) {
+			uuid = switch_core_session_strdup(session, brto);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no uuid bridged to %s\n", uuid);
+			return;
+		}
+	}
 
 	if (switch_strlen_zero(uuid) || !(rsession = switch_core_session_locate(uuid))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no uuid %s\n", uuid);

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_play_say.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_ivr_play_say.c	Mon May 26 12:59:57 2008
@@ -589,6 +589,7 @@
 SWITCH_DECLARE(switch_status_t) switch_ivr_gentones(switch_core_session_t *session, char *script, int32_t loops, switch_input_args_t *args)
 {
 	teletone_generation_session_t ts;
+	switch_dtmf_t dtmf = {0};
 	switch_buffer_t *audio_buffer;
 	switch_frame_t *read_frame = NULL;
 	switch_codec_t *read_codec = NULL, write_codec = { 0 };
@@ -624,6 +625,7 @@
 	}
 
 	for(;;) {
+		int done = 0;
 		switch_status_t status;
 		
 		if (!switch_channel_ready(channel)) {
@@ -643,8 +645,37 @@
 			break;
 		}
 
-		if (args && (args->read_frame_callback)) {
-			if (args->read_frame_callback(session, read_frame, args->user_data) != SWITCH_STATUS_SUCCESS) {
+		if (args && (args->input_callback || args->buf || args->buflen)) {
+			/*
+			   dtmf handler function you can hook up to be executed when a digit is dialed during gentones 
+			   if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
+			 */
+			if (switch_channel_has_dtmf(channel)) {
+				if (!args->input_callback && !args->buf) {
+					status = SWITCH_STATUS_BREAK;
+					done = 1;
+					break;
+				}
+				switch_channel_dequeue_dtmf(channel, &dtmf);
+				if (args->input_callback) {
+					status = args->input_callback(session, (void *)&dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen);
+				} else {
+					*((char *)args->buf) = dtmf.digit;
+					status = SWITCH_STATUS_BREAK;
+				}
+			}
+
+			if (args->input_callback) {
+				switch_event_t *event;
+
+				if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) {
+					status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen);
+					switch_event_destroy(&event);
+				}
+			}
+
+			if (status != SWITCH_STATUS_SUCCESS) {
+				done = 1;
 				break;
 			}
 		}
@@ -735,15 +766,18 @@
             dup = switch_core_session_strdup(session, alt);
 			engine = dup;
 
-			if ((voice = strchr(engine, ':'))) {
-				*voice++ = '\0';
-				if ((text = strchr(voice, ':'))) {
-					*text++ = '\0';
+			if (!switch_strlen_zero(engine)) {
+				if ((voice = strchr(engine, ':'))) {
+					*voice++ = '\0';
+					if (!switch_strlen_zero(voice) && (text = strchr(voice, ':'))) {
+						*text++ = '\0';
+					}
 				}
 			}
-			if (engine && voice && text) {
+
+			if (!switch_strlen_zero(engine) && !switch_strlen_zero(voice) && !switch_strlen_zero(text)) {
 				return switch_ivr_speak_text(session, engine, voice, text, args);
-			} else if (engine && !(voice && text)) {
+			} else if (!switch_strlen_zero(engine) && !(voice && text)) {
 				text = engine;
 				engine = (char *)switch_channel_get_variable(channel, "tts_engine");
 				voice = (char *)switch_channel_get_variable(channel, "tts_voice");
@@ -1386,6 +1420,9 @@
 		char *tp;
 		switch_size_t mylen = strlen(text) + extra + 1;
 		tmp = malloc(mylen);
+		if (!tmp) {
+			return SWITCH_STATUS_MEMERR;
+		}
 		memset(tmp, 0, mylen);
 		tp = tmp;
 		for (p = text; p && *p; p++) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_loadable_module.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_loadable_module.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_loadable_module.c	Mon May 26 12:59:57 2008
@@ -154,13 +154,18 @@
 				for (impl = ptr->implementations; impl; impl = impl->next) {
 					if (!impl->iananame) {
 						load_interface = 0;
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT,
+									  "Failed to load codec interface %s from %s due to no iana name in an implementation.\n", ptr->interface_name, key);
+						break;
+					}
+					if (impl->bytes_per_frame > SWITCH_RECOMMENDED_BUFFER_SIZE) {
+						load_interface = 0;
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT,
+									  "Failed to load codec interface %s from %s due to bytes per frame exceeding buffer size.\n", ptr->interface_name, key);
 						break;
 					}
 				}
-				if (!load_interface) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT,
-									  "Failed to load codec interface %s from %s due to no iana name in an implementation.\n", ptr->interface_name, key);
-				} else {
+				if (load_interface) {
 					for (impl = ptr->implementations; impl; impl = impl->next) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
 										  "Adding Codec '%s' (%s) %dhz %dms\n",
@@ -1336,28 +1341,31 @@
 	switch_assert(stream->data != NULL);
 	switch_assert(stream->write_function != NULL);
 
-	if (!stream->event) {
-		switch_event_create(&stream->event, SWITCH_EVENT_API);
+	if (!stream->param_event) {
+		switch_event_create(&stream->param_event, SWITCH_EVENT_API);
 	}
 
-	if (stream->event) {
+	if (stream->param_event) {
 		if (cmd) {
-			switch_event_add_header(stream->event, SWITCH_STACK_BOTTOM, "API-Command", "%s", cmd);
+			switch_event_add_header(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command", "%s", cmd);
 		}
 		if (arg) {
-			switch_event_add_header(stream->event, SWITCH_STACK_BOTTOM, "API-Command-Argument", "%s", arg);
+			switch_event_add_header(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command-Argument", "%s", arg);
 		}
 	}
 
+
 	if (cmd && (api = switch_loadable_module_get_api_interface(cmd)) != 0) {
-		status = api->function(arg, session, stream);
+		if ((status = api->function(arg, session, stream)) != SWITCH_STATUS_SUCCESS) {
+			stream->write_function(stream, "COMMAND RETURNED ERROR!\n");
+		}
 	} else {
 		status = SWITCH_STATUS_FALSE;
 		stream->write_function(stream, "INVALID COMMAND!\n");
 	}
 
-	if (stream->event) {
-		switch_event_fire(&stream->event);
+	if (stream->param_event) {
+		switch_event_fire(&stream->param_event);
 	}
 
 

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_log.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_log.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_log.c	Mon May 26 12:59:57 2008
@@ -268,7 +268,7 @@
 			memset(&to, 0, sizeof(to));
 			FD_SET(fd, &can_write);
 			to.tv_sec = 0;
-			to.tv_usec = 5000;
+			to.tv_usec = 100000;
 			if (select(fd+1, NULL, &can_write, NULL, &to) > 0) {
 				aok = FD_ISSET(fd, &can_write);
 			} else {
@@ -298,6 +298,8 @@
 		node->level = level;
 		node->content = content;
 		node->timestamp = now;
+
+
 		if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
 			free(node->data);
 			if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_odbc.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_odbc.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_odbc.c	Mon May 26 12:59:57 2008
@@ -144,8 +144,14 @@
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connecting %s\n", handle->dsn);
 	
-	result = SQLConnect(handle->con, (SQLCHAR *) handle->dsn, SQL_NTS, (SQLCHAR *) handle->username, SQL_NTS, (SQLCHAR *) handle->password, SQL_NTS);
-	
+	if(!strstr(handle->dsn, "DRIVER")) { 
+		result = SQLConnect(handle->con, (SQLCHAR *) handle->dsn, SQL_NTS, (SQLCHAR *) handle->username, SQL_NTS, (SQLCHAR *) handle->password, SQL_NTS); 
+	} else { 
+		SQLCHAR outstr[1024] = {0}; 
+		SQLSMALLINT outstrlen = 0; 
+		result = SQLDriverConnect(handle->con, NULL, (SQLCHAR *) handle->dsn, (SQLSMALLINT)strlen(handle->dsn), outstr, sizeof(outstr), &outstrlen, SQL_DRIVER_NOPROMPT); 
+	} 
+
 	if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
 		char *err_str;
 		if ((err_str = switch_odbc_handle_get_error(handle, NULL))) {

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_pcm.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_pcm.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_pcm.c	Mon May 26 12:59:57 2008
@@ -299,6 +299,13 @@
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 
+	SWITCH_ADD_CODEC(codec_interface, "PROXY VIDEO PASS-THROUGH");
+    switch_core_codec_add_implementation(pool, codec_interface,
+                                         SWITCH_CODEC_TYPE_VIDEO, 31, "PROXY-VID", NULL, 90000, 90000, 0,
+                                         0, 0, 0, 0, 1, 1, 1,
+										 switch_proxy_init, switch_proxy_encode, switch_proxy_decode, switch_proxy_destroy);
+
+
 	SWITCH_ADD_CODEC(codec_interface, "PROXY PASS-THROUGH");
 	switch_core_codec_add_implementation(pool, codec_interface,
 										 SWITCH_CODEC_TYPE_AUDIO, 0, "PROXY", NULL, 8000, 8000, 0,

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_rtp.c	Mon May 26 12:59:57 2008
@@ -765,7 +765,7 @@
 	}
 
 	if (!tx_port) {
-		*err = "Missing local port";
+		*err = "Missing remote port";
 		goto end;
 	}
 	
@@ -1130,7 +1130,34 @@
 			goto end;
 		}
 		
-		if (bytes > 0) {
+		if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) {
+			const char *tx_host;
+			const char *old_host;
+			char bufa[30], bufb[30];
+			tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr);
+			old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr);
+			if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) {
+				const char *err;
+				uint32_t old = rtp_session->remote_port;
+
+				if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) {
+					if (++rtp_session->autoadj_tally >= 10) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+										  "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host,
+										  switch_sockaddr_get_port(rtp_session->from_addr));
+						switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err);
+					}
+				}
+			}
+		}
+
+		if (bytes && rtp_session->autoadj_window) {
+			if (--rtp_session->autoadj_window == 0) {
+				switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ);
+			}
+		}
+
+		if (bytes) {
 			rtp_session->missed_count = 0;
 		}
 
@@ -1372,33 +1399,6 @@
 			goto end;
 		}
 		
-		if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) {
-			const char *tx_host;
-			const char *old_host;
-			char bufa[30], bufb[30];
-			tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr);
-			old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr);
-			if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) {
-				const char *err;
-				uint32_t old = rtp_session->remote_port;
-
-				if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) {
-					if (++rtp_session->autoadj_tally >= 10) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-										  "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host,
-										  switch_sockaddr_get_port(rtp_session->from_addr));
-						switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err);
-					}
-				}
-			}
-		}
-
-		if (rtp_session->autoadj_window) {
-			if (--rtp_session->autoadj_window == 0) {
-				switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ);
-			}
-		}
-
 		if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) {
 			goto do_continue;
 		}

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_utils.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_utils.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/switch_utils.c	Mon May 26 12:59:57 2008
@@ -373,11 +373,10 @@
             if ((ifd = open(file, O_RDONLY)) < 1) {
                 return SWITCH_FALSE;
             }
-
-            switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound);
-            if (!write_buf(fd, buf)) {
-                return SWITCH_FALSE;
-            }
+        }
+        switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound);
+        if (!write_buf(fd, buf)) {
+            return SWITCH_FALSE;
         }
 
         if (headers && !write_buf(fd, headers))
@@ -386,15 +385,13 @@
         if (!write_buf(fd, "\n\n"))
             return SWITCH_FALSE;
 
-        if (file) {
-			if (body && switch_stristr("content-type", body)) {
-				switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound);
-			} else {
-				switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound);
-			}
-            if (!write_buf(fd, buf))
-                return SWITCH_FALSE;
-        }
+		if (body && switch_stristr("content-type", body)) {
+			switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound);
+		} else {
+			switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound);
+		}
+        if (!write_buf(fd, buf))
+            return SWITCH_FALSE;
 
         if (body) {
             if (!write_buf(fd, body)) {
@@ -456,11 +453,9 @@
 
         }
 
-        if (file) {
-            switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
-            if (!write_buf(fd, buf))
-                return SWITCH_FALSE;
-        }
+        switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
+        if (!write_buf(fd, buf))
+            return SWITCH_FALSE;
     }
 
     if (fd) {
@@ -478,7 +473,6 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", filename);
 	}
 
-
     if (file) {
         switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Emailed file [%s] to [%s]\n", filename, to);
     } else {
@@ -1415,15 +1409,18 @@
 		return 0;
 	}
 
-	memset(buf, 0, len);
-
 	if (!url) {
 		return 0;
 	}
 
+	len--;
+
 	for (p = url; *p; p++) {
+		if (x >= len) {
+			break;
+		}
 		if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) {
-			if ((x + 3) > len) {
+			if ((x + 3) >= len) {
 				break;
 			}
 			buf[x++] = '%';
@@ -1432,10 +1429,9 @@
 		} else {
 			buf[x++] = *p;
 		}
-		if (x == len) {
-			break;
-		}
 	}
+	buf[x] = '\0';
+
 	return x;
 }
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/.update
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/.update	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/.update	Mon May 26 12:59:57 2008
@@ -1 +1 @@
-Wed May 21 00:25:55 CEST 2008
+Sun May 25 11:24:02 EDT 2008

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/RELEASE
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/RELEASE	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/RELEASE	Mon May 26 12:59:57 2008
@@ -9,6 +9,14 @@
  and in less than 10 lines, written in 3rd person English, with
  complete sentences />
 
+Bugs with BYE handling and event fetch/poll (SUBSCRIBE with Expires: 0) have
+been fixed in nua. Bugs with timer handling, RFC2543 dialog/transaction
+matching and gray list handling have been fixed in nta, all introduced by
+release 1.12.8.
+
+Stack now supports some load control with NTATAG_MAX_PROCEEDING(), limiting
+number of initial INVITE transactions being served concurrently.
+
 Bugs in blaa and foo have been fixed. The stack now supports
 use of foobar...
 
@@ -24,7 +32,17 @@
 **template**: New features in API are marked with Doxytag macro @VERSION_1_XX_X.
 
 libsofia-sip-ua:
-- **template**: Added foobar() function (sofia-sip/foobar.h).
+- Added nta_outgoing_bind() to <sofia-sip/nta.h>.
+- Allow changing TPTAG_LOG() and TPTAG_DUMP() values after tport_create()
+- Added NUTAG_SHUTDOWN_EVENTS(). If NUTAG_SHUTDOWN_EVENTS(1) nua setting is
+  used, nua sends events to application normally during shutdown, too.
+- Added NUTAG_SUB_EXPIRES() - default expiration time of subscription
+- Added NTATAG_MAX_PROCEEDING() - limit number of requests accepted in 
+  proceeding queue.
+- Using NUTAG_PROXY()/NTATAG_DEFAULT_PROXY() as handle-specific tag. 
+  Previously, NUTAG_PROXY() was ignored if given with nua_set_hparams(),
+  nua_invite(), nua_respond(), etc.
+- Added nua_handle_by_call_id(), nta_leg_by_call_id().
 - This release is ABI/API compatible with applications linked against 
   any 1.12.x release. However, applications built against this release won't 
   work against an older library. The ABI has been tested with the nua module 
@@ -38,6 +56,12 @@
 Contributors to this release
 ----------------------------
 
+- Michael Jerris: fixes, new features NTATAG_MAX_PROCEEDING(),
+  nua_handle_by_call_id(), nta_leg_by_call_id()
+- Colin Whittaker: re-calculating subscription duration when receiving NOTIFY
+- Jerry Richards: fix to sip_header_as_string()
+- Jussi Mutanen: fix to soa handling within nua
+
 <list of people who contributed to _this_ release
  - update as people's patches are added, or when you commit stuff
  - current development team members (see AUTHORS) may be omitted,
@@ -64,6 +88,37 @@
 Bugs fixed in this release
 --------------------------
 
+- Fixed sf.net bug #1827511: BYE can now be authenticated with 
+  nua_authenticate().
+- Fixed problems re-calculating the subscription duration upon NOTIFY.
+  Thanks to Colin Whittaker for reporting the problem and proposing a fix to
+  the problem.
+- Fixed crash when SOATAG_ORDERED_USER(1) was used and multiple m= lines were
+  added to the session.
+- Fixed problem with an error response terminating the session usage but
+  not triggering nua_i_state event reporting that to application.
+  Thanks to AlienPenguin for reporting the problem
+- Fixed crash and general lossage with event fetch (SUBSCRIBE with Expires: 0)
+  Thanks to Jarkko Riekki for reporting the problem.
+- Handle NULL argument to su_free() gracefully even if free() does not.
+  Thanks for Michael Jerris for submitting the patch.
+- Do not use PT 9 (G722) as invalid PT (currently use 19).
+- Fixed problems handling míllisecond timers in nta on 64-bit platforms.
+  Thanks to David Knell and Michael Jerris for reporting it.
+- Allow-Events is now included by nua in messages initiating dialogs.
+  Thanks to Jerry Richards for pointing out the problem.
+- Now checking that pointer is not NULL before calling free()
+  Thanks to Michail Jerris for submitting patch.
+- Fixed bug in sip_header_as_string() converting longish header to string
+  Thanks to Jerry Richards for submitting a patch
+- Fixed problem with soa session activation.
+  Thanks to Jussi Mutanen for patch.
+- Fixed problems handling host:port in user-supplied Via headers.
+- Fixed sf.net bug #1930055: nat detection did not un-REGISTER natted contact
+  if fist response to REGISTER was 200 OK.
+- Fixed crashes in soa if m= lines were removed from user sdp.
+
+
 < notable bugs fixed in this release
  - check the sf.net bug tracker; see closed bugs,
    sorted by closing date

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/configure.ac
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/configure.ac	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/configure.ac	Mon May 26 12:59:57 2008
@@ -105,6 +105,8 @@
 PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no")
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
+AC_CHECK_HEADERS([fnmatch.h])
+
 ### internal modules
 ### ----------------
 AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define to 1 always])

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases	Mon May 26 12:59:57 2008
@@ -54,5 +54,7 @@
  "EXP_1_12_7=@since Experimental in <a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.7.txt\">1.12.7</a>, available if --enable-experimental configuration option is given" \
  "VERSION_1_12_8=<a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.8.txt\">1.12.8</a>" \
  "NEW_1_12_8=@since New in <a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.8.txt\">1.12.8</a>" \
+ "VERSION_1_12_9=<a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.9.txt\">1.12.9</a>" \
+ "NEW_1_12_9=@since New in <a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.9.txt\">1.12.9</a>" \
 
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am	Mon May 26 12:59:57 2008
@@ -28,7 +28,7 @@
 
 # Including Doxyfile.rfc in dist breaks make manpages
 
-Doxyfile.rfc:
+Doxyfile.rfc: Makefile.am
 	$(AWK) 'END { b="\\"; q="\\\""; \
 		print "# Autogenerated aliases for RFCs "from" .. "to ; \
 		print "ALIASES += " b; \

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/conformance.docs
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/conformance.docs	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/docs/conformance.docs	Mon May 26 12:59:57 2008
@@ -756,7 +756,7 @@
 <a name="3856"></a><a name="3859"></a>
 <tr valign=top>
     <th align="left">
-	@RFC3856: Presence <br />
+	@RFC3856: Presence <br>
 	@RFC3859: Common Profile for Presence
     </th>
     <td>

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c	Mon May 26 12:59:57 2008
@@ -117,10 +117,13 @@
     http_header_t const *h, **hh;
 
     http = (http_t const *)src->t_value;
+    if (http == NULL)
+      return dst;
+
     mc = (void *)http->http_common->h_class;
     hh = (void *)msg_hclass_offset(mc, http, hc);
 
-    if (http == NULL ||
+    if (hh == NULL ||
 	(char *)hh >= ((char *)http + http->http_size) ||
 	(char *)hh < (char *)&http->http_request)
       return dst;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c	Mon May 26 12:59:57 2008
@@ -728,6 +728,9 @@
   else
     basic = malloc(basiclen + 1);
 
+  if (basic == NULL)
+    return -1;
+
   /*
    * Basic authentication consists of username and password separated by
    * colon and then base64 encoded.

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c	Mon May 26 12:59:57 2008
@@ -537,11 +537,10 @@
     if (n < 0 || n >= INT_MAX)
       continue;
     if (n >= upsize) {
-      upsize = n + 1;
-      userpass = realloc(userpass == buffer ? NULL : userpass, upsize);
-      if (userpass == NULL)
-	continue;
-      base64_d(userpass, upsize - 1, au->au_params[0]);
+      void *b = realloc(userpass == buffer ? NULL : userpass, upsize = n + 1);
+      if (b == NULL)
+	break;
+      base64_d(userpass = b, upsize - 1, au->au_params[0]);
     }
     userpass[n] = 0;
     if (!(pass = strchr(userpass, ':')))
@@ -1079,13 +1078,15 @@
       if (!*pass || !*user)
 	continue;
 
-      realm = ""; ident = "";
-
-      if ((realm = strchr(pass, ':'))) {
+      if ((realm = strchr(pass, ':')))
 	*realm++ = '\0';
-	if ((ident = strchr(realm, ':')))
-	  *ident++ = '\0';
-      }
+      else
+	realm = "";
+
+      if ((ident = strchr(realm, ':')))
+	*ident++ = '\0';
+      else
+	ident = "";
 
       apw = fresh + i++;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c	Mon May 26 12:59:57 2008
@@ -212,10 +212,11 @@
 msg_payload_t *msg_payload_create(su_home_t *home, void const *data, usize_t len)
 {
   msg_header_t *h = msg_header_alloc(home, msg_payload_class, len + 1);
-  msg_payload_t *pl = h->sh_payload;
 
-  if (pl) {
+  if (h) {
+    msg_payload_t *pl = (msg_payload_t *)h;
     char *b = msg_header_data(h->sh_common);
+
     if (data)
       memcpy(b, data, len);
     else
@@ -227,6 +228,7 @@
 
     return pl;
   }
+
   return NULL;
 }
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c	Mon May 26 12:59:57 2008
@@ -1871,8 +1871,10 @@
 
   b = msg_params_dup(&c->c_params, o->c_params, b, xtra);
   MSG_STRING_DUP(b, c->c_type, o->c_type);
-  c->c_subtype = strchr(c->c_type, '/');
-  c->c_subtype++;
+
+  c->c_subtype = c->c_type ? strchr(c->c_type, '/') : NULL;
+  if (c->c_subtype)
+    c->c_subtype++;
 
   assert(b <= end); (void)end;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c	Mon May 26 12:59:57 2008
@@ -1312,8 +1312,8 @@
 			     char b[], isize_t bsiz,
 			     int eos)
 {
-  msg_mclass_t const *mc = msg->m_class;
-  msg_href_t const *hr = mc->mc_payload;
+  msg_mclass_t const *mc;
+  msg_href_t const *hr;
   msg_header_t *h, *h0;
   msg_payload_t *pl;
   char *x;
@@ -1322,6 +1322,8 @@
     return -1;
 
   assert(!msg->m_chunk);
+  mc = msg->m_class;
+  hr = mc->mc_payload;
 
   if (return_payload == NULL)
     return_payload = &h0;
@@ -1334,7 +1336,7 @@
     return -1;
 
   append_parsed(msg, mo, hr, h, 0);
-  pl = h->sh_payload;
+  pl = (msg_payload_t*)h;
   *return_payload = h;
 
   if (bsiz >= body_len) {
@@ -1832,9 +1834,15 @@
       else
 	bsiz = used + n + 1;
 
+      if (bsiz < msg_min_size) {
+	errno = ENOMEM;
+	su_free(home, b);
+	return NULL;
+      }
+
       b2 = su_realloc(home, b, bsiz);
 
-      if (b2 == NULL || bsiz < msg_min_size) {
+      if (b2 == NULL) {
 	errno = ENOMEM; 
 	su_free(home, b);
 	return NULL;
@@ -1896,7 +1904,7 @@
   msg_header_t **separator;
   msg_header_t **payload;
   msg_header_t **multipart;
-  msg_mclass_t const *mc = msg->m_class;
+  msg_mclass_t const *mc;
   msg_header_t **tail, ***ptail;
 
   if (!msg)
@@ -1914,6 +1922,7 @@
 
   serialize_first(msg, h);
 
+  mc = msg->m_class;
   separator = (msg_header_t **)((char *)pub + mc->mc_separator->hr_offset);
   payload = (msg_header_t **)((char *)pub + mc->mc_payload->hr_offset);
   if (mc->mc_multipart->hr_class)
@@ -2115,13 +2124,14 @@
 		      msg_header_t **head,
 		      msg_header_t *h)
 {
-  msg_mclass_t const *mc = msg->m_class;
+  msg_mclass_t const *mc;
   msg_header_t **hh;
   msg_header_t **separator;
   msg_header_t **payload;
   
   assert(msg && pub && head && h);
 
+  mc = msg->m_class;
   separator = (msg_header_t **)((char *)pub + mc->mc_separator->hr_offset);
   payload = (msg_header_t **)((char *)pub + mc->mc_payload->hr_offset);
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c	Mon May 26 12:59:57 2008
@@ -191,9 +191,9 @@
 			issize_t (*scanner)(char *s), 
 			int sep)
 {
-  char const *auto_list[MSG_N_PARAMS];
-  char const **list = auto_list, **re_list;
-  int N = MSG_N_PARAMS, n = 0;
+  char const *stack[MSG_N_PARAMS];
+  char const **list = stack, **re_list;
+  size_t N = MSG_N_PARAMS, n = 0;
   issize_t tlen;
   char *s = *ss;
   char const **start;
@@ -221,7 +221,7 @@
     if (tlen > 0) {
       if (n + 1 == N) {		/* Reallocate list? */
 	N = MSG_PARAMS_NUM(N + 1);
-	if (list == auto_list || list == *append_list) {
+	if (list == stack || list == *append_list) {
 	  re_list = su_alloc(home, N * sizeof(*list));
 	  if (re_list)
 	    memcpy(re_list, list, n * sizeof(*list));
@@ -247,23 +247,25 @@
 
   *ss = s;
 
-  if (n > 0 && list == auto_list) {
+  if (n == 0) {
+    *append_list = NULL;
+    return 0;
+  }
+
+  if (list == stack) {
     size_t size = sizeof(*list) * MSG_PARAMS_NUM(n + 1);
     list = su_alloc(home, size);
     if (!list) return -1;
-    memcpy((void *)list, auto_list, n * sizeof(*list));
+    memcpy((void *)list, stack, n * sizeof(*list));
   }
 
   list[n] = NULL;
-  if (n == 0)
-    list = NULL;
-
   *append_list = list;
   return 0;
 
  error:
   *start = NULL;
-  if (list != auto_list && list != *append_list)
+  if (list != stack && list != *append_list)
     su_free(home, list);
   return -1;
 }
@@ -362,7 +364,8 @@
     for (n = 0; params[n]; n++)
       ;
     N = MSG_PARAMS_NUM(n + 1);
-  } else {
+  }
+  else {
     params = stack;
     N = MSG_PARAMS_NUM(1);
   }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c	Mon May 26 12:59:57 2008
@@ -1493,8 +1493,9 @@
 		       nta_incoming_t *irq, 
 		       sip_t const *sip)
 {
-  nea_sub_t *s = NULL;
-  s = nea_sub_create(nes);
+  nea_sub_t *s = nea_sub_create(nes);
+  if (s == NULL)
+    return 500;
 
   s->s_from = sip_from_dup(nes->nes_home, sip->sip_from);
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Mon May 26 12:59:57 2008
@@ -987,7 +987,7 @@
   void *smime         = agent->sa_smime;
   uint32_t flags      = agent->sa_flags;
   int rport           = agent->sa_rport;
-  int server_rport    = agent->sa_server_rport;
+  unsigned server_rport    = agent->sa_server_rport;
   int tcp_rport       = agent->sa_tcp_rport;
   unsigned preload         = agent->sa_preload;
   unsigned threadpool      = agent->sa_tport_threadpool;
@@ -2579,7 +2579,7 @@
     rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
     msg_header_replace_param(msg_home(msg), v->v_common, rport);
   }
-  else {
+  else if (agent->sa_server_rport == 2) {
     rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
     msg_header_replace_param(msg_home(msg), v->v_common, rport);
   } 
@@ -3310,7 +3310,7 @@
   url_t reg_url[1];
   url_string_t const *original = request_uri;
 
-  if (!leg || !msg)
+  if (!leg || !msg || !sip)
     return -1;
 
   if (!sip->sip_route && leg->leg_route) {
@@ -4086,6 +4086,10 @@
 
 /** Get dialog leg by @CallID.
  *
+ * @note Usually there should be only single dialog per @CallID on
+ * User-Agents. However, proxies may fork requests initiating the dialog and
+ * result in multiple calls per @CallID.
+ *
  * @since New in @VERSION_1_12_9.
  */
 SOFIAPUBFUN
@@ -4718,7 +4722,7 @@
       irq->irq_record_route = 
 	sip_record_route_copy(home, sip->sip_record_route);
     }
-    irq->irq_branch  = irq->irq_via->v_branch;
+    irq->irq_branch  = sip->sip_via->v_branch;
     irq->irq_reliable_tp = tport_is_reliable(tport);
 
     if (sip->sip_timestamp)
@@ -5818,7 +5822,7 @@
     msg = nta_msg_create(irq->irq_agent, 0);
     sip = sip_object(msg);
 
-    if (status != 0)
+    if (sip && status != 0)
       sip->sip_status = sip_status_create(msg_home(msg), status, phrase, NULL);
 
     if (nta_incoming_response_headers(irq, msg, sip) < 0)
@@ -5901,7 +5905,7 @@
     return -1;
   }
 
-  if (msg == NULL)
+  if (msg == NULL || sip == NULL)
     return -1;
 
   if (msg == irq->irq_response)
@@ -8399,6 +8403,8 @@
   if (!internal && orq->orq_delay == UINT_MAX)
     outgoing_estimate_delay(orq, sip);
 
+  assert(!internal || status >= 300);
+
   if (orq->orq_cc)
     agent_accept_compressed(orq->orq_agent, msg, orq->orq_cc);
 
@@ -9545,6 +9551,9 @@
     rlen = strlen(na->na_replace) + 1;
     sq = su_zalloc(home, (sizeof *sq) + rlen);
 
+    if (sq == NULL)
+      continue;
+
     *tail = sq, tail = &sq->sq_next;    
     sq->sq_otype = sres_type_naptr;
     sq->sq_priority = na->na_prefer;
@@ -10664,9 +10673,9 @@
     }
 
     if (rack) {
-      rack->ra_cseq = orq->orq_cseq->cs_seq;
-      rack->ra_method = orq->orq_cseq->cs_method;
-      rack->ra_method_name = orq->orq_cseq->cs_method_name;
+      rack->ra_cseq = oorq->orq_cseq->cs_seq;
+      rack->ra_method = oorq->orq_cseq->cs_method;
+      rack->ra_method_name = oorq->orq_cseq->cs_method_name;
     }
   }
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h	Mon May 26 12:59:57 2008
@@ -226,7 +226,7 @@
   /** If true, use rport at client */
   unsigned              sa_rport:1;
   /** If true, use rport at server */
-  unsigned              sa_server_rport:1;
+  unsigned              sa_server_rport:2;
   /** If true, use rport with tcp, too */
   unsigned              sa_tcp_rport:1;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c	Mon May 26 12:59:57 2008
@@ -685,10 +685,10 @@
  *     unsigned int
  *
  * @par Values
- *    - Value of @i delta-seconds in @RetryAfter header, from 0 to 86400
+ *    - Value of @a delta-seconds in @RetryAfter header, from 0 to 86400
  *
  * @par Default Value
- *    - 0 (no Retry-After is included)
+ *    - 0 (no @RetryAfter header is included)
  *
  * @sa NTATAG_TIMEOUT_408()
  */
@@ -1334,7 +1334,7 @@
  *
  * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via
  */
-tag_typedef_t ntatag_server_rport = BOOLTAG_TYPEDEF(server_rport);
+tag_typedef_t ntatag_server_rport = UINTTAG_TYPEDEF(server_rport);
 
 
 /**@def NTATAG_TCP_RPORT(x)

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c	Mon May 26 12:59:57 2008
@@ -54,7 +54,7 @@
   for (patterns = test_patterns; *patterns; patterns++) {
     if (!fnmatch(*patterns, name, 0)) {
       if (strcmp(*patterns, "*")) {
-	printf("%s: match with %s\n", name, *patterns);
+	printf("%s: running\n", name);
       }
       _tcase_add_test(tc, tf, name, 0, 0, 1);
       return;
@@ -64,14 +64,13 @@
   for (patterns = test_patterns; *patterns; patterns++) {
     if (!strcmp(*patterns, name) || !strcmp(*patterns, "*")) {
       if (strcmp(*patterns, "*")) {
-	printf("%s: match with %s\n", name, *patterns);
+	printf("%s: running\n", name);
       }
       _tcase_add_test(tc, tf, name, 0, 0, 1);
       return;
     }
   }
 #endif
-  printf("%s: no match\n", name);
 }
 
 int main(int argc, char *argv[])
@@ -91,6 +90,7 @@
 
     patterns = calloc(i, sizeof *patterns);
 
+    /* Split by commas */
     for (i = 0, s = cases;; i++) {
       patterns[i] = s;
       if (s == NULL)

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Mon May 26 12:59:57 2008
@@ -411,7 +411,7 @@
 
 /* 2.1 - Basic call cases */
 
-START_TEST(basic_call_with_bye_by_nua)
+START_TEST(call_2_1_1)
 {
   nua_handle_t *nh;
 
@@ -429,7 +429,7 @@
 END_TEST
 
 
-START_TEST(basic_call_with_bye_to_nua)
+START_TEST(call_2_1_2)
 {
   nua_handle_t *nh;
 
@@ -447,7 +447,7 @@
 END_TEST
 
 
-START_TEST(call_to_nua_with_bye_to_nua)
+START_TEST(call_2_1_3)
 {
   nua_handle_t *nh;
 
@@ -463,7 +463,7 @@
 END_TEST
 
 
-START_TEST(call_to_nua_with_bye_by_nua)
+START_TEST(call_2_1_4)
 {
   nua_handle_t *nh;
 
@@ -479,7 +479,7 @@
 END_TEST
 
 
-START_TEST(call_to_nua_with_bye_by_nua_challenged)
+START_TEST(call_2_1_5)
 {
   nua_handle_t *nh;
 
@@ -572,17 +572,51 @@
 END_TEST
 
 
+START_TEST(call_2_1_7)
+{
+  nua_handle_t *nh, *nh2;
+  sip_replaces_t *replaces;
+
+  s2_case("2.1.7", "Call lookup",
+	  "Test dialog and call-id lookup");
+
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+
+  invite_by_nua(nh, TAG_END());
+
+  nh2 = nua_handle_by_call_id(nua, dialog->call_id->i_id);
+  fail_if(!nh2); fail_if(nh != nh2); nua_handle_unref(nh2);
+
+  replaces = sip_replaces_format(NULL, "%s;from-tag=%s;to-tag=%s",
+				 dialog->call_id->i_id,
+				 dialog->local->a_tag,
+				 dialog->remote->a_tag);
+  fail_if(!replaces);
+
+  nh2 = nua_handle_by_replaces(nua, replaces);
+  fail_if(!nh2); fail_if(nh != nh2); nua_handle_unref(nh2);
+
+  msg_header_free_all(NULL, (msg_header_t *)replaces);
+
+  bye_by_nua(nh, TAG_END());
+
+  nua_handle_destroy(nh);
+}
+END_TEST
+
+
 TCase *invite_tcase(void)
 {
   TCase *tc = tcase_create("2.1 - Basic INVITE");
   tcase_add_checked_fixture(tc, call_setup, call_teardown);
   {
-    tcase_add_test(tc, basic_call_with_bye_by_nua);
-    tcase_add_test(tc, basic_call_with_bye_to_nua);
-    tcase_add_test(tc, call_to_nua_with_bye_to_nua);
-    tcase_add_test(tc, call_to_nua_with_bye_by_nua);
-    tcase_add_test(tc, call_to_nua_with_bye_by_nua_challenged);
+    tcase_add_test(tc, call_2_1_1);
+    tcase_add_test(tc, call_2_1_2);
+    tcase_add_test(tc, call_2_1_3);
+    tcase_add_test(tc, call_2_1_4);
+    tcase_add_test(tc, call_2_1_5);
     tcase_add_test(tc, call_2_1_6);
+    tcase_add_test(tc, call_2_1_7);
   }
   return tc;
 }
@@ -1104,7 +1138,7 @@
 /* ====================================================================== */
 /* Weird call termination cases */
 
-START_TEST(terminating_re_invite)
+START_TEST(bye_4_1_1)
 {
   nua_handle_t *nh;
   struct message *bye, *r481;
@@ -1146,7 +1180,7 @@
 END_TEST
 
 
-START_TEST(bye_invite_glare)
+START_TEST(bye_4_1_2)
 {
   nua_handle_t *nh;
   struct message *bye, *r481;
@@ -1181,7 +1215,7 @@
 }
 END_TEST
 
-START_TEST(call_4_1_3)
+START_TEST(bye_4_1_3)
 {
   nua_handle_t *nh;
   struct message *bye;
@@ -1222,7 +1256,7 @@
 END_TEST
 
 
-START_TEST(call_4_1_4)
+START_TEST(bye_4_1_4)
 {
   nua_handle_t *nh;
   struct message *bye;
@@ -1261,7 +1295,7 @@
 END_TEST
 
 
-START_TEST(call_4_1_5)
+START_TEST(bye_4_1_5)
 {
   nua_handle_t *nh;
   struct message *bye;
@@ -1298,7 +1332,7 @@
 END_TEST
 
 
-START_TEST(bye_invite_glare2)
+START_TEST(bye_4_1_6)
 {
   nua_handle_t *nh;
   struct message *bye, *r486;
@@ -1336,7 +1370,7 @@
 END_TEST
 
 
-START_TEST(bye_invite_glare3)
+START_TEST(bye_4_1_7)
 {
   nua_handle_t *nh;
   struct message *bye, *r486;
@@ -1373,7 +1407,7 @@
 }
 END_TEST
 
-START_TEST(bye_then_respond)
+START_TEST(bye_4_1_8)
 {
   nua_handle_t *nh;
   struct message *bye, *r486;
@@ -1412,7 +1446,102 @@
 END_TEST
 
 
-START_TEST(bye_with_timer)
+START_TEST(bye_4_1_9)
+{
+  nua_handle_t *nh;
+  struct message *bye;
+  struct event *i_bye;
+
+  s2_case("4.1.6", "Send BYE, receive BYE, destroy",
+	  "NUA sends BYE, receives BYE and handle gets destroyed");
+
+  nh = invite_to_nua(TAG_END());
+
+  mark_point();
+
+  s2_flush_events();
+
+  nua_bye(nh, TAG_END());
+  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  fail_if(!bye);
+
+  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  i_bye = s2_wait_for_event(nua_i_bye, 200);
+  fail_if(!i_bye);
+  s2_free_event(i_bye), i_bye = NULL;
+  fail_unless(s2_check_callstate(nua_callstate_terminated));
+  fail_unless(s2_check_response(200, SIP_METHOD_BYE));
+  nua_handle_destroy(nh);
+  mark_point();
+
+  su_root_step(s2->root, 10);
+  su_root_step(s2->root, 10);
+  su_root_step(s2->root, 10);
+
+  mark_point();
+  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_free_message(bye);
+
+  mark_point();
+  while (su_home_check_alloc((su_home_t *)nua, (void *)nh)) {
+    su_root_step(s2->root, 10);
+  }
+}
+END_TEST
+
+
+START_TEST(bye_4_1_10)
+{
+  nua_handle_t *nh;
+  struct message *invite, *bye;
+  struct event *i_bye;
+
+  s2_case("4.1.6", "Send auto-BYE upon receiving 501, receive BYE, destroy",
+	  "NUA sends BYE, receives BYE and handle gets destroyed");
+
+  nh = invite_to_nua(TAG_END());
+
+  mark_point();
+
+  s2_flush_events();
+
+  nua_invite(nh, TAG_END());
+  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  fail_if(!invite);
+  s2_respond_to(invite, dialog, SIP_501_NOT_IMPLEMENTED, TAG_END());
+  s2_free_message(invite);
+
+  fail_unless(s2_check_request(SIP_METHOD_ACK));
+
+  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  fail_if(!bye);
+
+  fail_unless(s2_check_callstate(nua_callstate_calling));
+  fail_unless(s2_check_event(nua_r_invite, 501));
+  fail_unless(s2_check_callstate(nua_callstate_terminating));
+
+  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  i_bye = s2_wait_for_event(nua_i_bye, 200);
+  fail_if(!i_bye);
+  s2_free_event(i_bye), i_bye = NULL;
+  fail_unless(s2_check_callstate(nua_callstate_terminated));
+  fail_unless(s2_check_response(200, SIP_METHOD_BYE));
+  nua_handle_destroy(nh);
+
+  su_root_step(s2->root, 10);
+  su_root_step(s2->root, 10);
+  su_root_step(s2->root, 10);
+
+  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_free_message(bye);
+
+  while (su_home_check_alloc((su_home_t *)nua, (void *)nh)) {
+    su_root_step(s2->root, 10);
+  }
+}
+END_TEST
+
+START_TEST(bye_4_2_1)
 {
   nua_handle_t *nh;
   struct message *bye;
@@ -1456,12 +1585,12 @@
 }
 END_TEST
 
-START_TEST(bye_with_timer2)
+START_TEST(bye_4_2_2)
 {
   nua_handle_t *nh;
   struct message *bye;
 
-  s2_case("4.2.1", "BYE in progress while call timer expires",
+  s2_case("4.2.2", "BYE in progress while call timer expires",
 	  "NUA receives INVITE, "
 	  "activates call timers, "
 	  "sends BYE, BYE challenged, "
@@ -1507,16 +1636,18 @@
   TCase *tc = tcase_create("4 - Call Termination");
   tcase_add_checked_fixture(tc, call_setup, call_teardown);
   {
-    tcase_add_test(tc, terminating_re_invite);
-    tcase_add_test(tc, bye_invite_glare);
-    tcase_add_test(tc, call_4_1_3);
-    tcase_add_test(tc, call_4_1_4);
-    tcase_add_test(tc, call_4_1_5);
-    tcase_add_test(tc, bye_invite_glare2);
-    tcase_add_test(tc, bye_invite_glare3);
-    tcase_add_test(tc, bye_with_timer);
-    tcase_add_test(tc, bye_with_timer2);
-    tcase_add_test(tc, bye_then_respond);
+    tcase_add_test(tc, bye_4_1_1);
+    tcase_add_test(tc, bye_4_1_2);
+    tcase_add_test(tc, bye_4_1_3);
+    tcase_add_test(tc, bye_4_1_4);
+    tcase_add_test(tc, bye_4_1_5);
+    tcase_add_test(tc, bye_4_1_6);
+    tcase_add_test(tc, bye_4_1_7);
+    tcase_add_test(tc, bye_4_1_8);
+    tcase_add_test(tc, bye_4_1_9);
+    tcase_add_test(tc, bye_4_1_10);
+    tcase_add_test(tc, bye_4_2_1);
+    tcase_add_test(tc, bye_4_2_2);
     tcase_set_timeout(tc, 5);
   }
   return tc;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua.c	Mon May 26 12:59:57 2008
@@ -1036,7 +1036,7 @@
   if (nua) {
 #if HAVE_OPEN_C
     struct nua_stack_handle_by_replaces_args a;
-	a.retval = NULL;
+    a.retval = NULL;
     a.nua = nua;
     a.r = r;
 #else

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c	Mon May 26 12:59:57 2008
@@ -379,8 +379,12 @@
     /* Destroy saved client request */
     if (cr0 != du->du_cr && nua_client_is_bound(du->du_cr)) {
       nua_client_bind(cr = du->du_cr, NULL);
-      if (!nua_client_is_queued(cr) &&
-	  !nua_client_is_reporting(cr))
+
+      if (nua_client_is_queued(cr))
+	nua_client_request_complete(cr);
+      else if (nua_client_is_reporting(cr))
+	;
+      else
 	nua_client_request_destroy(cr);
     }
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h	Mon May 26 12:59:57 2008
@@ -501,6 +501,9 @@
 #define nua_dialog_usage_public(p) ((p) ? (nua_dialog_usage_t*)(p) - 1 : NULL)
 #endif
 
+#define NUA_DIALOG_USAGE_PRIVATE(du) ((void *)((du) + 1))
+#define NUA_DIALOG_USAGE_PUBLIC(pu) ((void *)((nua_dialog_usage_t *)(pu) - 1))
+
 /* ---------------------------------------------------------------------- */
 
 int nua_client_create(nua_owner_t *owner,

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c	Mon May 26 12:59:57 2008
@@ -145,7 +145,7 @@
 
   if (ev == NULL) {
     char *o_type = su_strdup(home, event->o_type);
-    char *o_subtype = strchr(o_type, '.');
+    char *o_subtype = o_type ? strchr(o_type, '.') : NULL;
 
     if (o_subtype)
       *o_subtype++ = '\0';

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c	Mon May 26 12:59:57 2008
@@ -1103,7 +1103,6 @@
 
   if (nh == dnh || nh->nh_prefs != dnh->nh_prefs) {
     dst = nh->nh_prefs, *old = *dst;
-    assert(dst);
   }
   else {
     dst = su_zalloc(home, sizeof *dst), memset(old, 0, sizeof *old);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c	Mon May 26 12:59:57 2008
@@ -110,7 +110,7 @@
 			      nua_server_request_t *sr
 )
 {
-  struct publish_usage *pu = nua_dialog_usage_private(du);
+  struct publish_usage *pu = NUA_DIALOG_USAGE_PRIVATE(du);
 
   su_free(nh->nh_home, pu->pu_etag);
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c	Mon May 26 12:59:57 2008
@@ -188,7 +188,7 @@
 				  nua_dialog_state_t *ds,
 				  nua_dialog_usage_t *du)
 {
-  nua_registration_t *nr = nua_dialog_usage_private(du);
+  nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
 
   if (ds->ds_has_register)
     return -1;			/* There can be only one usage */
@@ -207,7 +207,7 @@
 				      nua_client_request_t *cr,
 				      nua_server_request_t *sr)
 {
-  nua_registration_t *nr = nua_dialog_usage_private(du);
+  nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
 
   if (nr->nr_list)
     nua_registration_remove(nr);	/* Remove from list of registrations */
@@ -236,7 +236,7 @@
 					 nua_dialog_state_t const *ds,
 					 sip_t const *sip)
 {
-  nua_registration_t *nr = nua_dialog_usage_private(du);
+  nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
   if (nr->nr_ob)
     outbound_peer_info(nr->nr_ob, sip);
 }
@@ -1016,16 +1016,18 @@
 				    msg_t *msg,
 				    int error)
 {
-  nua_dialog_usage_t *du = nua_dialog_usage_public(nr);
+  nua_dialog_usage_t *du;
   tp_name_t const *tpn;
-  int pending = nr->nr_error_report_id;
+  int pending;
 
-  assert(tport == nr->nr_tport);
-
-  if (!nr->nr_tport)
+  assert(nr && tport == nr->nr_tport);
+  if (nr == NULL || tport != nr->nr_tport)
     return;
 
-  if (tport_release(nr->nr_tport, pending, NULL, NULL, nr, 0) < 0)
+  du = NUA_DIALOG_USAGE_PUBLIC(nr);
+  pending = nr->nr_error_report_id;
+
+  if (tport_release(tport, pending, NULL, NULL, nr, 0) < 0)
     SU_DEBUG_1(("nua_register: tport_release() failed\n"));
   nr->nr_error_report_id = 0;
 
@@ -1110,7 +1112,7 @@
 				       nua_dialog_usage_t *du)
 {
   nua_client_request_t *cr = du->du_cr;
-  nua_registration_t *nr = nua_dialog_usage_private(du);
+  nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
 
   if (cr) {
     if (nua_client_is_queued(cr)) /* Already registering. */

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	Mon May 26 12:59:57 2008
@@ -223,7 +223,7 @@
 			   nua_dialog_state_t *ds,
 			   nua_dialog_usage_t *du)
 {
-  nua_session_usage_t *ss = nua_dialog_usage_private(du);  
+  nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du);
 
   if (ds->ds_has_session)
     return -1;
@@ -243,12 +243,14 @@
 			      nua_client_request_t *cr0,
 			      nua_server_request_t *sr0)
 {
-  nua_session_usage_t *ss = nua_dialog_usage_private(du);
+  nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du);
   nua_client_request_t *cr, *cr_next;
+  nua_server_request_t *sr;
 
   cr = du->du_cr;
 
-  if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200) {
+  if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200 && 
+      cr->cr_method == sip_method_invite) {
     ss->ss_reporting = 1;
     nua_invite_client_ack(cr, NULL);
     ss->ss_reporting = 0;
@@ -267,11 +269,13 @@
     if (cr == du->du_cr && cr->cr_orq)
       continue;
 
-    nua_stack_event(nh->nh_nua, nh, 
-   	      NULL,
-          cr->cr_event,
-	      SIP_481_NO_TRANSACTION,
-		  NULL);
+    if (cr->cr_status < 200) {
+      nua_stack_event(nh->nh_nua, nh, 
+		      NULL,
+		      cr->cr_event,
+		      SIP_481_NO_TRANSACTION,
+		      NULL);
+    }
 
     nua_client_request_destroy(cr);
 
@@ -291,6 +295,12 @@
     signal_call_state_change(nh, ss, status, phrase, nua_callstate_terminated);
   }
 
+  /* Application can respond to BYE after the session usage has terminated */
+  for (sr = ds->ds_sr; sr; sr = sr->sr_next) {
+    if (sr->sr_usage == du && sr->sr_method == sip_method_bye)
+      sr->sr_usage = NULL;
+  }
+
   ds->ds_has_session = 0;
   nh->nh_has_invite = 0;
   nh->nh_active_call = 0;
@@ -724,10 +734,15 @@
   if (!du)
     return -1;
 
+  ss = nua_dialog_usage_private(du);
+
+  if (ss->ss_state >= nua_callstate_terminating)
+    return nua_client_return(cr, 900, "Session is terminating", msg);
+
   if (nua_client_bind(cr, du) < 0)
     return nua_client_return(cr, 900, "INVITE already in progress", msg);
 
-  ss = nua_dialog_usage_private(du);
+  cr->cr_neutral = 0;
 
   session_timer_preferences(ss->ss_timer,
 			    sip,
@@ -737,8 +752,6 @@
 			    NH_PGET(nh, refresher),
 			    NH_PGET(nh, min_se));
 
-  cr->cr_neutral = 0;
-
   return 0;
 }
 
@@ -755,6 +768,9 @@
   if (du == NULL)		/* Call terminated */ 
     return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg);
 
+  if (ss->ss_state >= nua_callstate_terminating)
+    return nua_client_return(cr, 900, "Session is terminating", msg);
+
   assert(ss);
 
   invite_timeout = NH_PGET(nh, invite_timeout);
@@ -1167,7 +1183,7 @@
   if (error < 0) {
     if (ss->ss_reason == NULL)
       ss->ss_reason = "SIP;cause=500;text=\"Internal Error\"";
-    ss->ss_reporting = 1;	/* We report state here if BYE fails */
+    ss->ss_reporting = 1;	/* We report terminated state here if BYE fails */
     error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL);
     ss->ss_reporting = 0;
     signal_call_state_change(nh, ss, 500, "Internal Error", 
@@ -1212,6 +1228,7 @@
   char const *invite_branch;
 
   assert(cr->cr_orq);
+  assert(cr->cr_method == sip_method_invite);
 
 
   if (!ds->ds_leg) {
@@ -1461,7 +1478,7 @@
 				      nua_dialog_usage_t *du,
 				      sip_time_t now)
 {
-  nua_session_usage_t *ss = nua_dialog_usage_private(du);
+  nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du);
   nua_client_request_t const *cr = du->du_cr;
   nua_server_request_t const *sr;
 
@@ -1508,7 +1525,7 @@
 				      nua_dialog_state_t *ds,
 				      nua_dialog_usage_t *du)
 {
-  nua_session_usage_t *ss = nua_dialog_usage_private(du);
+  nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du);
   nua_server_request_t *sr, *sr_next;
   nua_client_request_t *cri;
 
@@ -1675,6 +1692,8 @@
   if (du == NULL)		/* Call terminated */
     return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg);
   assert(ss);
+  if (ss->ss_state >= nua_callstate_terminating)
+    return nua_client_return(cr, 900, "Session is terminating", msg);
 
   cri = du->du_cr;
 
@@ -2465,7 +2484,7 @@
       nua_stack_event(nh->nh_nua, nh, NULL,
 		      nua_i_media_error, status, phrase, NULL);
 
-      ss->ss_reporting = 1;	/* We report state here if BYE fails */
+      ss->ss_reporting = 1;	/* We report terminated state here if BYE fails */
       error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL);
       ss->ss_reporting = 0;
 
@@ -2562,7 +2581,7 @@
   /* send BYE, too, if 200 OK (or 183 to re-INVITE) timeouts  */
   ss->ss_reason = reason;
 
-  ss->ss_reporting = 1;		/* We report state here if BYE fails */
+  ss->ss_reporting = 1;		/* We report terminated state here if BYE fails */
   error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL);
   ss->ss_reporting = 0;
 
@@ -2675,19 +2694,22 @@
     return sr->sr_status;
 
   if (sr->sr_sdp) {
-    nua_session_usage_t *ss = nua_dialog_usage_private(sr->sr_usage);
+    nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(sr->sr_usage);
+    char const *offeranswer;
 
     /* XXX - check for overlap? */
     
-    if (sri->sr_offer_sent)
-      sr->sr_answer_recv = 1, ss->ss_oa_recv = Answer;
-    else 
-      sr->sr_offer_recv = 1, ss->ss_oa_recv = Offer;
+    if (sri->sr_offer_sent && !sri->sr_answer_recv)
+      sr->sr_answer_recv = 1, sri->sr_answer_recv = 1, offeranswer = Answer;
+    else
+      sr->sr_offer_recv = 1, offeranswer = Offer;
+
+    ss->ss_oa_recv = offeranswer;
 
     if (nh->nh_soa &&
 	soa_set_remote_sdp(nh->nh_soa, NULL, sr->sr_sdp, sr->sr_sdp_len) < 0) {
       SU_DEBUG_5(("nua(%p): %s server: error parsing %s\n", (void *)nh,
-		  "PRACK", Offer));
+		  "PRACK", offeranswer));
       return 
 	sr->sr_status = soa_error_as_sip_response(nh->nh_soa, &sr->sr_phrase);
     }
@@ -2710,7 +2732,7 @@
 
     if (nh->nh_soa == NULL) {
       if (sr->sr_offer_recv && session_get_description(sip, NULL, NULL))
-	sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer;
+	sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer;
     }
     else if ((sr->sr_offer_recv && soa_generate_answer(nh->nh_soa, NULL) < 0) ||
 	     (sr->sr_answer_recv && soa_process_answer(nh->nh_soa, NULL) < 0)) {
@@ -2724,7 +2746,7 @@
       if (session_include_description(nh->nh_soa, 1, msg, sip) < 0)
 	sr_status(sr, SIP_500_INTERNAL_SERVER_ERROR);
       else
-      sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer;
+	sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer;
     }
   }
 
@@ -3134,6 +3156,8 @@
   if (du == NULL)		/* Call terminated */
     return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg);
   assert(ss);
+  if (ss->ss_state >= nua_callstate_terminating)
+    return nua_client_return(cr, 900, "Session is terminating", msg);
 
   cri = du->du_cr;
 
@@ -3377,7 +3401,7 @@
     }
 
     sr->sr_offer_recv = 1;
-    ss->ss_oa_recv = Offer;
+    ss ? ss->ss_oa_recv = Offer : Offer;
   }
 
   return 0;
@@ -3395,7 +3419,7 @@
 
   if (200 <= sr->sr_status && sr->sr_status < 300 && sr->sr_sdp) {
     if (nh->nh_soa == NULL) {
-      sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer;
+      sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer;
     }
     else if (soa_generate_answer(nh->nh_soa, NULL) < 0) {
       SU_DEBUG_5(("nua(%p): %s server: %s %s\n", 
@@ -3592,7 +3616,9 @@
 
   if (nh->nh_soa)
     soa_terminate(nh->nh_soa, 0);
-  cr->cr_usage = du;
+
+  du->du_cr = NULL;
+  nua_client_bind(cr, du);
 
   return 0;
 }
@@ -3605,15 +3631,34 @@
   nua_session_usage_t *ss;
   char const *reason = NULL;
 
+  int error;
+  nua_server_request_t *sr;
+
   if (du == NULL)
     return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg);
 
   ss = nua_dialog_usage_private(du);
   reason = ss->ss_reason;
 
-  return nua_base_client_trequest(cr, msg, sip,
-				  SIPTAG_REASON_STR(reason),
-				  TAG_NEXT(tags));
+  error = nua_base_client_trequest(cr, msg, sip,
+				    SIPTAG_REASON_STR(reason),
+				    TAG_NEXT(tags));
+
+  if (error == 0) {
+    nua_dialog_usage_reset_refresh(du);
+    ss->ss_timer->timer_set = 0;
+
+    /* Terminate server transactions associated with session, too. */
+    for (sr = du->du_dialog->ds_sr; sr; sr = sr->sr_next) {
+      if (sr->sr_usage == du && nua_server_request_is_pending(sr) &&
+	  sr->sr_method != sip_method_bye) {
+	sr_status(sr, SIP_486_BUSY_HERE);
+	nua_server_respond(sr, 0);
+      }
+    }
+  }
+
+  return error;
 }
 
 /** @NUA_EVENT nua_r_bye
@@ -3663,18 +3708,28 @@
   }
   else {
     nua_session_usage_t *ss = nua_dialog_usage_private(du);
+    nua_client_request_t *cri;
+
+    if (ss->ss_reporting) {
+      return 1;			/* Somebody else's problem */
+    }
+    else if (cr->cr_waiting) {
+      return 1; /* Application problem */
+    }
+
+    nua_client_bind(cr, NULL);
 
     signal_call_state_change(nh, ss, status, "to BYE", 
 			     nua_callstate_terminated);
 
-    if (ss && !ss->ss_reporting) {
-      if (du->du_cr == NULL ||
-	  !nua_client_is_queued(du->du_cr) ||
-	  du->du_cr->cr_status >= 200) {
-	/* INVITE is completed, we can zap the session... */;
-	cr->cr_usage = NULL;
-	nua_session_usage_destroy(nh, ss);
-      }
+    for (cri = du->du_dialog->ds_cr; cri; cri = cri->cr_next) {
+      if (cri->cr_method == sip_method_invite)
+	break;
+    }
+
+    if (!cri || cri->cr_status >= 200) {
+      /* INVITE is completed, we can zap the session... */;
+      nua_session_usage_destroy(nh, ss);
     }
   }
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c	Mon May 26 12:59:57 2008
@@ -543,8 +543,6 @@
   nua_event_t event;
   int error = 0;
 
-  assert(tags);
-
   if (nh) {
     if (!nh->nh_prev)
       nh_append(nua, nh);
@@ -1043,7 +1041,7 @@
 		 SIPTAG_FROM(from), /* Remote AoR */
 		 TAG_END());
 
-  if (nua_stack_init_handle(nh->nh_nua, nh, NULL) < 0)
+  if (nh && nua_stack_init_handle(nua, nh, NULL) < 0)
     nh_destroy(nua, nh), nh = NULL;
 
   if (nh && create_dialog) {
@@ -1860,8 +1858,6 @@
   int terminated;
   int handle_can_be_terminated = initial && !sr->sr_event;
 
-  assert(nh);
-
   if (sr->sr_application) {
     /* There was an error sending response */
     if (sr->sr_application != sr->sr_status)
@@ -2010,7 +2006,6 @@
 			   NULL);
   }
 
-  cr->cr_owner = nh;
   cr->cr_methods = methods;
   cr->cr_event = event;
   cr->cr_method = method;
@@ -2020,17 +2015,25 @@
   cr->cr_auto = 1;
 
   if (su_msg_is_non_null(nh->nh_nua->nua_signal)) {
-    nua_event_data_t const *e = su_msg_data(nh->nh_nua->nua_signal)->ee_data;
+    nua_event_data_t *e = su_msg_data(nh->nh_nua->nua_signal)->ee_data;
 
     if (tags == e->e_tags && event == e->e_event) {
       cr->cr_auto = 0;
+
       if (tags) {
 	nua_move_signal(cr->cr_signal, nh->nh_nua->nua_signal);
-	cr->cr_tags = tags;
+	if (cr->cr_signal) {
+	  /* Steal reference from signal */
+	  cr->cr_owner = e->e_nh, e->e_nh = NULL;
+	  cr->cr_tags = tags;
+	}
       }
     }
   }
 
+  if (cr->cr_owner == NULL)
+    cr->cr_owner = nua_handle_ref(nh);
+
   if (tags && cr->cr_tags == NULL)
     cr->cr_tags = tl_tlist(nh->nh_home, TAG_NEXT(tags));
 
@@ -2099,6 +2102,7 @@
 
 void nua_client_request_complete(nua_client_request_t *cr)
 {
+  nua_client_request_remove(cr);
   if (cr && cr->cr_methods->crm_complete)
     cr->cr_methods->crm_complete(cr);
 }
@@ -2116,7 +2120,6 @@
 
   nua_destroy_signal(cr->cr_signal);
 
-  nua_client_request_remove(cr);
   nua_client_bind(cr, NULL);
   
   if (cr->cr_msg)
@@ -2125,7 +2128,6 @@
 
   if (cr->cr_orq)
     nta_outgoing_destroy(cr->cr_orq);
-
   cr->cr_orq = NULL;
 
   if (cr->cr_timer)
@@ -2135,6 +2137,8 @@
     su_free(nh->nh_home, cr->cr_target);
 
   su_free(nh->nh_home, cr);
+
+  nua_handle_unref(nh);
 }
 
 /** Bind client request to a dialog usage */ 
@@ -2803,10 +2807,12 @@
 			     char const *phrase,
 			     sip_t const *sip)
 {
-  nua_handle_t *nh = cr->cr_owner;
+  nua_handle_t *nh;
 
   assert(cr && status >= 200 && phrase && sip);
 
+  nh = cr->cr_owner;
+
   if (cr->cr_retry_count > NH_PGET(nh, retry_count))
     return 0;
 
@@ -3075,6 +3081,7 @@
   nua_handle_t *nh = cr->cr_owner;
   sip_method_t method = cr->cr_method;
   nua_dialog_usage_t *du;
+  nua_client_request_t *cr_next;
 
   cr->cr_reporting = 1, nh->nh_ds->ds_reporting = 1;
 
@@ -3132,14 +3139,15 @@
   cr->cr_phrase = NULL;
   cr->cr_reporting = 0, nh->nh_ds->ds_reporting = 0;
 
+  cr_next = nh->nh_ds->ds_cr;
+
   if (!nua_client_is_queued(cr) && !nua_client_is_bound(cr))
     nua_client_request_destroy(cr);
 
   if (method == sip_method_cancel)
     return 1;
 
-  return
-    nua_client_next_request(nh->nh_ds->ds_cr, method == sip_method_invite);
+  return nua_client_next_request(cr_next, method == sip_method_invite);
 }
 
 /** Send event, zap transaction but leave cr in list */

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c	Mon May 26 12:59:57 2008
@@ -107,7 +107,7 @@
  *   #nua_i_info, #nua_i_update, #nua_i_message, #nua_i_subscribe,
  *   #nua_i_notify, #nua_i_method, #nua_i_register
  *  Settings:
- * - NUTAG_APPL_METHOD()
+ * - NUTAG_APPL_METHOD(), NUTAG_PROXY()
  * - NUTAG_ALLOW(), SIPTAG_ALLOW(), and SIPTAG_ALLOW_STR()
  * - NUTAG_SUPPORTED(), SIPTAG_SUPPORTED(), and SIPTAG_SUPPORTED_STR()
  *
@@ -838,6 +838,8 @@
  * #nua_i_notify.
  *
  * Corresponding tag taking reference parameter is NUTAG_SUB_EXPIRES_REF().
+ *
+ * @NEW_1_12_9.
  */
 tag_typedef_t nutag_sub_expires = UINTTAG_TYPEDEF(substate);
 
@@ -873,7 +875,7 @@
  *
  * Corresponding tag taking reference parameter is NUTAG_NEWSUB_REF().
  *
- * @since @NEW_1_12_5.
+ * @NEW_1_12_5.
  */
 tag_typedef_t nutag_newsub = BOOLTAG_TYPEDEF(newsub);
 
@@ -2738,7 +2740,7 @@
 
 /**@def NUTAG_PROXY(x)
  *
- * Outbound proxy URL
+ * Outbound proxy URL.
  *
  * Same tag as NTATAG_DEFAULT_PROXY()
  *
@@ -2746,11 +2748,23 @@
  *    nua_set_params() \n
  *    nua_get_params() \n
  *    nua_create()
+ * @note
+ * Since @VERSION_1_12_9, NUTAG_PROXY()/NTATAG_DEFAULT_PROXY() can be used
+ * to set handle-specific outbound route. The route is set with \n
+ *    nua_set_hparams(), \n
+ *    nua_invite(), nua_prack(), nua_ack(), nua_update(), nua_respond(), \n
+ *    nua_info(), nua_cancel(), nua_bye(), \n
+ *    nua_register(), nua_unregister(), nua_publish(), nua_unpublish(), \n
+ *    nua_subscribe(), nua_unsubscribe(), nua_refer(), nua_notify(), \n
+ *    nua_options(), nua_message(), nua_method()
  *
  * @par Parameter type
  *    url_string_t const * (either char const * or url_t *)
  *
  * @par Values
+ *    NULL implies routing based on request-URI or Route header.
+ *    Non-NULL is used as invisible routing URI, ie., routing URI that is
+ *    not included in the request.
  *
  * Corresponding tag taking reference parameter is NUTAG_PROXY_REF().
  */

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c	Mon May 26 12:59:57 2008
@@ -723,6 +723,9 @@
 
   unsigned d = ob->ob_keepalive.interval;
 
+  if (msg == NULL)
+    return -1;
+
   assert(regsip); assert(regsip->sip_request);
 
   if (m && m->m_params) {
@@ -842,6 +845,13 @@
   if (status < 200)
     return 0;
 
+  if (sip == NULL) {
+    SU_DEBUG_3(("outbound(%p): keepalive %u %s\n", (void *)ob->ob_owner,
+		status, phrase));
+    ob->ob_oo->oo_keepalive_error(ob->ob_owner, ob, status, phrase, TAG_END());
+    return 0;
+  }
+
   if (status == 401 || status == 407) {
     if (sip->sip_www_authenticate)
       challenged += auc_challenge(ob->ob_keepalive.auc,

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c	Mon May 26 12:59:57 2008
@@ -98,7 +98,7 @@
 
 /* Internal prototypes */
 static void parse_message(sdp_parser_t *p);
-static void parsing_error(sdp_parser_t *p, char const *fmt, ...);
+static int parsing_error(sdp_parser_t *p, char const *fmt, ...);
 
 /** Parse an SDP message.
  *
@@ -357,7 +357,7 @@
   if (!STRICT(p))
     strip = SPACE TAB;		/* skip initial whitespace */
   else
-    strip = NULL;
+    strip = "";
 
   p->pr_ok = 1;
   p->pr_session->sdp_size = sizeof(p->pr_session);
@@ -550,18 +550,15 @@
   sdp_media_t *m;
 
   if (!p || !p->pr_ok)
-    ;
+    return -1;
   else if (sdp->sdp_version[0] != 0)
-    parsing_error(p, "Incorrect version");
+    return parsing_error(p, "Incorrect version");
   else if (!sdp->sdp_origin)
-    parsing_error(p, "No o= present");
+    return parsing_error(p, "No o= present");
   else if (p->pr_strict && !sdp->sdp_subject)
-    parsing_error(p, "No s= present");
+    return parsing_error(p, "No s= present");
   else if (p->pr_strict && !sdp->sdp_time)
-    parsing_error(p, "No t= present");
-
-  if (!p->pr_ok)
-    return -1;
+    return parsing_error(p, "No t= present");
 
   /* If there is no session level c= check that one exists for all media */
   /* c= line may be missing if this is a RTSP description */
@@ -1707,7 +1704,7 @@
   if (!STRICT(p))
     strip = SPACE TAB;		/* skip initial whitespace */
   else
-    strip = NULL;
+    strip = "";
   
   for (;
        record && p->pr_ok;
@@ -1846,7 +1843,7 @@
   size_t n;
   char *retval = *message;
 
-  if (strip)
+  if (strip[0])
     retval += strspn(retval, strip);
 
   n = strcspn(retval, sep);
@@ -1867,7 +1864,7 @@
   return retval;
 }
 
-static void parsing_error(sdp_parser_t *p, char const *fmt, ...)
+static int parsing_error(sdp_parser_t *p, char const *fmt, ...)
 {
   int n;
   va_list ap;
@@ -1878,6 +1875,8 @@
   va_end(ap);
 
   p->pr_ok = 0;
+
+  return -1;
 }
 
 static void parse_alloc_error(sdp_parser_t *p, const char *typename)

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c	Mon May 26 12:59:57 2008
@@ -681,17 +681,15 @@
 static void printing_error(sdp_printer_t *p, const char *fmt, ...)
 {
   va_list ap;
-  va_start(ap, fmt); 
-  
+
   if (p->pr_ok) {
     int n;
-
+    va_start(ap, fmt);
     n = vsnprintf(p->pr_buffer, p->pr_bsiz, fmt, ap);
-    
-    p->pr_ok = 0;
+    va_end(ap);
   }
 
-  va_end(ap);
+  p->pr_ok = 0;
 }
 
 static void sdp_printf(sdp_printer_t *p, const char *fmt, ...)

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c	Mon May 26 12:59:57 2008
@@ -554,46 +554,18 @@
 
 issize_t sip_content_type_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen)
 {
-  sip_content_type_t *c;
-
-  assert(h);
-
-  c = h->sh_content_type;
-
-  /* "Content-type:" type/subtyp *(; parameter))) */
-  if (/* Parse protocol */
-      sip_version_d(&s, &c->c_type) == -1 || /* compacts token / token */
-      (c->c_subtype = strchr(c->c_type, '/')) == NULL ||
-      (*s == ';' && msg_params_d(home, &s, &c->c_params) == -1) ||
-      (*s != '\0'))
-    return -1;
-
-  c->c_subtype++;
-
-  return 0;
+  return msg_content_type_d(home, (msg_header_t *)h, s, slen);
 }
 
 issize_t sip_content_type_e(char b[], isize_t bsiz, sip_header_t const *h, int flags)
 {
-  char *b0 = b, *end = b + bsiz;
-  sip_content_type_t const *c = h->sh_content_type;
-
-  MSG_STRING_E(b, end, c->c_type);
-  MSG_PARAMS_E(b, end, c->c_params, flags);
-  MSG_TERM_E(b, end);
-
-  return b - b0;
+  return msg_content_type_e(b, bsiz, (msg_header_t const *)h, flags);
 }
 
 static
 isize_t sip_content_type_dup_xtra(sip_header_t const *h, isize_t offset)
 {
-  sip_content_type_t const *c = h->sh_content_type;
-
-  MSG_PARAMS_SIZE(offset, c->c_params);
-  offset += MSG_STRING_SIZE(c->c_type);
-
-  return offset;
+  return msg_content_type_dup_xtra((msg_header_t *)h, offset);
 }
 
 /** Duplicate one #sip_content_type_t object */ 
@@ -601,18 +573,9 @@
 char *sip_content_type_dup_one(sip_header_t *dst, sip_header_t const *src,
 			       char *b, isize_t xtra)
 {
-  sip_content_type_t *c = dst->sh_content_type;
-  sip_content_type_t const *o = src->sh_content_type;
-  char *end = b + xtra;
-
-  b = msg_params_dup(&c->c_params, o->c_params, b, xtra);
-  MSG_STRING_DUP(b, c->c_type, o->c_type);
-  c->c_subtype = strchr(c->c_type, '/');
-  c->c_subtype++;
-
-  assert(b <= end); (void)end;
-
-  return b;
+  return msg_content_type_dup_one((msg_header_t *)dst,
+				  (msg_header_t const *)src,
+				  b, xtra);
 }
 
 /* ====================================================================== */

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c	Mon May 26 12:59:57 2008
@@ -158,7 +158,8 @@
 			(msg_pub_t *)sip, hc);
 
     /* Is header present in the SIP message? */
-    if ((char *)hh >= ((char *)sip + sip->sip_size) ||
+    if (hh == NULL ||
+	(char *)hh >= ((char *)sip + sip->sip_size) ||
 	(char *)hh < (char *)&sip->sip_request)
       return dst;
 
@@ -234,8 +235,12 @@
 
       if (h == SIP_NONE) {	/* Remove header */
 	hh = msg_hclass_offset(msg_mclass(msg), (msg_pub_t *)sip, hc);
-	while (*hh)
-	  msg_header_remove(msg, (msg_pub_t *)sip, *hh);
+	if (hh != NULL &&
+	    (char *)hh < ((char *)sip + sip->sip_size) &&
+	    (char *)hh >= (char *)&sip->sip_request) {
+	  while (*hh)
+	    msg_header_remove(msg, (msg_pub_t *)sip, *hh);
+	}
 	continue;
       } 
 
@@ -441,18 +446,21 @@
     msg_hclass_t *hc = NULL;
 
     hnv = su_strlst_item(l, i);
-    n = strcspn(hnv, "=");
+    n = hnv ? strcspn(hnv, "=") : 0;
     if (n == 0)
       break;
 
     if (n == 4 && strncasecmp(hnv, "body", 4) == 0)
       t = siptag_payload, hc = sip_payload_class;
-    else for (j = 0; (t = sip_tag_list[j]); j++) {
-      hc = (msg_hclass_t *)sip_tag_list[j]->tt_magic;
-      if (n == 1 && strncasecmp(hnv, hc->hc_short, 1) == 0)
-	break;
-      else if (n == (size_t)hc->hc_len && strncasecmp(hnv, hc->hc_name, n) == 0)
-	break;
+    else {
+      for (j = 0; (t = sip_tag_list[j]); j++) {
+	hc = (msg_hclass_t *)sip_tag_list[j]->tt_magic;
+	if (n == 1 && strncasecmp(hnv, hc->hc_short, 1) == 0)
+	  break;
+	else if (n == (size_t)hc->hc_len &&
+		 strncasecmp(hnv, hc->hc_name, n) == 0)
+	  break;
+      }
     }
 
     value = (char *)hnv + n;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c	Mon May 26 12:59:57 2008
@@ -364,17 +364,17 @@
  */
 issize_t sip_header_field_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen)
 {
-  assert(SIP_HDR_TEST(h));
-
   if (h && s && s[slen] == '\0') {
     size_t n = span_lws(s);
     s += n; slen -= n;
-    
+
     for (n = slen; n >= 1 && IS_LWS(s[n - 1]); n--)
       ;
     
     s[n] = '\0';
     
+    assert(SIP_HDR_TEST(h));
+
     return h->sh_class->hc_parse(home, h, s, slen);
   }
   else

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c	Mon May 26 12:59:57 2008
@@ -2227,7 +2227,6 @@
 
 static int test_content_disposition(void)
 {
-  /* Test Accept header */
   sip_content_disposition_t *cd, *cd0;
   su_home_t *home;
 
@@ -2247,6 +2246,38 @@
   END();
 }
 
+
+static int test_content_type(void)
+{
+  sip_content_type_t *c;
+  sip_content_type_t c0[1];
+  su_home_t *home;
+
+  BEGIN();
+
+  TEST_1(home = su_home_create());
+  TEST_1(c = sip_content_type_make(home, "application/sdp ; charset = utf-8"));
+  TEST_S(c->c_type, "application/sdp");
+  TEST_S(c->c_subtype, "sdp");
+  TEST_1(c->c_params && c->c_params[0] && !c->c_params[1]);
+  TEST_S(c->c_params[0], "charset=utf-8");
+  TEST_P(c->c_params[1], NULL);
+
+  sip_content_type_init(c0);
+  c = sip_content_type_dup(home, c0);
+  TEST_P(c->c_type, NULL);
+  TEST_P(c->c_subtype, NULL);
+
+  c0->c_type = "text";
+  c = sip_content_type_dup(home, c0);
+  TEST_S(c->c_type, "text");
+  TEST_P(c->c_subtype, NULL);
+
+  su_home_unref(home);
+  END();
+}
+
+
 static int test_www_authenticate(void)
 {
   sip_www_authenticate_t *www;
@@ -3570,6 +3601,7 @@
   retval |= test_refer(); fflush(stdout);
   retval |= test_route(); fflush(stdout);
   retval |= test_request_disposition(); fflush(stdout);
+  retval |= test_content_type(); fflush(stdout);
   retval |= test_caller_prefs(); fflush(stdout);
   retval |= test_callerpref_scoring(); fflush(stdout);
   retval |= test_warning(); fflush(stdout);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa.c	Mon May 26 12:59:57 2008
@@ -881,37 +881,41 @@
 
 /** Set capabilities */
 int 
-soa_base_set_capability_sdp(soa_session_t *ss, 
-			    sdp_session_t *sdp, char const *str0, isize_t len0)
+soa_base_set_capability_sdp(soa_session_t *ss,
+			    sdp_session_t *_sdp,
+			    char const *str0, isize_t len0)
 {
+  sdp_session_t sdp[1];
   sdp_origin_t o[1] = {{ sizeof(o) }};
   sdp_connection_t *c, c0[1] = {{ sizeof(c0) }};
   char c_address[64];
   sdp_time_t t[1] = {{ sizeof(t) }};
   sdp_media_t *m;
 
+  *sdp = *_sdp;
+
   if (sdp->sdp_origin)
     *o = *sdp->sdp_origin;
   else
     o->o_address = c0;
 
-  sdp->sdp_origin = o;
-
   if (soa_init_sdp_origin(ss, o, c_address) < 0)
     return -1;
 
+  sdp->sdp_origin = o;
+
   if (!sdp->sdp_subject)
-    sdp->sdp_subject = "-";
+    sdp->sdp_subject = "-";	/* s=- */
 
-  sdp->sdp_time = t;
+  sdp->sdp_time = t;		/* t=0 0 */
 
   /* Set port to zero - or should we check that port is already zero? */
   for (m = sdp->sdp_media; m; m = m->m_next)
     m->m_port = 0;
 
-  c = sdp->sdp_origin->o_address;
-
   if (sdp->sdp_connection == NULL) {
+    c = sdp->sdp_origin->o_address;
+
     for (m = sdp->sdp_media; m; m = m->m_next)
       if (m->m_connections == NULL)
 	break;
@@ -1977,6 +1981,9 @@
   sdp_parser_t *parser = NULL;
   sdp_session_t sdp[1];
 
+  if (ss == NULL)
+    return -1;
+
   switch (what) {
   case soa_capability_sdp_kind:
     ssd = ss->ss_caps;
@@ -1994,15 +2001,16 @@
     return -1;
   }
 
-  if (sdp_str && str_len == -1)
-    str_len = strlen(sdp_str);
-
-  if (sdp0)
+  if (sdp0) {
     new_version = sdp_session_cmp(sdp0, ssd->ssd_sdp) != 0;
-  else if (sdp_str)
+    sdp_str = NULL, str_len = -1;
+  }
+  else if (sdp_str) {
+    if (str_len == -1)
+      str_len = strlen(sdp_str);
     new_version = !ssd->ssd_unparsed ||
-      str0ncmp(sdp_str, ssd->ssd_unparsed, str_len) != 0 ||
-      ssd->ssd_unparsed[str_len] != '\0';
+      str0ncmp(sdp_str, ssd->ssd_unparsed, str_len + 1) != 0;
+  }
   else
     return (void)su_seterrno(EINVAL), -1;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c	Mon May 26 12:59:57 2008
@@ -1117,6 +1117,8 @@
 
   if (action == generate_offer)
     remote = NULL;
+  else if (remote == NULL)
+    return soa_set_status(ss, 500, "No remote SDP");
 
   /* Pre-negotiation Step: Expand truncated remote SDP */
   if (local && remote) switch (action) {
@@ -1127,6 +1129,8 @@
       SU_DEBUG_5(("%s: remote %s is truncated: expanding\n",
 		  by, action == generate_answer ? "offer" : "answer"));
       remote = soa_sdp_expand_media(tmphome, remote, local);
+      if (remote == NULL)
+	return soa_set_status(ss, 500, "Cannot expand remote session");
     }
   default:
     break;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c	Mon May 26 12:59:57 2008
@@ -1026,7 +1026,10 @@
   if (res->res_n_servers == 0)
     return (void)su_seterrno(ENETDOWN), (sres_query_t *)NULL;
 
-  if (sres_has_search_domain(res))
+  if (domain[dlen - 1] == '.')
+    /* Domain ends with dot - do not search */
+    dots = res->res_config->c_opt.ndots;
+  else if (sres_has_search_domain(res))
     for (dots = 0, dot = strchr(domain, '.');
 	 dots < res->res_config->c_opt.ndots && dot; 
 	 dots++, dot = strchr(dot + 1, '.'))
@@ -1045,6 +1048,8 @@
       char const *const *domains = res->res_config->c_search;
       char search[SRES_MAXDNAME + 1];
 
+      assert(dlen < SRES_MAXDNAME);
+
       memcpy(search, domain, dlen);
       search[dlen++] = '.';
       search[dlen] = '\0';
@@ -1062,7 +1067,9 @@
 	  sub = sres_query_alloc(res, sres_answer_subquery, (void *)query,
 				 type, search);
 
-	  if (sres_send_dns_query(res, sub) == 0) {
+	  if (sub == NULL) {
+	  }
+	  else if (sres_send_dns_query(res, sub) == 0) {
 	    query->q_subqueries[i] = sub;
 	  }
 	  else {
@@ -1430,7 +1437,10 @@
 {		    
   int i, n;
 
-  for (n = 0, i = 0; answers && answers[i]; i++) {
+  if (res == NULL || answers == NULL)
+    return su_seterrno(EFAULT);
+
+  for (n = 0, i = 0; answers[i]; i++) {
     if (answers[i]->sr_record->r_status ||
 	answers[i]->sr_record->r_class != sres_class_in ||
 	(type != 0 && answers[i]->sr_record->r_type != type)) {
@@ -2010,6 +2020,10 @@
     if (name_servers_length > MAX_DATALEN) break;
 
     name_servers = su_realloc(home, name_servers, name_servers_length);
+    if (name_servers == NULL) {
+      ret = ERROR_BUFFER_OVERFLOW;
+      break;
+    }
   }
 
   /* if reading the key was succesful, continue */
@@ -3411,23 +3425,26 @@
 #define ADDRSIZE 48
 #endif
     char host[ADDRSIZE] = "*";
+    uint16_t port = 0;
 
     if (from == NULL)
       ;
     else if (from->ss_family == AF_INET) {
       struct sockaddr_in const *sin = (void *)from;
       su_inet_ntop(AF_INET, &sin->sin_addr, host, sizeof host);
+      port = sin->sin_port;
     } 
 #if HAVE_SIN6
     else if (from->ss_family == AF_INET6) {
       struct sockaddr_in6 const *sin6 = (void *)from;
       su_inet_ntop(AF_INET6, &sin6->sin6_addr, host, sizeof host);
+      port = sin6->sin6_port;
     }
 #endif
 
     SU_DEBUG_5(("sres_resolver_receive(%p, %p) id=%u (from [%s]:%u)\n", 
 		(void *)res, (void *)query, m->m_id, 
-		host, ntohs(((struct sockaddr_in *)from)->sin_port)));
+		host, ntohs(port)));
   }
 }
 
@@ -3447,7 +3464,7 @@
 {
   sres_record_t *rr = NULL, **answers = NULL, *error = NULL;
   sres_query_t *query = NULL, **hq;
-  su_home_t *chome = CHOME(res->res_cache);
+  su_home_t *chome;
   hash_value_t hash;
   int err;
   unsigned i, total, errorcount = 0;
@@ -3455,6 +3472,7 @@
   assert(res && m && return_answers);
 
   time(&res->res_now);
+  chome = CHOME(res->res_cache);
 
   *qq = NULL;
   *return_answers = NULL;
@@ -3737,8 +3755,9 @@
     a6->a6_suffix.u6_addr[i] = m_get_uint8(m);
 
   if (a6->a6_prelen > 0) {
-    /* Zero pad bits */
-    a6->a6_suffix.u6_addr[16 - suffixlen] &= 0xff >> (a6->a6_prelen & 7);
+    if (suffixlen > 0)
+      /* Zero pad bits */
+      a6->a6_suffix.u6_addr[16 - suffixlen] &= 0xff >> (a6->a6_prelen & 7);
 
     offset = m->m_offset, prefixlen = m_get_domain(NULL, 0, m, 0) + 1;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c	Mon May 26 12:59:57 2008
@@ -111,7 +111,7 @@
 			 sres_socket_t new_socket,
 			 sres_socket_t old_socket)
 {
-  int i, N = b->n_sockets;
+  int i, N;
 
   if (b == NULL)
     return -1;
@@ -123,6 +123,8 @@
     return 0;
   }
 
+  N = b->n_sockets;
+
   if (old_socket != INVALID_SOCKET) {
     for (i = 0; i < N; i++) {
       if (b->fds[i].fd == old_socket)

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/stun/stun.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/stun/stun.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/stun/stun.c	Mon May 26 12:59:57 2008
@@ -81,7 +81,7 @@
 /** STUN log. */
 su_log_t stun_log[] = { SU_LOG_INIT("stun", "STUN_DEBUG", SU_DEBUG) }; 
 
-/**@var STUN_DEBUG
+/**@var char const STUN_DEBUG[]
  *
  * Environment variable determining the debug log level for @b stun module.
  *
@@ -90,7 +90,7 @@
  * 
  * @sa <sofia-sip/su_debug.h>, stun_log, SOFIA_DEBUG
  */
-extern char const STUN__DEBUG[];
+extern char const STUN_DEBUG[];
 
 enum {
   STUN_SENDTO_TIMEOUT = 1000,

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h	Mon May 26 12:59:57 2008
@@ -103,6 +103,8 @@
 
 SU_DLL void su_home_check(su_home_t const *home);
 
+SU_DLL int su_home_check_alloc(su_home_t const *home, void const *data);
+
 SU_DLL int su_home_mutex_lock(su_home_t *home);
 
 SU_DLL int su_home_mutex_unlock(su_home_t *home);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c	Mon May 26 12:59:57 2008
@@ -283,7 +283,7 @@
   su_block_find_collision_size;
 #endif
 
-su_inline su_alloc_t *su_block_find(su_block_t *b, void const *p)
+su_inline su_alloc_t *su_block_find(su_block_t const *b, void const *p)
 {
   size_t h, h0, probe;
 
@@ -306,8 +306,10 @@
   probe = (b->sub_n > SUB_P) ? SUB_P : 1;
 
   do {
-    if (b->sub_nodes[h].sua_data == p)
-      return &b->sub_nodes[h];
+    if (b->sub_nodes[h].sua_data == p) {
+      su_alloc_t const *retval = &b->sub_nodes[h];
+      return (su_alloc_t *)retval; /* discard const */
+    }
     h += probe;
     if (h >= b->sub_n)
       h -= b->sub_n;
@@ -463,7 +465,7 @@
     home->suh_blocks = b2;
 
     if (sub && !sub->sub_auto)
-      safefree(sub);
+      free(sub);
     sub = b2;
   }
 
@@ -836,6 +838,27 @@
   safefree(data);
 }
 
+/** Check if pointer has been allocated through home.
+ *
+ * @param home   pointer to a memory home
+ * @param data   pointer to a memory area possibly allocated though home
+ */
+int su_home_check_alloc(su_home_t const *home, void const *data)
+{
+  int retval = 0;
+
+  if (home && data) {
+    su_block_t const *sub = MEMLOCK(home);
+    su_alloc_t *allocation = su_block_find(sub, data);
+
+    retval = allocation != NULL;
+
+    UNLOCK(home);
+  }
+
+  return retval;
+}
+
 /** Check home consistency.
  *
  * Ensures that the home structure and all memory blocks allocated through
@@ -1065,7 +1088,7 @@
       else
 	used = s->sub_used;
 
-      if ((used && d == NULL) || 3 * used > 2 * d->sub_n) {
+      if (used && (d == NULL || 3 * used > 2 * d->sub_n)) {
 	if (d)
 	  for (n = n2 = d->sub_n; 3 * used > 2 * n2; n2 = 4 * n2 + 3)
 	    ;
@@ -1099,7 +1122,9 @@
 	d = d2;
       }
 
-      if ((n = s->sub_n)) {
+      if (s->sub_used) {
+	n = s->sub_n;
+
 	for (i = 0; i < n; i++)
 	  if (s->sub_nodes[i].sua_data) {
 	    su_block_add(d, s->sub_nodes[i].sua_data)[0] = s->sub_nodes[i];
@@ -1111,6 +1136,7 @@
       }
 
       if (s->sub_stats) {
+				/* XXX */
       }
     }
 
@@ -1626,7 +1652,7 @@
 /** Retrieve statistics from memory home.
  */
 void su_home_get_stats(su_home_t *home, int include_clones, 
-		       su_home_stat_t hs[1],
+		       su_home_stat_t *hs,
 		       isize_t size)
 {
   su_block_t *sub;
@@ -1634,7 +1660,7 @@
   if (hs == NULL || size < (sizeof hs->hs_size))
     return;
 
-  memset(hs, 0, size);
+  memset((void *)hs, 0, size);
 
   sub = MEMLOCK(home);
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c	Mon May 26 12:59:57 2008
@@ -560,11 +560,18 @@
   su_root_destroy(task->sut_root);
 }
 
+/**Wait for the clone to exit.
+ * @internal
+ *
+ * Called by su_port_wait() and su_clone_wait()
+ */ 
 void su_base_port_wait(su_clone_r rclone)
 {
   su_port_t *self;
   su_root_t *root_to_wait;
 
+  assert(*rclone);
+
   self = su_msg_from(rclone)->sut_port;
   assert(self == su_msg_to(rclone)->sut_port);
   root_to_wait = su_msg_to(rclone)->sut_root;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c	Mon May 26 12:59:57 2008
@@ -332,7 +332,7 @@
   p = ctx->in + count;
   *p++ = 0x80;
   
-  /* Bytes of padding needde to make 64 bytes */
+  /* Bytes of padding needed to make 64 bytes */
   count = 64 - 1 - count;
   
   /* Pad out to 56 mod 64 */

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_port.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_port.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_port.c	Mon May 26 12:59:57 2008
@@ -427,10 +427,18 @@
 #endif
 }
 
+/** Wait for clone to exit.
+ *
+ * @internal
+ *
+ * Called by su_clone_wait().
+ */
 void su_port_wait(su_clone_r rclone)
 {
   su_port_t *cloneport;
 
+  assert(*rclone);
+
   cloneport = su_msg_to(rclone)->sut_port;
   cloneport->sup_vtable->su_port_wait(rclone);
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c	Mon May 26 12:59:57 2008
@@ -388,6 +388,8 @@
 
 /** Wait for the pthread clone to exit.
  * @internal
+ *
+ * Called by su_port_wait() and su_clone_wait().
  */
 void su_pthread_port_wait(su_clone_r rclone)
 {
@@ -395,6 +397,8 @@
   struct su_pthread_port_waiting_parent mom[1];
   pthread_t tid;
 
+  assert(*rclone);
+
   clone = su_msg_to(rclone)->sut_port;
   parent = su_msg_from(rclone)->sut_port;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c	Mon May 26 12:59:57 2008
@@ -155,7 +155,7 @@
   if (m < 0)
     return m;
 
-  if (m == 0 && (size_t)n < size)
+  if (m == 0 && 0 < n && (size_t)n < size)
     b[--n] = '\0';
 
   return n + m;
@@ -756,6 +756,8 @@
   va_end(aq);
 
   t = rv = malloc(size);
+  if (rv == NULL)
+    return rv;
 
   tagi[0].t_tag = tag;
   tagi[0].t_value = value;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c	Mon May 26 12:59:57 2008
@@ -236,13 +236,18 @@
  */
 int su_vector_append(su_vector_t *vector, void *item)
 {
-  size_t index = vector->v_len;
+  size_t index;
 
-  if (vector && su_vector_make_place(vector, index)) {
-    vector->v_list[index] = item;
-    return 0;
-  }
-  return -1;
+  if (vector == 0)
+    return -1;
+
+  index = vector->v_len;
+
+  if (su_vector_make_place(vector, index) <= 0)
+    return -1;
+
+  vector->v_list[index] = item;
+  return 0;
 }
 
 /**Get a numbered item from list. 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c	Mon May 26 12:59:57 2008
@@ -185,17 +185,14 @@
 int su_wait_destroy(su_wait_t *waitobj)
 {
 #if SU_HAVE_WINSOCK
-  su_wait_t w0 = NULL;
+  assert(waitobj != NULL);
   if (*waitobj)
     WSACloseEvent(*waitobj);
-#elif SU_HAVE_POLL || HAVE_SELECT
-  su_wait_t w0 = { INVALID_SOCKET, 0, 0 };
 #else
   su_wait_t w0 = { INVALID_SOCKET, 0, 0 };
-#endif
   assert(waitobj != NULL);
   *waitobj = w0;
-
+#endif
   return waitobj ? 0 : -1;
 }
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport.c	Mon May 26 12:59:57 2008
@@ -1178,7 +1178,6 @@
   ta_list ta;
   int n;
   tport_params_t const *tpp;
-  tport_primary_t const *pri = self->tp_pri;
   int connect;
 
   if (self == NULL)
@@ -1207,7 +1206,9 @@
 	       TPTAG_THRPRQSIZE(tpp->tpp_thrprqsize),
 	       TPTAG_SIGCOMP_LIFETIME(tpp->tpp_sigcomp_lifetime),
 	       TPTAG_STUN_SERVER(tpp->tpp_stun_server),
-	       TAG_IF(pri, TPTAG_PUBLIC(pri ? pri->pri_public : 0)),
+	       TAG_IF(self->tp_pri,
+		      TPTAG_PUBLIC(self->tp_pri ?
+				   self->tp_pri->pri_public : 0)),
 	       TPTAG_TOS(tpp->tpp_tos),
 	       TAG_END());
 
@@ -2956,7 +2957,7 @@
 #if SU_HAVE_IN6
     if (su->su_family == AF_INET6) {
       ipaddr[0] = '[';
-      su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr + 1, sizeof(ipaddr) - 1);
+      su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr + 1, SU_ADDRSIZE);
       strcat(ipaddr, "]");
     }
     else {
@@ -4680,7 +4681,9 @@
     n_canon = 0;
 
   s = su_alloc(home, n_proto + n_canon + n_host + n_port + n_comp);
-  
+  if (s == NULL)
+    return -1;
+
   if (n_proto)
     dst->tpn_proto = memcpy(s, src->tpn_proto, n_proto), s += n_proto;
   else

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c	Mon May 26 12:59:57 2008
@@ -152,13 +152,17 @@
   char label[24] = "";
   char *comp = "";
   char name[SU_ADDRSIZE] = "";
-  su_sockaddr_t const *su = msg_addr(msg);
+  su_sockaddr_t const *su;
   unsigned short second, minute, hour;
 
+  assert(self); assert(msg);
+
   second = (unsigned short)(now.tv_sec % 60);
   minute = (unsigned short)((now.tv_sec / 60) % 60);
   hour = (unsigned short)((now.tv_sec / 3600) % 24);
 
+  su = msg_addr(msg);
+
 #if SU_HAVE_IN6
   if (su->su_family == AF_INET6) {
     if (su->su_sin6.sin6_flowinfo)
@@ -183,10 +187,13 @@
 		      size_t n, su_iovec_t const iov[], size_t iovused,
 		      char const *what, char const *how)
 {
-  tport_master_t *mr = self->tp_master;
+  tport_master_t *mr;
   char stamp[128];
   size_t i;
 
+  assert(self); assert(msg);
+
+  mr = self->tp_master;
   if (!mr->mr_dump_file)
     return;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c	Mon May 26 12:59:57 2008
@@ -226,7 +226,7 @@
  * If true, respond with PONG to PING. Default value is 0 (false).
  *
  * If set, the ping-pong protocol is used on TCP connections. If a ping (at
- * least 4 whitespace characters) is received within messages, a pong
+ * least 4 whitespace characters) is received between messages, a pong
  * (CR-LF) is sent in response.
  *
  * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(),

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c	Mon May 26 12:59:57 2008
@@ -277,7 +277,8 @@
     if (n <= 0)
       return (int)n;
 
-    SU_DEBUG_7(("%s(%p): received keepalive\n", __func__, (void *)self));
+    SU_DEBUG_7(("%s(%p): received keepalive (total %u)\n", __func__,
+		(void *)self, self->tp_ping));
 
     N -= n, self->tp_ping += n;
 
@@ -449,7 +450,9 @@
 		  __func__, (void *)self,
 		  "closing connection", TPN_ARGS(self->tp_name), 
 		  " because of PONG timeout"));
-      tport_close(self);
+      tport_error_report(self, EPIPE, NULL);
+      if (!self->tp_closed)
+	tport_close(self);
       return;
     }
   }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/open_c/group/test_nua.mmp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/open_c/group/test_nua.mmp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/open_c/group/test_nua.mmp	Mon May 26 12:59:57 2008
@@ -42,7 +42,7 @@
 SOURCEPATH 			..\..\libsofia-sip-ua\su
 SOURCE              memmem.c
 
-SOURCEPATH 			..\..\libsofia-sip-ua\nua
+SOURCEPATH 			..\..\tests
 SOURCE              test_nua.c
 SOURCE          test_ops.c
 SOURCE          test_init.c

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/tests/Makefile.am
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/tests/Makefile.am	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/tests/Makefile.am	Mon May 26 12:59:57 2008
@@ -32,20 +32,13 @@
 
 libtestnat_a_SOURCES =	test_nat.h test_nat.c test_nat_tags.c
 
-#
-# Install in special test package
-#
-testsdir = 		${libdir}/tests/libsofia-sip-ua-tests
-tests_PROGRAMS =
-
 if HAVE_CHECK
 TESTS += check_sofia
-tests_PROGRAMS += check_sofia
+check_PROGRAMS += check_sofia
 endif
 
 check_sofia_CFLAGS = @CHECK_CFLAGS@
 
-
 check_sofia_SOURCES = check_sofia.c check_sofia.h \
 	suite_for_nua.c
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp	Mon May 26 12:59:57 2008
@@ -725,6 +725,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\libsofia-sip-ua\nua\nua_types.h"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\libsofia-sip-ua\nua\outbound.c"
 # End Source File
 # Begin Source File

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj	Mon May 26 12:59:57 2008
@@ -3232,6 +3232,10 @@
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath="..\..\libsofia-sip-ua\nua\nua_types.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\libsofia-sip-ua\nua\outbound.c"
 					>
 					<FileConfiguration

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp	Mon May 26 12:59:57 2008
@@ -89,39 +89,39 @@
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_100rel.c"
+SOURCE="..\..\..\tests\test_100rel.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_basic_call.c"
+SOURCE="..\..\..\tests\test_basic_call.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_call_hold.c"
+SOURCE="..\..\..\tests\test_call_hold.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_call_reject.c"
+SOURCE="..\..\..\tests\test_call_reject.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_cancel_bye.c"
+SOURCE="..\..\..\tests\test_cancel_bye.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_extension.c"
+SOURCE="..\..\..\tests\test_extension.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_init.c"
+SOURCE="..\..\..\tests\test_init.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nat.c"
+SOURCE="..\..\..\tests\test_nat.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nat.h"
+SOURCE="..\..\..\tests\test_nat.h"
 # End Source File
 # Begin Source File
 
@@ -129,55 +129,55 @@
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua.c"
+SOURCE="..\..\..\tests\test_nua.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua.h"
+SOURCE="..\..\..\tests\test_nua.h"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua_api.c"
+SOURCE="..\..\..\tests\test_nua_api.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua_params.c"
+SOURCE="..\..\..\tests\test_nua_params.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_offer_answer.c"
+SOURCE="..\..\..\tests\test_offer_answer.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_ops.c"
+SOURCE="..\..\..\tests\test_ops.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_proxy.c"
+SOURCE="..\..\..\tests\test_proxy.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_proxy.h"
+SOURCE="..\..\..\tests\test_proxy.h"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_refer.c"
+SOURCE="..\..\..\tests\test_refer.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_register.c"
+SOURCE="..\..\..\tests\test_register.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_session_timer.c"
+SOURCE="..\..\..\tests\test_session_timer.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_simple.c"
+SOURCE="..\..\..\tests\test_simple.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_sip_events.c"
+SOURCE="..\..\..\tests\test_sip_events.c"
 # End Source File
 # Begin Source File
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj	Mon May 26 12:59:57 2008
@@ -234,7 +234,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_100rel.c"
+			RelativePath="..\..\..\tests\test_100rel.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -256,7 +256,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_basic_call.c"
+			RelativePath="..\..\..\tests\test_basic_call.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -278,7 +278,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_call_hold.c"
+			RelativePath="..\..\..\tests\test_call_hold.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -300,7 +300,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_call_reject.c"
+			RelativePath="..\..\..\tests\test_call_reject.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -322,7 +322,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_cancel_bye.c"
+			RelativePath="..\..\..\tests\test_cancel_bye.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -344,7 +344,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_extension.c"
+			RelativePath="..\..\..\tests\test_extension.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -366,7 +366,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_init.c"
+			RelativePath="..\..\..\tests\test_init.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -388,7 +388,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nat.c"
+			RelativePath="..\..\..\tests\test_nat.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -410,7 +410,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nat.h"
+			RelativePath="..\..\..\tests\test_nat.h"
 			>
 		</File>
 		<File
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua.c"
+			RelativePath="..\..\..\tests\test_nua.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -458,11 +458,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua.h"
+			RelativePath="..\..\..\tests\test_nua.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua_api.c"
+			RelativePath="..\..\..\tests\test_nua_api.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -484,7 +484,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua_params.c"
+			RelativePath="..\..\..\tests\test_nua_params.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -506,11 +506,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_offer_answer.c"
+			RelativePath="..\..\..\tests\test_offer_answer.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_ops.c"
+			RelativePath="..\..\..\tests\test_ops.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -532,7 +532,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_proxy.c"
+			RelativePath="..\..\..\tests\test_proxy.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -554,11 +554,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_proxy.h"
+			RelativePath="..\..\..\tests\test_proxy.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_refer.c"
+			RelativePath="..\..\..\tests\test_refer.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -580,7 +580,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_register.c"
+			RelativePath="..\..\..\tests\test_register.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -602,7 +602,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_session_timer.c"
+			RelativePath="..\..\..\tests\test_session_timer.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -624,7 +624,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_simple.c"
+			RelativePath="..\..\..\tests\test_simple.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -646,7 +646,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_sip_events.c"
+			RelativePath="..\..\..\tests\test_sip_events.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/GNUmakefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/GNUmakefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/GNUmakefile	Mon May 26 12:59:57 2008
@@ -1,80 +1,151 @@
-ifeq ($(SRCDIR)x,x)
-SRCDIR = $(CURDIR)
-endif
-SUBDIR = .
-BUILDDIR = $(SRCDIR)
-VPATH = .:$(SRCDIR)
+include Makefile.srcdir
 
-include $(SRCDIR)/Makefile.config
+BLDDIR = $(CURDIR)
+SUBDIR =
 
-SUBDIRS = include src lib tools
+export SRCDIR
+export BLDDIR
 
-PROGRAMS_TO_INSTALL = xmlrpc-c-config
+include $(BLDDIR)/Makefile.version
+include $(BLDDIR)/config.mk
+
+SUBDIRS = include lib src tools examples
+
+# The reason we don't build tools and examples by default is that they
+# contain executables, which require significantly more from the
+# environment to build than libraries.  Ergo, they are signficantly
+# more likely to fail to build.  Indeed, when 'tools' was built by
+# default, the majority of the reported build problems were with that.
+# Since they are ancillary to the package, building them by default is
+# not worth causing the whole build to fail.
 
-# We're in a transition between the bloated, complex GNU
-# Autoconf/Automake style of build, in which 'configure' creates all
-# the make files, to simpler static make files.  Some directories have
-# been converted; some haven't.  So we have the hack of putting
-# 'xmlrpc_config.h' as the first dependency of 'all' to make sure
-# 'configure runs before anything in the case that the user neglects
-# to run 'configure' before doing 'make'.
+# As with any subdirectory, to build 'tools' or 'examples', cd to the
+# subdirectory and make there.
+
+DEFAULT_SUBDIRS = include lib src
+
+PROGRAMS_TO_INSTALL = xmlrpc-c-config
 
-default: xmlrpc_config.h all
+default: xmlrpc-c-config xmlrpc-c-config.test $(DEFAULT_SUBDIRS:%=%/all)
 
 .PHONY: all
 all: xmlrpc-c-config xmlrpc-c-config.test $(SUBDIRS:%=%/all)
 
-# We don't want the transport_config.h rule in Makefile.common:
+# The examples subdirectory is special, because even the make file in there
+# is designed to be an example.  So it has to be simple and as close as
+# possible to something a person could use outside of the Xmlrpc-c source
+# tree.  One ramification of that is that it does not specify dependencies
+# on other parts of the Xmlrpc-c build.  That means we must separately
+# ensure that the Xmlrpc-c libraries are built before making the example
+# programs.
+#
+# It also means that you have to manually clean the examples directory
+# in order to get the examples rebuilt after you modify the Xmlrpc-c
+# libraries.
+
+examples/all: xmlrpc-c-config.test lib/all src/all include/all
+
+# Parallel make (make --jobs) is not smart enough to coordinate builds
+# between submakes, so a naive parallel make would cause certain
+# targets to get built multiple times simultaneously.  That is usually
+# unacceptable.  So we introduce extra dependencies here just to make
+# sure such targets are already up to date before the submake starts,
+# for the benefit of parallel make.  Note that we ensure that parallel
+# make works for 'make all' in the top directory, but it may still fail
+# for the aforementioned reason for other invocations.
+
+tools/all: include/all lib/all src/all
+src/all lib/all: include/all
+src/all: lib/all
+
+MAJOR := $(XMLRPC_MAJOR_RELEASE)
+MINOR := $(XMLRPC_MINOR_RELEASE)
+POINT := $(XMLRPC_POINT_RELEASE)
+version.h: $(SRCDIR)/Makefile.version
+	rm -f $@
+	echo "/* Generated by make file rule */" >>$@
+	echo "#define XMLRPC_C_VERSION" \
+	  \"Xmlrpc-c $(MAJOR).$(MINOR).$(POINT)"\"" >>$@
+	echo "#define XMLRPC_VERSION_MAJOR $(MAJOR)" >>$@
+	echo "#define XMLRPC_VERSION_MINOR $(MINOR)" >>$@
+	echo "#define XMLRPC_VERSION_POINT $(POINT)" >>$@
+
+# We don't want common.mk's rule for version.h
+OMIT_VERSION_H = Y
+
+# We don't want common.mk's rule for transport_config.h
 OMIT_TRANSPORT_CONFIG_H = Y
-transport_config.h: $(BUILDDIR)/Makefile.config
+
+include transport_config.make
+
+# shell_config is a fragment to place inside a Bourne shell program that
+# sets variables that tell how the build is configured.
+
+shell_config: $(BLDDIR)/config.mk
+	rm -f $@
+	@echo "Lots of echoes to '$@' suppressed here ..."
+	@echo '#' >>$@
+	@echo '#######################################################' >>$@
+	@echo "# From '$@'"                                             >>$@
+	@echo '#######################################################' >>$@
+	@echo 'ENABLE_ABYSS_THREADS="$(ENABLE_ABYSS_THREADS)"'		>>$@
+	@echo 'ENABLE_LIBXML2_BACKEND="$(ENABLE_LIBXML2_BACKEND)"'      >>$@
+	@echo 'MUST_BUILD_WININET_CLIENT="$(MUST_BUILD_WININET_CLIENT)"'>>$@
+	@echo 'MUST_BUILD_CURL_CLIENT="$(MUST_BUILD_CURL_CLIENT)"'	>>$@
+	@echo 'MUST_BUILD_LIBWWW_CLIENT="$(MUST_BUILD_LIBWWW_CLIENT)"'	>>$@
+	@echo 'NEED_RPATH="$(NEED_RPATH)"'				>>$@
+	@echo 'NEED_WL_RPATH="$(NEED_WL)RPATH)"'			>>$@
+	@echo 'LSOCKET="$(LSOCKET)"'					>>$@
+	@echo 'WININET_LDADD="$(WININET_LDADD)"'			>>$@
+	@echo 'WININET_RPATH="$(WININET_RPATH)"'			>>$@
+	@echo 'WININET_WL_RPATH="$(WININET_WL_RPATH)"'			>>$@
+	@echo 'CURL_LDADD="$(CURL_LDADD)"'				>>$@
+	@echo 'CURL_RPATH="$(CURL_RPATH)"'				>>$@
+	@echo 'CURL_WL_RPATH="$(CURL_WL_RPATH)"'			>>$@
+	@echo 'LIBWWW_LDADD="$(LIBWWW_LDADD)"'				>>$@
+	@echo 'LIBWWW_RPATH="$(LIBWWW_RPATH)"'				>>$@
+	@echo 'LIBWWW_WL_RPATH="$(LIBWWW_WL_RPATH)"'			>>$@
+	@echo 'XMLRPC_MAJOR_RELEASE="$(XMLRPC_MAJOR_RELEASE)"'		>>$@
+	@echo 'XMLRPC_MINOR_RELEASE="$(XMLRPC_MINOR_RELEASE)"'		>>$@
+	@echo 'XMLRPC_POINT_RELEASE="$(XMLRPC_POINT_RELEASE)"'		>>$@
+	@echo 'FEATURE_LIST="$(FEATURE_LIST)"'				>>$@
+	@echo 'PREFIX="$(PREFIX)"'					>>$@
+	@echo 'HEADERINST_DIR="$(HEADERINST_DIR)"'                      >>$@
+	@echo 'LIBINST_DIR="$(LIBINST_DIR)"'                            >>$@
+	@echo 'BLDDIR="$(BLDDIR)"'                                      >>$@
+	@echo 'ABS_SRCDIR="$(ABS_SRCDIR)"'                              >>$@
+	@echo '#######################################################' >>$@
+
+# We don't want config.mk's xmlrpc-c-config.test rule:
+OMIT_XMLRPC_C_CONFIG_TEST = Y
+
+xmlrpc-c-config xmlrpc-c-config.test:%: %.main shell_config
 	rm -f $@
-	echo '/* This file was generated by a make rule */' >>$@
-ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
-	echo '#define MUST_BUILD_WININET_CLIENT 1' >>$@
-else
-	echo '#define MUST_BUILD_WININET_CLIENT 0' >>$@
-endif
-ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
-	echo '#define MUST_BUILD_CURL_CLIENT 1' >>$@
-else
-	echo '#define MUST_BUILD_CURL_CLIENT 0' >>$@
-endif
-ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-	echo '#define MUST_BUILD_LIBWWW_CLIENT 1' >>$@
-else
-	echo '#define MUST_BUILD_LIBWWW_CLIENT 0' >>$@
-endif
-	echo "static const char * const XMLRPC_DEFAULT_TRANSPORT =" >>$@
-ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-	echo '"libwww";' >>$@
-else
-  ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
-	echo '"curl";' >>$@
-  else
-    ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
-	echo '"wininet";' >>$@
-    else
-	@echo 'ERROR: no client XML transport configured'; rm $@; false
-    endif
-  endif
-endif
+	@echo "Echoes to '$@' suppressed here ..."
+	@echo '#! /bin/sh' >>$@
+	@echo '#'                                                       >>$@
+	@echo '# This file was generated by a make rule'                >>$@
+	@echo '#'                                                       >>$@
+	cat shell_config >>$@
+	cat $< >>$@
+	chmod a+rx $@
 
 .PHONY: clean clean-local
 clean: $(SUBDIRS:%=%/clean) clean-common clean-local
 
 clean-local:
-	rm -f transport_config.h
+	rm -f transport_config.h version.h
 
 .PHONY: distclean distclean-local
 distclean: $(SUBDIRS:%=%/distclean) distclean-common distclean-local
 
 distclean-local: clean-local
-	rm -f config.log config.status Makefile.config libtool 
-	rm -f xmlrpc_config.h xmlrpc_amconfig.h stamp-h xmlrpc-c.spec 
-	rm -f xmlrpc-c-config xmlrpc-c-config.test
+	rm -f config.log config.status config.mk Makefile.srcdir
+	rm -f xmlrpc_config.h xmlrpc_amconfig.h stamp-h 
+	rm -f shell_config xmlrpc-c-config xmlrpc-c-config.test
+	rm -f TAGS
 
-.PHONY: tags
-tags: $(SUBDIRS:%=%/tags) TAGS
+check: $(SUBDIRS:%=%/check)
 
 DISTFILES = 
 
@@ -82,29 +153,31 @@
 distdir: distdir-common
 
 .PHONY: install
-install: $(SUBDIRS:%=%/install) install-common install-compat-hdr
-
-.PHONY: install-compat-hdr
-install-compat-hdr:
-# Install old names of header files for backward compatibility
-	cd $(DESTDIR)$(HEADERINST_DIR); \
-	  rm -f xmlrpc.h xmlrpc_client.h xmlrpc_server.h xmlrpc_cgi.h \
-                xmlrpc_server_abyss.h xmlrpc_server_w32httpsys.h \
-	        XmlRpcCpp.h; \
-	  $(LN_S) xmlrpc-c/oldxmlrpc.h         xmlrpc.h; \
-	  $(LN_S) xmlrpc-c/client.h            xmlrpc_client.h; \
-	  $(LN_S) xmlrpc-c/server.h            xmlrpc_server.h; \
-	  $(LN_S) xmlrpc-c/server_cgi.h        xmlrpc_cgi.h; \
-	  $(LN_S) xmlrpc-c/server_abyss.h      xmlrpc_server_abyss.h; \
-	  $(LN_S) xmlrpc-c/server_w32httpsys.h xmlrpc_server_w32httpsys.h; \
-	  $(LN_S) xmlrpc-c/oldcppwrapper.hpp   XmlRpcCpp.h ;\
+install: $(DEFAULT_SUBDIRS:%=%/install) install-common
 
 .PHONY: dep
-dep: $(SUBDIRS:%=%/dep)
+dep: version.h $(BLDDIR)/include/xmlrpc-c/config.h $(SUBDIRS:%=%/dep)
 
-xmlrpc-c-config xmlrpc-c-config.test xmlrpc_config.h xmlrpc_amconfig.h \
+xmlrpc_config.h xmlrpc_amconfig.h \
 	:%:%.in $(SRCDIR)/configure
 	$(SRCDIR)/configure
 
-include $(SRCDIR)/Makefile.common
+include $(SRCDIR)/common.mk
 
+
+# A trick to catch a common user error.  When you don't run 'configure',
+# you don't have a Makefile.srcdir, which means $(SRCDIR) is null.
+
+/common.mk:
+	@echo =======================================
+	@echo = You must run Configure before Make. =
+	@echo =======================================
+	false
+
+# 'tags' generates/updates an Emacs tags file, anmed TAGS, in the current
+# directory.  Use with Emacs command 'find-tag'.
+
+.PHONY: tags
+tags:
+	find . -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" | \
+	  etags -

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Makefile	Mon May 26 12:59:57 2008
@@ -7,8 +7,11 @@
 # GNU Make uses a make file named "GNUmakefile" in preference to "Makefile"
 # if it exists.  This package contains a "GNUmakefile".
 
+default: all
+
 all install clean dep depend:
 	@echo "You must use GNU Make to build this.  You are running some "
 	@echo "other Make.  GNU Make may be installed on your system with "
 	@echo "the name 'gmake'.  If not, see http://www.gnu.org/software ."
 	@echo
+	false

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/README
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/README	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/README	Mon May 26 12:59:57 2008
@@ -36,51 +36,17 @@
 configure the build to use that instead.  There's no really pressing
 reason to do that, though.
 
-Once you have the prerequisite libraries installed, you can issue
-these commands:
+BUILDING, INSTALLING
+--------------------
+
+See the file doc/INSTALL.
+
+In the simplest case, it's just a conventional
 
   $ ./configure
   $ make
   $ make install
 
-(There's supposed to be a 'make check' step in there too, to validate
-that everything built OK, but it's broken right now - 2005.01.07).
-
-To see it work, run a simple server like this:
-
-  $ examples/xmlrpc_sample_add_server 8080
-
-Then run a client that does an RPC to this server:
-
-  $ examples/xmlrpc_sample_add_client
-
-(I don't mean to imply that the above are consecutive shell commands;
-They can't be, because the server program runs indefinitely).
-
-Also try other sample servers and clients, described in examples/README.
-
-
-You may want to pass a '--prefix' argument to 'configure'.  See
-'./configure --help' for details.
-
-You may also want to disable client XML transports that you won't be
-using.  In particular, the Libwww transport can be inconvenient, because
-it typically uses about 20 shared libraries.  Any XML-RPC client
-program that uses Xmlrpc-c, whether or not the program uses any of the
-libwww facilities, must attach all those libraries, and that can take
-a significant amount of time.
-
-See './configure --help' for the options that disable certain transports.
-
-
-
-WINDOWS
--------
-
-All of the above is essentially for Unix-type operating systems.  To
-build and use Xmlrpc-c on Windows, see the file
-Windows/ReadMeWin32.txt.
-
 
 ADDITIONAL INFORMATION
 ----------------------

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ConfigureWin32.bat
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ConfigureWin32.bat	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ConfigureWin32.bat	Mon May 26 12:59:57 2008
@@ -1,7 +1,35 @@
- at echo off
-echo creating Win32 header files...
-copy .\xmlrpc_win32_config.h ..\config.h
-copy .\xmlrpc_win32_config.h ..\xmlrpc_config.h
-copy .\transport_config_win32.h ..\transport_config.h
-echo completed creating win32 header files.
-pause
+ at REM Windows build
+ at REM This must be RUN once to establish some header files,
+ at REM that are generated by the automake process
+ at echo creating Win32 header files...once only
+ at set TEMPV=
+ at if EXIST ..\include\xmlrpc-c\config.h goto DN1
+copy .\win32_config.h ..\include\xmlrpc-c\config.h > nul
+ at set TEMPV=%TEMPV% ..\include\xmlrpc-c\config.h
+:DN1
+ at if EXIST ..\xmlrpc_config.h goto DN2
+copy .\xmlrpc_win32_config.h ..\xmlrpc_config.h > nul
+ at set TEMPV=%TEMPV% ..\xmlrpc_config.h
+:DN2
+ at if EXIST ..\transport_config.h goto DN3
+copy .\transport_config_win32.h ..\transport_config.h > nul
+ at set TEMPV=%TEMPV% ..\transport_config.h
+:DN3
+ at if EXIST ..\version.h goto DN4
+call mkvers
+ at set TEMPV=%TEMPV% ..\version.h
+:DN4
+ at if EXIST ..\examples\config.h goto DN5
+copy .\xmlrpc_win32_config.h ..\examples\config.h > nul
+ at set TEMPV=%TEMPV% ..\examples\config.h
+:DN5
+ at if "%TEMPV%." == "." goto ALLDN
+ at echo Generated the following win32 header files ...
+ at echo %TEMPV%
+ at goto END
+
+:ALLDN
+ at echo Using previous copies ... Use CleanWin32.bat to remove, and do again ...
+ at goto END
+
+:END

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ReadMeWin32.txt
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ReadMeWin32.txt	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/ReadMeWin32.txt	Mon May 26 12:59:57 2008
@@ -1,116 +1,64 @@
-Build Instructions For XML-RPC For C/C++ On Windows
----------------------------------------------------
-
-The following instructions do not fully work in this release.  There
-is no trivial way to build this release for Windows.  The last release
-that was known to build without special effort on the part of the user
-is 1.02.
-
-Since then, nobody has maintained the code for Windows, and changes that
-were made for other platforms broke some things for Windows.  Most likely,
-anyone with a passing knowledge of building C code on Windows could
-update this code to work on Windows without any in-depth study of it.  If
-you do so, please contribute your work to save other users the trouble.
-
-The majority of the work that needs to be done to make the code build on
-Windows is simply adjusting project files to reflect the fact that files
-have been created, deleted, and moved since they were written.
-
-
-This release includes the option to compile the "http.sys" version of the
-XMLRPC-C server.  If you do not wish to build in the http.sys server,
-set the MUST_BUILD_HTTP_SYS_SERVER to 0 in the transport_config_win32.h and/or
-the transport_config.h file.  Successful conpilation requires installation 
-of the Microsoft Platform SDK for Windows XP SP2 (or later) to get the latest 
-header and link libraries required to support this functionality.  After 
-installation, be sure to properly register the directories as documented 
-in the Platform SDK help file topic "Installing the Platform SDK with 
-Visual Studio".  Download the Platform SDK from:
-http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
-
-To create the three headers required for Win32 WinInet compilation, run the
-ConfigureWin32.bat found in the Windows directory.  If you wish to alter the
-transports that are built to include curl or libwww, adjust the preprocessor
-definitions at the top of the transport_config_win32.h and/or
-the transport_config.h files.  See the file UsingCURLinWin32.txt for
-more information on using the curl transport.  
-
-To compile, open the xmlrpc.dsw file in Visual Studio 6 or greater.  The 
-project will convert and work fine in Visual Studio 2003 as well - 
-other versions of Visual Studio were not tested.
-NOTE: If you get an error while opening or converting the project files,
-it is likely due to using WinRar or similar to decompress the distribution
-tarball.  You can use WinZip or another utility to correctly decompress the
-.tgz file.
-
-Suggested testing for evaluation of the library involves a few projects.  
-Here is a quick getting started guide:
-
-1) Set the Active Project to query_meerkat and build it in release or debug 
-   modes.  The dependent projects will be built automatically.  In the 
-   project settings dialog, add the argument for what you wish to query 
-   meerkat for - "Windows" is a good query.  Run the project.  This will 
-   query the meerkat server for articles related to windows and output the 
-   results to the console.
-
-2) Set the Active Project to xmlrpc_sample_add_server and build it in 
-   release or debug modes.  The dependent projects will be built 
-   automatically.  In the project settings dialog, add the argument for 
-   the port to 8080.  This will run the server sample which adds two 
-   numbers and returns a result.  You should run this from a command 
-   prompt instead of through Visual Studio so you may run the sample
-   client as well.
-
-3) Set the Active Project to xmlrpc_sample_add_sync_client or 
-   xmlrpc_sample_add_async_client and build it in release or debug modes.  
-   The dependent projects will be built automatically.  This will run 
-   the client sample which submits two numbers to be added to the server 
-   application as described above and displays the result.  Note that the 
-   client example comes in the sync and async varieties.
-
-Steven Bone
-July 27, 2005
-sbone at pobox.com
-
-WIN32 CHANGES
-
-Changes from the 1.02 release for Win32:
-1) Option to easily disable the http.sys server for those who do not need
-   it or wish to download the Platform SDK.
-
-Changes from the 1.01 -> 1.02 release for Win32:
-1) Project files for gennmtab, xmlparse, and xmltok updated to include the 
-   path to the xmlrpc_config.h file.
-2) Bugfix for WinInet authentication.
-3) Supports xmlrpc_xportparms, xmlrpc_wininet_xportparms added
-   *potential breaking change* - now by default we fail on invalid
-   SSL certs, use the xmlrpc_wininet_xportparms option to enable old
-   behavior.
-4) Added project file for xmlrpc_sample_auth_client
-5) Added project and src for a http.sys based xmlrpc-c server.  See comments
-   in the source files.  This supports Windows XP SP2 and Windows Server
-   2003 and allows other http.sys based applications to bind to the same
-   port.  In Server 2003, IIS uses http.sys and thus the XML-RPC server
-   can be run on the standard port 80 along with IIS.  The sample also
-   supports https and basic authentication.  It tested OK with
-   http://validator.xmlrpc.com/  Note that the Platform SDK headers and
-   link libraries for Windows XP SP2 or newer are required to compile
-   xmlrpc-c for this module.  If you are not using this server, it is 
-   safe to exclude the xmlrpc_server_w32httpsys.c file from the xmlrpc
-   project and these dependencies will not be required.  You can get the 
-   latest platform SDK at 
-   http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
-   Be sure after installation to choose the program to "register the PSDK
-   directories with Visual Studio" so the newer headers are found.
-6) Better support for libcurl.  Updated project files, transport_config_win32.h,
-   added documentation UsingCURLinWin32.txt.
-   
-Changes from the 1.00 -> 1.01 release for Win32:
-1) Project files now reflect static linking for the expat XML library.
-2) Example projects were created/updated to keep them in sync with the 
-   distribution.  The project files were moved into the .\Windows 
-   directory
-3) Projects for the rpc and cpp tests were created.  The 
-   xmlrpc_win32_config.h defines the directory for the test files relative 
-   to the output directory
-4) Major refactoring of the Wininet Transport.   
\ No newline at end of file
+Build Instructions For XML-RPC For C/C++ On Windows
+---------------------------------------------------
+
+Latest Windows work was done by
+
+  Geoff McLane
+  19 October, 2007
+  home: http://geoffair.net
+
+
+1. Run the batch file ConfigureWin32.bat, found in the Windows
+directory. This will copy four(4) headers to the appropriate folders.
+
+2. Load xmlrpc.dsw in MSVC[7,8] or later, and build the Release or Debug
+configurations. DLL configurations are not included, and may not compile.
+
+This build requires that you have a Microsoft SDK, or Plaform SDK
+installed, since among other things, it uses <http.h>, and
+HTTPAPI.LIB, from the SDK.
+
+Once built, the rpctest.exe, in the bin folder, should run with no errors,
+and the xmlrpc_sample_add_server.exe, using port 8080, and
+xmlrpc_sample_add_sync_client.exe should communicate ... proving 7+5 = 12 ;=))
+
+Have fun.
+
+PS: Several other batch files are included in the Windows folder ...
+
+delsln.bat - to delete all the MSVC7 and 8 solution file.
+
+diffcfg.bat - compare the headers in windows with the version used in
+the compile. Requires diff.exe to be in the path.
+
+updcfg.bat - copy the 3 manually maintained configuration files back
+to the Windows folder (for distribution).
+
+cleawin32.bat - deletes the headers used in the compile. That is does the
+opposite of ConfigureWin32.bat.
+
+cleanall.bat - to remove ALL the binary files created. Requires an xdelete
+program which will recursively delete an entire folder.
+
+
+There is some historical information in ReadMeOld.txt, which used to be
+the contents of this file.  Some of it is still valid.
+
+
+Developing XML-RPC For C/C++ for Windows
+----------------------------------------
+
+If you fix or enhance something in the Windows build system, please send
+your updates to the Xmlrpc-c maintainer to be included in future releases
+so others don't have to repeat your work.
+
+Output of a Subversion 'diff' is usually the best way to send updates,
+but you can also send complete files or just a description of the
+change if that is easier.
+
+For the project files, we distribute only MSVC6-compatible DSP and DSW
+files (which are, of course, usable as input to later versions of MSVC
+as well).  That means if you need to modify something in the project
+files and you are not using MSVC6, you must edit the project files
+manually as text files.  Modifying them via the IDE would simply
+generate new files in a format that cannot be used with older MSVC.

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/UsingCURLinWin32.txt
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/UsingCURLinWin32.txt	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/UsingCURLinWin32.txt	Mon May 26 12:59:57 2008
@@ -1,64 +1,128 @@
-Background:
-Let’s say you need to support a xmlrpc-c client running as a service.  In this
-situation you cannot use WinInet.  Details of the restriction can be found on
-the libcurl website or various Microsoft KB articles.  The alternative is to use
-libcurl.  This document describes the steps required to use libcurl as your
-transport mechanism as supported by the latest files and projects provided in
-the xmlrpc-c distribution.  The assumption is that you can successfully compile
-the distribution of xmlrpc-c.
-
-Overview:
-The default projects in xmlrpc-c create standalone executables that do not
-require other DLL’s (release mode).  While the case can be made for this
-behavior pro and con, it is beyond this document to justify it.  Therefore, we
-need to create static link libraries for libcurl that mimics this behavior. 
-Once the link libraries are created, we can then add them (plus the requisite
-curl headers) into the xmlrpc-c project.  Finally, we enable the compilation of
-the curl transport file and tell xmlrpc-c that we will be using curl.  Lastly,
-we build and test the project.
-
-Steps to use CURL with Win32 xmlrpc-c:
-1. Download the CURL source.  In the “include” folder of the CURL distribution,
-copy the curl directory to the “lib” directory of xmlbpc-c.  When you are done
-with this step, you should have a curl.h file located in the directory
-xmlrpc-c\lib\curl\.  The xmlrpc project looks in this relative path for the
-necessary headers.
-
-2. In the CURL distribution, lib directory, is a file called Makefile.vc6.  Edit
-this file.  The line starting with CCNODBG should be changed to:
-CCNODBG    = cl.exe /MT /O2 /DNDEBUG
-The /MT option links with the Multithreaded non-dll version of the c runtime. 
-If this change is not made, the project will not link, as this is the default
-setting for the xmlrpc-c projects.  In debug mode, we use the dll version of the
-c runtime as it makes memory leak checking tools work better.
-
-3. Open a command prompt window and run the vcvars32.bat file in your Visual C++
-distribution.  If you are using Studio 2002 or 2003, use the “Visual Studio
-Command Prompt” from the Start menu to open the console.
-
-4. Compile release and debug mode libraries.  For the purposes of this tutorial,
-we are going to build only the curl library without ssl or zlib support.  In the
-command prompt, navigate to the curl\lib directory and execute the following
-commands:
-nmake -f Makefile.vc6 CFG=debug
-nmake -f Makefile.vc6 CFG=release
-
-5. The above step should have generated two static link libraries in the
-curl\lib directory: libcurl.lib and libcurld.lib.  Copy these files into the
-root of the xmlrpc-c\lib\ directory.  This step ends our involvement with the
-actual CURL distribution.  The remainder of the steps are for XMLRPC-C.
-
-6. Open the xmlrpc-c Visual Studio workspace (Instructions for VC++ 6, other
-versions are slightly different).  In File View, expand the xmlrpc project. 
-Under “Source Files” there is an entry for xmlrpc_curl_transport.c  This is not
-included in any build paths by default.  To enable it for compilation, right
-click the file to change the settings.  In the dropdown, select “All
-Configurations.”  Pick the General tab and uncheck the “Exclude File From Build”
-setting.  Press OK to save your changes to the project.
-
-7.  In the “Header Files” section of the xmlrpc project is a file called
-“transport_config.h”.  Edit this file to set the MUST_BUILD_CURL_CLIENT to 1,
-and if you wish to change the default transport to curl, change the
-XMLRPC_DEFAULT_TRANSPORT to “curl”. 
-
-8. Compile and test one or more of the sample client projects.
+Background:
+
+Let’s say you need to have a Xmlrpc-c client running as a service.
+In this situation you cannot use WinInet.  Details of the restriction
+can be found on the libcurl website or various Microsoft KB articles.
+The alternative is to use libcurl.  This document describes the steps
+required to use libcurl as your client XML transport mechanism.
+
+Overview:
+
+The default projects in Xmlrpc-c create standalone executables that do
+not require other DLL’s (release mode).  While the case can be made
+for this behavior pro and con, it is beyond this document to justify
+it.  Therefore, we need to create static link libraries for libcurl
+that mimics this behavior.  Once the link libraries are created, we
+can then add them (plus the requisite curl headers) into the Xmlrpc-c
+project.  Finally, we enable the compilation of the curl transport
+file and tell Xmlrpc-c that we will be using curl.  Lastly, we build
+and test the project.
+
+Steps to use CURL with Win32 Xmlrpc-c:
+
+1. Download the CURL source.  In the “include” folder of the
+CURL distribution, copy the curl directory to the “lib”
+directory of xmlrpc-c.  When you are done with this step, you should
+have a curl.h file located in the directory xmlrpc-c\lib\curl\.  The
+xmlrpc project looks in this relative path for the necessary headers.
+
+2. In the CURL distribution, lib directory, is a file called
+Makefile.vc6.  Edit this file.  The line starting with CCNODBG should
+be changed to:
+
+CCNODBG    = cl.exe /MT /O2 /DNDEBUG
+
+The /MT option links with the Multithreaded non-dll version of the c
+runtime.  If this change is not made, the project will not link, as
+this is the default setting for the Xmlrpc-c projects.
+
+3. Open a command prompt window and run the vcvars32.bat file in your
+Visual C++ distribution.  If you are using Studio 2002 or 2003, use
+the “Visual Studio Command Prompt” from the Start menu to open
+the console.
+
+4. Compile release and debug mode libraries.  For the purposes of this
+tutorial, we are going to build only the curl library without ssl or
+zlib compression capability.  In the command prompt, navigate to the
+curl\lib directory and execute the following commands:
+
+nmake -f Makefile.vc6 CFG=debug RTLIBCFG=static
+nmake -f Makefile.vc6 CFG=release RTLIBCFG=static
+
+5. The above step should have generated two static link libraries in
+the curl\lib directory: libcurl.lib and libcurld.lib.  Copy these
+files into the root of the xmlrpc-c\lib\ directory.  This step ends
+our involvement with the actual CURL distribution.  The remainder of
+the steps are for Xmlrpc-c.
+
+6. Open the Xmlrpc-c Visual Studio workspace (Instructions for VC++ 6,
+other versions are slightly different).  In File View, expand the
+xmlrpc project.  Under "Source Files" there is an entry for
+xmlrpc_curl_transport.c This is not included in any build paths by
+default.  To enable it for compilation, right click the file to change
+the settings.  In the dropdown, select "All Configurations."  Pick the
+General tab and uncheck the "Exclude File From Build" setting.  Press
+OK to save your changes to the project.
+
+7.  In the "Header Files" section of the xmlrpc project is a file
+called "transport_config.h".  Edit this file to set the
+MUST_BUILD_CURL_CLIENT to 1, and if you wish to change the default
+transport to curl, change the XMLRPC_DEFAULT_TRANSPORT to "curl".
+
+8. Compile and test one or more of the sample client projects.
+
+USING MSVC8 - 2007/11/25
+========================
+
+This is for MSVC8, but most will apply to all version of Microsoft
+Visual Studio.
+
+Download the CURL source. Run the buildconf.bat to generate some
+additional files. This builds a 'dummy' hugehelp.c, but it can also
+be built using the src\mkhelp.pl Perl script. You may have to build
+you own VCPROJ file for CURL, if you want to use MSVC. It does
+provide a Makefile.vc6 as mentioned above.
+
+To build all the CURL library variations, use
+> nmake /nologo vc-all 
+but note this will use the /MD[d] DLL runtime. Only by adding
+RTCFGLIB=static to each of the makefile commands will /MT[d] be
+used.
+
+Essentially, for building the static Debug or Release CURL libraries,
+it is all the sources in the curl\lib folder. Make sure you choose /MT
+and /MTd for the runtime, and build both using say the name libcurl.lib.
+
+When you have Debug\libcurl.lib and Release\libcurl.lib built, you
+are ready to build and link them with Xmlrpc-c.
+
+After running xmlrpc-c\Windows\configurewin32.bat, loading xmlrpc.dsw
+will convert all the projects to VCPROJ files. In the File View, in
+the xmlrpc project, in the properties of xmlrpc_curl_transport.c,
+change 'Exclude file from build' from 'yes' to 'no', for Debug
+and Release.
+
+In the 'Header Files' section, open the "transport_config.h" file,
+and change MUST_BUILD_CURL_CLIENT to 1, and the XMLRPC_DEFAULT_TRANSPORT
+to "curl", if desired.
+
+As usual, for each of the 'client' projects, and rpctest, in the properties,
+Linker section, you can add the library libcurl.lib on the Input tab, and
+the relative path to the library in the General tab to something like -
+..\..\curl\Debug and ..\..\curl\Release, or where ever you built or
+copied these static libraries too.
+
+Or you can adjust the Windows/curlink.h, to directly point to your
+respective Debug and Release static CURL libraries, either where you
+built them, or where you copied them too.
+
+Now, Xmlrpc-c should build using the CURL transport.
+
+Note, for the final linking, all RUNTIME libraries MUST be the SAME.
+A mixture of /MD and /MT will give big linkage problems. Any one project
+built with the alterate RUNTIME will show many items defined more than
+once. And of course, you can also NOT mix Debug with Release. That is
+/MDd with /MD, nor /MTd with /MT, or else there will be unresolved
+debug items.
+
+EOF

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/cpptest.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/cpptest.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/cpptest.dsp	Mon May 26 12:59:57 2008
@@ -1,102 +1,121 @@
-# Microsoft Developer Studio Project File - Name="cpptest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cpptest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cpptest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cpptest.mak" CFG="cpptest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cpptest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cpptest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "cpptest"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cpptest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\cpptest"
-# PROP Intermediate_Dir "Release\cpptest"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\lib\xmlrpc.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\cpptest.exe"
-
-!ELSEIF  "$(CFG)" == "cpptest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\cpptest"
-# PROP Intermediate_Dir "Debug\cpptest"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\\" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\lib\xmlrpcD.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\cpptest.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cpptest - Win32 Release"
-# Name "cpptest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\src\cpptest.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="cpptest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=cpptest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "cpptest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "cpptest.mak" CFG="cpptest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "cpptest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "cpptest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "cpptest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\cpptest"
+# PROP Intermediate_Dir "Release\cpptest"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "CURL_STATICLIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\lib\xmlrpccpp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Wininet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\cpptest.exe"
+
+!ELSEIF  "$(CFG)" == "cpptest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\cpptest"
+# PROP Intermediate_Dir "Debug\cpptest"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I ".." /I "../include" /I "../lib/util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "CURL_STATICLIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\lib\xmlrpccppD.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Wininet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\cpptestD.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "cpptest - Win32 Release"
+# Name "cpptest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\cpp\test\registry.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\cpp\test\server_abyss.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\cpp\test\server_pstream.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\cpp\test\test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\cpp\test\testclient_dummy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\cpp\test\tools.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/rpctest.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/rpctest.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/rpctest.dsp	Mon May 26 12:59:57 2008
@@ -1,236 +1,210 @@
-# Microsoft Developer Studio Project File - Name="rpctest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=rpctest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "rpctest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "rpctest.mak" CFG="rpctest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rpctest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rpctest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "rpctest"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "rpctest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\rpctest"
-# PROP Intermediate_Dir "Release\rpctest"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\include" /I "../lib/util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ..\lib\xmlrpc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Wininet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\rpctest.exe"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copy test files
-PostBuild_Cmds=copy ..\src\testdata\*.* .
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "rpctest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\rpctest"
-# PROP Intermediate_Dir "Debug\rpctest"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\\" /I "..\include" /I "../lib/util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\lib\xmlrpcD.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Wininet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\rpctestD.exe" /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copy test files
-PostBuild_Cmds=copy ..\src\testdata\*.* .
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rpctest - Win32 Release"
-# Name "rpctest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\src\test\cgi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\client.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\conf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\conn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\data.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\http.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\parse_xml.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\serialize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\server.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\server_abyss.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\test.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\thread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\token.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\token.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\value.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\xml_data.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_server_abyss.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\src\test\client.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\parse_xml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\serialize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\server_abyss.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\test.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\value.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\test\xml_data.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "TestFiles"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\src\testdata\http-req-simple.txt"
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\testdata\req_no_params.xml
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\testdata\req_out_of_order.xml
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\testdata\req_value_name.xml
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="rpctest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=rpctest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "rpctest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rpctest.mak" CFG="rpctest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rpctest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rpctest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rpctest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\rpctest"
+# PROP Intermediate_Dir "Release\rpctest"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\lib\xmlrpc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Wininet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\rpctest.exe"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copy test files
+PostBuild_Cmds=if not exist ..\Bin\data md ..\Bin\data	copy ..\src\test\data\*.* ..\Bin\data
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "rpctest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\rpctest"
+# PROP Intermediate_Dir "Debug\rpctest"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I ".." /I "../include" /I "../lib/util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\lib\xmlrpcD.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Wininet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\rpctestD.exe" /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copy test files
+PostBuild_Cmds=if not exist ..\Bin\data md ..\Bin\data	copy ..\src\test\data\*.* ..\Bin\data
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "rpctest - Win32 Release"
+# Name "rpctest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\test\abyss.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\cgi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\client.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\casprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\method_registry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\parse_xml.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\serialize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\serialize_value.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\server_abyss.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\test.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\token.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\value.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\xml_data.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\src\test\client.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\parse_xml.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\serialize.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\serialize_value.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\server_abyss.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\test.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\value.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\test\xml_data.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Group "TestFiles"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\src\testdata\http-req-simple.txt"
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\testdata\req_no_params.xml
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\testdata\req_out_of_order.xml
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\testdata\req_value_name.xml
+# End Source File
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/transport_config_win32.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/transport_config_win32.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/transport_config_win32.h	Mon May 26 12:59:57 2008
@@ -1,26 +1,13 @@
+/* Win32 version of transport_config.h.
+
+   For other platforms, this is generated automatically, but for Windows,
+   someone generates it manually.  Nonetheless, we keep it looking as much
+   as possible like the automatically generated one to make it easier to
+   maintain (e.g. you can compare the two and see why something builds
+   differently for Windows that for some other platform).
+*/
 #define MUST_BUILD_WININET_CLIENT 1
 #define MUST_BUILD_CURL_CLIENT 0
 #define MUST_BUILD_LIBWWW_CLIENT 0
-static const char * const XMLRPC_DEFAULT_TRANSPORT = "wininet";
-
-/* 
-Set to zero if you do not wish to build the http.sys
-based XMLRPC-C Server
-*/
-#define MUST_BUILD_HTTP_SYS_SERVER 1
-
-/*
-We use pragma statements to tell the linker what we need to link with.
-Since Curl requires Winsock, Winmm, and libcurl, and no other
-project does, if we are building curl support we tell the linker
-what libs we need to add.
-*/
-#if MUST_BUILD_CURL_CLIENT > 0
-#ifdef _DEBUG
-#pragma comment( lib, "../lib/libcurld.lib" )
-#else
-#pragma comment( lib, "../lib/libcurl.lib" )
-#endif
-#pragma comment( lib, "Winmm.lib" )
-#pragma comment( lib, "Ws2_32.lib" )
-#endif
\ No newline at end of file
+static const char * const XMLRPC_DEFAULT_TRANSPORT =
+"wininet";

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsp	Mon May 26 12:59:57 2008
@@ -1,258 +1,469 @@
-# Microsoft Developer Studio Project File - Name="xmlrpc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=xmlrpc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc.mak" CFG="xmlrpc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlrpc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xmlrpc - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "xmlrpc"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlrpc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\xmlrpc"
-# PROP Intermediate_Dir "Release\xmlrpc"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../lib/" /I "../lib/curl_transport" /I "../lib/util/include" /I "../include" /I "../" /I "../lib/expat/xmlparse" /I "../lib/w3c-libwww-5.3.2/Library/src" /I "../lib/abyss/src" /I "../lib/wininet_transport" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "ABYSS_WIN32" /D "CURL_STATICLIB" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\xmlrpc.lib"
-
-!ELSEIF  "$(CFG)" == "xmlrpc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\xmlrpc"
-# PROP Intermediate_Dir "Debug\xmlrpc"
-# PROP Target_Dir ""
-MTL=midl.exe
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib/" /I "../lib/curl_transport" /I "../lib/util/include" /I "../include" /I "../" /I "../lib/expat/xmlparse" /I "../lib/w3c-libwww-5.3.2/Library/src" /I "../lib/abyss/src" /I "../lib/wininet_transport" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "ABYSS_WIN32" /D "CURL_STATICLIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\xmlrpcD.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlrpc - Win32 Release"
-# Name "xmlrpc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc"
-# Begin Source File
-
-SOURCE=..\lib\util\casprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\util\pthreadx_win32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_array.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_authcookie.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_base64.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_builddecomp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_client.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\curl_transport\xmlrpc_curl_transport.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_data.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_datetime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_expat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_libxml2.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_registry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_serialize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_server_abyss.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_server_w32httpsys.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_struct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_strutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_support.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\xmlrpc_utf8.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\wininet_transport\xmlrpc_wininet_transport.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\abyss.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\base.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\util\include\bool.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\client.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\client_int.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\util\include\mallocvar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\util\include\pthreadx.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\server.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\server_abyss.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\server_cgi.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\server_w32httpsys.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\transport.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\transport_config.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\transport_int.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\include\xmlrpc-c\xmlparser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\xmlrpc_config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\curl_transport\xmlrpc_curl_transport.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\wininet_transport\xmlrpc_wininet_transport.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="xmlrpc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=xmlrpc - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "xmlrpc.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "xmlrpc.mak" CFG="xmlrpc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "xmlrpc - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xmlrpc - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xmlrpc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\xmlrpc"
+# PROP Intermediate_Dir "Release\xmlrpc"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../lib" /I "../lib/util/include" /I "../include" /I ".." /I "../lib/expat/xmlparse" /I "../lib/abyss/src" /I "../lib/wininet_transport" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "ABYSS_WIN32" /D "CURL_STATICLIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\xmlrpc.lib"
+
+!ELSEIF  "$(CFG)" == "xmlrpc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\xmlrpc"
+# PROP Intermediate_Dir "Debug\xmlrpc"
+# PROP Target_Dir ""
+LINK32=link.exe -lib
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../lib/util/include" /I "../include" /I ".." /I "../lib/expat/xmlparse" /I "../lib/abyss/src" /I "../lib/wininet_transport" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "ABYSS_WIN32" /D "CURL_STATICLIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\xmlrpcD.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "xmlrpc - Win32 Release"
+# Name "xmlrpc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc"
+# Begin Source File
+
+SOURCE=..\lib\libutil\asprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\error.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\make_printable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\memblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\method.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\pthreadx_win32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\parse_value.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\registry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\resource.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\select.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\sleep.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\system_method.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\trace.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\version.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\libutil\utf8.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\double.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_authcookie.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_base64.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_build.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_client.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_client_global.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_server_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\curl_transport\xmlrpc_curl_transport.c
+
+!IF  "$(CFG)" == "xmlrpc - Win32 Release"
+
+# ADD CPP /I "." /I "..\..\curl\include"
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "xmlrpc - Win32 Debug"
+
+# ADD CPP /I "." /I "..\..\curl\include"
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_data.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_datetime.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_decompose.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_expat.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_libxml2.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_serialize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_server_abyss.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_server_w32httpsys.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\xmlrpc_struct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\wininet_transport\xmlrpc_wininet_transport.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\http.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\abyss.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\abyss_info.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\abyss_winsock.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\base.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\base_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\bool.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\c_util.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\c_util.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\casprintf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\channel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\chanswitch.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\client.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\client_global.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\client_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\config.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\conn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\date.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\girmath.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\inline.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\linklist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\mallocvar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\double.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\method.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\pthreadx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\parse_value.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\registry.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\server.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\server.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\server_abyss.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\server_cgi.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\server_w32httpsys.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\sleep_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\socket.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\socket_win.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util\include\stdargx.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\string_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\system_method.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\thread.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\time_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\abyss\src\token.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\transport.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\transport_config.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\transport_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\util_int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\xml_rpc_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\expat\xmlparse\xmlparse.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\xmlrpc-c\xmlparser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\xmlrpc_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\curl_transport\xmlrpc_curl_transport.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\wininet_transport\xmlrpc_wininet_transport.h
+# End Source File
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsw
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsw	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc.dsw	Mon May 26 12:59:57 2008
@@ -1,194 +1,242 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "cpptest"=".\cpptest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gennmtab"="..\lib\expat\gennmtab\gennmtab.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "query_meerkat"=".\query_meerkat.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rpctest"=".\rpctest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlparse"="..\lib\expat\xmlparse\xmlparse.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmltok
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlrpc"=".\xmlrpc.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlparse
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlrpc_sample_add_asynch_client"=".\xmlrpc_sample_add_asynch_client.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlrpc_sample_add_server"=".\xmlrpc_sample_add_server.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlrpc_sample_add_server_w32httpsys"=".\xmlrpc_sample_add_server_w32httpsys.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlrpc_sample_add_sync_client"=".\xmlrpc_sample_add_sync_client.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlrpc_sample_auth_client"=".\xmlrpc_sample_auth_client.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xmlrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmltok"="..\lib\expat\xmltok\xmltok.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gennmtab
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "abyss"=".\abyss.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "cpptest"=".\cpptest.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xmlrpccpp
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abyss
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "gennmtab"=".\gennmtab.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "rpctest"=".\rpctest.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abyss
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlhttpsys"=".\xmlhttpsys.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xmlparse"=".\xmlparse.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmltok
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpc"=".\xmlrpc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlparse
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abyss
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpccpp"=".\xmlrpccpp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlparse
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abyss
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpc_sample_add_asynch_client"=".\xmlrpc_sample_add_asynch_client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpc_sample_add_server"=".\xmlrpc_sample_add_server.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abyss
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpc_sample_add_server_w32httpsys"=".\xmlrpc_sample_add_server_w32httpsys.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlhttpsys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpc_sample_add_sync_client"=".\xmlrpc_sample_add_sync_client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmlrpc_sample_auth_client"=".\xmlrpc_sample_auth_client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xmlrpc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmltok"=".\xmltok.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name gennmtab
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_asynch_client.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_asynch_client.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_asynch_client.dsp	Mon May 26 12:59:57 2008
@@ -1,102 +1,102 @@
-# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_asynch_client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=xmlrpc_sample_add_asynch_client - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_asynch_client.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_asynch_client.mak" CFG="xmlrpc_sample_add_asynch_client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlrpc_sample_add_asynch_client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "xmlrpc_sample_add_asynch_client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "xmlrpc_sample_add_asynch_client"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlrpc_sample_add_asynch_client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\xmlrpc_sample_add_asynch_client"
-# PROP Intermediate_Dir "Release\xmlrpc_sample_add_asynch_client"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ..\lib\xmlrpc.lib WinInet.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_asynch_client.exe"
-
-!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_asynch_client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\xmlrpc_sample_add_asynch_client"
-# PROP Intermediate_Dir "Debug\xmlrpc_sample_add_asynch_client"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\\" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\lib\xmlrpcD.lib WinInet.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_asynch_clientD.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlrpc_sample_add_asynch_client - Win32 Release"
-# Name "xmlrpc_sample_add_asynch_client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\examples\xmlrpc_asynch_client.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_asynch_client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xmlrpc_sample_add_asynch_client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "xmlrpc_sample_add_asynch_client.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "xmlrpc_sample_add_asynch_client.mak" CFG="xmlrpc_sample_add_asynch_client - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "xmlrpc_sample_add_asynch_client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xmlrpc_sample_add_asynch_client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xmlrpc_sample_add_asynch_client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\xmlrpc_sample_add_asynch_client"
+# PROP Intermediate_Dir "Release\xmlrpc_sample_add_asynch_client"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c /D "CURL_STATICLIB"
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\lib\xmlrpc.lib WinInet.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_asynch_client.exe"
+
+!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_asynch_client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\xmlrpc_sample_add_asynch_client"
+# PROP Intermediate_Dir "Debug\xmlrpc_sample_add_asynch_client"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c /D "CURL_STATICLIB"
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  ..\lib\xmlrpcD.lib WinInet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_asynch_clientD.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "xmlrpc_sample_add_asynch_client - Win32 Release"
+# Name "xmlrpc_sample_add_asynch_client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\xmlrpc_asynch_client.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server.dsp	Mon May 26 12:59:57 2008
@@ -1,140 +1,103 @@
-# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=xmlrpc_sample_add_server - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_server.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_server.mak" CFG="xmlrpc_sample_add_server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlrpc_sample_add_server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "xmlrpc_sample_add_server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "xmlrpc_sample_add_server"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlrpc_sample_add_server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release\xmlrpc_sample_add_server"
-# PROP Intermediate_Dir ".\Release\xmlrpc_sample_add_server"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpc.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_server.exe"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_server - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug\xmlrpc_sample_add_server"
-# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_add_server"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\\" /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpcD.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_serverD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlrpc_sample_add_server - Win32 Release"
-# Name "xmlrpc_sample_add_server - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\conf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\conn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\data.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\http.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\server.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\thread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\abyss\src\trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\examples\xmlrpc_sample_add_server.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xmlrpc_sample_add_server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "xmlrpc_sample_add_server.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "xmlrpc_sample_add_server.mak" CFG="xmlrpc_sample_add_server - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "xmlrpc_sample_add_server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xmlrpc_sample_add_server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xmlrpc_sample_add_server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release\xmlrpc_sample_add_server"
+# PROP Intermediate_Dir ".\Release\xmlrpc_sample_add_server"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpc.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_server.exe"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug\xmlrpc_sample_add_server"
+# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_add_server"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpcD.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_serverD.exe" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "xmlrpc_sample_add_server - Win32 Release"
+# Name "xmlrpc_sample_add_server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\xmlrpc_sample_add_server.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server_w32httpsys.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server_w32httpsys.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_server_w32httpsys.dsp	Mon May 26 12:59:57 2008
@@ -1,104 +1,102 @@
-# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_server_w32httpsys" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=xmlrpc_sample_add_server_w32httpsys - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_server_w32httpsys.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_server_w32httpsys.mak" CFG="xmlrpc_sample_add_server_w32httpsys - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlrpc_sample_add_server_w32httpsys - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "xmlrpc_sample_add_server_w32httpsys - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "xmlrpc_sample_add_server_w32httpsys"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlrpc_sample_add_server_w32httpsys - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release\xmlrpc_sample_add_server_w32httpsys"
-# PROP Intermediate_Dir ".\Release\xmlrpc_sample_add_server_w32httpsys"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpc.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_server_w32httpsys.exe"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_server_w32httpsys - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug\xmlrpc_sample_add_server_w32httpsys"
-# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_add_server_w32httpsys"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\\" /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpcD.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_server_w32httpsysD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlrpc_sample_add_server_w32httpsys - Win32 Release"
-# Name "xmlrpc_sample_add_server_w32httpsys - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\examples\xmlrpc_sample_add_server_w32httpsys.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_server_w32httpsys" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xmlrpc_sample_add_server_w32httpsys - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "xmlrpc_sample_add_server_w32httpsys.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xmlrpc_sample_add_server_w32httpsys.mak" CFG="xmlrpc_sample_add_server_w32httpsys - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xmlrpc_sample_add_server_w32httpsys - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xmlrpc_sample_add_server_w32httpsys - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xmlrpc_sample_add_server_w32httpsys - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release\xmlrpc_sample_add_server_w32httpsys"
+# PROP Intermediate_Dir ".\Release\xmlrpc_sample_add_server_w32httpsys"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpc.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_server_w32httpsys.exe"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_server_w32httpsys - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug\xmlrpc_sample_add_server_w32httpsys"
+# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_add_server_w32httpsys"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ABYSS_WIN32" /D "_THREAD" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ..\lib\xmlrpcD.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_server_w32httpsysD.exe" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "xmlrpc_sample_add_server_w32httpsys - Win32 Release"
+# Name "xmlrpc_sample_add_server_w32httpsys - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\xmlrpc_sample_add_server_w32httpsys.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_sync_client.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_sync_client.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_add_sync_client.dsp	Mon May 26 12:59:57 2008
@@ -1,104 +1,103 @@
-# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_sync_client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=xmlrpc_sample_add_sync_client - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_sync_client.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_add_sync_client.mak" CFG="xmlrpc_sample_add_sync_client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlrpc_sample_add_sync_client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "xmlrpc_sample_add_sync_client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "xmlrpc_sample_add_sync_client"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlrpc_sample_add_sync_client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release\xmlrpc_sample_add_sync_client"
-# PROP Intermediate_Dir ".\Release\xmlrpc_sample_add_sync_client"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ..\lib\xmlrpc.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_sync_client.exe"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_sync_client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug\xmlrpc_sample_add_sync_client"
-# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_add_sync_client"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\lib\xmlrpcD.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_sync_clientD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlrpc_sample_add_sync_client - Win32 Release"
-# Name "xmlrpc_sample_add_sync_client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\examples\xmlrpc_sample_add_client.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="xmlrpc_sample_add_sync_client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xmlrpc_sample_add_sync_client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "xmlrpc_sample_add_sync_client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xmlrpc_sample_add_sync_client.mak" CFG="xmlrpc_sample_add_sync_client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xmlrpc_sample_add_sync_client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xmlrpc_sample_add_sync_client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xmlrpc_sample_add_sync_client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release\xmlrpc_sample_add_sync_client"
+# PROP Intermediate_Dir ".\Release\xmlrpc_sample_add_sync_client"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c /D "CURL_STATICLIB"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\lib\xmlrpc.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_add_sync_client.exe"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "xmlrpc_sample_add_sync_client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug\xmlrpc_sample_add_sync_client"
+# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_add_sync_client"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c /D "CURL_STATICLIB"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\lib\xmlrpcD.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_add_sync_clientD.exe" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "xmlrpc_sample_add_sync_client - Win32 Release"
+# Name "xmlrpc_sample_add_sync_client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\xmlrpc_sample_add_client.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
+

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_auth_client.dsp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_auth_client.dsp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_sample_auth_client.dsp	Mon May 26 12:59:57 2008
@@ -1,104 +1,102 @@
-# Microsoft Developer Studio Project File - Name="xmlrpc_sample_auth_client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=xmlrpc_sample_auth_client - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_auth_client.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlrpc_sample_auth_client.mak" CFG="xmlrpc_sample_auth_client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlrpc_sample_auth_client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "xmlrpc_sample_auth_client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "xmlrpc_sample_auth_client"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlrpc_sample_auth_client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release\xmlrpc_sample_auth_client"
-# PROP Intermediate_Dir ".\Release\xmlrpc_sample_auth_client"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ..\lib\xmlrpc.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_auth_client.exe"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "xmlrpc_sample_auth_client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug\xmlrpc_sample_auth_client"
-# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_auth_client"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\lib\xmlrpcD.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_auth_clientD.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlrpc_sample_auth_client - Win32 Release"
-# Name "xmlrpc_sample_auth_client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\examples\auth_client.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="xmlrpc_sample_auth_client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xmlrpc_sample_auth_client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "xmlrpc_sample_auth_client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xmlrpc_sample_auth_client.mak" CFG="xmlrpc_sample_auth_client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xmlrpc_sample_auth_client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xmlrpc_sample_auth_client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xmlrpc_sample_auth_client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release\xmlrpc_sample_auth_client"
+# PROP Intermediate_Dir ".\Release\xmlrpc_sample_auth_client"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c /D "CURL_STATICLIB"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\lib\xmlrpc.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlrpc_sample_auth_client.exe"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "xmlrpc_sample_auth_client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug\xmlrpc_sample_auth_client"
+# PROP Intermediate_Dir ".\Debug\xmlrpc_sample_auth_client"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /I "../include" /I "../lib/util/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c /D "CURL_STATICLIB"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\lib\xmlrpcD.lib kernel32.lib user32.lib gdi32.lib WinInet.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\xmlrpc_sample_auth_clientD.exe" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "xmlrpc_sample_auth_client - Win32 Release"
+# Name "xmlrpc_sample_auth_client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\auth_client.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_win32_config.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_win32_config.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/Windows/xmlrpc_win32_config.h	Mon May 26 12:59:57 2008
@@ -1,130 +1,158 @@
-#pragma once
+/* Win32 version of xmlrpc_config.h.
 
-/* From xmlrpc_amconfig.h */
-  
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the setgroups function.  */
-/* #undef HAVE_SETGROUPS */
-
-/* #undef HAVE_ASPRINTF */
-
-/* Define if you have the wcsncmp function.  */
-#define HAVE_WCSNCMP 1
-
-/* Define if you have the <stdarg.h> header file.  */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <sys/filio.h> header file.  */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define if you have the <sys/ioctl.h> header file.  */
-/* #undef HAVE_SYS_IOCTL_H 1 */
-
-/* Define if you have the <wchar.h> header file.  */
-#define HAVE_WCHAR_H 1
-
-/* Define if you have the socket library (-lsocket).  */
-/* #undef HAVE_LIBSOCKET */
-
-/* Name of package */
-#define PACKAGE "xmlrpc-c"
-
-
-/* Win32 version of xmlrpc_config.h
+   For other platforms, this is generated automatically, but for Windows,
+   someone generates it manually.  Nonetheless, we keep it looking as much
+   as possible like the automatically generated one to make it easier to
+   maintain (e.g. you can compare the two and see why something builds
+   differently for Windows than for some other platform).
+
+   The purpose of this file is to define stuff particular to the build
+   environment being used to build Xmlrpc-c.  Xmlrpc-c source files can
+   #include this file and have build-environment-independent source code.
+
+   A major goal of this file is to reduce conditional compilation in
+   the other source files as much as possible.  Even more, we want to avoid
+   having to generate source code particular to a build environment
+   except in this file.   
+
+   This file is NOT meant to be used by any code outside of the
+   Xmlrpc-c source tree.  There is a similar file that gets installed
+   as <xmlrpc-c/config.h> that performs the same function for Xmlrpc-c
+   interface header files that get compiled as part of a user's program.
 
    Logical macros are 0 or 1 instead of the more traditional defined and
    undefined.  That's so we can distinguish when compiling code between
    "false" and some problem with the code.
 */
 
-/* Define if va_list is actually an array. */
-#define VA_LIST_IS_ARRAY 0
-  
-/* Define if we're using a copy of libwww with built-in SSL support. */
-#define HAVE_LIBWWW_SSL 0
+#ifndef XMLRPC_CONFIG_H_INCLUDED
+#define XMLRPC_CONFIG_H_INCLUDED
 
-/* Used to mark unused variables under GCC... */
-#define ATTR_UNUSED
+/* From xmlrpc_amconfig.h */
 
-/* Define this if your C library provides reasonably complete and correct Unicode wchar_t support. */
-#define HAVE_UNICODE_WCHAR 1
-  
-#define DIRECTORY_SEPARATOR "\\"
+#define HAVE__STRICMP 1
+/* Name of package */
+#define PACKAGE "xmlrpc-c"
+/*----------------------------------*/
 
-  
-/* Windows-specific includes. */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if !defined (vsnprintf)
-  #define vsnprintf _vsnprintf
-#endif
-#if !defined (snprintf)
-  #define snprintf _snprintf
-#endif
-#if !defined (popen) 
-  #define popen _popen
+#ifndef HAVE_SETGROUPS
+#define HAVE_SETGROUPS 0
 #endif
-
-
-#include <time.h>
-#include <WINSOCK.h>
-#include <direct.h>  /* for _chdir() */
-
-/* We are linking against the multithreaded versions
-   of the Microsoft runtimes - this makes gmtime 
-   equiv to gmtime_r in that Windows gmtime is threadsafe
-*/
-#if !defined (gmtime_r)
-static struct tm* gmtime_r(const time_t *timep, struct tm* result)
-{
-	struct tm *local;
-
-	local = gmtime(timep);
-	memcpy(result,local,sizeof(struct tm));
-	return result;
-}
-
+#ifndef HAVE_ASPRINTF
+#define HAVE_ASPRINTF 0
 #endif
-
-#ifndef socklen_t
-typedef unsigned int socklen_t;
+#ifndef HAVE_SETENV
+#define HAVE_SETENV 0
 #endif
-
-/* inttypes.h */
-#ifndef int8_t
-typedef signed char       int8_t;
+#ifndef HAVE_PSELECT
+#define HAVE_PSELECT 0
 #endif
-#ifndef uint8_t
-typedef unsigned char     uint8_t;
+#ifndef HAVE_WCSNCMP
+#define HAVE_WCSNCMP 1
 #endif
-#ifndef int16_t
-typedef signed short      int16_t;
+#ifndef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY 0
 #endif
-#ifndef uint16_t
-typedef unsigned short    uint16_t;
+#ifndef HAVE_LOCALTIME_R
+#define HAVE_LOCALTIME_R 0
 #endif
-#ifndef int32_t
-typedef signed int        int32_t;
+#ifndef HAVE_GMTIME_R
+#define HAVE_GMTIME_R 0
 #endif
-#ifndef uint32_t
-typedef unsigned int      uint32_t;
+#ifndef HAVE_STRCASECMP
+#define HAVE_STRCASECMP 0
 #endif
-#ifndef int64_t
-typedef __int64           int64_t;
+#ifndef HAVE_STRICMP
+#define HAVE_STRICMP 0
 #endif
-#ifndef uint64_t
-typedef unsigned __int64  uint64_t;
+#ifndef HAVE__STRICMP
+#define HAVE__STRICMP 0
 #endif
 
-#define __inline__ __inline
+#define HAVE_WCHAR_H 1
+#define HAVE_SYS_FILIO_H 0
+#define HAVE_SYS_IOCTL_H 0
+
+#define VA_LIST_IS_ARRAY 0
+
+#define HAVE_LIBWWW_SSL 0
+
+/* Used to mark an unused function parameter */
+#define ATTR_UNUSED
+
+#define DIRECTORY_SEPARATOR "\\"
+
+#define HAVE_UNICODE_WCHAR 1
+
+/*  Xmlrpc-c code uses __inline__ to declare functions that should
+    be compiled as inline code.  GNU C recognizes the __inline__ keyword.
+    Others recognize 'inline' or '__inline' or nothing at all to say
+    a function should be inlined.
+
+    We could make 'configure' simply do a trial compile to figure out
+    which one, but for now, this approximation is easier:
+*/
+#if (!defined(__GNUC__))
+  #if (!defined(__inline__))
+    #if (defined(__sgi) || defined(_AIX) || defined(_MSC_VER))
+      #define __inline__ __inline
+    #else   
+      #define __inline__
+    #endif
+  #endif
+#endif
+
+/* MSVCRT means we're using the Microsoft Visual C++ runtime library */
+
+#ifdef _MSC_VER
+/* The compiler is Microsoft Visual C++. */
+  #define MSVCRT _MSC_VER
+#else
+  #define MSVCRT 0
+#endif
+
+#if MSVCRT
+  /* The MSVC runtime library _does_ have a 'struct timeval', but it is
+     part of the Winsock interface (along with select(), which is probably
+     its intended use), so isn't intended for use for general timekeeping.
+  */
+  #define HAVE_TIMEVAL 0
+  #define HAVE_TIMESPEC 0
+#else
+  #define HAVE_TIMEVAL 1
+  /* timespec is Posix.1b.  If we need to work on a non-Posix.1b non-Windows
+     system, we'll have to figure out how to make Configure determine this.
+  */
+  #define HAVE_TIMESPEC 1
+#endif
+
+#if MSVCRT
+  #define XMLRPC_VSNPRINTF _vsnprintf
+#else
+  #define XMLRPC_VSNPRINTF vsnprintf
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+/* Starting with MSVC 8, the runtime library defines various POSIX functions
+   such as strdup() whose names violate the ISO C standard (the standard
+   says the strXXX names are reserved for the standard), but warns you of
+   the standards violation.  That warning is 4996, along with other warnings
+   that tell you you're using a function that Microsoft thinks you
+   shouldn't.
+
+   Well, POSIX is more important than that element of ISO C, so we disable
+   that warning.
+
+   FYI, msvcrt also defines _strdup(), etc, which doesn't violate the
+   naming standard.  But since other environments don't define _strdup(),
+   we can't use it in portable code.
+*/
+#pragma warning(disable:4996)
+#endif
 
-#define HAVE_SETENV 1
-__inline BOOL setenv(const char* name, const char* value, int i) 
-{
-	return (SetEnvironmentVariable(name, value) != 0) ? TRUE : FALSE;
-}
+#define snprintf _snprintf
+#define popen _popen
+#define strtoll _strtoui64
+#define strtoull _strtoui64
 
+#endif

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/configure.in
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/configure.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/configure.in	Mon May 26 12:59:57 2008
@@ -1,30 +1,21 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(include/xmlrpc-c/base.h)
-AC_CONFIG_HEADERS(xmlrpc_amconfig.h)
+AM_CONFIG_HEADER(xmlrpc_amconfig.h)
 
 dnl =======================================================================
 dnl Define PACKAGE, VERSION, @PACKAGE@, @VERSION@
 dnl =======================================================================
 
-dnl Increment the package version for each release.
-AM_INIT_AUTOMAKE(xmlrpc-c, 1.03.13)
-
-dnl This version number needs to be changed in several *different* tricky
-dnl ways for each release. Please read the libtool documentation very
-dnl closely before touching this or making a release!
-VERSION_INFO="-version-info 7:0:4"
-AC_SUBST(VERSION_INFO)
-
-dnl Get our host type.
+dnl "x.xx" is supposed to be a version number, but is meaningless here.
+dnl The real version number is in Makefile.version.
+AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
+
+dnl Define @build@, @build_cpu@, @build_vendor@, @build_os,
+dnl @host, @host_cpu@, @host_vender, and @host_os@ substitutions.
+dnl "host" means the target system -- the one for which we are building.
+dnl "build" means the system that will do the building.
 AC_CANONICAL_HOST
-XMLRPC_HOST_TYPE=$host
-AC_SUBST(XMLRPC_HOST_TYPE)
-
-dnl We need this to compensate for an incompatibility between autoconf
-dnl and our libtool.  autoconf generates an invalid ltconfig command
-dnl otherwise.
-test -z "$target" && target=NONE
 
 dnl =======================================================================
 dnl Decide What To Build
@@ -95,11 +86,6 @@
 AC_SUBST(MUST_BUILD_LIBWWW_CLIENT)
 
 
-if test "$MUST_BUILD_WININET_CLIENT $MUST_BUILD_CURL_CLIENT $MUST_BUILD_LIBWWW_CLIENT" = "no no no"; then
-  AC_MSG_NOTICE([We are not building any client XML transport, therefore we will not build the client library at all.])
-fi
-
-
 dnl Set up the appropriate Makefile substitutions.
 
 LIBXMLRPC_CLIENT_LA=libxmlrpc_client.la
@@ -203,34 +189,6 @@
 AC_SUBST(XMLRPCCPP_H)
 AC_SUBST(XML_RPC_API2CPP_SUBDIR)
 
-dnl =======================================================================
-dnl Decide what to do about Unicode.
-dnl =======================================================================
-
-dnl Check to see if we should build our Unicode stuff.
-AC_MSG_CHECKING(whether to build Unicode support)
-AC_ARG_ENABLE(unicode,
-  [  --disable-unicode         Don't build Unicode and wchar_t capability], ,
-enable_unicode=yes)
-AC_MSG_RESULT($enable_unicode)
-
-dnl Do all the work...
-if test x"$enable_unicode" != xno; then
-    FEATURE_LIST="unicode $FEATURE_LIST"
-    HAVE_UNICODE_WCHAR_DEFINE=1
-
-    dnl Unicode function needed by test suites.
-    AC_CHECK_FUNCS(wcsncmp)
-
-    AC_CHECK_HEADERS(wchar.h, , [
-    AC_MSG_ERROR(wchar.h is required to build this library)
-    ])
-
-else
-    HAVE_UNICODE_WCHAR_DEFINE=0
-fi
-
-AC_SUBST(HAVE_UNICODE_WCHAR_DEFINE)
 
 AC_SUBST(FEATURE_LIST)
 
@@ -241,7 +199,6 @@
 
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_INSTALL
 
 
 dnl =======================================================================
@@ -255,6 +212,18 @@
 # require too much testing.)
 AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
 
+# Above sets LIBS, which is not all that useful because we don't want
+# to include every library in every link.  It also sets
+# ac_cv_lib_socket_socket, which we use to pass more specific information
+# to the configuration files.
+
+if test x"$ac_cv_lib_socket_socket" = xyes; then
+  LSOCKET=-lsocket
+else
+  LSOCKET=
+fi
+AC_SUBST(LSOCKET)
+
 # For some reason, we don't seem to need this on Solaris.  If you do
 # need it, go ahead and try it.
 # AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
@@ -266,13 +235,48 @@
 
 AC_STDC_HEADERS
 
+dnl We don't use AM_CONFIG_HEADER to define HAVE_WCHAR_H, etc. because
+dnl the following is more straightforward and easier to understand,
+dnl especially for a newcomer.  Furthermore, AM_CONFIG_HEADER represents
+dnl false as undefined, whereas our scheme represents it as 0.  undefined
+dnl is a poor choice because it often means just that you neglected to
+dnl choose a value for some reason.
+
+dnl defines ac_cv_header_wchar_h, etc:
+AC_CHECK_HEADERS(wchar.h)
+
+if test x"$ac_cv_header_wchar_h" = xyes; then
+  HAVE_WCHAR_H_DEFINE=1
+else
+  HAVE_WCHAR_H_DEFINE=0
+fi
+AC_SUBST(HAVE_WCHAR_H_DEFINE)
+
+# Needed by Abyss on Solaris:
+
+AC_CHECK_HEADERS(sys/filio.h)
+if test x"$ac_cv_header_sys_filio_h" = xyes; then
+  HAVE_SYS_FILIO_H_DEFINE=1
+else
+  HAVE_SYS_FILIO_H_DEFINE=0
+fi
+AC_SUBST(HAVE_SYS_FILIO_H_DEFINE)
+
+# Needed by Abyss on Solaris:
+
+AC_CHECK_HEADERS(sys/ioctl.h)
+if test x"$ac_cv_header_sys_ioctl_h" = xyes; then
+  HAVE_SYS_IOCTL_H_DEFINE=1
+else
+  HAVE_SYS_IOCTL_H_DEFINE=0
+fi
+AC_SUBST(HAVE_SYS_IOCTL_H_DEFINE)
+
+
 AC_CHECK_HEADERS(stdarg.h, , [
 AC_MSG_ERROR(stdarg.h is required to build this library)
 ])
 
-# I/O headers, needed by Abyss on Solaris.
-AC_CHECK_HEADERS(sys/filio.h sys/ioctl.h)
-
 
 dnl =======================================================================
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -296,13 +300,12 @@
 fi
 AC_SUBST(VA_LIST_IS_ARRAY_DEFINE)
 
-dnl See if the compiler supports __attribute__ gracefully.
-AC_MSG_CHECKING(whether compiler supports __attribute__)
+AC_MSG_CHECKING(whether compiler has __attribute__)
 AC_TRY_COMPILE(, [int x __attribute__((__unused__));],
-compiler_supports_attribute=yes,
-compiler_supports_attribute=no)
-AC_MSG_RESULT($compiler_supports_attribute)
-if test x"$compiler_supports_attribute" = xyes; then
+compiler_has_attribute=yes,
+compiler_has_attribute=no)
+AC_MSG_RESULT($compiler_has_attribute)
+if test x"$compiler_has_attribute" = xyes; then
     ATTR_UNUSED="__attribute__((__unused__))"
 else
     ATTR_UNUSED=
@@ -318,13 +321,28 @@
 AC_MSG_ERROR(your C library does not provide vsnprintf)
 ])
 
-dnl CygWin looks like Unix, but doesn't provide setgroups.
+dnl Unicode function needed by test suites.
+AC_CHECK_FUNCS(wcsncmp)
+
+dnl CygWin doesn't provide setgroups.
 AC_CHECK_FUNCS(setgroups)
 
 AC_CHECK_FUNCS(asprintf)
 
 AC_CHECK_FUNCS(setenv)
 
+dnl uclib doesn't have pselect
+AC_CHECK_FUNCS(pselect)
+
+dnl Windows doesn't have gettimeofday, localtime_r, or gmtime_r
+AC_CHECK_FUNCS(gettimeofday)
+AC_CHECK_FUNCS(localtime_r)
+AC_CHECK_FUNCS(gmtime_r)
+
+dnl Windows doesn't have strcasecmp;
+AC_CHECK_FUNCS(strcasecmp)
+AC_CHECK_FUNCS(stricmp)
+AC_CHECK_FUNCS(_stricmp)
 
 dnl =======================================================================
 dnl Checks for operating system features.
@@ -339,8 +357,6 @@
 dnl =======================================================================
 dnl ABYSS Configuration
 dnl =======================================================================
-dnl Abyss doesn't pay any attention to xmlrpc_config.h, so we need to
-dnl pass it some flags on the command-line.
 
 AC_MSG_CHECKING(whether to use Abyss pthread function)
 AC_ARG_ENABLE(abyss-threads,
@@ -353,9 +369,7 @@
 
 if test x"$enable_abyss_threads" != xno; then
     CFLAGS="$CFLAGS -D_THREAD"
-    LIBABYSS_LDADD="-lpthread"
 fi
-AC_SUBST(LIBABYSS_LDADD)
 
 
 dnl =======================================================================
@@ -435,7 +449,7 @@
 dnl Finding w3c-libwww
 dnl =======================================================================
 dnl Once upon a time, we used a patched copy of libwww that needed to
-dnl co-exist with the system copy of libwww. We have some vestigal support
+dnl co-exist with the system copy of libwww. We have some vestigal function
 dnl for keeping track of libwww's rpath, although this is no longer really
 dnl necessary.
 
@@ -540,7 +554,7 @@
 
     dnl Oh, such massive brain damage! Because there may be another copy
     dnl of curl in the default dynamic loader search path, we need to
-    dnl adjust the search patch manually. Just gag me with a backquote, OK?
+    dnl adjust the search path manually. Just gag me with a backquote, OK?
     AC_MSG_CHECKING(for curl library directory)
     dnl Yawn. We're using the regular boring version.
     CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
@@ -581,39 +595,15 @@
 enable_libxml2_backend=no)
 AC_MSG_CHECKING(whether to build the libxml2 backend)
 AC_MSG_RESULT($enable_libxml2_backend)
-ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
-AC_SUBST(ENABLE_LIBXML2_BACKEND)
-
-dnl If we're using the libxml2 backend, look for pkg-config
-if test x"$enable_libxml2_backend" != xno; then
-    AC_MSG_CHECKING(for pkg-config)
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    if test x$PKG_CONFIG = xno; then
-        AC_MSG_ERROR([*** pkg-config not found.  See http://www.freedesktop.org/software/pkgconfig/])
-    fi
-
-dnl Set up the appropriate Makefile substitutions
-    LIBXML2_CFLAGS=`pkg-config --cflags libxml-2.0`
-    AC_SUBST(LIBXML2_CFLAGS)
-    CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
-
-    LIBXML2_LIBS=`pkg-config --libs libxml-2.0`
-    AC_SUBST(LIBXML2_LIBS)
 
-    EXTRA_XML_LIBS="$LIBXML2_LIBS"
-else
-    EXTRA_XML_LIBS="-lxmlrpc_xmlparse -lxmlrpc_xmltok"
+if test $enable_libxml2_backend = yes; then
+  AC_CHECK_PROG(have_xml2_config, xml2-config, yes, no)
+  if test $have_xml2_config = no; then
+    AC_MSG_ERROR([You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no working xml2-config in your command search path), so we cannot not build for libxml2])
+  fi
 fi
-
-AC_SUBST(EXTRA_XML_LIBS)
-
-AC_MSG_CHECKING(whether to test with Electric Fence)
-AC_ARG_ENABLE(efence,
-  [  --enable-efence           Enable malloc/free debugging with Bruce Perens\'
-                              Electric Fence library (test suites only).])
-AC_MSG_RESULT($enable_efence)
-ENABLE_EFENCE=$enable_efence
-AC_SUBST(ENABLE_EFENCE)
+ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
+AC_SUBST(ENABLE_LIBXML2_BACKEND)
 
 dnl =======================================================================
 dnl Compiler information
@@ -634,57 +624,30 @@
 AC_SUBST(BUILDDIR)
 
 
+dnl =======================================================================
+dnl Output our results.
+dnl =======================================================================
 
-AC_DEFUN([AX_COMPILER_VENDOR],
-[
-AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
- [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
-  # note: don't check for gcc first since some other compilers define __GNUC__
-  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
-    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-#if !($vencpp)
-      thisisanerror;
-#endif
-])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
-  done
- ])
-])
+dnl Note that AM_CONFIG_HEADER at the top of this file outputs another
+dnl result: xmlrpc_amconfig.h .
 
-AX_COMPILER_VENDOR
+AC_OUTPUT( \
+          Makefile.srcdir \
+          config.mk \
+          xmlrpc_config.h \
+          )
 
-#  Enable 64 bit build
-AC_ARG_ENABLE(64,
-[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
 
-if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-    if test "${enable_64}" = "yes"; then
-        COMPILER_CFLAGS=-m64
-        COMPILER_CXXFLAGS=-m64
-    fi
+if test ! -f GNUmakefile; then
+  ln -s "${srcdir}/GNUmakefile" .
+fi
+if test ! -f Makefile; then
+  ln -s "${srcdir}/Makefile" .
 fi
 
-AC_SUBST(COMPILER_CFLAGS)
-AC_SUBST(COMPILER_CXXFLAGS)
-
-dnl =======================================================================
-dnl Libtool
-dnl =======================================================================
-AM_PROG_LIBTOOL
 
+if test "$MUST_BUILD_WININET_CLIENT $MUST_BUILD_CURL_CLIENT $MUST_BUILD_LIBWWW_CLIENT" = "no no no"; then
+  AC_MSG_NOTICE([\n\n==>We are not building any client XML transport (see earlier messages explaining why), therefore WE WILL NOT BUILD THE CLIENT LIBRARY.])
+fi
 
-dnl =======================================================================
-dnl Output our results.
-dnl =======================================================================
 
-AC_OUTPUT(xmlrpc-c-config \
-          xmlrpc-c-config.test \
-          Makefile.config \
-          xmlrpc_config.h \
-          lib/expat/Makefile \
-          lib/expat/xmlparse/Makefile \
-          lib/expat/xmlwf/Makefile \
-          lib/expat/sample/Makefile \
-          )
-chmod +x xmlrpc-c-config
-chmod +x xmlrpc-c-config.test

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/COPYING
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/COPYING	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/COPYING	Mon May 26 12:59:57 2008
@@ -2,7 +2,7 @@
 (and do other things with it which are controlled by copyright law)
 under a few simple conditions.
 
-Each source files describes the copyright license for that particular
+Each source file describes the copyright license for that particular
 file.  This file summarizes the licenses for your convenience.
 
 All the code written specifically for Xmlrpc-c, which is most

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/HISTORY
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/HISTORY	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/HISTORY	Mon May 26 12:59:57 2008
@@ -1,5 +1,5 @@
-(There is a detailed release-by-release change history after the
-following overview).
+For a release-by-release change history, see
+<http://xmlrpc-c.sourceforge.net/change.html>.
 
 XML-RPC For C/C++ was created by Eric Kidd in 2000, when XML-RPC was
 new and vital.  Its development was funded in significant part by
@@ -22,7 +22,7 @@
 consequently became rather stable and interest in Xmlrpc-c levelled
 off.
 
-This dark age of Xmlrpc-c lasted until November 2004, when Bryan Henderson
+This dark age of Xmlrpc-c lasted until October 2004, when Bryan Henderson
 set out to find an RPC mechanism to use in one of his projects.  Bryan
 found XML-RPC and then Xmlrpc-c.  He decided that the two were almost right
 for his needs, but he needed some small extensions.
@@ -59,395 +59,3 @@
 each of his releases consisted of a single source code tarball, and
 that tarball was not signed.  Bryan removed some redundant sources of
 information from the package and the web site.
-
-
-DETAILED RELEASE HISTORY:
-
-
-(BJH means Bryan Henderson <bryanh at giraffe-data.com>)
-(SAB means Steven A. Bone <sbone at pobox.com>)
-
-1.03.14 - 06.04.15
-
-  *BJH: Fix int/size_t mismatch in xmlrpc_server_abyss.c (manifests on 64
-        bit systems).
-
-1.03.13 - 06.04.05
-
-  *BJH: Fix build on system with no wchar_t.
-
-  *BJH: Abyss XML-RPC server accepts (ignores) parameters after
-        "text/xml" in Content-type header from client.
-
-1.03.12 - 06.03.20
-
-  *BJH: Fix build of transport_config.h
-
-  *BJH: Remove tantalizing but broken RPM spec file.
-
-  *BJH: Remove casprintf.o from link of 'xmlrpc', 'xmlrpc_transport', because
-        it conflicts with the version in libxmlrpc_client.
-
-  *BJH: Change order of libraries in linking 'xml-rpc-api2cpp' to fix
-        undefined reference error.
-
-1.03.11 - 06.01.25
-
-  *Mike Goddard: in Xmlrpc-c-config, allow libwww-client as synonym 
-        for client, for backward compatibility.
-
-  *Daniel Dlab: Correct INTERNET_FLAG_IGNORE_CERT_DATE_INVALID to
-        ERROR_INTERNET_SEC_CERT_DATE_INVALID in Wininet transport.
-
-  *BJH: Fix memory leak in C++ client result value - one leak per RPC.
-
-  *BJH: Fix memory leak in C++ client - one leak per RPC.
-
-  *BJH: Fix signature in xmlrpc_sample_add_server C++ example program.
-
-  *BJH: Fix memory leak in xmlrpc_server_abyss_set_handler().
-
-  *BJH: Fix memory leak in server method registry -- one leak for each
-        RPC.
-
-  *BJH: Fix memory leak in wide character constructor functions.
-
-1.03.10 - December 18, 2005
-
-  *BJH: Change default minimum on paramList::getDouble() from DBL_MIN
-        to -DBL_MAX.
-
-1.03.09 - December 7, 2005
-
-  * BJH: Fix size_t/int type mismatch in xmlrpc_server_abyss.c.
-
-  * BJH: meerkat-app-list example program: remove NUL character from
-         time period parameter.
-
-1.03.08 - November 23, 2005
-
-  * BJH: Fix use of uninitialized 'name' member in Abyss ServerCreate().
-
-  * BJH: Install client_simple.hpp interface header file.
-
-  * BJH: Fix bogus NULL default value for string argument in 
-         serverAbyss constructor.  Use null string instead
-
-  * BJH: Remove 'cpptest' from default make.
-
-  * Mike West:
-         Don't include tools/xmlrpc and tools/xmlrpc_transport
-         in the build if client library configured out.
-
-1.03.07 - October 22, 2005
-
-  * BJH: Remove curl_global_cleanup() so that multiple simultaneous
-         Curl client XML transports per process are essentially
-         possible and they don't interfere with other process use of
-         Curl.
-
-  * BJH: Serialize access to synchronous Curl session in Curl client
-         XML transport (to avoid crashes with multiple threads).
-
-  * BJH: When installing legacy header symlinks, remove old names first.
-
-1.03.06 - October 6, 2005
-
-  * BJH: Fix use of pthread_mutex_t in girmem.hpp so it can be used in
-         a Windows program.
-
-  * BJH: Don't include xml-rpc-api2cpp in the build with --disable-cpp.
-
-  * BJH: Fix bug in tools build, where it tries to link libxml2 instead
-         of expat.
-
-  * BJH: Add missing xmlrpc_config.h so lib/abyss/src/socket.h will
-         compile on Solaris.
-
-1.03.05 - September 24, 2005
-
-  * BJH: Change int to long in XMLRPC_STRUCTSIZE to correct 64 bit
-         compile error.
-
-  * BJH: Add virtual destructor for client to quiet compiler warning.
-
-  * BJH: Don't try to build Abyss example programs if Abyss libraries not
-         built.
-
-  * BJH: Include <sys/filio.h> if it exists (i.e. Solaris).
-
-  * BJH: Include <stdlib.h> instead of <malloc.h>, which doesn't exist
-         in some environments.
-
-1.03.04 - September 9, 2005
-
-  * BJH: Make Abyss work with short writes to sockets.  Thanks 
-         Alistair John Strachan <s0348365 at sms.ed.ac.uk>.
-
-  * BJH: Remove unused SSPRINTF definition that won't compile on AIX
-         because it has variable arguments.
-
-  * BJH: Fix Curl transport bug: arbitrary values for SSL verify options.
-
-1.03.03 - August 4, 2005
-
-  * SAB: Fix for Windows what broke between 1.02 and 1.03.
-
-  * SAB: Fix incorrect result of xmlrpc_read_string_w() (wrong-size memcpy()).
-
-  * BJH: Fix various things that don't compile on AIX.
-
-  * BJH: Fix bug: doesn't install libxmlrpc_abyss.
-
-  * BJH: Fix missing -l options in xmlrpc-c-config --client
-
-1.03.02 - July 20, 2005
-
-  * BJH: Fix for bug in which Abyss doesn't build with either thread or
-    fork capability.  (Add -D_UNIX and -D_THREAD compile options).
-
-1.03.01 - July 9, 2005
-
-  * BJH: Fix for libxml2, no curl builds. make clean cleans test directory
-
-1.03 - June 26, 2005
-
-  * BJH: new C++ libraries designed for pure C++ applications
-    (Application never sees the underlying C structures or reference
-    counts).
-
-  * BJH: Make Curl do cookies (session only) and persistent connections.
-    This is only for calls through the synchronous interface, and the
-    synchronous interface is no longer thread safe -- you can have only
-    one thread making calls through it.
-
-  * BJH: Add Curl SSL_NO_VERIFYPEER, SSL_NO_VERIFYHOST control.
-
-  * BJH: Add User-Agent to Curl transport, Xmlrpc program.
-
-  * BJH: libwww transport does not do the weird handling of the "auth"
-    cookie.  It used to have a global cookie (one cookie shared by all
-    servers) called "auth", which it maintained in an environment
-    variable.
-
-  * BJH: interface header files renamed from xmlrpc_xxx to xmlrpc-c/xxx
-    (old names installed a symbolic links for backward compatibility).
-
-  * BJH: libxmlrpc_server_abyss: Add ability to set the /RPC2 handler
-    without also setting default handler, and to set handlers for files
-    other than /RPC2.
-
-  * BJH: libxmlrpc_server_abyss: Eliminate global variable for registry
-    handle.
-
-  * BJH: Abyss: allow user's request handlers to have context
-    (Add URIHandler2 type).
-
-  * BJH: Add xmlrpc_datetime_new_sec(), xmlrpc_read_datetime_sec().
-
-  * BJH: Builds on AIX - new __inline definition, uint32_t instead of uint32,
-    et al.
-
-  * BJH: Don't build client library if not building any client XML      
-    transport.
-
-  * BJH: Fix bug: xmlrpc_serialize_base64_data() doesn't free working
-    storage.
-
-  * BJH: Fix mysterious disablement of forking Abyss (ServerRunForked()).
-
-  * BJH: Fix bug: 'make install' doesn't install libxmlrpc_xmltok.
-    
-  * BJH: Renamed CGI stuff, add non-builtin-registry style of CGI server.
-
-  * BJH: Break up 'rpctest', rename to 'test'.
-
-1.02 - April 4, 2005
-
-  * SAB: Win32 http.sys server: Add new project and sample as 
-    an alternative to Abyss on current Win32 platforms.  Does
-    basic authentication and SSL.  Requires recent Platform SDK to
-    build.
-  
-  * BJH: Add xmlrpc_int_new(), xmlrpc_read_int(), etc., 
-    xmlrpc_decompose_value()
-
-  * BJH: Add nil (<nil/>, XMLRPC_TYPE_NIL) capability.
-  
-  * SAB: WinInet Transport: Add Ignore Invalid SSL certs option.
-  
-  * BJH: Add 'network_interface' option to Curl transport.
-
-  * BJH: Add basic authentication to 'xmlrpc' program.
-
-  * BJH: Add 'xmlrpc_transport' tool.
-
-  * SAB: Improve use of libCurl in Win32.  Add documentation
-    and alter some project and configuration files.
-
-  * BJH: Add transport-specific options.
-
-  * BJH: Use GNUmakefile to catch non-GNU make
-
-  * BJH: Fix usage message in xmlrpc-c-config.
-
-  * BJH: Curl transport: check for failure of Winsock startup.
-
-  * BJH: Fix memory leak in Curl - not freeing curlTransaction.
-
-  * SAB: WinInet Transport: Fix bad authentication header.
-  
-
-1.01 - January 8, 2005
-
-  * SAB: Windows works again; new build strategy.
-
-  * BJH: Abyss:  Add ConnCreate2() with foreground capability.
-
-  * BJH: Abyss:  Add ServerRunOnce2() with foreground capability.
-
-  * BJH: Abyss:  Fix ServerRunOnce().
-
-  * BJH: Add xmlrpc_server_abyss().
-
-  * BJH: Abyss pthreads is default
-
-  * BJH: Clean up client transport multiplexor
-
-  * BJH: Separate out server registry stuff into new libxml_server.
-  
-  * BJH: Examples/Makefile uses new xmlrpc-c-config.test so as to be a
-    better example.
-
-  * BJH: Fail when structure format specifier does not end in
-    "*" instead of just asserting that it does.
-
-  * BJH: Fail when structure format specifier is not closed by "}"
-    instead of just asserting that it is.
-
-  * BJH: Add xmlrpc_array_read_item().
-
-1.00 - October 25, 2004
-  * New modular client XML transport structure.  Curl and Wininet transports
-    (in addition to existing libwww).
-  * Bryan Henderson: create Makefile.config; make examples/ directory use
-    static make file.
-  * Bryan Henderson: replace Makefile.am with already built Makefile.in.
-  * Peter Astrand: make it compile with Gcc 3.1.1.
-  * Joe Shaw: Can use libxml2 instead of libexpat.
-  * Bernhard Herzog: const fixes
-  * Stephen Blackheath: ./configure support for building Abyss
-    with pthreads.
-  * Jeff Dubrule: Removed C++ comments from expat.
-  * Patrick Boykin: Facility to copy xmlrpc_server_info structs.
-
-0.9.10 - Eric Kidd <eric.kidd at pobox.com> - 30 June 2001
-
-  * Man pages!
-  * Debian packages!
-
-  * Jeff Stewart: NT CGI fixes.
-  * Andy Maloney: Win32 xmlrpc_win32_config.h fixes.
-  * Mike Bytnar: Solaris build fixes.  Thanks!
-
-  * No more 'CVS' directories lurking in the dist tarball.
-  * Disabled rpath stuff so we comply with Debian policy.
-  * wchar_t code can now be disabled.
-  * New interop server.
-  * Parts of an interop client.
-  * Lots of interop fixes.
-  * Other stuff.
-
-0.9.9 - Eric Kidd <eric.kidd at pobox.com> - 03 April 2001
-
-  * xml-rpc-api2cpp now generates usable proxy classes.
-  * Luke Howard: Default method capability.
-  * Abstract XML parser API (but you'll need to edit makefiles to use it).
-  * Implemented a configurable size limit for XML data off the network.
-
-  * Ability to build and parse XML-RPC values using wchar_t strings.
-  * Basic UTF-8 handling: Refuse to process invalid UTF-8 from network,
-    print warnings when sending invalid UTF-8 *to* network.
-  * Highly robust UTF-8 validator, decoder, encoder.
-
-  * Modularized the build system--build only what you need.
-  * Integrated Electric Fence into build system (optional).
-
-  * Fixed all recent, reproducible bugs in CVS. These were generally
-    Windows build bugs.
-  * Andy Maloney: Build fixes for Windows.
-  * Mike Bytnar: Build fixes for Solaris.
-  * RedHat 7 warning fixes.
-
-0.9.8 - Eric Kidd <eric.kidd at pobox.com> - 19 February 2001
-
-  * J. Alan Eldridge, Rosimildo daSIlva: Build fixes.
-  * Send 'encoding="UTF-8"' in XML prologue.
-
-0.9.7 - Eric Kidd <eric.kidd at pobox.com> - 14 February 2001
-
-  * SECURITY: Configurable nesting limits (see advisory 1) to prevent
-    denial-of-service attacks and stack overflow.
-  * Win32 build fixes from Alex Olugbile.
-  * Function name fix from Luke Howard.
-
-0.9.6w - Eric Kidd <eric.kidd at pobox.com> - 02 February 2001
-
-  * Merged Win32 VC/C++ changes from Alex and Ian.
-  * Merged Win32 Cygwin changes from Rosimildo daSilva
-
-0.9.6 - Eric Kidd <eric.kidd at pobox.com> - 30 January 2001
-
-  * Fixed lots of gcc warnings.
-  * Added a new 'xmlrpc_server_info' class, which allows you to
-    set options on a per-server basis.
-  * HTTP Basic authentication.
-  * Added internal implementation of system.multicall, lots of brutal test
-    cases, and stubs for other system.* commands.
-  * Added APIs for accessing CGI and Abyss method registries.
-  * Implemented system.listMethods, system.methodHelp, system.methodSignature.
-  * Fixed stupid bug in parsing of "(ss*)"-style array descriptions
-    where there were no extra elements.
-  * Added highly experimental hacked copy of mod_gzip into the
-    tools/turbocharger directory. This version does gzip *and* deflate!
-  * Added xml-rpc-api2txt, since XML-RPC doesn't have any IDL language.
-  * Merged in Ilya Goldberg's libwww/SSL setup code.
-
-0.9.5 - Eric Kidd <eric.kidd at pobox.com> - 20 January 2001
-
-  * Bug fix: Make sure CGI-based servers send correct content-length.
-
-0.9.4 - Eric Kidd <eric.kidd at pobox.com> - 18 January 2001
-
-  * Services for CGI-based servers.
-
-0.9.3 - Eric Kidd <eric.kidd at pobox.com> - 14 January 2001
-
-  * Works with Libwww 5.2.8, even when linked against expat.
-  * Added xmlrpc_value_type and XmlRpcValue::getType functions.
-  * Miscellaneous API tweaks to discourage writing of incorrect programs.
-    Should not affect any correct programs.
-
-0.9.2 - Eric Kidd <eric.kidd at pobox.com> - 12 January 2001
-
-  * Improved error messages.
-  * Refuse to link against libwww if it was built with expat.
-
-0.9.1 - Eric Kidd <eric.kidd at pobox.com> - 9 January 2001
-
-  * Integrated Rick Blair's fix to speed up libwww client.
-  * Added informative URLs to Meerkat example programs.
-  * Hid the implementation details of xmlrpc_value, just to keep
-    people honest. (No more dangerous allocation on the stack!)
-  * Minor C++ code cleanup after buying modern C++ books.
-  * Documentation improvements.
-
-Some other contributions of unknown date:
-
-  Adrian Likins made lots of good, real-world suggestions for improvement.
-
-  Ian MacLean made patches from Alex's Windows port.
-
-  Brian Quinlan of the Active State company made lots of cool patches,
-  including preliminary wchar_t capability.
-

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/TODO
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/TODO	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/doc/TODO	Mon May 26 12:59:57 2008
@@ -7,16 +7,8 @@
 FUNCTIONAL CHANGES
 ------------------
 
-Make xmlrpc_server_abyss() catch a SIGTERM and terminate cleanly.
-
-Make a system.shutdown XML-RPC method to send SIGTERM to its server.
-Don't know what kind of security.
-
-Provide an interface for Abyss servers where the user accepts the TCP
-connection and passes to Xmlrpc-c the open socket.  This would be
-useful for inetd servers, among others.
-
-Document the xmlrpc-c/server_abyss.hpp interface.
+Put details in the manual for the xmlrpc-c/server_abyss.hpp interface:
+libxmlrpc_server_abyss++.html.
 
 Implement pluggable XML transports on the server side like on the
 client side.
@@ -24,9 +16,6 @@
 Create a non-XML non-HTTP efficient transport, client and server.
 The tools/binmode-rpc-kit/ directory might be useful.  Consider XDR.
 
-Make clients and servers reentrant (this requires getting or making
-reentrant HTTP libraries).
-
 Change the argument order of asynchronous response callbacks to be
 more consistent with the xmlrpc_client_call_asynch function.  Also
 take a look at the server method callback.
@@ -37,9 +26,8 @@
 This will break binary and source API compatibility in a very minor
 way.
 
-Make a Perl interface to Xmlrpc-c libraries.  This would be better than the
-existing Perl RPC::XML modules because the latter are Perl all the way down
-to the sockets and are thus very slow.
+Expand the Perl interface to Xmlrpc-c libraries to do server functions.
+Maybe match some other features of RPC::XML.
 
 Don't use xmlrpc_value for things that aren't part of an XML-RPC call or
 response.  It's confusing.  In particular, we use an xmlrpc_value
@@ -49,12 +37,16 @@
 Don't use XML-RPC fault codes internally.  It's confusing.  Plus, there's
 no need for fault codes at all.  Just use the string descriptions.
 
+Add a function to deregister a method from a method registry.
+
+Add a "registry" type that works via a filesystem directory.  There is
+a .so file for each method with its code, and probably a configuration
+file.  Make it dynamically updatable.
+
 
 IMPLEMENTATION CHANGES
 ----------------------
 
-Replace dynamically created make files with static ones based on GNU make.
-
 Use function pointers to access cleanup code in xmlrpc_DECREF?
 
 Or even better: Should we create some kind of class-like system to declare

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/Makefile	Mon May 26 12:59:57 2008
@@ -5,14 +5,15 @@
 # these programs depend.
 
 
-ifeq ($(SRCDIR)x,x)
+ifeq ($(SRCDIR),)
 SRCDIR = $(CURDIR)/..
-BUILDDIR = $(SRCDIR)
+BLDDIR = $(SRCDIR)
 endif
+SUBDIR = examples
 
-default: all
+include $(BLDDIR)/config.mk
 
-include $(BUILDDIR)/Makefile.config
+default: all
 
 CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
 LDFLAGS = $(LADD)
@@ -20,19 +21,25 @@
 # If this were a real application, working from an installed copy of
 # Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'.  It would be
 # found in the user's PATH.
-XMLRPC_C_CONFIG = $(BUILDDIR)/xmlrpc-c-config.test
+XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
 
 CLIENTPROGS = \
   auth_client \
-  query-meerkat \
   synch_client \
   xmlrpc_sample_add_client \
   xmlrpc_asynch_client \
 
+ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
+  CLIENTPROGS += interrupted_client
+endif
+
 SERVERPROGS_CGI = \
   xmlrpc_sample_add_server.cgi
 
 SERVERPROGS_ABYSS = \
+  interrupted_server \
+  xmlrpc_inetd_server \
+  xmlrpc_socket_server \
   xmlrpc_loop_server \
   xmlrpc_sample_add_server \
   xmlrpc_server_validatee \
@@ -54,7 +61,7 @@
   PROGS += $(SERVERPROGS_CGI) 
 endif
 
-INCLUDES = $(shell $(XMLRPC_C_CONFIG) client abyss-server --cflags)
+INCLUDES = -I. $(shell $(XMLRPC_C_CONFIG) client abyss-server --cflags)
 
 LDADD_CLIENT = \
   $(shell $(XMLRPC_C_CONFIG) client --ldadd)
@@ -75,8 +82,12 @@
 endif
 
 .PHONY: cpp/all
-cpp/all:
-	$(MAKE) -C $(dir $@) $(notdir $@)
+cpp/all: $(BLDDIR)/examples/cpp
+	$(MAKE) -C cpp -f $(SRCDIR)/examples/cpp/Makefile all
+
+# When building in separate tree, directory won't exist yet
+$(BLDDIR)/examples/cpp:
+	mkdir $@
 
 $(CLIENTPROGS):%:%.o
 	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
@@ -90,17 +101,25 @@
 gen_sample_add_xml:%:%.o
 	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE)
 
-%.o:%.c
+OBJECTS = $(patsubst %,%.o,$(patsubst %.cgi,%_cgi,$(PROGS)))
+
+$(OBJECTS):%.o:%.c
 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
 
-*.c: config.h xmlrpc_amconfig.h
+# config.h and xmlrpc_amconfig.h just describe the build environment.
+# We use them so that the example programs will build in users'
+# various environments.  If you're copying these examples, you can
+# just remove these headers from the programs and hardcode whatever is
+# right for your build environment.
+
+$(OBJECTS): config.h xmlrpc_amconfig.h
 
 config.h:
-	$(LN_S) $(BUILDDIR)/xmlrpc_config.h $@
+	$(LN_S) $(BLDDIR)/xmlrpc_config.h $@
 xmlrpc_amconfig.h:
-	$(LN_S) $(BUILDDIR)/$@ .
+	$(LN_S) $(BLDDIR)/$@ .
 
-include $(SRCDIR)/Makefile.common
+include $(SRCDIR)/common.mk
 
 .PHONY: clean
 clean: clean-common

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/auth_client.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/auth_client.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/auth_client.c	Mon May 26 12:59:57 2008
@@ -20,22 +20,26 @@
 #define VERSION    "1.0"
 #define SERVER_URL "http://localhost:8080/RPC2"
 
-static void die_if_fault_occurred (xmlrpc_env *env)
-{
-    if (env->fault_occurred) {
+
+
+static void
+die_if_fault_occurred(xmlrpc_env * const envP) {
+    if (envP->fault_occurred) {
         fprintf(stderr, "XML-RPC Fault: %s (%d)\n",
-                env->fault_string, env->fault_code);
+                envP->fault_string, envP->fault_code);
         exit(1);
     }
 }
 
+
+
 int 
 main(int           const argc, 
      const char ** const argv ATTR_UNUSED) {
 
     xmlrpc_env env;
-    xmlrpc_server_info * server;
-    xmlrpc_value * result;    
+    xmlrpc_server_info * serverP;
+    xmlrpc_value * resultP;
     xmlrpc_int sum;
     
     if (argc-1 > 0) {
@@ -48,29 +52,29 @@
     xmlrpc_env_init(&env);
 
     /* Make a new object to represent our XML-RPC server. */
-    server = xmlrpc_server_info_new(&env, SERVER_URL);
+    serverP = xmlrpc_server_info_new(&env, SERVER_URL);
     die_if_fault_occurred(&env);
 
     /* Set up our authentication information. */
-    xmlrpc_server_info_set_basic_auth(&env, server, "jrandom", "secret");
+    xmlrpc_server_info_set_basic_auth(&env, serverP, "jrandom", "secret");
     die_if_fault_occurred(&env);
 
-    result = 
+    resultP = 
         xmlrpc_client_call_server(
-            &env, server, "sample.add", "(ii)", 
+            &env, serverP, "sample.add", "(ii)", 
             (xmlrpc_int32) 5, (xmlrpc_int32) 7);
     die_if_fault_occurred(&env);
 
     /* Dispose of our server object. */
-    xmlrpc_server_info_free(server);
+    xmlrpc_server_info_free(serverP);
     
     /* Get the authentication information and print it out. */
-    xmlrpc_read_int(&env, result, &sum);
+    xmlrpc_read_int(&env, resultP, &sum);
     die_if_fault_occurred(&env);
-    printf("The sum  is %d\n", sum);
+    printf("The sum is %d\n", sum);
     
     /* Dispose of our result value. */
-    xmlrpc_DECREF(result);
+    xmlrpc_DECREF(resultP);
 
     /* Shut down our XML-RPC client library. */
     xmlrpc_env_clean(&env);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/Makefile	Mon May 26 12:59:57 2008
@@ -5,14 +5,15 @@
 # these programs depend.
 
 
-ifeq ($(SRCDIR)x,x)
+ifeq ($(SRCDIR),)
 SRCDIR = $(CURDIR)/../..
-BUILDDIR = $(SRCDIR)
+BLDDIR = $(SRCDIR)
 endif
+SUBDIR=examples/cpp
 
-default: all
+include $(BLDDIR)/config.mk
 
-include $(BUILDDIR)/Makefile.config
+default: all
 
 CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
 LDFLAGS = $(LADD)
@@ -20,18 +21,18 @@
 # If this were a real application, working from an installed copy of
 # Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'.  It would be
 # found in the user's PATH.
-XMLRPC_C_CONFIG = $(BUILDDIR)/xmlrpc-c-config.test
+XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
 
 
 SERVERPROGS_ABYSS = \
+  xmlrpc_inetd_server \
+  xmlrpc_loop_server \
   xmlrpc_sample_add_server \
 
-LEGACY_CLIENTPROGS = \
-  meerkat-app-list
-
 CLIENTPROGS = \
   xmlrpc_sample_add_client \
   sample_add_client_complex \
+  asynch_client \
 
 # Build up PROGS:
 PROGS = 
@@ -41,10 +42,16 @@
 endif
 
 ifeq ($(MUST_BUILD_CLIENT),yes)
-  PROGS += $(CLIENTPROGS) $(LEGACY_CLIENTPROGS)
+  PROGS += $(CLIENTPROGS)
 endif
 
-INCLUDES = $(shell $(XMLRPC_C_CONFIG) c++2 client abyss-server --cflags)
+PROGS += pstream_inetd_server
+
+ifeq ($(MUST_BUILD_CLIENT),yes)
+  PROGS += pstream_client
+endif
+
+INCLUDES = -I. $(shell $(XMLRPC_C_CONFIG) c++2 client abyss-server --cflags)
 
 LDADD_SERVER_ABYSS = \
   $(shell $(XMLRPC_C_CONFIG) c++2 abyss-server --ldadd)
@@ -55,31 +62,42 @@
 LDADD_BASE = \
   $(shell $(XMLRPC_C_CONFIG) c++2 --ldadd)
 
-LDADD_LEGACY_CLIENT = \
-  $(shell $(XMLRPC_C_CONFIG) c++ client --ldadd)
-
 all: $(PROGS)
 
 $(SERVERPROGS_ABYSS):%:%.o
 	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
 
-$(LEGACY_CLIENTPROGS):%:%.o
-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT)
-
 $(CLIENTPROGS):%:%.o
 	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
 
-%.o:%.cpp
+
+LDADD_PSTREAM_CLIENT = \
+  $(shell $(XMLRPC_C_CONFIG) c++2 client --ldadd)
+
+pstream_client:%:%.o
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_PSTREAM_CLIENT)
+
+LDADD_PSTREAM_SERVER = \
+  $(shell $(XMLRPC_C_CONFIG) c++2 pstream-server --ldadd)
+
+pstream_inetd_server:%:%.o
+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_PSTREAM_SERVER)
+
+OBJECTS = $(PROGS:%=%.o)
+
+$(OBJECTS):%.o:%.cpp
 	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $<
 
-*.c: config.h xmlrpc_amconfig.h
+# See example/Makefile for an explanation of config.h and xmlrpc_amconfig.h
+
+$(OBJECTS): config.h xmlrpc_amconfig.h
 
 config.h:
-	$(LN_S) $(BUILDDIR)/xmlrpc_config.h $@
+	$(LN_S) $(BLDDIR)/xmlrpc_config.h $@
 xmlrpc_amconfig.h:
-	$(LN_S) $(BUILDDIR)/$@ .
+	$(LN_S) $(BLDDIR)/$@ .
 
-include $(SRCDIR)/Makefile.common
+include $(SRCDIR)/common.mk
 
 .PHONY: clean
 clean: clean-common

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/sample_add_client_complex.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/sample_add_client_complex.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/sample_add_client_complex.cpp	Mon May 26 12:59:57 2008
@@ -14,12 +14,13 @@
   facility.  It is for demonstration purposes.
 =============================================================================*/
 
+#include <cassert>
+#include <cstdlib>
 #include <string>
 #include <iostream>
 #include <xmlrpc-c/girerr.hpp>
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/client.hpp>
-#include <cassert>
 
 using namespace std;
 
@@ -32,7 +33,11 @@
     }
 
     try {
-        xmlrpc_c::clientXmlTransport_curl myTransport;
+        xmlrpc_c::clientXmlTransport_curl myTransport(
+            xmlrpc_c::clientXmlTransport_curl::constrOpt()
+            .no_ssl_verifyhost(true)
+            .user_agent("sample_add/1.0"));
+
         xmlrpc_c::client_xml myClient(&myTransport);
 
         string const methodName("sample.add");
@@ -47,8 +52,6 @@
 
         xmlrpc_c::carriageParm_curl0 myCarriageParm(serverUrl);
 
-        xmlrpc_c::value result;
-        
         myRpcP->call(&myClient, &myCarriageParm);
 
         assert(myRpcP->isFinished());
@@ -58,8 +61,8 @@
 
         cout << "Result of RPC (sum of 5 and 7): " << sum << endl;
 
-    } catch (girerr::error const error) {
-        cerr << "Client threw error: " << error.what() << endl;
+    } catch (exception const& e) {
+        cerr << "Client threw error: " << e.what() << endl;
     } catch (...) {
         cerr << "Client threw unexpected error." << endl;
     }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_client.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_client.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_client.cpp	Mon May 26 12:59:57 2008
@@ -1,3 +1,4 @@
+#include <cstdlib>
 #include <string>
 #include <iostream>
 #include <xmlrpc-c/girerr.hpp>
@@ -28,8 +29,8 @@
 
         cout << "Result of RPC (sum of 5 and 7): " << sum << endl;
 
-    } catch (girerr::error const error) {
-        cerr << "Client threw error: " << error.what() << endl;
+    } catch (exception const& e) {
+        cerr << "Client threw error: " << e.what() << endl;
     } catch (...) {
         cerr << "Client threw unexpected error." << endl;
     }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_server.cpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_server.cpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/cpp/xmlrpc_sample_add_server.cpp	Mon May 26 12:59:57 2008
@@ -1,4 +1,11 @@
 #include <cassert>
+#include <stdexcept>
+#include <iostream>
+#ifdef WIN32
+#  include <windows.h>
+#else
+#  include <unistd.h>
+#endif
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
@@ -6,6 +13,13 @@
 
 using namespace std;
 
+#ifdef WIN32
+  #define SLEEP(seconds) SleepEx(seconds * 1000);
+#else
+  #define SLEEP(seconds) sleep(seconds);
+#endif
+
+
 class sampleAddMethod : public xmlrpc_c::method {
 public:
     sampleAddMethod() {
@@ -26,6 +40,11 @@
         paramList.verifyEnd(2);
         
         *retvalP = xmlrpc_c::value_int(addend + adder);
+
+        // Sometimes, make it look hard (so client can see what it's like
+        // to do an RPC that takes a while).
+        if (adder == 1)
+            SLEEP(2);
     }
 };
 
@@ -35,21 +54,24 @@
 main(int           const, 
      const char ** const) {
 
-    xmlrpc_c::registry myRegistry;
-
-    xmlrpc_c::methodPtr const sampleAddMethodP(new sampleAddMethod);
-
-    myRegistry.addMethod("sample.add", sampleAddMethodP);
+    try {
+        xmlrpc_c::registry myRegistry;
 
-    xmlrpc_c::serverAbyss myAbyssServer(
-        myRegistry,
-        8080,              // TCP port on which to listen
-        "/tmp/xmlrpc_log"  // Log file
-        );
-
-    myAbyssServer.run();
-    // xmlrpc_c::serverAbyss.run() never returns
-    assert(false);
+        xmlrpc_c::methodPtr const sampleAddMethodP(new sampleAddMethod);
 
+        myRegistry.addMethod("sample.add", sampleAddMethodP);
+        
+        xmlrpc_c::serverAbyss myAbyssServer(
+            myRegistry,
+            8080,              // TCP port on which to listen
+            "/tmp/xmlrpc_log"  // Log file
+            );
+        
+        myAbyssServer.run();
+        // xmlrpc_c::serverAbyss.run() never returns
+        assert(false);
+    } catch (exception const& e) {
+        cerr << "Something failed.  " << e.what() << endl;
+    }
     return 0;
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/gen_sample_add_xml.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/gen_sample_add_xml.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/gen_sample_add_xml.c	Mon May 26 12:59:57 2008
@@ -16,10 +16,10 @@
 #include "config.h"
 
 static void 
-die_if_fault_occurred (xmlrpc_env *env) {
-    if (env->fault_occurred) {
+die_if_fault_occurred(xmlrpc_env * const envP) {
+    if (envP->fault_occurred) {
         fprintf(stderr, "XML-RPC Fault: %s (%d)\n",
-                env->fault_string, env->fault_code);
+                envP->fault_string, envP->fault_code);
         exit(1);
     }
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/synch_client.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/synch_client.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/synch_client.c	Mon May 26 12:59:57 2008
@@ -11,11 +11,11 @@
 #define NAME "XML-RPC C Test Client synch_client"
 #define VERSION "1.0"
 
-static void die_if_fault_occurred (xmlrpc_env *env)
-{
-    if (env->fault_occurred) {
+static void
+die_if_fault_occurred(xmlrpc_env * const envP) {
+    if (envP->fault_occurred) {
         fprintf(stderr, "XML-RPC Fault: %s (%d)\n",
-                env->fault_string, env->fault_code);
+                envP->fault_string, envP->fault_code);
         exit(1);
     }
 }
@@ -28,7 +28,7 @@
 
     xmlrpc_env env;
     xmlrpc_value * resultP;
-    const char * state_name;
+    const char * stateName;
 
     if (argc-1 > 0) {
         fprintf(stderr, "No arguments");
@@ -48,10 +48,10 @@
     die_if_fault_occurred(&env);
     
     /* Get our state name and print it out. */
-    xmlrpc_read_string(&env, resultP, &state_name);
+    xmlrpc_read_string(&env, resultP, &stateName);
     die_if_fault_occurred(&env);
-    printf("%s\n", state_name);
-    free((char*)state_name);
+    printf("%s\n", stateName);
+    free((char*)stateName);
    
     /* Dispose of our result value. */
     xmlrpc_DECREF(resultP);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_asynch_client.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_asynch_client.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_asynch_client.c	Mon May 26 12:59:57 2008
@@ -3,6 +3,10 @@
    simpler synchronous client xmlprc_sample_add_client.c, except that
    it adds 3 different pairs of numbers with the summation RPCs going on
    simultaneously.
+
+   Use this with xmlrpc_sample_add_server.  Note that that server
+   intentionally takes extra time to add 1 to anything, so you can see
+   our 5+1 RPC finish after our 5+0 and 5+2 RPCs.
 */
 
 #include <stdlib.h>
@@ -17,10 +21,10 @@
 #define VERSION "1.0"
 
 static void 
-die_if_fault_occurred (xmlrpc_env *env) {
-    if (env->fault_occurred) {
+die_if_fault_occurred(xmlrpc_env * const envP) {
+    if (envP->fault_occurred) {
         fprintf(stderr, "Something failed. %s (XML-RPC fault code %d)\n",
-                env->fault_string, env->fault_code);
+                envP->fault_string, envP->fault_code);
         exit(1);
     }
 }
@@ -28,13 +32,13 @@
 
 
 static void 
-handle_sample_add_response(const char *   const server_url,
-                           const char *   const method_name,
-                           xmlrpc_value * const param_array,
+handle_sample_add_response(const char *   const serverUrl,
+                           const char *   const methodName,
+                           xmlrpc_value * const paramArrayP,
                            void *         const user_data ATTR_UNUSED,
                            xmlrpc_env *   const faultP,
                            xmlrpc_value * const resultP) {
-    
+
     xmlrpc_env env;
     xmlrpc_int addend, adder;
     
@@ -44,14 +48,14 @@
     /* Our first four arguments provide helpful context.  Let's grab the
        addends from our parameter array. 
     */
-    xmlrpc_decompose_value(&env, param_array, "(ii)", &addend, &adder);
+    xmlrpc_decompose_value(&env, paramArrayP, "(ii)", &addend, &adder);
     die_if_fault_occurred(&env);
 
     printf("RPC with method '%s' at URL '%s' to add %d and %d "
-           "has completed\n", method_name, server_url, addend, adder);
+           "has completed\n", methodName, serverUrl, addend, adder);
     
     if (faultP->fault_occurred)
-        printf("The RPC failed.  %s", faultP->fault_string);
+        printf("The RPC failed.  %s\n", faultP->fault_string);
     else {
         xmlrpc_int sum;
 
@@ -68,10 +72,11 @@
 main(int           const argc, 
      const char ** const argv ATTR_UNUSED) {
 
-    char * const url = "http://localhost:8080/RPC2";
-    char * const methodName = "sample.add";
+    const char * const serverUrl = "http://localhost:8080/RPC2";
+    const char * const methodName = "sample.add";
 
     xmlrpc_env env;
+    xmlrpc_client * clientP;
     xmlrpc_int adder;
 
     if (argc-1 > 0) {
@@ -82,17 +87,21 @@
     /* Initialize our error environment variable */
     xmlrpc_env_init(&env);
 
-    /* Create the Xmlrpc-c client object */
-    xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, NAME, VERSION, NULL, 0);
+    /* Required before any use of Xmlrpc-c client library: */
+    xmlrpc_client_setup_global_const(&env);
+    die_if_fault_occurred(&env);
+
+    xmlrpc_client_create(&env, XMLRPC_CLIENT_NO_FLAGS, NAME, VERSION, NULL, 0,
+                         &clientP);
     die_if_fault_occurred(&env);
 
     for (adder = 0; adder < 3; ++adder) {
         printf("Making XMLRPC call to server url '%s' method '%s' "
                "to request the sum "
-               "of 5 and %d...\n", url, methodName, adder);
+               "of 5 and %d...\n", serverUrl, methodName, adder);
 
         /* request the remote procedure call */
-        xmlrpc_client_call_asynch(url, methodName,
+        xmlrpc_client_start_rpcf(&env, clientP, serverUrl, methodName,
                                   handle_sample_add_response, NULL,
                                   "(ii)", (xmlrpc_int32) 5, adder);
         die_if_fault_occurred(&env);
@@ -100,13 +109,15 @@
     
     printf("RPCs all requested.  Waiting for & handling responses...\n");
 
-    /* The following is what calls handle_sample_add_response() (3 times) */
-    xmlrpc_client_event_loop_finish_asynch();
+    /* Wait for all RPCs to be done.  With some transports, this is also
+       what causes them to go.
+    */
+    xmlrpc_client_event_loop_finish(clientP);
 
     printf("All RPCs finished.\n");
 
-    /* Destroy the Xmlrpc-c client object */
-    xmlrpc_client_cleanup();
+    xmlrpc_client_destroy(clientP);
+    xmlrpc_client_teardown_global_const();
 
     return 0;
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_loop_server.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_loop_server.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_loop_server.c	Mon May 26 12:59:57 2008
@@ -9,6 +9,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
 #include <xmlrpc-c/base.h>
 #include <xmlrpc-c/abyss.h>
 #include <xmlrpc-c/server.h>
@@ -29,12 +32,33 @@
        obviously don't want to die just because a client didn't complete
        an RPC, so we ignore SIGPIPE.
     */
+#ifndef WIN32
     struct sigaction mysigaction;
     
     sigemptyset(&mysigaction.sa_mask);
     mysigaction.sa_flags = 0;
     mysigaction.sa_handler = SIG_IGN;
     sigaction(SIGPIPE, &mysigaction, NULL);
+#endif
+}
+
+
+
+static void
+printPeerIpAddr(TSession * const abyssSessionP) {
+
+    struct abyss_unix_chaninfo * channelInfoP;
+    struct sockaddr_in * sockAddrInP;
+    unsigned char * ipAddr;  /* 4 byte array */
+
+    SessionGetChannelInfo(abyssSessionP, (void*)&channelInfoP);
+
+    sockAddrInP = (struct sockaddr_in *) &channelInfoP->peerAddr;
+
+    ipAddr = (unsigned char *)&sockAddrInP->sin_addr.s_addr;
+
+    printf("RPC is from IP address %u.%u.%u.%u\n",
+           ipAddr[0], ipAddr[1], ipAddr[2], ipAddr[3]);
 }
 
 
@@ -42,10 +66,13 @@
 static xmlrpc_value *
 sample_add(xmlrpc_env *   const envP, 
            xmlrpc_value * const paramArrayP,
-           void *         const userData ATTR_UNUSED) {
+           void *         const serverInfo ATTR_UNUSED,
+           void *         const channelInfo) {
     
     xmlrpc_int x, y, z;
 
+    printPeerIpAddr(channelInfo);
+
     /* Parse our argument array. */
     xmlrpc_decompose_value(envP, paramArrayP, "(ii)", &x, &y);
     if (envP->fault_occurred)
@@ -60,6 +87,32 @@
 
 
 
+static xmlrpc_server_shutdown_fn requestShutdown;
+
+static void
+requestShutdown(xmlrpc_env * const faultP,
+                void *       const context,
+                const char * const comment,
+                void *       const callInfo) {
+
+    /* You make this run by executing the system method
+       'system.shutdown'.  This function is registered in the method
+       registry as the thing to call for that.
+    */
+    int * const terminationRequestedP = context;
+    TSession * const abyssSessionP = callInfo;
+
+    xmlrpc_env_init(faultP);
+
+    fprintf(stderr, "Termination requested: %s\n", comment);
+
+    printPeerIpAddr(abyssSessionP);
+    
+    *terminationRequestedP = 1;
+}
+
+
+
 int 
 main(int           const argc, 
      const char ** const argv) {
@@ -67,6 +120,8 @@
     TServer abyssServer;
     xmlrpc_registry * registryP;
     xmlrpc_env env;
+    int terminationRequested;  /* A boolean value */
+    const char * error;
 
     if (argc-1 != 1) {
         fprintf(stderr, "You must specify 1 argument:  The TCP port number "
@@ -74,34 +129,42 @@
                 "You specified %d.\n",  argc-1);
         exit(1);
     }
+
+    AbyssInit(&error);
     
     xmlrpc_env_init(&env);
 
     registryP = xmlrpc_registry_new(&env);
 
-    xmlrpc_registry_add_method(
-        &env, registryP, NULL, "sample.add", &sample_add, NULL);
+    xmlrpc_registry_add_method2(
+        &env, registryP, "sample.add", &sample_add, NULL, NULL, NULL);
 
-    MIMETypeInit();
+    xmlrpc_registry_set_shutdown(registryP,
+                                 &requestShutdown, &terminationRequested);
 
-    ServerCreate(&abyssServer, "XmlRpcServer", atoi(argv[1]), 
-                 NULL, NULL);
+    ServerCreate(&abyssServer, "XmlRpcServer", atoi(argv[1]), NULL, NULL);
     
-    xmlrpc_server_abyss_set_handlers(&abyssServer, registryP);
+    xmlrpc_server_abyss_set_handlers2(&abyssServer, "/RPC2", registryP);
 
     ServerInit(&abyssServer);
 
     setupSignalHandlers();
 
-    while (1) {
+    terminationRequested = 0;
+
+    while (!terminationRequested) {
         printf("Waiting for next RPC...\n");
 
-        ServerRunOnce2(&abyssServer, ABYSS_FOREGROUND);
+        ServerRunOnce(&abyssServer);
             /* This waits for the next connection, accepts it, reads the
                HTTP POST request, executes the indicated RPC, and closes
                the connection.
             */
     }
 
+    ServerFree(&abyssServer);
+
+    AbyssTerm();
+
     return 0;
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_client.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_client.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_client.c	Mon May 26 12:59:57 2008
@@ -16,10 +16,10 @@
 #define VERSION "1.0"
 
 static void 
-die_if_fault_occurred (xmlrpc_env *env) {
-    if (env->fault_occurred) {
+die_if_fault_occurred (xmlrpc_env * const envP) {
+    if (envP->fault_occurred) {
         fprintf(stderr, "XML-RPC Fault: %s (%d)\n",
-                env->fault_string, env->fault_code);
+                envP->fault_string, envP->fault_code);
         exit(1);
     }
 }
@@ -31,10 +31,10 @@
      const char ** const argv ATTR_UNUSED) {
 
     xmlrpc_env env;
-    xmlrpc_value *result;
+    xmlrpc_value * resultP;
     xmlrpc_int32 sum;
-    char * const serverUrl = "http://localhost:8080/RPC2";
-    char * const methodName = "sample.add";
+    const char * const serverUrl = "http://localhost:8080/RPC2";
+    const char * const methodName = "sample.add";
 
     if (argc-1 > 0) {
         fprintf(stderr, "This program has no arguments\n");
@@ -53,17 +53,17 @@
            "of 5 and 7...\n", serverUrl, methodName);
 
     /* Make the remote procedure call */
-    result = xmlrpc_client_call(&env, serverUrl, methodName,
-                                "(ii)", (xmlrpc_int32) 5, (xmlrpc_int32) 7);
+    resultP = xmlrpc_client_call(&env, serverUrl, methodName,
+                                 "(ii)", (xmlrpc_int32) 5, (xmlrpc_int32) 7);
     die_if_fault_occurred(&env);
     
     /* Get our sum and print it out. */
-    xmlrpc_read_int(&env, result, &sum);
+    xmlrpc_read_int(&env, resultP, &sum);
     die_if_fault_occurred(&env);
-    printf("The sum  is %d\n", sum);
+    printf("The sum is %d\n", sum);
     
     /* Dispose of our result value. */
-    xmlrpc_DECREF(result);
+    xmlrpc_DECREF(resultP);
 
     /* Clean up our error-handling environment. */
     xmlrpc_env_clean(&env);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server.c	Mon May 26 12:59:57 2008
@@ -2,6 +2,11 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef WIN32
+#  include <windows.h>
+#else
+#  include <unistd.h>
+#endif
 
 #include <xmlrpc-c/base.h>
 #include <xmlrpc-c/server.h>
@@ -9,23 +14,38 @@
 
 #include "config.h"  /* information about this build environment */
 
+
+#ifdef WIN32
+  #define SLEEP(seconds) SleepEx(seconds * 1000, 1);
+#else
+  #define SLEEP(seconds) sleep(seconds);
+#endif
+
+
 static xmlrpc_value *
-sample_add(xmlrpc_env *   const env, 
-           xmlrpc_value * const param_array, 
-           void *         const user_data ATTR_UNUSED) {
+sample_add(xmlrpc_env *   const envP,
+           xmlrpc_value * const paramArrayP,
+           void *         const serverInfo ATTR_UNUSED,
+           void *         const channelInfo ATTR_UNUSED) {
 
     xmlrpc_int32 x, y, z;
 
     /* Parse our argument array. */
-    xmlrpc_decompose_value(env, param_array, "(ii)", &x, &y);
-    if (env->fault_occurred)
+    xmlrpc_decompose_value(envP, paramArrayP, "(ii)", &x, &y);
+    if (envP->fault_occurred)
         return NULL;
 
     /* Add our two numbers. */
     z = x + y;
 
+    /* Sometimes, make it look hard (so client can see what it's like
+       to do an RPC that takes a while).
+    */
+    if (y == 1)
+        SLEEP(3);
+
     /* Return our result. */
-    return xmlrpc_build_value(env, "i", z);
+    return xmlrpc_build_value(envP, "i", z);
 }
 
 
@@ -41,7 +61,8 @@
     if (argc-1 != 1) {
         fprintf(stderr, "You must specify 1 argument:  The TCP port "
                 "number on which the server will accept connections "
-                "for RPCs.  You specified %d arguments.\n",  argc-1);
+                "for RPCs (8080 is a common choice).  "
+                "You specified %d arguments.\n",  argc-1);
         exit(1);
     }
     
@@ -49,17 +70,17 @@
 
     registryP = xmlrpc_registry_new(&env);
 
-    xmlrpc_registry_add_method(
-        &env, registryP, NULL, "sample.add", &sample_add, NULL);
+    xmlrpc_registry_add_method2(
+        &env, registryP, "sample.add", &sample_add, NULL, NULL, NULL);
 
     /* In the modern form of the Abyss API, we supply parameters in memory
        like a normal API.  We select the modern form by setting
        config_file_name to NULL: 
     */
     serverparm.config_file_name = NULL;
-    serverparm.registryP = registryP;
-    serverparm.port_number = atoi(argv[1]);
-    serverparm.log_file_name = "/tmp/xmlrpc_log";
+    serverparm.registryP        = registryP;
+    serverparm.port_number      = atoi(argv[1]);
+    serverparm.log_file_name    = "/tmp/xmlrpc_log";
 
     printf("Running XML-RPC server...\n");
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_cgi.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_cgi.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_cgi.c	Mon May 26 12:59:57 2008
@@ -10,22 +10,22 @@
 #include "config.h"  /* information about this build environment */
 
 static xmlrpc_value *
-sample_add(xmlrpc_env *   const env, 
-           xmlrpc_value * const param_array, 
+sample_add(xmlrpc_env *   const envP,
+           xmlrpc_value * const paramArrayP,
            void *         const user_data ATTR_UNUSED) {
 
     xmlrpc_int32 x, y, z;
 
     /* Parse our argument array. */
-    xmlrpc_decompose_value(env, param_array, "(ii)", &x, &y);
-    if (env->fault_occurred)
+    xmlrpc_decompose_value(envP, paramArrayP, "(ii)", &x, &y);
+    if (envP->fault_occurred)
         return NULL;
 
     /* Add our two numbers. */
     z = x + y;
 
     /* Return our result. */
-    return xmlrpc_build_value(env, "i", z);
+    return xmlrpc_build_value(envP, "i", z);
 }
 
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_w32httpsys.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_w32httpsys.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_sample_add_server_w32httpsys.c	Mon May 26 12:59:57 2008
@@ -167,8 +167,8 @@
 	serverparm.portNum=8080;
 
 	//if this is set, we will use the authorization function
-	serverparm.authfn=NULL;
-	//serverparm.authfn=&handleAuthorization;
+	//serverparm.authfn=NULL;
+	serverparm.authfn=&handleAuthorization;
 
 	//set the logging level and log file
 	serverparm.logLevel=2;

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_server_validatee.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_server_validatee.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/examples/xmlrpc_server_validatee.c	Mon May 26 12:59:57 2008
@@ -51,9 +51,9 @@
 
 #include "config.h"  /* information about this build environment */
 
-#define RETURN_IF_FAULT(env) \
+#define RETURN_IF_FAULT(envP) \
     do { \
-        if ((env)->fault_occurred) \
+        if ((envP)->fault_occurred) \
             return NULL; \
     } while (0)
         
@@ -65,20 +65,19 @@
 
 static xmlrpc_value *
 array_of_structs(xmlrpc_env *   const envP, 
-                 xmlrpc_value * const param_array, 
+                 xmlrpc_value * const paramArrayP, 
                  void *         const user_data ATTR_UNUSED) {
 
-    xmlrpc_value * array;
+    xmlrpc_value * arrayP;
     xmlrpc_value * retval;
 
-    /* Parse our argument array. */
-    xmlrpc_decompose_value(envP, param_array, "(A)", &array);
+    xmlrpc_decompose_value(envP, paramArrayP, "(A)", &arrayP);
     if (envP->fault_occurred)
         retval = NULL;
     else {
         /* Add up all the struct elements named "curly". */
         size_t size;
-        size = xmlrpc_array_size(envP, array);
+        size = xmlrpc_array_size(envP, arrayP);
         if (envP->fault_occurred)
             retval = NULL;
         else {
@@ -86,18 +85,20 @@
             unsigned int i;
             sum = 0;
             for (i = 0; i < size && !envP->fault_occurred; ++i) {
-                xmlrpc_value * strct;
-                strct = xmlrpc_array_get_item(envP, array, i);
+                xmlrpc_value * strctP;
+                strctP = xmlrpc_array_get_item(envP, arrayP, i);
                 if (!envP->fault_occurred) {
                     xmlrpc_int32 curly;
-                    xmlrpc_decompose_value(envP, strct, "{s:i,*}", 
+                    xmlrpc_decompose_value(envP, strctP, "{s:i,*}", 
                                            "curly", &curly);
                     if (!envP->fault_occurred)
                         sum += curly;
                 }
             }
-            xmlrpc_DECREF(array);
-            if (!envP->fault_occurred)
+            xmlrpc_DECREF(arrayP);
+            if (envP->fault_occurred)
+                retval = NULL;
+            else
                 retval = xmlrpc_build_value(envP, "i", sum);
         }
     }
@@ -111,30 +112,31 @@
 */
 
 static xmlrpc_value *
-count_entities(xmlrpc_env *   const env, 
-               xmlrpc_value * const param_array, 
+count_entities(xmlrpc_env *   const envP,
+               xmlrpc_value * const paramArrayP, 
                void *         const user_data ATTR_UNUSED) {
-    const char *str;
+
+    const char * str;
     size_t len, i;
     xmlrpc_int32 left, right, amp, apos, quote;
 
-    xmlrpc_decompose_value(env, param_array, "(s#)", &str, &len);
-    RETURN_IF_FAULT(env);
+    xmlrpc_decompose_value(envP, paramArrayP, "(s#)", &str, &len);
+    RETURN_IF_FAULT(envP);
 
     left = right = amp = apos = quote = 0;
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < len; ++i) {
         switch (str[i]) {
-        case '<': left++; break;
-        case '>': right++; break;
-        case '&': amp++; break;
-        case '\'': apos++; break;
-        case '\"': quote++; break;
+        case '<':  ++left;  break;
+        case '>':  ++right; break;
+        case '&':  ++amp;   break;
+        case '\'': ++apos;  break;
+        case '\"': ++quote; break;
         default: break;
         }
     }
     free((void*)str);
 
-    return xmlrpc_build_value(env, "{s:i,s:i,s:i,s:i,s:i}",
+    return xmlrpc_build_value(envP, "{s:i,s:i,s:i,s:i,s:i}",
                               "ctLeftAngleBrackets", left,
                               "ctRightAngleBrackets", right,
                               "ctAmpersands", amp,
@@ -150,43 +152,46 @@
 */
 
 static xmlrpc_value *
-easy_struct(xmlrpc_env *   const env, 
-            xmlrpc_value * const param_array,
+easy_struct(xmlrpc_env *   const envP,
+            xmlrpc_value * const paramArrayP,
             void *         const user_data ATTR_UNUSED) {
 
     xmlrpc_int32 larry, moe, curly;
 
     /* Parse our argument array and get the stooges. */
-    xmlrpc_decompose_value(env, param_array, "({s:i,s:i,s:i,*})",
+    xmlrpc_decompose_value(envP, paramArrayP, "({s:i,s:i,s:i,*})",
                            "larry", &larry,
                            "moe", &moe,
                            "curly", &curly);
-    RETURN_IF_FAULT(env);
+    RETURN_IF_FAULT(envP);
 
     /* Return our result. */
-    return xmlrpc_build_value(env, "i", larry + moe + curly);
+    return xmlrpc_build_value(envP, "i", larry + moe + curly);
 }
 
 
+
 /*=========================================================================
 **  validator1.echoStructTest
 **=========================================================================
 */
 
 static xmlrpc_value *
-echo_struct(xmlrpc_env *   const env, 
-            xmlrpc_value * const param_array, 
+echo_struct(xmlrpc_env *   const envP,
+            xmlrpc_value * const paramArrayP, 
             void *         const user_data ATTR_UNUSED) {
-    xmlrpc_value *s;
+
+    xmlrpc_value * sP;
 
     /* Parse our argument array. */
-    xmlrpc_decompose_value(env, param_array, "(S)", &s);
-    RETURN_IF_FAULT(env);
+    xmlrpc_decompose_value(envP, paramArrayP, "(S)", &sP);
+    RETURN_IF_FAULT(envP);
     
-    return s;  /* We transfer our reference on 's' to Caller */
+    return sP;  /* We transfer our reference on '*sP' to Caller */
 }
 
 
+
 /*=========================================================================
 **  validator1.manyTypesTest
 **=========================================================================
@@ -203,6 +208,7 @@
 }
 
 
+
 /*=========================================================================
 **  validator1.moderateSizeArrayCheck
 **=========================================================================
@@ -214,7 +220,7 @@
             size_t          const str1_len,
             const char *    const str2,
             size_t          const str2_len,
-            xmlrpc_value ** const resultP) {
+            xmlrpc_value ** const resultPP) {
 
     /* Concatenate the two strings. */
 
@@ -227,8 +233,8 @@
     } else {
         memcpy(buffer, str1, str1_len);
         memcpy(&buffer[str1_len], str2, str2_len);
-        *resultP = xmlrpc_build_value(envP, "s#", 
-                                      buffer, str1_len + str2_len);
+        *resultPP = xmlrpc_build_value(envP, "s#", 
+                                       buffer, str1_len + str2_len);
         free(buffer);
     }
 }
@@ -236,31 +242,34 @@
 
 
 static xmlrpc_value *
-moderate_array(xmlrpc_env *   const envP, 
-               xmlrpc_value * const param_array, 
+moderate_array(xmlrpc_env *   const envP,
+               xmlrpc_value * const paramArrayP,
                void *         const user_data ATTR_UNUSED) {
 
-    xmlrpc_value *array, *item, *result;
-    int size;
-    const char * str1;
-    const char * str2;
-    size_t str1_len, str2_len;
     xmlrpc_value * retval;
+    xmlrpc_value * arrayP;
 
     /* Parse our argument array. */
-    xmlrpc_decompose_value(envP, param_array, "(A)", &array);
+    xmlrpc_decompose_value(envP, paramArrayP, "(A)", &arrayP);
     if (!envP->fault_occurred) {
-        size = xmlrpc_array_size(envP, array);
+        int const size = xmlrpc_array_size(envP, arrayP);
         if (!envP->fault_occurred) {
             /* Get our first string. */
-            item = xmlrpc_array_get_item(envP, array, 0);
+            xmlrpc_value * const firstItemP =
+                xmlrpc_array_get_item(envP, arrayP, 0);
             if (!envP->fault_occurred) {
-                xmlrpc_read_string_lp(envP, item, &str1_len, &str1);
+                const char * str1;
+                size_t str1_len;
+                xmlrpc_read_string_lp(envP, firstItemP, &str1_len, &str1);
                 if (!envP->fault_occurred) {
                     /* Get our last string. */
-                    item = xmlrpc_array_get_item(envP, array, size - 1);
+                    xmlrpc_value * const lastItemP =
+                        xmlrpc_array_get_item(envP, arrayP, size - 1);
                     if (!envP->fault_occurred) {
-                        xmlrpc_read_string_lp(envP, item, &str2_len, &str2);
+                        const char * str2;
+                        size_t str2_len;
+                        xmlrpc_read_string_lp(envP, lastItemP,
+                                              &str2_len, &str2);
                         if (!envP->fault_occurred) {
                             concatenate(envP, str1, str1_len, str2, str2_len,
                                         &retval);
@@ -271,12 +280,13 @@
                 }
             }
         }
-        xmlrpc_DECREF(array);
+        xmlrpc_DECREF(arrayP);
     }
-    return result;
+    return retval;
 }
 
 
+
 /*=========================================================================
 **  validator1.nestedStructTest
 **=========================================================================
@@ -284,15 +294,17 @@
 
 static xmlrpc_value *
 nested_struct(xmlrpc_env *   const envP,
-              xmlrpc_value * const param_array, 
+              xmlrpc_value * const paramArrayP,
               void *         const user_data ATTR_UNUSED) {
 
     xmlrpc_value * yearsP;
     xmlrpc_value * retval;
 
     /* Parse our argument array. */
-    xmlrpc_decompose_value(envP, param_array, "(S)", &yearsP);
-    if (!envP->fault_occurred) {
+    xmlrpc_decompose_value(envP, paramArrayP, "(S)", &yearsP);
+    if (envP->fault_occurred)
+        retval = NULL;
+    else {
         /* Get values of larry, moe and curly for 2000-04-01. */
         xmlrpc_int32 larry, moe, curly;
         xmlrpc_decompose_value(envP, yearsP,
@@ -301,36 +313,41 @@
                                "larry", &larry,
                                "moe", &moe,
                                "curly", &curly);               
-        if (!envP->fault_occurred)
+        if (envP->fault_occurred)
+            retval = NULL;
+        else
             retval = xmlrpc_build_value(envP, "i", larry + moe + curly);
+
         xmlrpc_DECREF(yearsP);
     }
     return retval;
 }
 
 
+
 /*=========================================================================
 **  validator1.simpleStructReturnTest
 **=========================================================================
 */
 
 static xmlrpc_value *
-struct_return(xmlrpc_env *   const env, 
-              xmlrpc_value * const param_array, 
+struct_return(xmlrpc_env *   const envP,
+              xmlrpc_value * const paramArrayP,
               void *         const user_data ATTR_UNUSED) {
 
     xmlrpc_int32 i;
 
-    xmlrpc_decompose_value(env, param_array, "(i)", &i);
-    RETURN_IF_FAULT(env);
+    xmlrpc_decompose_value(envP, paramArrayP, "(i)", &i);
+    RETURN_IF_FAULT(envP);
 
-    return xmlrpc_build_value(env, "{s:i,s:i,s:i}",
+    return xmlrpc_build_value(envP, "{s:i,s:i,s:i}",
                               "times10", (xmlrpc_int32) i * 10,
                               "times100", (xmlrpc_int32) i * 100,
                               "times1000", (xmlrpc_int32) i * 1000);
 }
 
 
+
 /*=========================================================================
 **  main
 **=========================================================================

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/Makefile	Mon May 26 12:59:57 2008
@@ -1,60 +1,146 @@
-ifeq ($(SRCDIR)x,x)
-SRCDIR = $(CURDIR)/..
+ifeq ($(SRCDIR),)
+  updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
+  SRCDIR := $(call updir,$(CURDIR))
+  BLDDIR := $(SRCDIR)
 endif
-SUBDIR = src
-BUILDDIR = $(SRCDIR)
-VPATH = .:$(SRCDIR)
+SUBDIR := include
 
-include $(BUILDDIR)/Makefile.config
+include $(BLDDIR)/config.mk
+
+default: all
+
+all: xmlrpc-c/config.h
+
+xmlrpc-c/config.h: $(BLDDIR)/$(SUBDIR)/xmlrpc-c
+	>$@
+	@echo "Lots of echoes to '$@' suppressed here ..."
+	@echo '#ifndef XMLRPC_C_CONFIG_H_INCLUDED'                        >>$@
+	@echo '#define XMLRPC_C_CONFIG_H_INCLUDED'                        >>$@
+	@echo ''                                                          >>$@
+	@echo '/* This file, part of XML-RPC For C/C++, is meant to '     >>$@
+	@echo '   define characteristics of this particular installation '>>$@ 
+	@echo '   that the other <xmlrpc-c/...> header files need in '    >>$@
+	@echo '   order to compile correctly when #included in Xmlrpc-c'  >>$@
+	@echo '   user code.'						  >>$@
+	@echo ''                                                          >>$@
+	@echo '   Those header files #include this one.'                  >>$@
+	@echo ''                                                          >>$@
+	@echo '   This file was created by a make rule.'                  >>$@
+	@echo '*/'                                                        >>$@
+	@echo '#define XMLRPC_HAVE_WCHAR $(HAVE_WCHAR_H_DEFINE)'          >>$@
+	@echo '#ifdef WIN32'                                              >>$@
+	@echo '  /* SOCKET is a type defined by <winsock.h>.  Anyone who' >>$@
+	@echo '     uses XMLRPC_SOCKET on a WIN32 system must #include'   >>$@
+	@echo '     <winsock.h>'                                          >>$@
+	@echo '  */'                                                      >>$@
+	@echo '  #define XMLRPC_SOCKET SOCKET'                            >>$@
+	@echo '  #define XMLRPC_HAVE_TIMEVAL 0'                           >>$@
+	@echo '  #define XMLRPC_HAVE_TIMESPEC 0'                          >>$@
+	@echo '#else'                                                     >>$@
+	@echo '  #define XMLRPC_SOCKET int'                               >>$@
+	@echo '  #define XMLRPC_HAVE_TIMEVAL 1'                           >>$@
+	@echo '  #define XMLRPC_HAVE_TIMESPEC 1'                          >>$@
+	@echo '#endif'                                                    >>$@
+	@echo ''                                                          >>$@
+	@echo '#if defined(_MSC_VER)'                                     >>$@
+	@echo '  /* Newer MSVC has long long, but MSVC 6 does not */'     >>$@
+	@echo '  #define XMLRPC_INT64 __int64'				  >>$@
+	@echo '  #define XMLRPC_INT32 __int32'				  >>$@
+	@echo '#else'							  >>$@
+	@echo '  #define XMLRPC_INT64 long long'	                  >>$@
+	@echo '  #define XMLRPC_INT32 int'		                  >>$@
+	@echo '#endif'                                                    >>$@
+	@echo '#endif'                                                    >>$@
+
+$(BLDDIR)/$(SUBDIR)/xmlrpc-c:
+	mkdir $@
+
+COMPAT_LINK_CMDS = \
+  $(LN_S) xmlrpc-c/oldxmlrpc.h         xmlrpc.h; \
+  $(LN_S) xmlrpc-c/server.h            xmlrpc_server.h; \
+  $(LN_S) xmlrpc-c/server_abyss.h      xmlrpc_server_abyss.h; \
+  $(LN_S) xmlrpc-c/server_w32httpsys.h xmlrpc_server_w32httpsys.h; \
 
 HEADERS_TO_INSTALL = \
-  xmlrpc-c/oldxmlrpc.h \
+  xmlrpc-c/config.h \
+  xmlrpc-c/inttypes.h \
+  xmlrpc-c/c_util.h \
+  xmlrpc-c/util.h \
   xmlrpc-c/base.h \
   xmlrpc-c/abyss.h \
+  xmlrpc-c/abyss_unixsock.h \
+  xmlrpc-c/abyss_winsock.h \
   xmlrpc-c/server.h \
   xmlrpc-c/server_abyss.h \
   xmlrpc-c/server_w32httpsys.h \
+  xmlrpc-c/oldxmlrpc.h \
 
 ifeq ($(ENABLE_CPLUSPLUS),yes)
   HEADERS_TO_INSTALL += \
     xmlrpc-c/oldcppwrapper.hpp \
+    xmlrpc-c/girerr.hpp \
+    xmlrpc-c/girmem.hpp \
     xmlrpc-c/base.hpp \
     xmlrpc-c/timeout.hpp \
     xmlrpc-c/xml.hpp \
     xmlrpc-c/registry.hpp \
-    xmlrpc-c/server_abyss.hpp\
-    xmlrpc-c/girerr.hpp\
-    xmlrpc-c/girmem.hpp\
+    xmlrpc-c/server_abyss.hpp \
+    xmlrpc-c/packetsocket.hpp \
+    xmlrpc-c/server_pstream.hpp \
 
+    COMPAT_LINK_CMDS += $(LN_S) xmlrpc-c/oldcppwrapper.hpp XmlRpcCpp.h;
 endif
 
-
-
 HEADERINST_PREFIX = /xmlrpc-c
 
 ifeq ($(MUST_BUILD_CLIENT),yes)
   HEADERS_TO_INSTALL += \
     xmlrpc-c/client.h \
     xmlrpc-c/transport.h \
+    xmlrpc-c/client_global.h \
+
+  COMPAT_LINK_CMDS += $(LN_S) xmlrpc-c/client.h xmlrpc_client.h;
 
   ifeq ($(ENABLE_CPLUSPLUS),yes)
-    HEADERS_TO_INSTALL += xmlrpc-c/client.hpp xmlrpc-c/client_simple.hpp
+    HEADERS_TO_INSTALL += \
+      xmlrpc-c/client.hpp \
+      xmlrpc-c/client_transport.hpp \
+      xmlrpc-c/client_simple.hpp \
+
   endif
 endif
 ifeq ($(ENABLE_CGI_SERVER),yes)
   HEADERS_TO_INSTALL += xmlrpc-c/server_cgi.h
+  COMPAT_LINK_CMDS += $(LN_S) xmlrpc-c/server_cgi.h xmlrpc_cgi.h;
 endif
 
 default: all
 
 all:
 
+.PHONY: install-compat-hdr
+install-compat-hdr:
+# Install old names of header files for backward compatibility
+	cd $(DESTDIR)$(HEADERINST_DIR); \
+	  rm -f xmlrpc.h xmlrpc_client.h xmlrpc_server.h xmlrpc_cgi.h \
+                xmlrpc_server_abyss.h xmlrpc_server_w32httpsys.h \
+	        XmlRpcCpp.h; \
+	  $(COMPAT_LINK_CMDS)
+
 .PHONY: install
-install: install-common
+install: install-common install-compat-hdr
 
 .PHONY: clean distclean dep
 clean:
 distclean:
+	rm -f xmlrpc-c/config.h
+
+.PHONY: check
+check:
+
+.PHONY: dep
 dep:
 
-include $(SRCDIR)/Makefile.common
+OMIT_CONFIG_H_RULE = Y
+
+include $(SRCDIR)/common.mk

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/abyss.h	Mon May 26 12:59:57 2008
@@ -11,711 +11,504 @@
   Copyright information is at the end of the file.
 ****************************************************************************/
 
-#ifndef _ABYSS_H_
-#define _ABYSS_H_
+#ifndef XMLRPC_ABYSS_H_INCLUDED
+#define XMLRPC_ABYSS_H_INCLUDED
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef ABYSS_WIN32
-#include "xmlrpc_config.h"
-#else
-#include <inttypes.h>
-#endif
-/*********************************************************************
-** Paths and so on...
-*********************************************************************/
-
-#ifdef ABYSS_WIN32
-#define DEFAULT_ROOT        "c:\\abyss"
-#define DEFAULT_DOCS        DEFAULT_ROOT"\\htdocs"
-#define DEFAULT_CONF_FILE   DEFAULT_ROOT"\\conf\\abyss.conf"
-#define DEFAULT_LOG_FILE    DEFAULT_ROOT"\\log\\abyss.log"
-#else
-#ifdef __rtems__
-#define DEFAULT_ROOT        "/abyss"
-#else
-#define DEFAULT_ROOT        "/usr/local/abyss"
-#endif
-#define DEFAULT_DOCS        DEFAULT_ROOT"/htdocs"
-#define DEFAULT_CONF_FILE   DEFAULT_ROOT"/conf/abyss.conf"
-#define DEFAULT_LOG_FILE    DEFAULT_ROOT"/log/abyss.log"
-#endif
-
-/*********************************************************************
-** Maximum numer of simultaneous connections
-*********************************************************************/
-
-#define MAX_CONN    4000
-
-/*********************************************************************
-** Server Info Definitions
-*********************************************************************/
-
-#define SERVER_VERSION      "0.3"
-#define SERVER_HVERSION     "ABYSS/0.3"
-#define SERVER_HTML_INFO \
-  "<p><HR><b><i><a href=\"http:\057\057abyss.linuxave.net\">" \
-  "ABYSS Web Server</a></i></b> version "SERVER_VERSION"<br>" \
-  "&copy; <a href=\"mailto:mmoez at bigfoot.com\">Moez Mahfoudh</a> - 2000</p>"
-#define SERVER_PLAIN_INFO \
-  CRLF "----------------------------------------" \
-       "----------------------------------------" \
-  CRLF "ABYSS Web Server version "SERVER_VERSION CRLF"(C) Moez Mahfoudh - 2000"
-
-/*********************************************************************
-** General purpose definitions
-*********************************************************************/
-
-#ifdef ABYSS_WIN32
-#define strcasecmp(a,b) stricmp((a),(b))
-#else
-#define ioctlsocket(a,b,c)  ioctl((a),(b),(c))
-#endif  /* ABYSS_WIN32 */
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif  /* NULL */
+#include <sys/types.h>
 
-#ifndef TRUE
-#define TRUE    1
-#endif  /* TRUE */
+#include <xmlrpc-c/inttypes.h>
 
-#ifndef FALSE
-#define FALSE    0
-#endif  /* FALSE */
-
-#ifdef ABYSS_WIN32
-#define LBR "\n"
-#else
-#define LBR "\n"
-#endif  /* ABYSS_WIN32 */
+/****************************************************************************
+  STUFF FOR THE OUTER CONTROL PROGRAM TO USE
+****************************************************************************/
 
 typedef int abyss_bool;
 
-/*********************************************************************
-** Buffer
-*********************************************************************/
-
-typedef struct
-{
-    void *data;
-    uint32_t size;
-    uint32_t staticid;
-} TBuffer;
-
-abyss_bool BufferAlloc(TBuffer *buf,uint32_t memsize);
-abyss_bool BufferRealloc(TBuffer *buf,uint32_t memsize);
-void BufferFree(TBuffer *buf);
-
-
-/*********************************************************************
-** String
-*********************************************************************/
+/****************************************************************************
+  GLOBAL (STATIC) PROGRAM STUFF
+****************************************************************************/
 
-typedef struct
-{
-    TBuffer buffer;
-    uint32_t size;
-} TString;
-
-abyss_bool StringAlloc(TString *s);
-abyss_bool StringConcat(TString *s,char *s2);
-abyss_bool StringBlockConcat(TString *s,char *s2,char **ref);
-void StringFree(TString *s);
-char *StringData(TString *s);
+void
+AbyssInit(const char ** const errorP);
 
+void
+AbyssTerm(void);
 
 /*********************************************************************
-** List
+** MIMEType
 *********************************************************************/
 
-typedef struct {
-    void **item;
-    uint16_t size;
-    uint16_t maxsize;
-    abyss_bool autofree;
-} TList;
+typedef struct MIMEType MIMEType;
 
-void
-ListInit(TList * const listP);
+MIMEType *
+MIMETypeCreate(void);
 
 void
-ListInitAutoFree(TList * const listP);
+MIMETypeDestroy(MIMEType * const MIMETypeP);
 
 void
-ListFree(TList * const listP);
+MIMETypeInit(void);
 
 void
-ListFreeItems(TList * const listP);
+MIMETypeTerm(void);
 
 abyss_bool
-ListAdd(TList * const listP,
-        void *  const str);
-
-void
-ListRemove(TList * const listP);
-
-abyss_bool
-ListAddFromString(TList * const listP,
-                  char *  const c);
+MIMETypeAdd2(MIMEType *   const MIMETypeP,
+             const char * const type,
+             const char * const ext);
 
 abyss_bool
-ListFindString(TList *    const listP,
-               char *     const str,
-               uint16_t * const indexP);
+MIMETypeAdd(const char * const type,
+            const char * const ext);
 
 
-/*********************************************************************
-** Table
-*********************************************************************/
-
-typedef struct 
-{
-    char *name,*value;
-    uint16_t hash;
-} TTableItem;
-
-typedef struct
-{
-    TTableItem *item;
-    uint16_t size,maxsize;
-} TTable;
-
-void TableInit(TTable *t);
-void TableFree(TTable *t);
-abyss_bool TableAdd(TTable *t,char *name,char *value);
-abyss_bool TableAddReplace(TTable *t,char *name,char *value);
-abyss_bool TableFindIndex(TTable *t,char *name,uint16_t *index);
-char *TableFind(TTable *t,char *name);
+enum abyss_foreback {ABYSS_FOREGROUND, ABYSS_BACKGROUND};
 
+#define HAVE_CHANSWITCH
 
-/*********************************************************************
-** Thread
-*********************************************************************/
+typedef struct _TChanSwitch TChanSwitch;
+typedef struct _TChannel TChannel;
+typedef struct _TSocket TSocket;
 
-#ifdef ABYSS_WIN32
-#include <windows.h>
-#define  THREAD_ENTRYTYPE  WINAPI
-#else
-#define  THREAD_ENTRYTYPE
-#include <pthread.h>
-#endif  /* ABYSS_WIN32 */
-
-typedef uint32_t (THREAD_ENTRYTYPE *TThreadProc)(void *);
-#ifdef ABYSS_WIN32
-typedef HANDLE TThread;
+#ifdef WIN32
+  #include <xmlrpc-c/abyss_winsock.h>
 #else
-typedef pthread_t TThread;
-typedef void* (*PTHREAD_START_ROUTINE)(void *);
-#endif  /* ABYSS_WIN32 */
-
-abyss_bool ThreadCreate(TThread *t,TThreadProc func,void *arg);
-abyss_bool ThreadRun(TThread *t);
-abyss_bool ThreadStop(TThread *t);
-abyss_bool ThreadKill(TThread *t);
-void ThreadWait(uint32_t ms);
-void ThreadExit( TThread *t, int ret_value );
-void ThreadClose( TThread *t );
+  #include <xmlrpc-c/abyss_unixsock.h>
+#endif
 
-/*********************************************************************
-** Mutex
-*********************************************************************/
+void
+ChanSwitchInit(const char ** const errorP);
 
-#ifdef ABYSS_WIN32
-typedef HANDLE TMutex;
-#else
-typedef pthread_mutex_t TMutex;
-#endif  /* ABYSS_WIN32 */
+void
+ChanSwitchTerm(void);
 
-abyss_bool MutexCreate(TMutex *m);
-abyss_bool MutexLock(TMutex *m);
-abyss_bool MutexUnlock(TMutex *m);
-abyss_bool MutexTryLock(TMutex *m);
-void MutexFree(TMutex *m);
+/* If you're wondering where the constructors for TChanSwitch,
+   TChannel, and TSocket are: They're implementation-specific, so look
+   in abyss_unixsock.h, etc.
+*/
 
+void
+ChanSwitchDestroy(TChanSwitch * const chanSwitchP);
 
-/*********************************************************************
-** Pool
-*********************************************************************/
+void
+ChannelInit(const char ** const errorP);
 
-typedef struct _TPoolZone
-{
-    char *pos,*maxpos;
-    struct _TPoolZone *next,*prev;
-/*  char data[0]; */
-    char data[1];
-} TPoolZone;
-
-typedef struct
-{
-    TPoolZone *firstzone,*currentzone;
-    uint32_t zonesize;
-    TMutex mutex;
-} TPool;
+void
+ChannelTerm(void);
 
-abyss_bool PoolCreate(TPool *p,uint32_t zonesize);
-void PoolFree(TPool *p);
+void
+ChannelDestroy(TChannel * const channelP);
 
-void *PoolAlloc(TPool *p,uint32_t size);
-char *PoolStrdup(TPool *p,char *s);
+void
+SocketDestroy(TSocket * const socketP);
 
 
-/*********************************************************************
-** Socket
-*********************************************************************/
+typedef struct {
+    /* Before Xmlrpc-c 1.04, the internal server representation,
+       struct _TServer, was exposed to users and was the only way to
+       set certain parameters of the server.  Now, use the (new)
+       ServerSet...() functions.  Use the HAVE_ macros to determine
+       which method you have to use.
+    */
+    struct _TServer * srvP;
+} TServer;
 
-#ifdef ABYSS_WIN32
-#include <winsock.h>
-#else
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <unistd.h>
+typedef struct _TSession TSession;
 
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#endif  /* ABYSS_WIN32 */
+abyss_bool
+ServerCreate(TServer *       const serverP,
+             const char *    const name,
+             xmlrpc_uint16_t const port,
+             const char *    const filespath,
+             const char *    const logfilename);
 
-#define TIME_INFINITE   0xffffffff
+void
+ServerCreateSwitch(TServer *     const serverP,
+                   TChanSwitch * const chanSwitchP,
+                   const char ** const errorP);
 
-#ifdef ABYSS_WIN32
-typedef SOCKET TSocket;
-#else
-typedef uint32_t TSocket;
-#endif  /* ABYSS_WIN32 */
+abyss_bool
+ServerCreateSocket(TServer *    const serverP,
+                   const char * const name,
+                   TOsSocket    const socketFd,
+                   const char * const filespath,
+                   const char * const logfilename);
 
-typedef struct in_addr TIPAddr;
+#define HAVE_SERVER_CREATE_SOCKET_2
+void
+ServerCreateSocket2(TServer *     const serverP,
+                    TSocket *     const socketP,
+                    const char ** const errorP);
 
-#define IPB1(x) (((unsigned char *)(&x))[0])
-#define IPB2(x) (((unsigned char *)(&x))[1])
-#define IPB3(x) (((unsigned char *)(&x))[2])
-#define IPB4(x) (((unsigned char *)(&x))[3])
+abyss_bool
+ServerCreateNoAccept(TServer *    const serverP,
+                     const char * const name,
+                     const char * const filespath,
+                     const char * const logfilename);
 
-abyss_bool SocketInit(void);
+void
+ServerFree(TServer * const serverP);
 
-abyss_bool SocketCreate(TSocket *s);
-abyss_bool SocketClose(TSocket *s);
+void
+ServerSetName(TServer *    const serverP,
+              const char * const name);
 
-int SocketWrite(TSocket *s, char *buffer, uint32_t len);
-uint32_t SocketRead(TSocket *s, char *buffer, uint32_t len);
-uint32_t SocketPeek(TSocket *s, char *buffer, uint32_t len);
+void
+ServerSetFilesPath(TServer *    const serverP,
+                   const char * const filesPath);
 
-abyss_bool SocketConnect(TSocket *s, TIPAddr *addr, uint16_t port);
-abyss_bool SocketBind(TSocket *s, TIPAddr *addr, uint16_t port);
+void
+ServerSetLogFileName(TServer *    const serverP,
+                     const char * const logFileName);
 
-abyss_bool SocketListen(TSocket *s, uint32_t backlog);
-abyss_bool SocketAccept(TSocket *s, TSocket *ns,TIPAddr *ip);
+#define HAVE_SERVER_SET_KEEPALIVE_TIMEOUT 1
+void
+ServerSetKeepaliveTimeout(TServer *       const serverP,
+                          xmlrpc_uint32_t const keepaliveTimeout);
 
-uint32_t SocketError(void);
+#define HAVE_SERVER_SET_KEEPALIVE_MAX_CONN 1
+void
+ServerSetKeepaliveMaxConn(TServer *       const serverP,
+                          xmlrpc_uint32_t const keepaliveMaxConn);
 
-uint32_t SocketWait(TSocket *s,abyss_bool rd,abyss_bool wr,uint32_t timems);
+#define HAVE_SERVER_SET_TIMEOUT 1
+void
+ServerSetTimeout(TServer *       const serverP,
+                 xmlrpc_uint32_t const timeout);
 
-abyss_bool SocketBlocking(TSocket *s, abyss_bool b);
-uint32_t SocketAvailableReadBytes(TSocket *s);
+#define HAVE_SERVER_SET_ADVERTISE 1
+void
+ServerSetAdvertise(TServer *  const serverP,
+                   abyss_bool const advertise);
 
+#define HAVE_SERVER_SET_MIME_TYPE 1
+void
+ServerSetMimeType(TServer *  const serverP,
+                  MIMEType * const MIMETypeP);
 
-/*********************************************************************
-** File
-*********************************************************************/
+void
+ServerInit(TServer * const serverP);
 
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <limits.h>
+void
+ServerRun(TServer * const serverP);
 
-#ifndef NAME_MAX
-#define NAME_MAX    1024
-#endif
+void
+ServerRunOnce(TServer * const serverP);
 
-#ifdef ABYSS_WIN32
-#ifndef __BORLANDC__
-#define O_APPEND    _O_APPEND
-#define O_CREAT     _O_CREAT 
-#define O_EXCL      _O_EXCL
-#define O_RDONLY    _O_RDONLY
-#define O_RDWR      _O_RDWR 
-#define O_TRUNC _O_TRUNC
-#define O_WRONLY    _O_WRONLY
-#define O_TEXT      _O_TEXT
-#define O_BINARY    _O_BINARY
-#endif
+/* ServerRunOnce2() is obsolete.  See user's guide. */
+void
+ServerRunOnce2(TServer *           const serverP,
+               enum abyss_foreback const foregroundBackground);
 
-#define A_HIDDEN    _A_HIDDEN
-#define A_NORMAL    _A_NORMAL
-#define A_RDONLY    _A_RDONLY
-#define A_SUBDIR    _A_SUBDIR
-#else
-#define A_SUBDIR    1
-#define O_BINARY    0
-#define O_TEXT      0
-#endif  /* ABYSS_WIN32 */
-
-#ifdef ABYSS_WIN32
-
-#ifndef __BORLANDC__
-typedef struct _stati64 TFileStat;
-typedef struct _finddata_t TFileInfo;
-typedef long TFileFind;
+void
+ServerRunChannel(TServer *     const serverP,
+                 TChannel *    const channelP,
+                 void *        const channelInfoP,
+                 const char ** const errorP);
 
-#else
+#define HAVE_SERVER_RUN_CONN_2
+void
+ServerRunConn2(TServer *     const serverP,
+               TSocket *     const connectedSocketP,
+               const char ** const errorP);
 
-typedef struct stat TFileStat;
-typedef struct finddata_t
-{
-    char name[NAME_MAX+1];
-    int attrib;
-    uint64_t size;
-    time_t time_write;
-   WIN32_FIND_DATA data;
-} TFileInfo;
-typedef HANDLE TFileFind;
-#endif
+void
+ServerRunConn(TServer * const serverP,
+              TOsSocket const connectedSocket);
 
-#else
+void
+ServerDaemonize(TServer * const serverP);
 
-#include <unistd.h>
-#include <dirent.h>
+void
+ServerTerminate(TServer * const serverP);
 
-typedef struct stat TFileStat;
+void
+ServerResetTerminate(TServer * const serverP);
 
-typedef struct finddata_t
-{
-    char name[NAME_MAX+1];
-    int attrib;
-    uint64_t size;
-    time_t time_write;
-} TFileInfo;
-
-typedef struct 
-{
-    char path[NAME_MAX+1];
-    DIR *handle;
-} TFileFind;
+void
+ServerUseSigchld(TServer * const serverP);
 
+#ifndef WIN32
+void
+ServerHandleSigchld(pid_t const pid);
 #endif
 
-typedef int TFile;
-
-abyss_bool FileOpen(TFile *f, const char *name,uint32_t attrib);
-abyss_bool FileOpenCreate(TFile *f, const char *name, uint32_t attrib);
-abyss_bool FileClose(TFile *f);
+typedef abyss_bool (*URIHandler) (TSession *); /* deprecated */
 
-abyss_bool FileWrite(TFile *f, void *buffer, uint32_t len);
-int32_t FileRead(TFile *f, void *buffer, uint32_t len);
+struct URIHandler2;
 
-abyss_bool FileSeek(TFile *f, uint64_t pos, uint32_t attrib);
-uint64_t FileSize(TFile *f);
+typedef void (*initHandlerFn)(struct URIHandler2 *,
+                              abyss_bool *);
 
-abyss_bool FileStat(char *filename,TFileStat *filestat);
+typedef void (*termHandlerFn)(void *);
 
-abyss_bool FileFindFirst(TFileFind *filefind,char *path,TFileInfo *fileinfo);
-abyss_bool FileFindNext(TFileFind *filefind,TFileInfo *fileinfo);
-void FileFindClose(TFileFind *filefind);
+typedef void (*handleReq2Fn)(struct URIHandler2 *,
+                             TSession *,
+                             abyss_bool *);
 
-/*********************************************************************
-** Server (1/2)
-*********************************************************************/
+typedef struct URIHandler2 {
+    initHandlerFn init;
+    termHandlerFn term;
+    handleReq2Fn  handleReq2;
+    URIHandler    handleReq1;  /* deprecated */
+    void *        userdata;
+} URIHandler2;
 
-typedef struct _TServer
-{
-    TSocket listensock;
-    TFile logfile;
-    TMutex logmutex;
-    char *name;
-    char *filespath;
-    uint16_t port;
-    uint32_t keepalivetimeout,keepalivemaxconn,timeout;
-    TList handlers;
-    TList defaultfilenames;
-    void *defaulthandler;
-    abyss_bool advertise;
-#ifndef _WIN32
-    uid_t uid;
-    gid_t gid;
-    TFile pidfile;
-#endif  
-	int running;
-} TServer;
+void
+ServerAddHandler2(TServer *     const srvP,
+                  URIHandler2 * const handlerP,
+                  abyss_bool *  const successP);
 
+abyss_bool
+ServerAddHandler(TServer * const srvP,
+                 URIHandler const handler);
 
-/*********************************************************************
-** Conn
-*********************************************************************/
+typedef abyss_bool (*THandlerDflt) (TSession *);
 
-#define BUFFER_SIZE 4096 
+/* Note: 'handler' used to be URIHandler;  THandlerDflt is a newer name
+   for the same type
+*/
 
-typedef struct _TConn
-{
-    TServer *server;
-    uint32_t buffersize,bufferpos;
-    uint32_t inbytes,outbytes;  
-    TSocket socket;
-    TIPAddr peerip;
-    abyss_bool hasOwnThread;
-    TThread thread;
-    abyss_bool connected;
-    abyss_bool inUse;
-    const char * trace;
-    void (*job)(struct _TConn *);
-    char buffer[BUFFER_SIZE];
-} TConn;
+void
+ServerDefaultHandler(TServer *    const srvP,
+                     THandlerDflt const handler);
 
-TConn *ConnAlloc(void);
-void ConnFree(TConn *c);
+/* ConfReadServerFile() is inappropriately named; it was a mistake.
+   But then, so is having this function at all.  The config file is
+   inappropriate for an API.
+*/
 
-enum abyss_foreback {ABYSS_FOREGROUND, ABYSS_BACKGROUND};
+abyss_bool
+ConfReadServerFile(const char * const filename,
+                   TServer *    const srvP);
 
-abyss_bool ConnCreate(TConn *c, TSocket *s, void (*func)(TConn *));
-abyss_bool ConnCreate2(TConn *             const connectionP, 
-                       TServer *           const serverP,
-                       TSocket             const connectedSocket,
-                       TIPAddr             const peerIpAddr,
-                       void            ( *       func)(TConn *),
-                       enum abyss_foreback const foregroundBackground);
-abyss_bool ConnProcess(TConn *c);
-abyss_bool ConnKill(TConn *c);
-void ConnClose(TConn *c);
-
-abyss_bool ConnWrite(TConn *c,void *buffer,uint32_t size);
-abyss_bool ConnRead(TConn *c, uint32_t timems);
-void ConnReadInit(TConn *c);
-abyss_bool ConnReadLine(TConn *c,char **z,uint32_t timems);
+void
+LogWrite(TServer *    const srvP,
+         const char * const c);
 
-abyss_bool ConnWriteFromFile(TConn *c,TFile *file,uint64_t start,uint64_t end,
-            void *buffer,uint32_t buffersize,uint32_t rate);
+/****************************************************************************
+  STUFF FOR HTTP REQUEST HANDLERS TO USE
+****************************************************************************/
 
+typedef enum {
+    m_unknown, m_get, m_put, m_head, m_post, m_delete, m_trace, m_options
+} TMethod;
 
-/*********************************************************************
-** Range
-*********************************************************************/
+typedef struct {
+    TMethod method;
+    const char * uri;
+        /* This is NOT the URI.  It is the pathname part of the URI.
+           We really should fix that and put the pathname in another
+           member.  If the URI does not contain a pathname, this is "*".
+        */
+    const char * query;
+        /* The query part of the URI (stuff after '?').  NULL if none. */
+    const char * host;
+        /* NOT the value of the host: header.  Rather, the name of the
+           target host (could be part of the host: value; could be from the
+           URI).  No port number.  NULL if request does not specify a host
+           name.
+        */
+    const char * from;
+    const char * useragent;
+    const char * referer;
+    const char * requestline;
+    const char * user;
+        /* Requesting user (from authorization: header).  NULL if
+           request doesn't specify or handler has not authenticated it.
+        */
+    xmlrpc_uint16_t port;
+        /* The port number from the URI, or default 80 if the URI doesn't
+           specify a port.
+        */
+    abyss_bool keepalive;
+} TRequestInfo;
 
-abyss_bool RangeDecode(char *str,uint64_t filesize,uint64_t *start,uint64_t *end);
+abyss_bool
+SessionRefillBuffer(TSession * const sessionP);
 
-/*********************************************************************
-** Date
-*********************************************************************/
+size_t
+SessionReadDataAvail(TSession * const sessionP);
 
-#include <time.h>
+void
+SessionGetReadData(TSession *    const sessionP, 
+                   size_t        const max, 
+                   const char ** const outStartP, 
+                   size_t *      const outLenP);
 
-typedef struct tm TDate;
+void
+SessionGetRequestInfo(TSession *            const sessionP,
+                      const TRequestInfo ** const requestInfoPP);
 
-abyss_bool DateToString(TDate *tm,char *s);
-abyss_bool DateToLogString(TDate *tm,char *s);
+void
+SessionGetChannelInfo(TSession * const sessionP,
+                      void **    const channelInfoPP);
 
-abyss_bool DateDecode(char *s,TDate *tm);
+void *
+SessionGetDefaultHandlerCtx(TSession * const sessionP);
 
-int32_t DateCompare(TDate *d1,TDate *d2);
+char *
+RequestHeaderValue(TSession *   const sessionP,
+                   const char * const name);
 
-abyss_bool DateFromGMT(TDate *d,time_t t);
-abyss_bool DateFromLocal(TDate *d,time_t t);
+abyss_bool
+ResponseAddField(TSession *   const sessionP,
+                 const char * const name,
+                 const char * const value);
 
-abyss_bool DateInit(void);
+void
+ResponseWriteStart(TSession * const sessionP);
 
-/*********************************************************************
-** Base64
-*********************************************************************/
+/* For backward compatibility: */
+#define ResponseWrite ResponseWriteStart
 
-void Base64Encode(char *s,char *d);
+abyss_bool
+ResponseWriteBody(TSession *      const sessionP,
+                  const char *    const data,
+                  xmlrpc_uint32_t const len);
 
-/*********************************************************************
-** Session
-*********************************************************************/
+abyss_bool
+ResponseWriteEnd(TSession * const sessionP);
 
-typedef enum
-{
-    m_unknown,m_get,m_put,m_head,m_post,m_delete,m_trace,m_options
-} TMethod;
+abyss_bool
+ResponseChunked(TSession * const sessionP);
 
-typedef struct
-{
-    TMethod method;
-    uint32_t nbfileds;
-    char *uri;
-    char *query;
-    char *host;
-    char *from;
-    char *useragent;
-    char *referer;
-    char *requestline;
-    char *user;
-    uint16_t port;
-    TList cookies;
-    TList ranges;
-
-    uint16_t status;
-    TString header;
-
-    abyss_bool keepalive,cankeepalive;
-    abyss_bool done;
-
-    TServer *server;
-    TConn *conn;
+xmlrpc_uint16_t
+ResponseStatusFromErrno(int const errnoArg);
 
-    uint8_t versionminor,versionmajor;
+void
+ResponseStatus(TSession *      const sessionP,
+               xmlrpc_uint16_t const code);
 
-    TTable request_headers,response_headers;
+void
+ResponseStatusErrno(TSession * const sessionP);
 
-    TDate date;
+abyss_bool
+ResponseContentType(TSession *   const serverP,
+                    const char * const type);
 
-    abyss_bool chunkedwrite,chunkedwritemode;
-} TSession;
+abyss_bool
+ResponseContentLength(TSession *      const sessionP,
+                      xmlrpc_uint64_t const len);
 
-/*********************************************************************
-** Request
-*********************************************************************/
+void
+ResponseError2(TSession *   const sessionP,
+               const char * const explanation);
 
-#define CR      '\r'
-#define LF      '\n'
-#define CRLF    "\r\n"
+void
+ResponseError(TSession * const sessionP);
 
-abyss_bool RequestValidURI(TSession *r);
-abyss_bool RequestValidURIPath(TSession *r);
-abyss_bool RequestUnescapeURI(TSession *r);
+const char *
+MIMETypeFromExt(const char * const ext);
 
-char *RequestHeaderValue(TSession *r,char *name);
+const char *
+MIMETypeFromExt2(MIMEType *   const MIMETypeP,
+                 const char * const ext);
 
-abyss_bool RequestRead(TSession *r);
-void RequestInit(TSession *r,TConn *c);
-void RequestFree(TSession *r);
+const char *
+MIMETypeFromFileName2(MIMEType *   const MIMETypeP,
+                      const char * const fileName);
 
-abyss_bool RequestAuth(TSession *r,char *credential,char *user,char *pass);
+const char *
+MIMETypeFromFileName(const char * const fileName);
 
-/*********************************************************************
-** Response
-*********************************************************************/
+const char *
+MIMETypeGuessFromFile2(MIMEType *   const MIMETypeP,
+                       const char * const fileName);
 
-abyss_bool ResponseAddField(TSession *r,char *name,char *value);
-void ResponseWrite(TSession *r);
+const char *
+MIMETypeGuessFromFile(const char * const filename);
 
-abyss_bool ResponseChunked(TSession *s);
 
-void ResponseStatus(TSession *r,uint16_t code);
-void ResponseStatusErrno(TSession *r);
+/****************************************************************************
+  STUFF THAT PROBABLY DOESN'T BELONG IN THIS FILE BECAUSE IT IS INTERNAL
 
-abyss_bool ResponseContentType(TSession *r,char *type);
-abyss_bool ResponseContentLength(TSession *r,uint64_t len);
+  Some day, we sort this out.
+****************************************************************************/
 
-void ResponseError(TSession *r);
 
+#define CR      '\r'
+#define LF      '\n'
+#define CRLF    "\r\n"
 
 /*********************************************************************
-** HTTP
+** Paths and so on...
 *********************************************************************/
 
-char *HTTPReasonByStatus(uint16_t status);
-
-int32_t HTTPRead(TSession *s,char *buffer,uint32_t len);
-
-abyss_bool HTTPWrite(TSession *s,char *buffer,uint32_t len);
-abyss_bool HTTPWriteEnd(TSession *s);
+#ifdef WIN32
+#define DEFAULT_ROOT        "c:\\abyss"
+#define DEFAULT_DOCS        DEFAULT_ROOT"\\htdocs"
+#define DEFAULT_CONF_FILE   DEFAULT_ROOT"\\conf\\abyss.conf"
+#define DEFAULT_LOG_FILE    DEFAULT_ROOT"\\log\\abyss.log"
+#else
+#ifdef __rtems__
+#define DEFAULT_ROOT        "/abyss"
+#else
+#define DEFAULT_ROOT        "/usr/local/abyss"
+#endif
+#define DEFAULT_DOCS        DEFAULT_ROOT"/htdocs"
+#define DEFAULT_CONF_FILE   DEFAULT_ROOT"/conf/abyss.conf"
+#define DEFAULT_LOG_FILE    DEFAULT_ROOT"/log/abyss.log"
+#endif
 
 /*********************************************************************
-** Server (2/2)
+** Maximum number of simultaneous connections
 *********************************************************************/
 
-abyss_bool ServerCreate(TServer *srv,
-                        const char *name,
-                        uint16_t port,
-                        const char *filespath,
-                        const char *logfilename);
-
-void ServerFree(TServer *srv);
-
-int ServerInit(TServer *srv);
-void ServerRun(TServer *srv);
-void ServerRunOnce(TServer *srv);
-void ServerRunOnce2(TServer *           const srv,
-                    enum abyss_foreback const foregroundBackground);
-
-typedef abyss_bool (*URIHandler) (TSession *); /* deprecated */
-
-struct URIHandler2;
-
-typedef void (*initHandlerFn)(struct URIHandler2 *,
-                              abyss_bool *);
-
-typedef void (*termHandlerFn)(struct URIHandler2 *);
-
-typedef void (*handleReq2Fn)(struct URIHandler2 *,
-                             TSession *,
-                             abyss_bool *);
-
-typedef struct URIHandler2 {
-    initHandlerFn init;
-    termHandlerFn term;
-    handleReq2Fn  handleReq2;
-    URIHandler    handleReq1;  /* deprecated */
-    void *        userdata;
-} URIHandler2;
-
-void
-ServerAddHandler2(TServer *     const srvP,
-                  URIHandler2 * const handlerP,
-                  abyss_bool *  const successP);
-
-abyss_bool
-ServerAddHandler(TServer * const srvP,
-                 URIHandler const handler);
-
-void
-ServerDefaultHandler(TServer *  const srvP,
-                     URIHandler const handler);
-
-abyss_bool LogOpen(TServer *srv, const char *filename);
-void LogWrite(TServer *srv,char *c);
-void LogClose(TServer *srv);
-
+#define MAX_CONN    16
 
 /*********************************************************************
-** MIMEType
+** General purpose definitions
 *********************************************************************/
 
-void MIMETypeInit(void);
-abyss_bool MIMETypeAdd(char *type,char *ext);
-char *MIMETypeFromExt(char *ext);
-char *MIMETypeFromFileName(char *filename);
-char *MIMETypeGuessFromFile(char *filename);
+#ifndef NULL
+#define NULL ((void *)0)
+#endif  /* NULL */
+
+#ifndef TRUE
+#define TRUE    1
+#endif  /* TRUE */
 
+#ifndef FALSE
+#define FALSE    0
+#endif  /* FALSE */
 
 /*********************************************************************
-** Conf
+** Range
 *********************************************************************/
 
-abyss_bool ConfReadMIMETypes(char *filename);
-abyss_bool ConfReadServerFile(const char *filename,TServer *srv);
+abyss_bool
+RangeDecode(char *            const str,
+            xmlrpc_uint64_t   const filesize,
+            xmlrpc_uint64_t * const start,
+            xmlrpc_uint64_t * const end);
 
+abyss_bool DateInit(void);
 
 /*********************************************************************
-** Trace
+** Base64
 *********************************************************************/
 
-void TraceMsg(char *fmt,...);
-void TraceExit(char *fmt,...);
-
+void
+Base64Encode(const char * const chars,
+             char *       const base64);
 
 /*********************************************************************
 ** Session
 *********************************************************************/
 
-abyss_bool SessionLog(TSession *s);
+abyss_bool SessionLog(TSession * const s);
 
 
 #ifdef __cplusplus
 }
+
+
 #endif
 
 /*****************************************************************************

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.h	Mon May 26 12:59:57 2008
@@ -6,8 +6,11 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <time.h>
+#include <xmlrpc-c/util.h>
+#include <xmlrpc-c/config.h>
+  /* Defines XMLRPC_HAVE_WCHAR, XMLRPC_INT64 */
 
-#ifdef HAVE_UNICODE_WCHAR
+#if XMLRPC_HAVE_WCHAR
 #include <wchar.h>
 #endif
 
@@ -17,16 +20,26 @@
 
 
 /*=========================================================================
-**  Typedefs
-**=========================================================================
-**  We define names for these types, because they may change from platform
-**  to platform.
+**  Version of libxmlrpc
+**=======================================================================*/
+extern unsigned int const xmlrpc_version_major;
+extern unsigned int const xmlrpc_version_minor;
+extern unsigned int const xmlrpc_version_point;
+
+/*=========================================================================
+**  C types equivalent to XML-RPC types
+**=======================================================================*/
+
+/*  We define names for these types, because they may change from platform
+    to platform.
 */
 
 typedef signed int xmlrpc_int;  
     /* An integer of the type defined by XML-RPC <int>; i.e. 32 bit */
-typedef signed int xmlrpc_int32;
-    /* An integer of the type defined by XML-RPC <int4>; i.e. 32 bit */
+typedef XMLRPC_INT32 xmlrpc_int32;
+    /* An integer of the type defined by XML-RPC <i4>; i.e. 32 bit */
+typedef XMLRPC_INT64 xmlrpc_int64;
+    /* An integer of the type defined by "XML-RPC" <i8>; i.e. 64 bit */
 typedef int xmlrpc_bool;
     /* A boolean (of the type defined by XML-RPC <boolean>, but there's
        really only one kind)
@@ -38,296 +51,19 @@
        for mathematical completeness.
     */
 
-#define XMLRPC_INT32_MAX (2147483647)
-#define XMLRPC_INT32_MIN (-XMLRPC_INT32_MAX - 1)
-
-
-
-/*=========================================================================
-**  C struct size computations
-**=======================================================================*/
-
-/* Use XMLRPC_STRUCT_MEMBER_SIZE() to determine how big a structure is
-   up to and including a specified member.  E.g. if you have
-   struct mystruct {int red; int green; int blue};, then
-   XMLRPC_STRUCT_MEMBER_SIZE(mystruct, green) is (8).
-*/
-
-#define _XMLRPC_STRUCT_MEMBER_OFFSET(TYPE, MBRNAME) \
-  ((unsigned long)(char*)&((TYPE *)0)->MBRNAME)
-#define _XMLRPC_STRUCT_MEMBER_SIZE(TYPE, MBRNAME) \
-  sizeof(((TYPE *)0)->MBRNAME)
-#define XMLRPC_STRUCTSIZE(TYPE, MBRNAME) \
-  (_XMLRPC_STRUCT_MEMBER_OFFSET(TYPE, MBRNAME) + \
-  _XMLRPC_STRUCT_MEMBER_SIZE(TYPE, MBRNAME))
-
-/*=========================================================================
-**  Assertions and Debugging
-**=========================================================================
-**  Note that an assertion is _not_ a directive to check a condition and
-**  crash if it isn't true.  It is an assertion that the condition _is_
-**  true.  This assertion helps people to read the code.  The program
-**  may also check the assertion as it runs, and if it conflicts with reality,
-**  recognize that the program is incorrect and abort it.  In practice,
-**  it does this checking when the program was compiled without the NDEBUG
-**  macro defined.
-*/
-
-#ifndef NDEBUG
-
-#define XMLRPC_ASSERT(cond) \
-    do \
-        if (!(cond)) \
-            xmlrpc_assertion_failed(__FILE__, __LINE__); \
-    while (0)
-
-#else
-#define XMLRPC_ASSERT(cond) (0)
-#endif
-
-extern void xmlrpc_assertion_failed (char* file, int line);
-
-/* Validate a pointer. */
-#define XMLRPC_ASSERT_PTR_OK(ptr) \
-    XMLRPC_ASSERT((ptr) != NULL)
-
-/* We only call this if something truly drastic happens. */
-#define XMLRPC_FATAL_ERROR(msg) xmlrpc_fatal_error(__FILE__, __LINE__, (msg))
-
-extern void xmlrpc_fatal_error (char* file, int line, char* msg);
-
-
-/*=========================================================================
-**  Strings
-**=======================================================================*/
-
-/* Traditional C strings are char *, because they come from a time before
-   there was 'const'.  Now, const char * makes a lot more sense.  Also,
-   in modern times, we tend to dynamically allocate memory for strings.
-   We need this free function accordingly.  Ordinary free() doesn't check
-   the type, and can generate a warning due to the 'const'.
+/* xmlrpc_socket is just for backward compatibility, in case someone decided
+   to use this in user code.  New code should use the native type for a
+   socket (e.g. int or SOCKET).  (We stopped using this because for winsock
+   users, we would have to #include <winsock.h> in every file that
+   #includes <xmlrpc-c/base.h> and we don't want that).
 */
-void
-xmlrpc_strfree(const char * const string);
-
-
+typedef int xmlrpc_socket;
 
-/*=========================================================================
-**  xmlrpc_env
-**=========================================================================
-**  XML-RPC represents runtime errors as <fault> elements. These contain
-**  <faultCode> and <faultString> elements.
-**
-**  Since we need as much thread-safety as possible, we borrow an idea from
-**  CORBA--we store exception information in an "environment" object.
-**  You'll pass this to many different functions, and it will get filled
-**  out appropriately.
-**
-**  For example:
-**
-**    xmlrpc_env env;
-**
-**    xmlrpc_env_init(&env);
-**
-**    xmlrpc_do_something(&env);
-**    if (env.fault_occurred)
-**        report_error_appropriately();
-**
-**    xmlrpc_env_clean(&env);
-*/
-
-#define XMLRPC_INTERNAL_ERROR               (-500)
-#define XMLRPC_TYPE_ERROR                   (-501)
-#define XMLRPC_INDEX_ERROR                  (-502)
-#define XMLRPC_PARSE_ERROR                  (-503)
-#define XMLRPC_NETWORK_ERROR                (-504)
-#define XMLRPC_TIMEOUT_ERROR                (-505)
-#define XMLRPC_NO_SUCH_METHOD_ERROR         (-506)
-#define XMLRPC_REQUEST_REFUSED_ERROR        (-507)
-#define XMLRPC_INTROSPECTION_DISABLED_ERROR (-508)
-#define XMLRPC_LIMIT_EXCEEDED_ERROR         (-509)
-#define XMLRPC_INVALID_UTF8_ERROR           (-510)
-
-typedef struct _xmlrpc_env {
-    int   fault_occurred;
-    xmlrpc_int32 fault_code;
-    char* fault_string;
-} xmlrpc_env;
-
-/* Initialize and destroy the contents of the provided xmlrpc_env object.
-** These functions will never fail. */
-void xmlrpc_env_init (xmlrpc_env* env);
-void xmlrpc_env_clean (xmlrpc_env* env);
-
-/* Fill out an xmlrpc_fault with the specified values, and set the
-** fault_occurred flag. This function will make a private copy of 'string',
-** so you retain responsibility for your copy. */
-void 
-xmlrpc_env_set_fault(xmlrpc_env * const env, 
-                     int          const faultCode, 
-                     const char * const faultDescription);
-
-/* The same as the above, but using a printf-style format string. */
-void 
-xmlrpc_env_set_fault_formatted (xmlrpc_env * const envP, 
-                                int          const code,
-                                const char * const format, 
-                                ...);
-
-/* This one infers XMLRPC_INTERNAL_ERROR and has a shorter name.
-   So a call takes up less source code space.
-*/
-void
-xmlrpc_faultf(xmlrpc_env * const envP,
-              const char * const format,
-              ...);
-
-/* A simple debugging assertion. */
-#define XMLRPC_ASSERT_ENV_OK(env) \
-    XMLRPC_ASSERT((env) != NULL && !(env)->fault_occurred)
-
-/* This version must *not* interpret 'str' as a format string, to avoid
-** several evil attacks. */
-#define XMLRPC_FAIL(env,code,str) \
-    do { xmlrpc_env_set_fault((env),(code),(str)); goto cleanup; } while (0)
-
-#define XMLRPC_FAIL1(env,code,str,arg1) \
-    do { \
-        xmlrpc_env_set_fault_formatted((env),(code),(str),(arg1)); \
-        goto cleanup; \
-    } while (0)
-
-#define XMLRPC_FAIL2(env,code,str,arg1,arg2) \
-    do { \
-        xmlrpc_env_set_fault_formatted((env),(code),(str),(arg1),(arg2)); \
-        goto cleanup; \
-    } while (0)
-
-#define XMLRPC_FAIL3(env,code,str,arg1,arg2,arg3) \
-    do { \
-        xmlrpc_env_set_fault_formatted((env),(code), \
-                                       (str),(arg1),(arg2),(arg3)); \
-        goto cleanup; \
-    } while (0)
-
-#define XMLRPC_FAIL_IF_NULL(ptr,env,code,str) \
-    do { \
-        if ((ptr) == NULL) \
-            XMLRPC_FAIL((env),(code),(str)); \
-    } while (0)
-
-#define XMLRPC_FAIL_IF_FAULT(env) \
-    do { if ((env)->fault_occurred) goto cleanup; } while (0)
-
-
-/*=========================================================================
-**  Resource Limits
-**=========================================================================
-**  To discourage denial-of-service attacks, we provide several adjustable
-**  resource limits. These functions are *not* re-entrant.
-*/
-
-/* Limit IDs. There will be more of these as time goes on. */
-#define XMLRPC_NESTING_LIMIT_ID   (0)
-#define XMLRPC_XML_SIZE_LIMIT_ID  (1)
-#define XMLRPC_LAST_LIMIT_ID      (XMLRPC_XML_SIZE_LIMIT_ID)
-
-/* By default, deserialized data may be no more than 64 levels deep. */
-#define XMLRPC_NESTING_LIMIT_DEFAULT  (64)
-
-/* By default, XML data from the network may be no larger than 512K.
-** Some client and server modules may fail to enforce this properly. */
-#define XMLRPC_XML_SIZE_LIMIT_DEFAULT (512*1024)
-
-/* Set a specific limit to the specified value. */
-extern void xmlrpc_limit_set (int limit_id, size_t value);
-
-/* Get the value of a specified limit. */
-extern size_t xmlrpc_limit_get (int limit_id);
-
-
-/*=========================================================================
-**  xmlrpc_mem_block
-**=========================================================================
-**  A resizable chunk of memory. This is mostly used internally, but it is
-**  also used by the public API in a few places.
-**  The struct fields are private!
-*/
-
-typedef struct _xmlrpc_mem_block {
-    size_t _size;
-    size_t _allocated;
-    void*  _block;
-} xmlrpc_mem_block;
-
-/* Allocate a new xmlrpc_mem_block. */
-xmlrpc_mem_block* xmlrpc_mem_block_new (xmlrpc_env* env, size_t size);
-
-/* Destroy an existing xmlrpc_mem_block, and everything it contains. */
-void xmlrpc_mem_block_free (xmlrpc_mem_block* block);
-
-/* Initialize the contents of the provided xmlrpc_mem_block. */
-void xmlrpc_mem_block_init
-    (xmlrpc_env* env, xmlrpc_mem_block* block, size_t size);
-
-/* Deallocate the contents of the provided xmlrpc_mem_block, but not the
-** block itself. */
-void xmlrpc_mem_block_clean (xmlrpc_mem_block* block);
-
-/* Get the size and contents of the xmlrpc_mem_block. */
-size_t 
-xmlrpc_mem_block_size(const xmlrpc_mem_block * const block);
-
-void * 
-xmlrpc_mem_block_contents(const xmlrpc_mem_block * const block);
-
-/* Resize an xmlrpc_mem_block, preserving as much of the contents as
-** possible. */
-void xmlrpc_mem_block_resize
-    (xmlrpc_env* env, xmlrpc_mem_block* block, size_t size);
-
-/* Append data to an existing xmlrpc_mem_block. */
-void xmlrpc_mem_block_append
-    (xmlrpc_env* env, xmlrpc_mem_block* block, const void *data, size_t len);
-
-#define XMLRPC_MEMBLOCK_NEW(type,env,size) \
-    xmlrpc_mem_block_new((env), sizeof(type) * (size))
-#define XMLRPC_MEMBLOCK_FREE(type,block) \
-    xmlrpc_mem_block_free(block)
-#define XMLRPC_MEMBLOCK_INIT(type,env,block,size) \
-    xmlrpc_mem_block_init((env), (block), sizeof(type) * (size))
-#define XMLRPC_MEMBLOCK_CLEAN(type,block) \
-    xmlrpc_mem_block_clean(block)
-#define XMLRPC_MEMBLOCK_SIZE(type,block) \
-    (xmlrpc_mem_block_size(block) / sizeof(type))
-#define XMLRPC_MEMBLOCK_CONTENTS(type,block) \
-    ((type*) xmlrpc_mem_block_contents(block))
-#define XMLRPC_MEMBLOCK_RESIZE(type,env,block,size) \
-    xmlrpc_mem_block_resize(env, block, sizeof(type) * (size))
-#define XMLRPC_MEMBLOCK_APPEND(type,env,block,data,size) \
-    xmlrpc_mem_block_append(env, block, data, sizeof(type) * (size))
-
-/* Here are some backward compatibility definitions.  These longer names
-   used to be the only ones and typed memory blocks were considered
-   special.
-*/
-#define XMLRPC_TYPED_MEM_BLOCK_NEW(type,env,size) \
-    XMLRPC_MEMBLOCK_NEW(type,env,size)
-#define XMLRPC_TYPED_MEM_BLOCK_FREE(type,block) \
-    XMLRPC_MEMBLOCK_FREE(type,block)
-#define XMLRPC_TYPED_MEM_BLOCK_INIT(type,env,block,size) \
-    XMLRPC_MEMBLOCK_INIT(type,env,block,size)
-#define XMLRPC_TYPED_MEM_BLOCK_CLEAN(type,block) \
-    XMLRPC_MEMBLOCK_CLEAN(type,block)
-#define XMLRPC_TYPED_MEM_BLOCK_SIZE(type,block) \
-    XMLRPC_MEMBLOCK_SIZE(type,block)
-#define XMLRPC_TYPED_MEM_BLOCK_CONTENTS(type,block) \
-    XMLRPC_MEMBLOCK_CONTENTS(type,block)
-#define XMLRPC_TYPED_MEM_BLOCK_RESIZE(type,env,block,size) \
-    XMLRPC_MEMBLOCK_RESIZE(type,env,block,size)
-#define XMLRPC_TYPED_MEM_BLOCK_APPEND(type,env,block,data,size) \
-    XMLRPC_MEMBLOCK_APPEND(type,env,block,data,size)
+#define XMLRPC_INT32_MAX 0x7fffffff
+#define XMLRPC_INT32_MIN (-XMLRPC_INT32_MAX - 1)
 
+#define XMLRPC_INT64_MAX 0x7fffffffffffffffll
+#define XMLRPC_INT64_MIN (-XMLRPC_INT64_MAX - 1)
 
 
 /*=========================================================================
@@ -337,22 +73,28 @@
 */
 
 typedef enum {
-    XMLRPC_TYPE_INT      = 0,
-    XMLRPC_TYPE_BOOL     = 1,
-    XMLRPC_TYPE_DOUBLE   = 2,
-    XMLRPC_TYPE_DATETIME = 3,
-    XMLRPC_TYPE_STRING   = 4,
-    XMLRPC_TYPE_BASE64   = 5,
-    XMLRPC_TYPE_ARRAY    = 6,
-    XMLRPC_TYPE_STRUCT   = 7,
-    XMLRPC_TYPE_C_PTR    = 8,
-    XMLRPC_TYPE_NIL      = 9,
+    XMLRPC_TYPE_INT      =  0,
+    XMLRPC_TYPE_BOOL     =  1,
+    XMLRPC_TYPE_DOUBLE   =  2,
+    XMLRPC_TYPE_DATETIME =  3,
+    XMLRPC_TYPE_STRING   =  4,
+    XMLRPC_TYPE_BASE64   =  5,
+    XMLRPC_TYPE_ARRAY    =  6,
+    XMLRPC_TYPE_STRUCT   =  7,
+    XMLRPC_TYPE_C_PTR    =  8,
+    XMLRPC_TYPE_NIL      =  9,
+    XMLRPC_TYPE_I8       = 10,
     XMLRPC_TYPE_DEAD     = 0xDEAD
 } xmlrpc_type;
 
+#define XMLRPC_HAVE_I8 1
+
 /* These are *always* allocated on the heap. No exceptions. */
 typedef struct _xmlrpc_value xmlrpc_value;
 
+const char *
+xmlrpc_type_name(xmlrpc_type const type);
+
 void
 xmlrpc_abort_if_array_bad(xmlrpc_value * const arrayP);
 
@@ -360,19 +102,23 @@
     xmlrpc_abort_if_array_bad(val)
 
 /* Increment the reference count of an xmlrpc_value. */
-extern void xmlrpc_INCREF (xmlrpc_value* value);
+extern void xmlrpc_INCREF (xmlrpc_value* const value);
 
 /* Decrement the reference count of an xmlrpc_value. If there
 ** are no more references, free it. */
-extern void xmlrpc_DECREF (xmlrpc_value* value);
+extern void xmlrpc_DECREF (xmlrpc_value* const value);
 
 /* Get the type of an XML-RPC value. */
-extern xmlrpc_type xmlrpc_value_type (xmlrpc_value* value);
+extern xmlrpc_type xmlrpc_value_type (xmlrpc_value* const value);
 
 xmlrpc_value *
 xmlrpc_int_new(xmlrpc_env * const envP,
                int          const intValue);
 
+xmlrpc_value *
+xmlrpc_i8_new(xmlrpc_env * const envP, 
+              xmlrpc_int64 const value);
+
 void 
 xmlrpc_read_int(xmlrpc_env *         const envP,
                 const xmlrpc_value * const valueP,
@@ -423,6 +169,25 @@
                      size_t       const length,
                      const char * const stringValue);
 
+xmlrpc_value *
+xmlrpc_string_new_va(xmlrpc_env * const envP,
+                     const char * const format,
+                     va_list            args);
+
+xmlrpc_value *
+xmlrpc_string_new_f(xmlrpc_env * const envP,
+                    const char * const format,
+                    ...);
+
+xmlrpc_value *
+xmlrpc_string_new_lp_cr(xmlrpc_env * const envP, 
+                        size_t       const length,
+                        const char * const value);
+
+xmlrpc_value *
+xmlrpc_string_new_cr(xmlrpc_env * const envP,
+                     const char * const value);
+
 void
 xmlrpc_read_string(xmlrpc_env *         const envP,
                    const xmlrpc_value * const valueP,
@@ -430,12 +195,23 @@
 
 
 void
+xmlrpc_read_string_crlf(xmlrpc_env *         const envP,
+                        const xmlrpc_value * const valueP,
+                        const char **        const stringValueP);
+
+void
+xmlrpc_read_string_lp_crlf(xmlrpc_env *         const envP,
+                           const xmlrpc_value * const valueP,
+                           size_t *             const lengthP,
+                           const char **        const stringValueP);
+
+void
 xmlrpc_read_string_lp(xmlrpc_env *         const envP,
                       const xmlrpc_value * const valueP,
                       size_t *             const lengthP,
                       const char **        const stringValueP);
 
-#ifdef HAVE_UNICODE_WCHAR
+#if XMLRPC_HAVE_WCHAR
 xmlrpc_value *
 xmlrpc_string_w_new(xmlrpc_env *    const envP,
                     const wchar_t * const stringValue);
@@ -451,11 +227,32 @@
                      const wchar_t ** const stringValueP);
 
 void
+xmlrpc_read_string_w_crlf(xmlrpc_env *     const envP,
+                          xmlrpc_value *   const valueP,
+                          const wchar_t ** const stringValueP);
+
+void
 xmlrpc_read_string_w_lp(xmlrpc_env *     const envP,
                         xmlrpc_value *   const valueP,
                         size_t *         const lengthP,
                         const wchar_t ** const stringValueP);
-#endif
+
+void
+xmlrpc_read_string_w_lp_crlf(xmlrpc_env *     const envP,
+                             xmlrpc_value *   const valueP,
+                             size_t *         const lengthP,
+                             const wchar_t ** const stringValueP);
+
+xmlrpc_value *
+xmlrpc_string_w_new_lp_cr(xmlrpc_env *    const envP, 
+                          size_t          const length,
+                          const wchar_t * const value);
+
+xmlrpc_value *
+xmlrpc_string_w_new_cr(xmlrpc_env *    const envP,
+                       const wchar_t * const value);
+
+#endif /* XMLRPC_HAVE_WCHAR */
 
 xmlrpc_value *
 xmlrpc_base64_new(xmlrpc_env *          const envP, 
@@ -485,9 +282,9 @@
 /* Append an item to an XML-RPC array.
 ** Sets XMLRPC_TYPE_ERROR if 'array' is not an array. */
 extern void
-xmlrpc_array_append_item (xmlrpc_env   * envP,
-                          xmlrpc_value * arrayP,
-                          xmlrpc_value * valueP);
+xmlrpc_array_append_item (xmlrpc_env   * const envP,
+                          xmlrpc_value * const arrayP,
+                          xmlrpc_value * const valueP);
 
 void
 xmlrpc_array_read_item(xmlrpc_env *         const envP,
@@ -515,18 +312,8 @@
                                   xmlrpc_value* value);
 */
 
-void
-xmlrpc_read_nil(xmlrpc_env *   const envP,
-                xmlrpc_value * const valueP);
-                
-
-void
-xmlrpc_read_cptr(xmlrpc_env *         const envP,
-                 const xmlrpc_value * const valueP,
-                 void **              const ptrValueP);
-
 xmlrpc_value *
-xmlrpc_struct_new(xmlrpc_env * env);
+xmlrpc_struct_new(xmlrpc_env * const env);
 
 /* Return the number of key/value pairs in a struct.
 ** Sets XMLRPC_TYPE_ERROR if 'strct' is not a struct. */
@@ -574,17 +361,17 @@
                            xmlrpc_value ** const valuePP);
 
 void
+xmlrpc_struct_read_value(xmlrpc_env *    const envP,
+                         xmlrpc_value *  const structP,
+                         const char *    const key,
+                         xmlrpc_value ** const valuePP);
+
+void
 xmlrpc_struct_read_value_v(xmlrpc_env *    const envP,
                            xmlrpc_value *  const structP,
                            xmlrpc_value *  const keyP,
                            xmlrpc_value ** const valuePP);
 
-void
-xmlrpc_struct_read_value(xmlrpc_env *    const envP,
-                         xmlrpc_value *  const strctP,
-                         const char *    const key,
-                         xmlrpc_value ** const valuePP);
-
 /* The "get_value" functions are deprecated.  Use the "find_value"
    and "read_value" functions instead.
 */
@@ -650,11 +437,27 @@
    Deprecated.  Use xmlrpc_struct_read_member() instead.
 */
 void
-xmlrpc_struct_get_key_and_value(xmlrpc_env *    env,
-                                xmlrpc_value *  strct,
-                                int             index,
-                                xmlrpc_value ** out_keyval,
-                                xmlrpc_value ** out_value);
+xmlrpc_struct_get_key_and_value(xmlrpc_env *    const env,
+                                xmlrpc_value *  const strct,
+                                int             const index,
+                                xmlrpc_value ** const out_keyval,
+                                xmlrpc_value ** const out_value);
+
+void
+xmlrpc_read_cptr(xmlrpc_env *         const envP,
+                 const xmlrpc_value * const valueP,
+                 void **              const ptrValueP);
+
+void
+xmlrpc_read_nil(xmlrpc_env *   const envP,
+                xmlrpc_value * const valueP);
+                
+
+void 
+xmlrpc_read_i8(xmlrpc_env *         const envP,
+               const xmlrpc_value * const valueP,
+               xmlrpc_int64 *       const intValueP);
+
 
 xmlrpc_value *
 xmlrpc_cptr_new(xmlrpc_env * const envP,
@@ -675,7 +478,7 @@
 void
 xmlrpc_build_value_va(xmlrpc_env *    const env,
                       const char *    const format,
-                      va_list               args,
+                      va_list         const args,
                       xmlrpc_value ** const valPP,
                       const char **   const tailP);
 
@@ -689,7 +492,7 @@
 xmlrpc_decompose_value_va(xmlrpc_env *   const envP,
                           xmlrpc_value * const value,
                           const char *   const format,
-                          va_list              args);
+                          va_list        const args);
 
 /* xmlrpc_parse_value... is the same as xmlrpc_decompose_value... except
    that it doesn't do proper memory management -- it returns xmlrpc_value's
@@ -709,44 +512,67 @@
 xmlrpc_parse_value_va(xmlrpc_env *   const envP,
                       xmlrpc_value * const value,
                       const char *   const format,
-                      va_list              args);
+                      va_list        const args);
 
 /*=========================================================================
 **  Encoding XML
 **=======================================================================*/
 
-/* Serialize an XML value without any XML header. This is primarily used
-** for testing purposes. */
+typedef enum xmlrpc_dialect {
+    xmlrpc_dialect_i8,
+    xmlrpc_dialect_apache
+} xmlrpc_dialect;
+
+void 
+xmlrpc_serialize_value2(xmlrpc_env *       const envP,
+                        xmlrpc_mem_block * const outputP,
+                        xmlrpc_value *     const valueP,
+                        xmlrpc_dialect     const dialect);
+
 void
-xmlrpc_serialize_value(xmlrpc_env *       env,
-                       xmlrpc_mem_block * output,
-                       xmlrpc_value *     value);
+xmlrpc_serialize_value(xmlrpc_env *       const envP,
+                       xmlrpc_mem_block * const outputP,
+                       xmlrpc_value *     const valueP);
+
+void 
+xmlrpc_serialize_params2(xmlrpc_env *       const envP,
+                         xmlrpc_mem_block * const outputP,
+                         xmlrpc_value *     const paramArrayP,
+                         xmlrpc_dialect     const dialect);
 
-/* Serialize a list of parameters without any XML header. This is
-** primarily used for testing purposes. */
 void
-xmlrpc_serialize_params(xmlrpc_env *       env,
-                        xmlrpc_mem_block * output,
-                        xmlrpc_value *     param_array);
+xmlrpc_serialize_params(xmlrpc_env *       const envP,
+                        xmlrpc_mem_block * const outputP,
+                        xmlrpc_value *     const paramArrayP);
 
-/* Serialize an XML-RPC call. */
 void 
-xmlrpc_serialize_call (xmlrpc_env *       const env,
-                       xmlrpc_mem_block * const output,
-                       const char *       const method_name,
-                       xmlrpc_value *     const param_array);
+xmlrpc_serialize_call2(xmlrpc_env *       const envP,
+                       xmlrpc_mem_block * const outputP,
+                       const char *       const methodName,
+                       xmlrpc_value *     const paramArrayP,
+                       xmlrpc_dialect     const dialect);
 
-/* Serialize an XML-RPC return value. */
-extern void
-xmlrpc_serialize_response(xmlrpc_env *       env,
-                          xmlrpc_mem_block * output,
-                          xmlrpc_value *     value);
+void 
+xmlrpc_serialize_call(xmlrpc_env *       const envP,
+                      xmlrpc_mem_block * const outputP,
+                      const char *       const methodName,
+                      xmlrpc_value *     const paramArrayP);
 
-/* Serialize an XML-RPC fault (as specified by 'fault'). */
-extern void
-xmlrpc_serialize_fault(xmlrpc_env *       env,
-                       xmlrpc_mem_block * output,
-                       xmlrpc_env *       fault);
+void 
+xmlrpc_serialize_response2(xmlrpc_env *       const envP,
+                           xmlrpc_mem_block * const outputP,
+                           xmlrpc_value *     const valueP,
+                           xmlrpc_dialect     const dialect);
+
+void
+xmlrpc_serialize_response(xmlrpc_env *       const envP,
+                          xmlrpc_mem_block * const outputP,
+                          xmlrpc_value *     const valueP);
+
+void
+xmlrpc_serialize_fault(xmlrpc_env *       const envP,
+                       xmlrpc_mem_block * const outputP,
+                       const xmlrpc_env * const faultP);
 
 
 /*=========================================================================
@@ -764,13 +590,21 @@
                   const char **   const out_method_name,
                   xmlrpc_value ** const out_param_array);
 
-/* Parse an XML-RPC response. If a fault occurs (or was received over the
-** wire), return NULL and set up 'env'. The calling is responsible for
-** calling xmlrpc_DECREF on the return value (if it isn't NULL). */
-xmlrpc_value *
-xmlrpc_parse_response(xmlrpc_env * env, 
-                      const char * xml_data, 
-                      size_t       xml_len);
+void
+xmlrpc_parse_response2(xmlrpc_env *    const envP,
+                       const char *    const xmlData,
+                       size_t          const xmlDataLen,
+                       xmlrpc_value ** const resultPP,
+                       int *           const faultCodeP,
+                       const char **   const faultStringP);
+
+
+/* xmlrpc_parse_response() is for backward compatibility */
+
+xmlrpc_value *
+xmlrpc_parse_response(xmlrpc_env * const envP, 
+                      const char * const xmlData, 
+                      size_t       const xmlDataLen);
 
 
 /*=========================================================================
@@ -802,42 +636,6 @@
 
 
 /*=========================================================================
-**  UTF-8 Encoding and Decoding
-**=========================================================================
-**  We need a correct, reliable and secure UTF-8 decoder. This decoder
-**  raises a fault if it encounters invalid UTF-8.
-**
-**  Note that ANSI C does not precisely define the representation used
-**  by wchar_t--it may be UCS-2, UTF-16, UCS-4, or something from outer
-**  space. If your platform does something especially bizarre, you may
-**  need to reimplement these routines.
-*/
-
-#ifdef HAVE_UNICODE_WCHAR
-
-/* Ensure that a string contains valid, legally-encoded UTF-8 data.
-** (Incorrectly-encoded UTF-8 strings are often used to bypass security
-** checks.) */
-void 
-xmlrpc_validate_utf8 (xmlrpc_env * const env,
-                      const char * const utf8_data,
-                      size_t       const utf8_len);
-
-/* Decode a UTF-8 string. */
-xmlrpc_mem_block *
-xmlrpc_utf8_to_wcs(xmlrpc_env * env,
-                   char *       utf8_data,
-                   size_t       utf8_len);
-
-/* Encode a UTF-8 string. */
-xmlrpc_mem_block *
-xmlrpc_wcs_to_utf8(xmlrpc_env * env,
-                   wchar_t *    wcs_data,
-                   size_t       wcs_len);
-
-#endif /* HAVE_UNICODE_WCHAR */
-
-/*=========================================================================
 **  Authorization Cookie Handling
 **=========================================================================
 **  Routines to get and set values for authorizing via authorization
@@ -847,12 +645,44 @@
 **  a cookie replacement of basic authentication.)
 **/
 
-extern void xmlrpc_authcookie_set(xmlrpc_env * env,
-                                  const char * username,
-                                  const char * password);
+extern void xmlrpc_authcookie_set(xmlrpc_env * const env,
+                                  const char * const username,
+                                  const char * const password);
 
 char *xmlrpc_authcookie(void);
 
+/*=========================================================================
+   Resource Limits
+
+   Ideally, there would be enough resource limits to ensure that
+   XML-RPC partners cannot cause libxmlrpc objects and routines to use
+   more resource than is available for them (either by accident or
+   malice).  We have a long way to go to get there.
+   
+=========================================================================*/
+/* These functions are _not_ re-entrant and the limits are per-process
+   (i.e. their values live in static global variables).
+*/
+
+/* Limit IDs. There will be more of these as time goes on. */
+#define XMLRPC_NESTING_LIMIT_ID   (0)
+#define XMLRPC_XML_SIZE_LIMIT_ID  (1)
+#define XMLRPC_LAST_LIMIT_ID      (XMLRPC_XML_SIZE_LIMIT_ID)
+
+/* By default, deserialized data may be no more than 64 levels deep. */
+#define XMLRPC_NESTING_LIMIT_DEFAULT  (64)
+
+/* By default, XML data from the network may be no larger than 512K.
+** Some client and server modules may fail to enforce this properly. */
+#define XMLRPC_XML_SIZE_LIMIT_DEFAULT (512*1024)
+
+/* Set a specific limit to the specified value. */
+extern void xmlrpc_limit_set (int const limit_id, size_t const value);
+
+/* Get the value of a specified limit. */
+extern size_t xmlrpc_limit_get (int const limit_id);
+
+
 #ifdef __cplusplus
 }
 #endif

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base.hpp	Mon May 26 12:59:57 2008
@@ -1,5 +1,5 @@
-#ifndef XMLRPC_HPP_INCLUDED
-#define XMLRPC_HPP_INCLUDED
+#ifndef XMLRPC_BASE_HPP_INCLUDED
+#define XMLRPC_BASE_HPP_INCLUDED
 
 #include <climits>
 #include <cfloat>
@@ -8,7 +8,7 @@
 #include <map>
 #include <string>
 
-#include "xmlrpc-c/base.h"
+#include <xmlrpc-c/base.h>
 
 namespace xmlrpc_c {
 
@@ -36,6 +36,7 @@
         TYPE_STRUCT     = 7,
         TYPE_C_PTR      = 8,
         TYPE_NIL        = 9,
+        TYPE_I8         = 10,
         TYPE_DEAD       = 0xDEAD
     };
 
@@ -44,6 +45,9 @@
     xmlrpc_c::value&
     operator=(xmlrpc_c::value const&);
 
+    bool
+    isInstantiated() const;
+
     // The following are not meant to be public to users, but just to
     // other Xmlrpc-c library modules.  If we ever go to a pure C++
     // implementation, not based on C xmlrpc_value objects, this shouldn't
@@ -54,7 +58,7 @@
 
     void
     addToCStruct(xmlrpc_value * const structP,
-                    std::string const key) const;
+                 std::string    const key) const;
 
     xmlrpc_value *
     cValue() const;
@@ -63,7 +67,7 @@
 
     void
     instantiate(xmlrpc_value * const valueP);
-        // Work only on a placeholder object created by the no-argument
+        // Works only on a placeholder object created by the no-argument
         // constructor.
 
     xmlrpc_value * cValueP;
@@ -96,10 +100,18 @@
 
 class value_string : public value {
 public:
-    value_string(std::string const& cvalue);
+    enum nlCode {nlCode_all, nlCode_lf};
+
+    value_string(std::string const& cppvalue,
+                 nlCode      const  nlCode);
+
+    value_string(std::string const& cppvalue);
 
     value_string(xmlrpc_c::value const baseValue);
 
+    std::string
+    crlfValue() const;
+
     operator std::string() const;
 };
 
@@ -120,8 +132,12 @@
 public:
     value_datetime(std::string const cvalue);
     value_datetime(time_t const cvalue);
+#if XMLRPC_HAVE_TIMEVAL
     value_datetime(struct timeval const& cvalue);
+#endif
+#if XMLRPC_HAVE_TIMESPEC
     value_datetime(struct timespec const& cvalue);
+#endif
 
     value_datetime(xmlrpc_c::value const baseValue);
 
@@ -147,15 +163,6 @@
 
 
 
-class value_nil : public value {
-public:
-    value_nil();
-
-    value_nil(xmlrpc_c::value const baseValue);
-};
-
-
-
 class value_struct : public value {
 public:
     value_struct(std::map<std::string, xmlrpc_c::value> const& cvalue);
@@ -182,6 +189,26 @@
 
 
 
+class value_nil : public value {
+public:
+    value_nil();
+
+    value_nil(xmlrpc_c::value const baseValue);
+};
+
+
+
+class value_i8 : public value {
+public:
+    value_i8(xmlrpc_int64 const cvalue);
+
+    value_i8(xmlrpc_c::value const baseValue);
+
+    operator xmlrpc_int64() const;
+};
+
+
+
 class fault {
 /*----------------------------------------------------------------------------
    This is an XML-RPC fault.
@@ -255,9 +282,12 @@
 public:
     paramList(unsigned int const paramCount = 0);
 
-    void
+    paramList&
     add(xmlrpc_c::value const param);
 
+    paramList&
+    addx(xmlrpc_c::value const param);
+
     unsigned int
     size() const;
 
@@ -300,6 +330,11 @@
     void
     getNil(unsigned int const paramNumber) const;
 
+    xmlrpc_int64
+    getI8(unsigned int const paramNumber,
+          xmlrpc_int64 const minimum = XMLRPC_INT64_MIN,
+          xmlrpc_int64 const maximum = XMLRPC_INT64_MAX) const;
+
     void
     verifyEnd(unsigned int const paramNumber) const;
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base_int.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base_int.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/base_int.h	Mon May 26 12:59:57 2008
@@ -1,5 +1,5 @@
 /*============================================================================
-                         xmlrpc_client_int.h
+                         base_int.h
 ==============================================================================
   This header file defines the interface between modules inside
   xmlrpc-c.
@@ -11,12 +11,19 @@
 ============================================================================*/
 
 
-#ifndef  XMLRPC_INT_H_INCLUDED
-#define  XMLRPC_INT_H_INCLUDED
+#ifndef  XMLRPC_C_BASE_INT_H_INCLUDED
+#define  XMLRPC_C_BASE_INT_H_INCLUDED
+
+#include "xmlrpc_config.h"
+#include "bool.h"
+#include "int.h"
+
+#include <xmlrpc-c/base.h>
+#include <xmlrpc-c/util_int.h>
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 
 struct _xmlrpc_value {
@@ -26,20 +33,37 @@
     /* Certain data types store their data directly in the xmlrpc_value. */
     union {
         xmlrpc_int32 i;
+        xmlrpc_int64 i8;
         xmlrpc_bool b;
         double d;
         /* time_t t */
-        void *c_ptr;
+        void * c_ptr;
     } _value;
     
     /* Other data types use a memory block.
 
-       For a string, this is the characters of the string in UTF-8, plus
-       a NUL added to the end.
+       For a string, this is the characters of the lines of the string
+       in UTF-8, with lines delimited by either CR, LF, or CRLF, plus
+       a NUL added to the end.  The characters of the lines may be any
+       character representable in UTF-8, even the ones that are not
+       legal XML (XML doesn't allow ASCII control characters except
+       tab, CR, LF).  But note that a line can't contain CR or LF
+       because that would form a line delimiter.  To disambiguate:
+       CRLF together is always one line delimiter.
+       
+       This format for string is quite convenient because it is also
+       the format of that part of an XML document which is the
+       contents of a <string> element (except of course that for the
+       non-XML characters, we have to stretch the definition of XML).
+
+       For base64, this is bytes of the byte string, directly.
+
+       For datetime, this is in the same format as the contents of
+       a <dateTime.iso8601> XML element.  That really ought to be changed
+       to time_t some day.
     */
     xmlrpc_mem_block _block;
 
-#ifdef HAVE_UNICODE_WCHAR
     xmlrpc_mem_block *_wcs_block;
         /* This is a copy of the string value in _block, but in UTF-16
            instead of UTF-8.  This member is not always present.  If NULL,
@@ -49,8 +73,10 @@
            redundant with _block.
 
            This member is always NULL when the data type is not string.
+
+           This member is always NULL on a system that does not have
+           Unicode wchar functions.
         */
-#endif
 };
 
 #define XMLRPC_ASSERT_VALUE_OK(val) \
@@ -65,9 +91,9 @@
 
 
 typedef struct {
-    unsigned char key_hash;
-    xmlrpc_value *key;
-    xmlrpc_value *value;
+    uint32_t keyHash;
+    xmlrpc_value * key;
+    xmlrpc_value * value;
 } _struct_member;
 
 
@@ -78,38 +104,20 @@
 const char *
 xmlrpc_typeName(xmlrpc_type const type);
 
-
-struct _xmlrpc_registry {
-    int _introspection_enabled;
-    xmlrpc_value *_methods;
-    xmlrpc_value *_default_method;
-    xmlrpc_value *_preinvoke_method;
-};
-
-
-/* When we deallocate a pointer in a struct, we often replace it with
-** this and throw in a few assertions here and there. */
-#define XMLRPC_BAD_POINTER ((void*) 0xDEADBEEF)
-
-
 void
 xmlrpc_traceXml(const char * const label, 
                 const char * const xml,
                 unsigned int const xmlLength);
 
 void
+xmlrpc_destroyString(xmlrpc_value * const stringP);
+
+void
 xmlrpc_destroyStruct(xmlrpc_value * const structP);
 
 void
 xmlrpc_destroyArrayContents(xmlrpc_value * const arrayP);
 
-const char * 
-xmlrpc_makePrintable(const char * const input);
-
-const char *
-xmlrpc_makePrintableChar(char const input);
-
-
 /*----------------------------------------------------------------------------
    The following are for use by the legacy xmlrpc_parse_value().  They don't
    do proper memory management, so they aren't appropriate for general use,
@@ -138,7 +146,7 @@
                           size_t *             const lengthP,
                           const char **        const stringValueP);
 
-#ifdef HAVE_UNICODE_WCHAR
+#if XMLRPC_HAVE_WCHAR
 void
 xmlrpc_read_string_w_old(xmlrpc_env *     const envP,
                          xmlrpc_value *   const valueP,
@@ -185,6 +193,6 @@
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif
 
 #endif

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.h	Mon May 26 12:59:57 2008
@@ -16,33 +16,61 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/*=========================================================================
-**  Initialization and Shutdown
-**=========================================================================
-**  These routines initialize and terminate the XML-RPC client. If you're
-**  already using libwww on your own, you can pass
-**  XMLRPC_CLIENT_SKIP_LIBWWW_INIT to avoid initializing it twice.
+struct xmlrpc_client;
+struct xmlrpc_client_transport;
+struct xmlrpc_client_transport_ops;
+#ifndef __cplusplus
+typedef struct xmlrpc_client xmlrpc_client;
+typedef struct xmlrpc_client_transport xmlrpc_client_transport;
+typedef struct xmlrpc_client_transport_ops xmlrpc_client_transport_ops;
+#endif
+
+/* libxmlrpc_client typically does _not_ actually include all of the
+   XML transports declared here by xmlrpc_*_transport_ops.
+
+   Use 'xmlrpc-c-config --features' to determine which features are
+   installed.
 */
 
-#define XMLRPC_CLIENT_NO_FLAGS         (0)
-#define XMLRPC_CLIENT_SKIP_LIBWWW_INIT (1)
+/* Before Xmlrpc-c 1.13 (December 2007), we declared struct
+   xmlrpc_xportparms, as a sort of "base class."  The struct was never
+   complete -- you just cast pointer to it it to pointers to other
+   types.  It turned out not to be really helpful and casts are ugly,
+   so now we just use void * as a base class pointer.
+*/
 
-extern void
-xmlrpc_client_init(int          const flags,
-                   const char * const appname,
-                   const char * const appversion);
-
-struct xmlrpc_xportparms;
-    /* This is a "base class".  The struct is never complete; you're
-       supposed to cast between struct xmlrpc_xportparms * and 
-       "struct xmlrpc_..._xportparms *" in order to use it.  
-    */
+extern struct xmlrpc_client_transport_ops xmlrpc_libwww_transport_ops;
+extern struct xmlrpc_client_transport_ops xmlrpc_wininet_transport_ops;
+extern struct xmlrpc_client_transport_ops xmlrpc_curl_transport_ops;
+
+enum xmlrpc_sslversion {
+    XMLRPC_SSLVERSION_DEFAULT,
+    XMLRPC_SSLVERSION_TLSv1,
+    XMLRPC_SSLVERSION_SSLv2,
+    XMLRPC_SSLVERSION_SSLv3
+};
 
 struct xmlrpc_curl_xportparms {
+    /* This is designed so that zero values are always the defaults. */
     const char * network_interface;
     xmlrpc_bool  no_ssl_verifypeer;
     xmlrpc_bool  no_ssl_verifyhost;
     const char * user_agent;
+    const char * ssl_cert;
+    const char * sslcerttype;
+    const char * sslcertpasswd;
+    const char * sslkey;
+    const char * sslkeytype;
+    const char * sslkeypasswd;
+    const char * sslengine;
+    xmlrpc_bool  sslengine_default;
+    enum xmlrpc_sslversion sslversion;
+    const char * cainfo;
+    const char * capath;
+    const char * randomfile;
+    const char * egdsocket;
+    const char * ssl_cipher_list;
+    unsigned int timeout;
 };
 
 
@@ -61,10 +89,17 @@
 /* XMLRPC_WXPSIZE(xyz) is analogous to XMLRPC_CPSIZE, below */
 
 struct xmlrpc_clientparms {
+    /* (transport, transportparmsP, transportparm_size) and
+       (transportOpsP, transportP) are mutually exclusive.
+    */
     const char *               transport;
-    struct xmlrpc_xportparms * transportparmsP;
-        /* Cast a "struct ..._xportparms *" to fit here */
+    const void *               transportparmsP;
+        /* This should be type "const struct ..._xportparms *" */
     size_t                     transportparm_size;
+
+    const struct xmlrpc_client_transport_ops * transportOpsP;
+    xmlrpc_client_transport *  transportP;
+    xmlrpc_dialect             dialect;
 };
 
 #define XMLRPC_CPSIZE(mbrname) \
@@ -77,24 +112,9 @@
    not the caller is new enough to have supplied a certain parameter.
 */
 
-void 
-xmlrpc_client_init2(xmlrpc_env *                      const env,
-                    int                               const flags,
-                    const char *                      const appname,
-                    const char *                      const appversion,
-                    const struct xmlrpc_clientparms * const clientparms,
-                    unsigned int                      const parm_size);
-
-extern void
-xmlrpc_client_cleanup(void);
-
 const char * 
 xmlrpc_client_get_default_transport(xmlrpc_env * const env);
 
-/*=========================================================================
-** Required for both internal and external development.
-**=========================================================================
-*/
 /* A callback function to handle the response to an asynchronous call.
 ** If 'fault->fault_occurred' is true, then response will be NULL. All
 ** arguments except 'user_data' will be deallocated internally; please do
@@ -112,32 +132,39 @@
 
 
 /*=========================================================================
-**  xmlrpc_server_info
-**=========================================================================
-**  We normally refer to servers by URL. But sometimes we need to do extra
-**  setup for particular servers. In that case, we can create an
-**  xmlrpc_server_info object, configure it in various ways, and call the
-**  remote server.
-**
-**  (This interface is also designed to discourage further multiplication
-**  of xmlrpc_client_call APIs. We have enough of those already. Please
-**  add future options and flags using xmlrpc_server_info.)
-*/
+   xmlrpc_server_info
+===========================================================================
+  We normally refer to servers by URL. But sometimes we need to do extra
+  setup for particular servers. In that case, we can create an
+  xmlrpc_server_info object, configure it in various ways, and call the
+  remote server.
+
+  (This interface is also designed to discourage further multiplication
+  of xmlrpc_client_call APIs. We have enough of those already. Please
+  add future options and flags using xmlrpc_server_info.)
+=========================================================================*/
 
 typedef struct _xmlrpc_server_info xmlrpc_server_info;
 
 /* Create a new server info record, pointing to the specified server. */
 xmlrpc_server_info *
-xmlrpc_server_info_new(xmlrpc_env * const env,
-                       const char * const server_url);
+xmlrpc_server_info_new(xmlrpc_env * const envP,
+                       const char * const serverUrl);
 
 /* Create a new server info record, with a copy of the old server. */
 extern xmlrpc_server_info * 
-xmlrpc_server_info_copy(xmlrpc_env *env, xmlrpc_server_info *src_server);
+xmlrpc_server_info_copy(xmlrpc_env *         const envP,
+                        xmlrpc_server_info * const srcP);
+
+void
+xmlrpc_server_info_free(xmlrpc_server_info * const serverP);
 
-/* Delete a server info record. */
-extern void
-xmlrpc_server_info_free (xmlrpc_server_info *server);
+
+void 
+xmlrpc_server_info_set_user(xmlrpc_env *         const envP,
+                            xmlrpc_server_info * const serverInfoP,
+                            const char *         const username,
+                            const char *         const password);
 
 void 
 xmlrpc_server_info_set_basic_auth(xmlrpc_env *         const envP,
@@ -145,118 +172,116 @@
                                   const char *         const username,
                                   const char *         const password);
 
+void
+xmlrpc_server_info_allow_auth_basic(xmlrpc_env *         const envP,
+                                    xmlrpc_server_info * const sP);
 
-/*=========================================================================
-**  xmlrpc_client_call
-**=========================================================================
-**  A synchronous XML-RPC client. Do not attempt to call any of these
-**  functions from inside an asynchronous callback!
-*/
+void
+xmlrpc_server_info_disallow_auth_basic(xmlrpc_env *         const envP,
+                                       xmlrpc_server_info * const sP);
 
-xmlrpc_value * 
-xmlrpc_client_call(xmlrpc_env * const envP,
-                   const char * const server_url,
-                   const char * const method_name,
-                   const char * const format,
-                   ...);
-
-xmlrpc_value * 
-xmlrpc_client_call_params(xmlrpc_env *   const envP,
-                          const char *   const serverUrl,
-                          const char *   const methodName,
-                          xmlrpc_value * const paramArrayP);
-
-xmlrpc_value * 
-xmlrpc_client_call_server(xmlrpc_env *               const envP,
-                          const xmlrpc_server_info * const server,
-                          const char *               const method_name,
-                          const char *               const format, 
-                          ...);
+void
+xmlrpc_server_info_allow_auth_digest(xmlrpc_env *         const envP,
+                                     xmlrpc_server_info * const sP);
 
-xmlrpc_value *
-xmlrpc_client_call_server_params(
-    xmlrpc_env *               const envP,
-    const xmlrpc_server_info * const serverP,
-    const char *               const method_name,
-    xmlrpc_value *             const paramArrayP);
+void
+xmlrpc_server_info_disallow_auth_digest(xmlrpc_env *         const envP,
+                                        xmlrpc_server_info * const sP);
+
+void
+xmlrpc_server_info_allow_auth_negotiate(xmlrpc_env *         const envP,
+                                        xmlrpc_server_info * const sP);
+
+void
+xmlrpc_server_info_disallow_auth_negotiate(xmlrpc_env *         const envP,
+                                           xmlrpc_server_info * const sP);
+
+void
+xmlrpc_server_info_allow_auth_ntlm(xmlrpc_env *         const envP,
+                                   xmlrpc_server_info * const sP);
+
+void
+xmlrpc_server_info_disallow_auth_ntlm(xmlrpc_env *         const envP,
+                                      xmlrpc_server_info * const sP);
+
+extern unsigned int const xmlrpc_client_version_major;
+extern unsigned int const xmlrpc_client_version_minor;
+extern unsigned int const xmlrpc_client_version_point;
+
+void
+xmlrpc_client_setup_global_const(xmlrpc_env * const envP);
+
+void
+xmlrpc_client_teardown_global_const(void);
+
+void 
+xmlrpc_client_create(xmlrpc_env *                      const envP,
+                     int                               const flags,
+                     const char *                      const appname,
+                     const char *                      const appversion,
+                     const struct xmlrpc_clientparms * const clientparmsP,
+                     unsigned int                      const parmSize,
+                     xmlrpc_client **                  const clientPP);
+
+void 
+xmlrpc_client_destroy(xmlrpc_client * const clientP);
 
 void
-xmlrpc_client_transport_call(
+xmlrpc_client_transport_call2(
     xmlrpc_env *               const envP,
-    void *                     const reserved,  /* for client handle */
+    xmlrpc_client *            const clientP,
     const xmlrpc_server_info * const serverP,
     xmlrpc_mem_block *         const callXmlP,
     xmlrpc_mem_block **        const respXmlPP);
 
+void
+xmlrpc_client_call2(xmlrpc_env *               const envP,
+                    struct xmlrpc_client *     const clientP,
+                    const xmlrpc_server_info * const serverInfoP,
+                    const char *               const methodName,
+                    xmlrpc_value *             const paramArrayP,
+                    xmlrpc_value **            const resultPP);
 
-/*=========================================================================
-**  xmlrpc_client_call_asynch
-**=========================================================================
-**  An asynchronous XML-RPC client.
-*/
+void
+xmlrpc_client_call2f(xmlrpc_env *    const envP,
+                     xmlrpc_client * const clientP,
+                     const char *    const serverUrl,
+                     const char *    const methodName,
+                     xmlrpc_value ** const resultPP,
+                     const char *    const format,
+                     ...);
 
-/* Make an asynchronous XML-RPC call. We make internal copies of all
-** arguments except user_data, so you can deallocate them safely as soon
-** as you return. Errors will be passed to the callback. You will need
-** to run the event loop somehow; see below.
-** WARNING: If an error occurs while building the argument, the
-** response handler will be called with a NULL param_array. */
 void 
-xmlrpc_client_call_asynch(const char * const server_url,
-                          const char * const method_name,
-                          xmlrpc_response_handler callback,
-                          void *       const user_data,
-                          const char * const format,
-                          ...);
+xmlrpc_client_event_loop_finish(xmlrpc_client * const clientP);
 
-/* As above, but use an xmlrpc_server_info object. The server object can be
-** safely destroyed as soon as this function returns. */
 void 
-xmlrpc_client_call_server_asynch(xmlrpc_server_info * const server,
-                                 const char *         const method_name,
-                                 xmlrpc_response_handler callback,
-                                 void *               const user_data,
-                                 const char *         const format,
-                                 ...);
+xmlrpc_client_event_loop_finish_timeout(xmlrpc_client * const clientP,
+                                        unsigned long   const milliseconds);
 
-/* As above, but the parameter list is supplied as an xmlrpc_value
-** containing an array.
-*/
 void
-xmlrpc_client_call_asynch_params(const char *   const server_url,
-                                 const char *   const method_name,
-                                 xmlrpc_response_handler callback,
-                                 void *         const user_data,
-                                 xmlrpc_value * const paramArrayP);
-    
-/* As above, but use an xmlrpc_server_info object. The server object can be
-** safely destroyed as soon as this function returns. */
-void 
-xmlrpc_client_call_server_asynch_params(
-    xmlrpc_server_info * const server,
-    const char *         const method_name,
-    xmlrpc_response_handler callback,
-    void *               const user_data,
-    xmlrpc_value *       const paramArrayP);
-    
-/*=========================================================================
-**  Event Loop Interface
-**=========================================================================
-**  These functions can be used to run the XML-RPC event loop. If you
-**  don't like these, you can also run the libwww event loop directly.
-*/
-
-/* Finish all outstanding asynchronous calls. Alternatively, the loop
-** will exit if someone calls xmlrpc_client_event_loop_end. */
-extern void
-xmlrpc_client_event_loop_finish_asynch(void);
+xmlrpc_client_start_rpc(xmlrpc_env *             const envP,
+                        struct xmlrpc_client *   const clientP,
+                        xmlrpc_server_info *     const serverInfoP,
+                        const char *             const methodName,
+                        xmlrpc_value *           const argP,
+                        xmlrpc_response_handler        responseHandler,
+                        void *                   const userData);
 
+void 
+xmlrpc_client_start_rpcf(xmlrpc_env *    const envP,
+                         xmlrpc_client * const clientP,
+                         const char *    const serverUrl,
+                         const char *    const methodName,
+                         xmlrpc_response_handler callback,
+                         void *          const userData,
+                         const char *    const format,
+                         ...);
 
-/* Finish all outstanding asynchronous calls. */
-extern void
-xmlrpc_client_event_loop_finish_asynch_timeout(unsigned long milliseconds);
-
+void
+xmlrpc_client_set_interrupt(xmlrpc_client * const clientP,
+                            int *           const interruptP);
 
+#include <xmlrpc-c/client_global.h>
 
 /* Copyright (C) 2001 by First Peer, Inc. All rights reserved.
 **

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client.hpp	Mon May 26 12:59:57 2008
@@ -2,33 +2,17 @@
 #define CLIENT_HPP_INCLUDED
 
 #include <string>
+#include <vector>
+#include <memory>
 
 #include <xmlrpc-c/girerr.hpp>
 #include <xmlrpc-c/girmem.hpp>
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/timeout.hpp>
-#include <xmlrpc-c/client.h>
+#include <xmlrpc-c/client_transport.hpp>
 
 namespace xmlrpc_c {
 
-
-class carriageParm {
-/*----------------------------------------------------------------------------
-   The parameter to a client for an individual RPC.  It tells specifics
-   of how to carry the call to the server and the response back.  For
-   example, it may identify the server.  It may identify communication
-   protocols to use.  It may indicate permission and accounting
-   information.
-
-   This is a base class; the carriage parameter is specific to the
-   class of client.  For example, an HTTP-based client would have a
-   URL and HTTP basic authentication info as parameter.
------------------------------------------------------------------------------*/
-protected:
-    virtual ~carriageParm();
-    carriageParm();
-};
-
 class clientTransactionPtr;
 
 class clientTransaction : public girmem::autoObject {
@@ -50,13 +34,18 @@
     
 public:
     clientTransactionPtr();
+
+    clientTransactionPtr(clientTransaction * const transP);
+
     virtual ~clientTransactionPtr();
 
     virtual xmlrpc_c::clientTransaction *
     operator->() const;
 };
 
-class client {
+class clientPtr;
+
+class client : public girmem::autoObject {
 /*----------------------------------------------------------------------------
    A generic client -- a means of performing an RPC.  This is so generic
    that it can be used for clients that are not XML-RPC.
@@ -64,196 +53,91 @@
    This is a base class.  Derived classes define things such as that
    XML and HTTP get used to perform the RPC.
 -----------------------------------------------------------------------------*/
+    friend class clientTransactionPtr;
+
 public:
     virtual ~client();
 
     virtual void
-    call(carriageParm *         const  carriageParmP,
-         std::string            const  methodName,
-         xmlrpc_c::paramList    const& paramList,
-         xmlrpc_c::rpcOutcome * const  outcomeP) = 0;
+    call(xmlrpc_c::carriageParm * const  carriageParmP,
+         std::string              const& methodName,
+         xmlrpc_c::paramList      const& paramList,
+         xmlrpc_c::rpcOutcome *   const  outcomeP) = 0;
 
     virtual void
     start(xmlrpc_c::carriageParm *       const  carriageParmP,
-          std::string                    const  methodName,
+          std::string                    const& methodName,
           xmlrpc_c::paramList            const& paramList,
           xmlrpc_c::clientTransactionPtr const& tranP);
-};
-
-class connection {
-/*----------------------------------------------------------------------------
-   A nexus of a particular client and a particular server, along with
-   carriage parameters for performing RPCs between the two.
-
-   This is a minor convenience for client programs that always talk to
-   the same server the same way.
-
-   Use this as a parameter to rpc.call().
------------------------------------------------------------------------------*/
-public:
-    connection(xmlrpc_c::client *       const clientP,
-               xmlrpc_c::carriageParm * const carriageParmP);
-
-    ~connection();
-
-    xmlrpc_c::client *       clientP;
-    xmlrpc_c::carriageParm * carriageParmP;
-};
-
-class carriageParm_http0 : public carriageParm {
-
-public:
-    carriageParm_http0(std::string const serverUrl);
-
-    ~carriageParm_http0();
-
-    void
-    setBasicAuth(std::string const userid,
-                 std::string const password);
-
-    xmlrpc_server_info * c_serverInfoP;
-
-protected:
-    // Only a derived class is allowed to create an object with no
-    // server URL, and the derived class expected to follow it up
-    // with an instantiate() to establish the server URL.
-
-    carriageParm_http0();
 
     void
-    instantiate(std::string const serverUrl);
+    finishAsync(xmlrpc_c::timeout const timeout);
+    
+    virtual void
+    setInterrupt(int *);
 };
 
-class carriageParm_curl0 : public xmlrpc_c::carriageParm_http0 {
-
+class clientPtr : public girmem::autoObjectPtr {
 public:
-    carriageParm_curl0(std::string const serverUrl);
-
-};
+    clientPtr();
 
-class carriageParm_libwww0 : public xmlrpc_c::carriageParm_http0 {
+    explicit clientPtr(xmlrpc_c::client * const clientP);
 
-public:
-    carriageParm_libwww0(std::string const serverUrl);
+    xmlrpc_c::client *
+    operator->() const;
 
+    xmlrpc_c::client *
+    get() const;
 };
 
-class carriageParm_wininet0 : public xmlrpc_c::carriageParm_http0 {
-
+class serverAccessor : public girmem::autoObject {
+    
 public:
-    carriageParm_wininet0(std::string const serverUrl);
+    serverAccessor(xmlrpc_c::clientPtr       const clientP,
+                   xmlrpc_c::carriageParmPtr const carriageParmP);
 
-};
-
-class xmlTransactionPtr;
-
-class xmlTransaction : public girmem::autoObject {
-
-    friend class xmlTransactionPtr;
-
-public:
-    virtual void
-    finish(std::string const& responseXml) const;
-
-    virtual void
-    finishErr(girerr::error const& error) const;
+    void
+    call(std::string            const& methodName,
+         xmlrpc_c::paramList    const& paramList,
+         xmlrpc_c::rpcOutcome * const  outcomeP) const;
 
-protected:
-    xmlTransaction();
+private:
+    xmlrpc_c::clientPtr       const clientP;
+    xmlrpc_c::carriageParmPtr const carriageParmP;
 };
 
-class xmlTransactionPtr : public girmem::autoObjectPtr {
+class serverAccessorPtr : public girmem::autoObjectPtr {
 public:
-    xmlTransactionPtr();
-
-    xmlrpc_c::xmlTransaction *
-    operator->() const;
-};
-
-class clientXmlTransport {
-/*----------------------------------------------------------------------------
-   An object which transports XML to and from an XML-RPC server for an
-   XML-RPC client.
+    serverAccessorPtr();
 
-   This is a base class.  Derived classes define methods to perform the
-   transportation in particular ways.
------------------------------------------------------------------------------*/
-public:
-    virtual ~clientXmlTransport();
+    explicit
+    serverAccessorPtr(xmlrpc_c::serverAccessor * const serverAccessorP);
 
-    virtual void
-    call(xmlrpc_c::carriageParm * const  carriageParmP,
-         std::string              const& callXml,
-         std::string *            const  responseXmlP) = 0;
-
-    virtual void
-    start(xmlrpc_c::carriageParm *    const  carriageParmP,
-          std::string                 const& callXml,
-          xmlrpc_c::xmlTransactionPtr const& xmlTranP);
-
-    virtual void
-    finishAsync(xmlrpc_c::timeout const timeout);
+    xmlrpc_c::serverAccessor *
+    operator->() const;
 
-    static void
-    asyncComplete(
-        struct xmlrpc_call_info * const callInfoP,
-        xmlrpc_mem_block *        const responseXmlMP,
-        xmlrpc_env                const transportEnv);
+    xmlrpc_c::serverAccessor *
+    get() const;
 };
 
-class clientXmlTransport_http : public xmlrpc_c::clientXmlTransport {
+class connection {
 /*----------------------------------------------------------------------------
-   A base class for client XML transports that use the simple, classic
-   C HTTP transports.
------------------------------------------------------------------------------*/
-public:
-    virtual ~clientXmlTransport_http();
-    
-    void
-    call(xmlrpc_c::carriageParm * const  carriageParmP,
-         std::string              const& callXml,
-         std::string *            const  responseXmlP);
-    
-    void
-    start(xmlrpc_c::carriageParm *    const  carriageParmP,
-          std::string                 const& callXml,
-          xmlrpc_c::xmlTransactionPtr const& xmlTranP);
-        
-    virtual void
-    finishAsync(xmlrpc_c::timeout const timeout);
-
-protected:
-    clientXmlTransport_http() {} // ensure no one can create
-    struct xmlrpc_client_transport *           c_transportP;
-    const struct xmlrpc_client_transport_ops * c_transportOpsP;
-};
-
-class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
-
-public:
-    clientXmlTransport_curl(std::string const networkInterface = "",
-                            bool        const noSslVerifyPeer = false,
-                            bool        const noSslVerifyHost = false,
-                            std::string const userAgent = "");
+   A nexus of a particular client and a particular server, along with
+   carriage parameters for performing RPCs between the two.
 
-    ~clientXmlTransport_curl();
-};
+   This is a minor convenience for client programs that always talk to
+   the same server the same way.
 
-class clientXmlTransport_libwww : public xmlrpc_c::clientXmlTransport_http {
-    
+   Use this as a parameter to rpc.call().
+-----------------------------------------------------------------------------*/
 public:
-    clientXmlTransport_libwww(std::string const appname = "",
-                              std::string const appversion = "");
-
-    ~clientXmlTransport_libwww();
-};
-
-class clientXmlTransport_wininet : public xmlrpc_c::clientXmlTransport_http {
+    connection(xmlrpc_c::client *       const clientP,
+               xmlrpc_c::carriageParm * const carriageParmP);
 
-public:
-    clientXmlTransport_wininet(bool const allowInvalidSslCerts = false);
+    ~connection();
 
-    ~clientXmlTransport_wininet();
+    xmlrpc_c::client *       clientP;
+    xmlrpc_c::carriageParm * carriageParmP;
 };
 
 class client_xml : public xmlrpc_c::client {
@@ -264,23 +148,36 @@
 public:
     client_xml(xmlrpc_c::clientXmlTransport * const transportP);
 
+    client_xml(xmlrpc_c::clientXmlTransport * const transportP,
+               xmlrpc_dialect                 const dialect);
+
+    client_xml(xmlrpc_c::clientXmlTransportPtr const transportP);
+
+    client_xml(xmlrpc_c::clientXmlTransportPtr const transportP,
+               xmlrpc_dialect                  const dialect);
+
+    ~client_xml();
+
     void
     call(carriageParm *         const  carriageParmP,
-         std::string            const  methodName,
+         std::string            const& methodName,
          xmlrpc_c::paramList    const& paramList,
          xmlrpc_c::rpcOutcome * const  outcomeP);
 
     void
     start(xmlrpc_c::carriageParm *       const  carriageParmP,
-          std::string                    const  methodName,
+          std::string                    const& methodName,
           xmlrpc_c::paramList            const& paramList,
           xmlrpc_c::clientTransactionPtr const& tranP);
 
     void
     finishAsync(xmlrpc_c::timeout const timeout);
 
+    virtual void
+    setInterrupt(int * interruptP);
+
 private:
-    xmlrpc_c::clientXmlTransport * transportP;
+    struct client_xml_impl * implP;
 };
 
 class xmlTransaction_client : public xmlrpc_c::xmlTransaction {
@@ -363,32 +260,20 @@
     xmlrpc_c::fault
     getFault() const;
 
-protected:
     rpc(std::string         const  methodName,
         xmlrpc_c::paramList const& paramList);
 
     virtual ~rpc();
 
 private:
-    enum state {
-        STATE_UNFINISHED,  // RPC is running or not started yet
-        STATE_ERROR,       // We couldn't execute the RPC
-        STATE_FAILED,      // RPC executed successfully, but failed per XML-RPC
-        STATE_SUCCEEDED    // RPC is done, no exception
-    };
-    enum state state;
-    girerr::error * errorP;     // Defined only in STATE_ERROR
-    xmlrpc_c::rpcOutcome outcome;
-        // Defined only in STATE_FAILED and STATE_SUCCEEDED
-    std::string methodName;
-    xmlrpc_c::paramList paramList;
+    struct rpc_impl * implP;
 };
 
 class rpcPtr : public clientTransactionPtr {
 public:
     rpcPtr();
 
-    rpcPtr(xmlrpc_c::rpc * const rpcP);
+    explicit rpcPtr(xmlrpc_c::rpc * const rpcP);
 
     rpcPtr(std::string         const  methodName,
            xmlrpc_c::paramList const& paramList);

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_int.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_int.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_int.h	Mon May 26 12:59:57 2008
@@ -14,24 +14,43 @@
 #ifndef  XMLRPC_CLIENT_INT_H_INCLUDED
 #define  XMLRPC_CLIENT_INT_H_INCLUDED
 
+#include "xmlrpc-c/util.h"
+
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 struct _xmlrpc_server_info {
-    char *_server_url;
-    char *_http_basic_auth;
-};
-
-/* Create a new server info record, with a copy of the old server. */
-extern xmlrpc_server_info * 
-xmlrpc_server_info_copy(xmlrpc_env *env, xmlrpc_server_info *aserver);
+    const char * serverUrl;
+    struct {
+        bool basic;
+        bool digest;
+        bool gssnegotiate;
+        bool ntlm;
+    } allowedAuth;
+    const char * userNamePw;
+        /* The username/password value for HTTP, i.e. in
+           "user:password" form
+
+           This can be NULL to indicate "none", but only if 'allowedAuth'
+           doesn't allow any form of authentication.
+        */
+    const char * basicAuthHdrValue;
+        /* A complete value for an HTTP Authorization: header that
+           requests HTTP basic authentication.  This exists whether
+           or not 'allowedAuth' allows basic authentication, and is
+           completely redundant with 'userNamePw'.  It exists mainly
+           for historical reasons, and may also save some computation
+           when the same xmrpc_server_info is used for multiple
+           HTTP connections.
 
+           This is NULL exactly when 'userNamePw' is NULL.
+        */
+};
 
 /*=========================================================================
 ** Transport Implementation functions.
-**=========================================================================
-*/
+**========================================================================= */
 #include "xmlrpc-c/transport.h"
 
 /* The generalized event loop. This uses the above flags. For more details,

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_simple.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_simple.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/client_simple.hpp	Mon May 26 12:59:57 2008
@@ -14,8 +14,6 @@
 public:
     clientSimple();
 
-    ~clientSimple();
-
     void
     call(std::string       const serverUrl,
          std::string       const methodName,
@@ -35,8 +33,7 @@
          xmlrpc_c::value *   const  resultP);
 
 private:
-    xmlrpc_c::client * clientP;
-    xmlrpc_c::clientXmlTransport * transportP;
+    xmlrpc_c::clientPtr clientP;
 };
 
 } // namespace

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girerr.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girerr.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girerr.hpp	Mon May 26 12:59:57 2008
@@ -21,6 +21,11 @@
     std::string _what;
 };
 
+// throwf() always throws a girerr::error .
+
+void
+throwf(const char * const format, ...);
+
 } // namespace
 
 #endif

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girmem.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girmem.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/girmem.hpp	Mon May 26 12:59:57 2008
@@ -19,6 +19,7 @@
 #  include <pthread.h>
    typedef pthread_mutex_t girmem_lock;
 #else
+#  include <windows.h>
    typedef CRITICAL_SECTION girmem_lock;
 #endif
 
@@ -51,14 +52,20 @@
     ~autoObjectPtr();
     
     void
-    instantiate(girmem::autoObject * const objectP);
-    
+    point(girmem::autoObject * const objectP);
+
+    void
+    unpoint();
+
     autoObjectPtr
     operator=(girmem::autoObjectPtr const& objectPtr);
     
     girmem::autoObject *
     operator->() const;
     
+    girmem::autoObject *
+    get() const;
+
 protected:
     girmem::autoObject * objectP;
 };

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/oldcppwrapper.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/oldcppwrapper.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/oldcppwrapper.hpp	Mon May 26 12:59:57 2008
@@ -25,6 +25,7 @@
 // -Bryan 2005.03.12.
 
 
+#include <cstdlib>
 #include <string>
 #include <xmlrpc-c/base.h>
 #include <xmlrpc-c/client.h>
@@ -87,7 +88,7 @@
     XmlRpcEnv (void) { xmlrpc_env_init(&mEnv); }
     ~XmlRpcEnv (void) { xmlrpc_env_clean(&mEnv); }
     
-    bool         faultOccurred (void) const { return mEnv.fault_occurred; };
+    bool     faultOccurred (void) const {return (mEnv.fault_occurred != 0);};
     bool         hasFaultOccurred (void) const { return faultOccurred(); };
         /* hasFaultOccurred() is for backward compatibility.
            faultOccurred() is a superior name for this.

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/registry.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/registry.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/registry.hpp	Mon May 26 12:59:57 2008
@@ -32,15 +32,6 @@
     std::string signature() const { return _signature; };
     std::string help() const { return _help; };
 
-    // self() is a strange concession to the fact that we interface with
-    // C code.  C code needs a regular pointer to this method, but our
-    // C++ interface carefully prevents one from making such a pointer,
-    // since it would be an uncounted reference.  So users of self() must
-    // make sure that the reference it returns is always subordinate to a
-    // methodPtr reference.
-
-    xmlrpc_c::method * self();
-
 protected:
     std::string _signature;
     std::string _help;
@@ -95,8 +86,6 @@
     execute(std::string         const& methodName,
             xmlrpc_c::paramList const& paramList,
             xmlrpc_c::value *   const  resultP) = 0;
-
-    xmlrpc_c::defaultMethod * self();  // analogous to 'method' class
 };
 
 class defaultMethodPtr : public girmem::autoObjectPtr {
@@ -108,9 +97,14 @@
 
     xmlrpc_c::defaultMethod *
     operator->() const;
+
+    xmlrpc_c::defaultMethod *
+    get() const;
 };
 
-class registry {
+
+
+class registry : public girmem::autoObject {
 /*----------------------------------------------------------------------------
    An Xmlrpc-c server method registry.  An Xmlrpc-c server transport
    (e.g.  an HTTP server) uses this object to process an incoming
@@ -131,6 +125,20 @@
 
     void
     disableIntrospection();
+
+    class shutdown {
+    public:
+        virtual ~shutdown() = 0;
+        virtual void
+        doit(std::string const& comment,
+             void *      const  callInfo) const = 0;
+    };
+
+    void
+    setShutdown(const shutdown * const shutdownP);
+
+    void
+    setDialect(xmlrpc_dialect const dialect);
     
     void
     processCall(std::string   const& body,
@@ -145,23 +153,37 @@
 private:
 
     xmlrpc_registry * c_registryP;
-        /* Pointer to the C registry object we use to implement this
-           object.
-        */
+        // Pointer to the C registry object we use to implement this
+        // object.
 
     std::list<xmlrpc_c::methodPtr> methodList;
-        /* This is a list of all the method objects (actually, pointers
-           to them).  But since the real registry is the C registry object,
-           all this list is for is to maintain references to the objects
-           to which the C registry points so that they continue to exist.
-        */
+        // This is a list of all the method objects (actually, pointers
+        // to them).  But since the real registry is the C registry object,
+        // all this list is for is to maintain references to the objects
+        // to which the C registry points so that they continue to exist.
+
     xmlrpc_c::defaultMethodPtr defaultMethodP;
-        /* The real identifier of the default method is the C registry
-           object; this member exists only to maintain a reference to the
-           object to which the C registry points so that it will continue
-           to exist.
-        */
+        // The real identifier of the default method is the C registry
+        // object; this member exists only to maintain a reference to the
+        // object to which the C registry points so that it will continue
+        // to exist.
 };
+
+
+class registryPtr : public girmem::autoObjectPtr {
+
+public:
+    registryPtr();
+
+    registryPtr(xmlrpc_c::registry * const registryP);
+
+    xmlrpc_c::registry *
+    operator->() const;
+
+    xmlrpc_c::registry *
+    get() const;
+};
+
 } // namespace
 
 #endif

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server.h	Mon May 26 12:59:57 2008
@@ -9,145 +9,121 @@
 extern "C" {
 #endif
 
-/*=========================================================================
-**  XML-RPC Server Method Registry
-**=========================================================================
-**  A method registry maintains a list of functions, and handles
-**  dispatching. To build an XML-RPC server, just add an XML-RPC protocol
-**  driver.
-**
-**  Methods are C functions which take some combination of the following
-**  parameters. All pointers except user_data belong to the library, and
-**  must not be freed by the callback or used after the callback returns.
-**
-**  env:          An XML-RPC error-handling environment. No faults will be
-**                set when the function is called. If an error occurs,
-**                set an appropriate fault and return NULL. (If a fault is
-**                set, the NULL return value will be enforced!)
-**  host:         The 'Host:' header passed by the XML-RPC client, or NULL,
-**                if no 'Host:' header has been provided.
-**  method_name:  The name used to call this method.
-**  user_data:    The user_data used to register this method.
-**  param_array:  The parameters passed to this function, stored in an
-**                XML-RPC array. You are *not* responsible for calling
-**                xmlrpc_DECREF on this array.
-**
-**  Return value: If no fault has been set, the function must return a
-**                valid xmlrpc_value. This will be serialized, returned
-**                to the caller, and xmlrpc_DECREF'd.
-*/
-
-/* A function to call before invoking a method for doing things like access
-** control or sanity checks.  If a fault is set from this function, the
-** method will not be called and the fault will be returned. */
+typedef struct xmlrpc_registry xmlrpc_registry;
+
 typedef void
-(*xmlrpc_preinvoke_method)(xmlrpc_env *   env,
-                           const char *   method_name,
-                           xmlrpc_value * param_array,
-                           void *         user_data);
+(*xmlrpc_preinvoke_method)(xmlrpc_env *   const envP,
+                           const char *   const methodName,
+                           xmlrpc_value * const paramArrayP,
+                           void *         const userData);
 
-/* An ordinary method. */
 typedef xmlrpc_value *
-(*xmlrpc_method)(xmlrpc_env *   env,
-                 xmlrpc_value * param_array,
-                 void *         user_data);
+(*xmlrpc_method1)(xmlrpc_env *   const envP,
+                  xmlrpc_value * const paramArrayP,
+                  void *         const serverInfo);
 
-/* A default method to call if no method can be found. */
 typedef xmlrpc_value *
-(*xmlrpc_default_method)(xmlrpc_env *   env,
-                         const char *   host,
-                         const char *   method_name,
-                         xmlrpc_value * param_array,
-                         void *         user_data);
+(*xmlrpc_method2)(xmlrpc_env *   const envP,
+                  xmlrpc_value * const paramArrayP,
+                  void *         const serverInfo,
+                  void *         const callInfo);
 
-/* Our registry structure. This has no public members. */
-typedef struct _xmlrpc_registry xmlrpc_registry;
+typedef xmlrpc_method1 xmlrpc_method;  /* backward compatibility */
+
+typedef xmlrpc_value *
+(*xmlrpc_default_method)(xmlrpc_env *   const envP,
+                         const char *   const callInfoP,
+                         const char *   const methodName,
+                         xmlrpc_value * const paramArrayP,
+                         void *         const serverInfo);
+
+extern unsigned int const xmlrpc_server_version_major;
+extern unsigned int const xmlrpc_server_version_minor;
+extern unsigned int const xmlrpc_server_version_point;
 
-/* Create a new method registry. */
 xmlrpc_registry *
-xmlrpc_registry_new(xmlrpc_env * env);
+xmlrpc_registry_new(xmlrpc_env * const envP);
 
-/* Delete a method registry. */
 void
-xmlrpc_registry_free(xmlrpc_registry * registry);
+xmlrpc_registry_free(xmlrpc_registry * const registryP);
 
-/* Disable introspection.  The xmlrpc_registry has introspection
-** capability built-in.  If you want to make nosy people work harder,
-** you can turn this off. */
 void
-xmlrpc_registry_disable_introspection(xmlrpc_registry * registry);
+xmlrpc_registry_disable_introspection(xmlrpc_registry * const registryP);
 
-/* Register a method. The host parameter must be NULL (for now). You
-** are responsible for owning and managing user_data. The registry
-** will make internal copies of any other pointers it needs to
-** keep around. */
 void
-xmlrpc_registry_add_method(xmlrpc_env *      env,
-                           xmlrpc_registry * registry,
-                           const char *      host,
-                           const char *      method_name,
-                           xmlrpc_method     method,
-                           void *            user_data);
+xmlrpc_registry_add_method(xmlrpc_env *      const envP,
+                           xmlrpc_registry * const registryP,
+                           const char *      const host,
+                           const char *      const methodName,
+                           xmlrpc_method     const method,
+                           void *            const serverInfo);
+
+void
+xmlrpc_registry_add_method_w_doc(xmlrpc_env *      const envP,
+                                 xmlrpc_registry * const registryP,
+                                 const char *      const host,
+                                 const char *      const methodName,
+                                 xmlrpc_method     const method,
+                                 void *            const serverInfo,
+                                 const char *      const signatureString,
+                                 const char *      const help);
+
+void
+xmlrpc_registry_add_method2(xmlrpc_env *      const envP,
+                            xmlrpc_registry * const registryP,
+                            const char *      const methodName,
+                            xmlrpc_method2          method,
+                            const char *      const signatureString,
+                            const char *      const help,
+                            void *            const serverInfo);
+
+void
+xmlrpc_registry_set_default_method(xmlrpc_env *          const envP,
+                                   xmlrpc_registry *     const registryP,
+                                   xmlrpc_default_method const handler,
+                                   void *                const userData);
+
+void
+xmlrpc_registry_set_preinvoke_method(xmlrpc_env *            const envP,
+                                     xmlrpc_registry *       const registryP,
+                                     xmlrpc_preinvoke_method const method,
+                                     void *                  const userData);
+
+
+typedef void xmlrpc_server_shutdown_fn(xmlrpc_env * const envP,
+                                       void *       const context,
+                                       const char * const comment,
+                                       void *       const callInfo);
+
+void
+xmlrpc_registry_set_shutdown(xmlrpc_registry *           const registryP,
+                             xmlrpc_server_shutdown_fn * const shutdownFn,
+                             void *                      const context);
+
+void
+xmlrpc_registry_set_dialect(xmlrpc_env *      const envP,
+                            xmlrpc_registry * const registryP,
+                            xmlrpc_dialect    const dialect);
+
+/*----------------------------------------------------------------------------
+   Lower interface -- services to be used by an HTTP request handler
+-----------------------------------------------------------------------------*/
+                    
+void
+xmlrpc_registry_process_call2(xmlrpc_env *        const envP,
+                              xmlrpc_registry *   const registryP,
+                              const char *        const xmlData,
+                              size_t              const xmlLen,
+                              void *              const callInfo,
+                              xmlrpc_mem_block ** const outputPP);
 
-/* As above, but allow the user to supply introspection information. 
-**
-** Signatures use their own little description language. It consists
-** of one-letter type code (similar to the ones used in xmlrpc_parse_value)
-** for the result, a colon, and zero or more one-letter type codes for
-** the parameters. For example:
-**   i:ibdsAS86
-** If a function has more than one possible prototype, separate them with
-** commas:
-**   i:,i:s,i:ii
-** If the function signature can't be represented using this language,
-** pass a single question mark:
-**   ?
-** Help strings are ASCII text, and may contain HTML markup. */
-void
-xmlrpc_registry_add_method_w_doc(xmlrpc_env *      env,
-                                 xmlrpc_registry * registry,
-                                 const char *      host,
-                                 const char *      method_name,
-                                 xmlrpc_method     method,
-                                 void *            user_data,
-                                 const char *      signature,
-                                 const char *      help);
-
-/* Given a registry, a host name, and XML data; parse the <methodCall>,
-** find the appropriate method, call it, serialize the response, and
-** return it as an xmlrpc_mem_block. Most errors will be serialized
-** as <fault> responses. If a *really* bad error occurs, set a fault and
-** return NULL. (Actually, we currently give up with a fatal error,
-** but that should change eventually.)
-** The caller is responsible for destroying the memory block. */
 xmlrpc_mem_block *
 xmlrpc_registry_process_call(xmlrpc_env *      const envP,
                              xmlrpc_registry * const registryP,
                              const char *      const host,
-                             const char *      const xml_data,
-                             size_t            const xml_len);
-
-/* Define a default method for the specified registry.  This will be invoked
-** if no other method matches.  The user_data pointer is property of the
-** application, and will not be freed or manipulated by the registry. */
-void
-xmlrpc_registry_set_default_method(xmlrpc_env *          env,
-                                   xmlrpc_registry *     registry,
-                                   xmlrpc_default_method handler,
-                                   void *                user_data);
-
-/* Define a preinvoke method for the specified registry.  This function will
-** be called before any method (either the default or a registered one) is
-** invoked.  Applications can use this to do things like access control or
-** sanity checks.  The user_data pointer is property of the application,
-** and will not be freed or manipulated by the registry. */
-void
-xmlrpc_registry_set_preinvoke_method(xmlrpc_env *            env,
-                                     xmlrpc_registry *       registry,
-                                     xmlrpc_preinvoke_method method,
-                                     void *                  user_data);
+                             const char *      const xmlData,
+                             size_t            const xmlLen);
 
-                    
 #ifdef __cplusplus
 }
 #endif

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.h	Mon May 26 12:59:57 2008
@@ -1,33 +1,43 @@
+/*============================================================================
+                              server_abyss.h
+==============================================================================
+  This declares the user interface to libxmlrpc_server_abyss, which
+  provides facilities for running an XML-RPC server based on the Xmlrpc-c
+  Abyss HTTP server.
+============================================================================*/
+
 /* Copyright and license information is at the end of the file */
 
 #ifndef  XMLRPC_SERVER_ABYSS_H_INCLUDED
 #define  XMLRPC_SERVER_ABYSS_H_INCLUDED
 
-#include "xmlrpc-c/server.h"
+#ifdef WIN32
+#include <winsock.h>  /* For XMLRPC_SOCKET (= SOCKET) */
+#endif
+
+#include <xmlrpc-c/config.h>  /* For XMLRPC_SOCKET */
+#include <xmlrpc-c/abyss.h>
+#include <xmlrpc-c/server.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-struct _TServer;
-
-/*=========================================================================
-**  XML-RPC Server (based on Abyss)
-**=========================================================================
-**  A simple XML-RPC server based on the Abyss web server. If errors
-**  occur during server setup, the server will exit. In general, if you
-**  want to use this API, you'll need to be familiar with Abyss.
-**
-**  There are two ways to use Abyss:
-**    1) You can use the handy wrapper functions.
-**    2) You can set up Abyss yourself, and install the appropriate
-**       handlers manually.
-*/
-
 #define XMLRPC_SERVER_ABYSS_NO_FLAGS (0)
 
 
+/*=========================================================================
+**  Global Initialization/Termination.
+**  
+**  These are not thread-safe.  You call them at the beginning and end
+**  of your program, when it is only one thread.
+**=======================================================================*/
+
+void
+xmlrpc_server_abyss_global_init(xmlrpc_env * const envP);
 
+void
+xmlrpc_server_abyss_global_term(void);
 
 /*=========================================================================
 **  Basic Abyss Server Functions
@@ -53,7 +63,11 @@
     unsigned int      keepalive_max_conn;
     unsigned int      timeout;
     xmlrpc_bool       dont_advertise;
-
+    xmlrpc_bool       socket_bound;
+    XMLRPC_SOCKET     socket_handle;
+    const char *      uri_path;
+    xmlrpc_bool       chunk_response;
+    xmlrpc_bool       enable_shutdown;
 } xmlrpc_server_abyss_parms;
 
 
@@ -62,23 +76,81 @@
 
 /* XMLRPC_APSIZE(xyz) is the minimum size a struct xmlrpc_server_abyss_parms
    must be to include the 'xyz' member.  This is essential to forward and
-   backward compatbility, as new members will be added to the end of the
+   backward compatibility, as new members will be added to the end of the
    struct in future releases.  This is how the callee knows whether or
    not the caller is new enough to have supplied a certain parameter.
 */
 
+/*=========================================================================
+**  Simple server with Abyss under the covers
+**=======================================================================*/
+
 void
 xmlrpc_server_abyss(xmlrpc_env *                      const envP,
                     const xmlrpc_server_abyss_parms * const parms,
                     unsigned int                      const parm_size);
 
+/*=========================================================================
+**  Object-oriented XML-RPC server with Abyss under the covers
+**=======================================================================*/
+
+typedef struct xmlrpc_server_abyss xmlrpc_server_abyss_t;
+
+void
+xmlrpc_server_abyss_create(xmlrpc_env *                      const envP,
+                           const xmlrpc_server_abyss_parms * const parmsP,
+                           unsigned int                      const parmSize,
+                           xmlrpc_server_abyss_t **          const serverPP);
+
+void
+xmlrpc_server_abyss_destroy(xmlrpc_server_abyss_t * const serverP);
+
+void
+xmlrpc_server_abyss_run_server(xmlrpc_env *            const envP,
+                               xmlrpc_server_abyss_t * const serverP);
+
+void
+xmlrpc_server_abyss_terminate(xmlrpc_env *            const envP,
+                              xmlrpc_server_abyss_t * const serverP);
+
+void
+xmlrpc_server_abyss_reset_terminate(xmlrpc_env *            const envP,
+                                    xmlrpc_server_abyss_t * const serverP);
+
+void
+xmlrpc_server_abyss_use_sigchld(xmlrpc_server_abyss_t * const serverP);
+
+
+typedef struct xmlrpc_server_abyss_sig xmlrpc_server_abyss_sig;
+
+void
+xmlrpc_server_abyss_setup_sig(
+    xmlrpc_env *               const envP,
+    xmlrpc_server_abyss_t *    const serverP,
+    xmlrpc_server_abyss_sig ** const oldHandlersPP);
+
+void
+xmlrpc_server_abyss_restore_sig(
+    const xmlrpc_server_abyss_sig * const oldHandlersP);
+
+
+
+/*=========================================================================
+**  Functions to make an XML-RPC server out of your own Abyss server
+**=======================================================================*/
+
+void
+xmlrpc_server_abyss_set_handlers2(TServer *         const srvP,
+                                  const char *      const filename,
+                                  xmlrpc_registry * const registryP);
+
 void
-xmlrpc_server_abyss_set_handlers(struct _TServer * const srvP,
+xmlrpc_server_abyss_set_handlers(TServer *         const serverP,
                                  xmlrpc_registry * const registryP);
 
 void
 xmlrpc_server_abyss_set_handler(xmlrpc_env *      const envP,
-                                struct _TServer * const srvP,
+                                TServer *         const serverP,
                                 const char *      const filename,
                                 xmlrpc_registry * const registryP);
 
@@ -109,8 +181,8 @@
 ** function.
 **/
 void 
-xmlrpc_server_abyss_run_first(void (runfirst(void *)),
-                              void * const runfirstArg);
+xmlrpc_server_abyss_run_first(runfirstFn const runfirst,
+                              void *     const runfirstArg);
 
 /*=========================================================================
 **  Method Registry
@@ -145,18 +217,18 @@
 /* A quick & easy shorthand for adding a method. Depending on
 ** how you've configured your copy of Abyss, it's probably not safe to
 ** call this method after calling xmlrpc_server_abyss_run. */
-void xmlrpc_server_abyss_add_method (char *method_name,
-                                     xmlrpc_method method,
-                                     void *user_data);
+void xmlrpc_server_abyss_add_method (char *        const method_name,
+                                     xmlrpc_method const method,
+                                     void *        const user_data);
     
 /* As above, but provide documentation (see xmlrpc_registry_add_method_w_doc
 ** for more information). You should really use this one. */
 extern void
-xmlrpc_server_abyss_add_method_w_doc (char *method_name,
-                                      xmlrpc_method method,
-                                      void *user_data,
-                                      char *signature,
-                                      char *help);
+xmlrpc_server_abyss_add_method_w_doc (char *        const method_name,
+                                      xmlrpc_method const method,
+                                      void *        const user_data,
+                                      char *        const signature,
+                                      char *        const help);
 
 /*=========================================================================
 **  Content Handlers

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/server_abyss.hpp	Mon May 26 12:59:57 2008
@@ -1,5 +1,11 @@
 #ifndef SERVER_ABYSS_HPP_INCLUDED
 #define SERVER_ABYSS_HPP_INCLUDED
+
+#ifdef WIN32
+#include <winsock.h>   // For XMLRPC_SOCKET (= SOCKET)
+#endif
+
+#include "xmlrpc-c/config.h"  // For XMLRPC_SOCKET
 #include "xmlrpc-c/base.hpp"
 #include "abyss.h"
 
@@ -8,6 +14,52 @@
 class serverAbyss {
     
 public:
+    class constrOpt {
+    public:
+        constrOpt();
+
+        constrOpt & registryPtr       (xmlrpc_c::registryPtr      const& arg);
+        constrOpt & registryP         (const xmlrpc_c::registry * const& arg);
+        constrOpt & socketFd          (XMLRPC_SOCKET  const& arg);
+        constrOpt & portNumber        (unsigned int   const& arg);
+        constrOpt & logFileName       (std::string    const& arg);
+        constrOpt & keepaliveTimeout  (unsigned int   const& arg);
+        constrOpt & keepaliveMaxConn  (unsigned int   const& arg);
+        constrOpt & timeout           (unsigned int   const& arg);
+        constrOpt & dontAdvertise     (bool           const& arg);
+        constrOpt & uriPath           (std::string    const& arg);
+        constrOpt & chunkResponse     (bool           const& arg);
+
+        struct value {
+            xmlrpc_c::registryPtr      registryPtr;
+            const xmlrpc_c::registry * registryP;
+            XMLRPC_SOCKET  socketFd;
+            unsigned int   portNumber;
+            std::string    logFileName;
+            unsigned int   keepaliveTimeout;
+            unsigned int   keepaliveMaxConn;
+            unsigned int   timeout;
+            bool           dontAdvertise;
+            std::string    uriPath;
+            bool           chunkResponse;
+        } value;
+        struct {
+            bool registryPtr;
+            bool registryP;
+            bool socketFd;
+            bool portNumber;
+            bool logFileName;
+            bool keepaliveTimeout;
+            bool keepaliveMaxConn;
+            bool timeout;
+            bool dontAdvertise;
+            bool uriPath;
+            bool chunkResponse;
+        } present;
+    };
+
+    serverAbyss(constrOpt const& opt);
+
     serverAbyss(
         xmlrpc_c::registry const& registry,
         unsigned int       const  portNumber = 8080,
@@ -15,32 +67,67 @@
         unsigned int       const  keepaliveTimeout = 0,
         unsigned int       const  keepaliveMaxConn = 0,
         unsigned int       const  timeout = 0,
-        bool               const  dontAdvertise = false
+        bool               const  dontAdvertise = false,
+        bool               const  socketBound = false,
+        XMLRPC_SOCKET      const  socketFd = 0
         );
     ~serverAbyss();
     
-    void run();
+    void
+    run();
+
+    void
+    runOnce();
+
+    void
+    runConn(int const socketFd);
+
+    void
+    terminate();
     
+    class shutdown : public xmlrpc_c::registry::shutdown {
+    public:
+        shutdown(xmlrpc_c::serverAbyss * const severAbyssP);
+        virtual ~shutdown();
+        void doit(std::string const& comment, void * const callInfo) const;
+    private:
+        xmlrpc_c::serverAbyss * const serverAbyssP;
+    };
+
 private:
-    // We rely on the creator to keep the registry object around as
-    // long as the server object is, so that this pointer is valid.
-    // We need to use some kind of automatic handle instead.
-    
-    const xmlrpc_c::registry * registryP;
-    
-    std::string  configFileName;
-    std::string  logFileName;
-    unsigned int portNumber;
-    unsigned int keepaliveTimeout;
-    unsigned int keepaliveMaxConn;
-    unsigned int timeout;
-    bool         dontAdvertise;
+    // The user has the choice of supplying the registry by plain pointer
+    // (and managing the object's existence himself) or by autoObjectPtr
+    // (with automatic management).  'registryPtr' exists here only to
+    // maintain a reference count in the case that the user supplied an
+    // autoObjectPtr.  The object doesn't reference the C++ registry
+    // object except during construction, because the C registry is the
+    // real registry.
+    xmlrpc_c::registryPtr registryPtr;
+
+    TServer cServer;
+
+    void
+    setAdditionalServerParms(constrOpt const& opt);
+
+    void
+    initialize(constrOpt const& opt);
 };
 
 
 void
 server_abyss_set_handlers(TServer *          const  srvP,
-                          xmlrpc_c::registry const& registry);
+                          xmlrpc_c::registry const& registry,
+                          std::string        const& uriPath = "/RPC2");
+
+void
+server_abyss_set_handlers(TServer *                  const  srvP,
+                          const xmlrpc_c::registry * const  registryP,
+                          std::string                const& uriPath = "/RPC2");
+
+void
+server_abyss_set_handlers(TServer *             const srvP,
+                          xmlrpc_c::registryPtr const registryPtr,
+                          std::string           const& uriPath = "/RPC2");
 
 } // namespace
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/timeout.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/timeout.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/timeout.hpp	Mon May 26 12:59:57 2008
@@ -8,9 +8,10 @@
     timeout() : finite(false) {}
 
     timeout(unsigned int const duration) : duration(duration) {}
+        // 'duration' is the timeout time in milliseconds
 
     bool finite;
-    unsigned int duration;
+    unsigned int duration;  // in milliseconds
 };
 
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/transport.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/transport.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/transport.h	Mon May 26 12:59:57 2008
@@ -6,7 +6,8 @@
 extern "C" {
 #endif
 
-#include "xmlrpc-c/base.h"
+#include <xmlrpc-c/util.h>
+#include <xmlrpc-c/client.h>
 
 struct xmlrpc_call_info;
 
@@ -16,12 +17,16 @@
 **  Transport function type declarations.
 **=========================================================================
 */
+typedef void (*xmlrpc_transport_setup)(xmlrpc_env * const envP);
+
+typedef void (*xmlrpc_transport_teardown)(void);
+
 typedef void (*xmlrpc_transport_create)(
     xmlrpc_env *                      const envP,
     int                               const flags,
     const char *                      const appname,
     const char *                      const appversion,
-    const struct xmlrpc_xportparms *  const transportparmsP,
+    const void *                      const transportparmsP,
     size_t                            const transportparm_size,
     struct xmlrpc_client_transport ** const handlePP);
     
@@ -58,14 +63,20 @@
     xmlrpc_timeoutType               const timeoutType,
     xmlrpc_timeout                   const timeout);
 
+typedef void (*xmlrpc_transport_set_interrupt)(
+    struct xmlrpc_client_transport * const clientTransportP,
+    int *                            const interruptP);
 
 struct xmlrpc_client_transport_ops {
 
+    xmlrpc_transport_setup         setup_global_const;
+    xmlrpc_transport_teardown      teardown_global_const;
     xmlrpc_transport_create        create;
     xmlrpc_transport_destroy       destroy;
     xmlrpc_transport_send_request  send_request;
     xmlrpc_transport_call          call;
     xmlrpc_transport_finish_asynch finish_asynch;
+    xmlrpc_transport_set_interrupt set_interrupt;
 };
 
 #ifdef __cplusplus

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xml.hpp
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xml.hpp	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xml.hpp	Mon May 26 12:59:57 2008
@@ -13,6 +13,12 @@
              std::string *       const  callXmlP);
     
 void
+generateCall(std::string         const& methodName,
+             xmlrpc_c::paramList const& paramList,
+             xmlrpc_dialect      const  dialect,
+             std::string *       const  callXmlP);
+    
+void
 parseSuccessfulResponse(std::string       const& responseXml,
                         xmlrpc_c::value * const  resultP);
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xmlparser.h
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xmlparser.h	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/include/xmlrpc-c/xmlparser.h	Mon May 26 12:59:57 2008
@@ -27,11 +27,12 @@
 typedef struct _xml_element xml_element;
 
 /* Destroy an xml_element. */
-void xml_element_free (xml_element *elem);
+void xml_element_free (xml_element * const elem);
 
 /* Return a pointer to the element's name. Do not free this pointer!
 ** This pointer should point to standard ASCII or UTF-8 data. */
-char *xml_element_name (xml_element *elem);
+const char *
+xml_element_name(const xml_element * const elemP);
 
 /* Return the xml_element's CDATA. Do not free this pointer!
 ** This pointer should point to standard ASCII or UTF-8 data.
@@ -46,8 +47,11 @@
 char *xml_element_cdata (xml_element *elem);
 
 /* Return the xml_element's child elements. Do not free this pointer! */
-size_t xml_element_children_size (xml_element *elem);
-xml_element **xml_element_children (xml_element *elem);
+size_t
+xml_element_children_size(const xml_element * const elemP);
+
+xml_element **
+xml_element_children(const xml_element * const elemP);
 
 
 /*=========================================================================
@@ -58,7 +62,11 @@
 **  You are responsible for calling xml_element_free on the returned pointer.
 */
 
-xml_element *xml_parse (xmlrpc_env *env, const char *xml_data, int xml_len);
+void
+xml_parse(xmlrpc_env *   const envP,
+          const char *   const xmlData,
+          size_t         const xmlDataLen,
+          xml_element ** const resultPP);
 
 
 /* Copyright (C) 2001 by First Peer, Inc. All rights reserved.

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/Makefile	Mon May 26 12:59:57 2008
@@ -1,11 +1,15 @@
-ifeq ($(SRCDIR)x,x)
-SRCDIR = $(CURDIR)/..
-endif
-SUBDIR = lib
-
-include $(SRCDIR)/Makefile.config
-
-SUBDIRS = util
+ifeq ($(SRCDIR),)
+  updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
+  SRCDIR := $(call updir,$(CURDIR))
+  BLDDIR := $(SRCDIR)
+endif
+SUBDIR := lib
+
+include $(BLDDIR)/config.mk
+
+# Build up SUBDIRS:
+SUBDIRS = 
+SUBDIRS += util libutil
 ifeq ($(ENABLE_ABYSS_SERVER),yes)
   SUBDIRS += abyss
 endif
@@ -18,36 +22,37 @@
 ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
   SUBDIRS += libwww_transport
 endif
-ifneq ($(ENABLE_LIBXML2),yes)
+ifneq ($(ENABLE_LIBXML2_BACKEND),yes)
   SUBDIRS += expat
 endif
 
 default: all
 
-.PHONY: all
+.PHONY: all clean distclean tags distdir install check dep
+
 all: $(SUBDIRS:%=%/all)
 
-.PHONY: clean
+# Extra dependencies to make parallel make work in spite of all the submakes
+# (See top level make file for details)
+abyss/all curl_transport/all: $(BLDDIR)/version.h
+
 clean: $(SUBDIRS:%=%/clean) clean-common
 
-.PHONY: distclean
 distclean: $(SUBDIRS:%=%/distclean) distclean-common
 
-.PHONY: tags
 tags: $(SUBDIRS:%=%/tags) TAGS
 
 DISTFILES = 
 
-.PHONY: distdir
 distdir: distdir-common
 
-.PHONY: install
 install: $(SUBDIRS:%=%/install)
 
-.PHONY: dep
+check:
+
 dep: $(SUBDIRS:%=%/dep)
 
-include $(SRCDIR)/Makefile.common
+include $(SRCDIR)/common.mk
 
 
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/Makefile	Mon May 26 12:59:57 2008
@@ -1,9 +1,12 @@
-ifeq ($(SRCDIR)x,x)
-SRCDIR = $(CURDIR)/../..
+ifeq ($(SRCDIR),)
+  updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
+  LIBDIR := $(call updir,$(CURDIR))
+  SRCDIR := $(call updir,$(LIBDIR))
+  BLDDIR := $(SRCDIR)
 endif
-SUBDIR = lib/abyss
+SUBDIR := lib/abyss
 
-include $(SRCDIR)/Makefile.config
+include $(BLDDIR)/config.mk
 
 SUBDIRS = src
 
@@ -32,7 +35,7 @@
 .PHONY: dep
 dep: $(SUBDIRS:%=%/dep)
 
-include $(SRCDIR)/Makefile.common
+include $(SRCDIR)/common.mk
 
 
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/Makefile
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/Makefile	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/Makefile	Mon May 26 12:59:57 2008
@@ -1,52 +1,102 @@
-ifeq ($(SRCDIR)x,x)
-SRCDIR = $(CURDIR)/../../..
+ifeq ($(SRCDIR),)
+  updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
+  ABYSSDIR := $(call updir,$(CURDIR))
+  LIBDIR := $(call updir,$(ABYSSDIR))
+  SRCDIR := $(call updir,$(LIBDIR))
+  BLDDIR := $(SRCDIR)
 endif
-SUBDIR = lib/abyss/src
+SUBDIR := lib/abyss/src
 
-include $(SRCDIR)/Makefile.config
+include $(BLDDIR)/config.mk
+
+default: all
+
+TARGET_LIBRARY_NAMES := libxmlrpc_abyss
+
+STATIC_LIBRARIES_TO_INSTALL = libxmlrpc_abyss.a
+
+SHARED_LIBS_TO_BUILD := libxmlrpc_abyss
+SHARED_LIBS_TO_INSTALL := libxmlrpc_abyss
 
-CFLAGS = $(CFLAGS_COMMON)
-CFLAGS += -D_UNIX
-ifeq ($(ENABLE_ABYSS_THREADS),yes)
-CFLAGS += -D_THREAD
-endif
-CFLAGS += 
-CFLAGS +=  $(CFLAGS_PERSONAL) $(CADD)
-LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR)
 ifeq ($(ENABLE_ABYSS_THREADS),yes)
-LIBLDFLAGS += -lpthread
+  THREAD_MODULE = thread_pthread
+else
+  THREAD_MODULE = thread_fork
 endif
-LIBLDFLAGS += $(LADD)
 
-INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/include -I$(SRCDIR)/lib/util/include
+TARGET_MODS = \
+  channel \
+  chanswitch \
+  conf \
+  conn \
+  data \
+  date \
+  file \
+  handler \
+  http \
+  init \
+  response \
+  server \
+  session \
+  socket \
+  socket_unix \
+  token \
+  $(THREAD_MODULE) \
+  trace \
+
+OMIT_ABYSS_LIB_RULE = Y
+MAJ=3
+  # Major number of shared libraries in this directory
+
+include $(SRCDIR)/common.mk
+
+CFLAGS = $(CFLAGS_COMMON) -D_UNIX $(CFLAGS_PERSONAL) $(CADD)
+
+INCLUDES = -Iblddir -Isrcdir -Isrcdir/include -Isrcdir/lib/util/include
+
+ABYSS_SHLIB = $(call shlibfn,libxmlrpc_abyss)
+#ABYSS_SHLIB is e.g. libxmlrpc_abyss.so.3.1
+ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc_abyss)
+#ABYSS_SHLIBLE is e.g. libxmlrpc_abyss.so
+
+# LIBDEP is the shared libraries on which libxmlrpc_abyss depends.
+# The runtime loader should load these libraries when it loads libxmlrpc_abyss.
+
+LIBDEP = $(LIBXMLRPC_UTIL)
+
+ifneq ($(SHARED_LIB_TYPE),NONE)
+  TARGET_SHARED_LIBS := $(ABYSS_SHLIB) $(ABYSS_SHLIBLE)
+  endif
 
-LTLIBRARIES_TO_INSTALL = libxmlrpc_abyss.la
+# This 'common.mk' dependency makes sure the symlinks get built before
+# this make file is used for anything.
 
-default: all
+$(SRCDIR)/common.mk: srcdir blddir
 
 .PHONY: all
-all: libxmlrpc_abyss.la
+all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
 
 
-ABYSS_OBJS = \
-  conf.lo \
-  data.lo \
-  token.lo \
-  trace.lo \
-  file.lo \
-  thread.lo \
-  http.lo \
-  socket.lo \
-  server.lo \
-  conn.lo \
-
-
-libxmlrpc_abyss.la: $(ABYSS_OBJS)
-	$(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
-
-$(ABYSS_OBJS):%.lo:%.c
-	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) \
-	  $(CFLAGS) $<
+# Rule for this is in common.mk, courtesy of TARGET_SHARED_LIBRARIES:
+$(ABYSS_SHLIB): $(TARGET_MODS:%=%.osh) $(LIBDEP)
+$(ABYSS_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh) $(LIBDEP)
+
+# Rule for this is in common.mk, courtesy of TARGET_STATIC_LIBRARIES:
+
+libxmlrpc_abyss.a: $(TARGET_MODS:%=%.o)
+libxmlrpc_abyss.a: LIBOBJECTS = $(TARGET_MODS:%=%.o)
+
+#-----------------------------------------------------------------------------
+#  RULES TO COMPILE OBJECT MODULES FOR LIBRARIES
+#-----------------------------------------------------------------------------
+
+# Rules to compile object modules from which to build the static and shared
+# Abyss library are in common.mk, courtesy of TARGET_MODS.
+
+
+# Need this dependency for those who don't use Makefile.depend.
+# Without it, version.h doesn't get created.
+response.o response.osh handler.o handler.osh: version.h
 
 .PHONY: clean
 clean: clean-common
@@ -66,6 +116,4 @@
 .PHONY: dep
 dep: dep-common
 
-include $(SRCDIR)/Makefile.common
-
 include Makefile.depend

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conf.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conf.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conf.c	Mon May 26 12:59:57 2008
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(ABYSS_WIN32) && !defined(__BORLANDC__)
+#if defined(WIN32) && !defined(__BORLANDC__)
 #include <direct.h>
 #endif
 
@@ -44,7 +44,15 @@
 #include <pwd.h>
 #endif
 
+#include "xmlrpc_config.h"
+#include "bool.h"
+#include "xmlrpc-c/string_int.h"
 #include "xmlrpc-c/abyss.h"
+#include "trace.h"
+#include "file.h"
+#include "server.h"
+#include "http.h"
+#include "handler.h"
 
 /*********************************************************************
 ** Configuration Files Parsing Functions
@@ -52,46 +60,59 @@
 
 
 
-static abyss_bool
-ConfReadLine(TFile *f,char *buffer,uint32_t len) {
-    abyss_bool r=TRUE;
-    char c,*p,*z=buffer;
-
-    while ((--len)>0)
-    {
-        if (FileRead(f,buffer,1)<1)
-        {
-            if (z==buffer)
-                r=FALSE;
+static bool
+ConfReadLine(TFile *  const fileP,
+             char *   const buffer,
+             uint32_t const lenArg) {
+
+    bool r;
+    char c;
+    char * p;
+    char * z;
+    uint32_t len;
+
+    len = lenArg;  /* initial value */
+    r = TRUE;  /* initial value */
+    z = buffer;  /* initial value */
+
+    while (--len > 0) {
+        int32_t bytesRead;
+        
+        bytesRead = FileRead(fileP, z, 1);
+        if (bytesRead < 1) {
+            if (z == buffer)
+                r = FALSE;
             break;
         };
 
-        if ((*buffer==CR) || (*buffer==LF) )
+        if (*z == CR || *z == LF)
             break;
 
-        buffer++;
-    };
+        ++z;
+    }
 
-    if (len==0)
-        while (FileRead(f,&c,1)==1)
-            if ((c==CR) || (c==LF))
+    if (len == 0)
+        while (FileRead(fileP, &c, 1) == 1)
+            if (c == CR || c == LF)
                 break;
 
-    *buffer='\0';
+    *buffer = '\0';
 
     /* Discard comments */
-    p=strchr(z,'#');
+    p = strchr(z, '#');
     if (p)
-        *p='\0';
+        *p = '\0';
 
     return r;
 }
 
-static abyss_bool
-ConfNextToken(char **p) {
+
+
+static bool
+ConfNextToken(char ** const p) {
+
     while (1)
-        switch (**p)
-        {
+        switch (**p) {
         case '\t':
         case ' ':
             (*p)++;
@@ -130,213 +151,251 @@
         };
 }
 
-static abyss_bool
-ConfReadInt(char *p,int32_t *n,int32_t min,int32_t max) {
-    char *e;
+static bool
+ConfReadInt(const char * const p,
+            int32_t *    const n,
+            int32_t      const min,
+            int32_t      const max) {
+/*----------------------------------------------------------------------------
+   Convert string 'p' to integer *n.
+
+   If it isn't a valid integer or is not with the bounds [min, max],
+   return FALSE.  Otherwise, return TRUE.
+-----------------------------------------------------------------------------*/
+    char * e;
 
-    *n=strtol(p,&e,10);
+    *n = strtol(p, &e, 10);
 
-    if (min!=max)
-        return ((e!=p) && (*n>=min) && (*n<=max));
+    if (min != max)
+        return ((e != p) && (*n >= min) && (*n <= max));
     else
-        return (e!=p);
+        return (e != p);
 }
 
-static abyss_bool
-ConfReadBool(char *p, abyss_bool *b) {
-    if (strcasecmp(p,"yes")==0)
-    {
-        *b=TRUE;
-        return TRUE;
-    };
 
-    if (strcasecmp(p,"no")==0)
-    {
-        *b=FALSE;
-        return TRUE;
-    };
 
-    return FALSE;
+static bool
+ConfReadBool(const char * const token,
+             bool *       const bP) {
+
+    bool succeeded;
+
+    if (xmlrpc_strcaseeq(token, "yes")) {
+        *bP = TRUE;
+        succeeded = TRUE;
+    } else if (xmlrpc_strcaseeq(token, "no")) {
+        *bP = FALSE;
+        succeeded = TRUE;
+    } else
+        succeeded = FALSE;
+
+    return succeeded;
 }
 
 /*********************************************************************
 ** MIME Types File
 *********************************************************************/
 
-abyss_bool ConfReadMIMETypes(char *filename)
-{
-    TFile f;
-    char z[512],*p;
-    char *mimetype,*ext;
-
-    if (!FileOpen(&f,filename,O_RDONLY))
-        return FALSE;
-
-    while (ConfReadLine(&f,z,512))
-    {
-        p=z;
-
-        if (ConfNextToken(&p)) {
-            mimetype=ConfGetToken(&p);
-            if (mimetype) {
-                while (ConfNextToken(&p)) {
-                    ext=ConfGetToken(&p);
-                    if (ext)
-                        MIMETypeAdd(mimetype,ext);
-                    else
-                        break;
+static void
+readMIMETypesFile(const char * const filename,
+                  MIMEType **  const MIMETypePP) {
+
+    bool success;
+    MIMEType * MIMETypeP;
+
+    MIMETypeP = MIMETypeCreate();
+    if (MIMETypeP) {
+        TFile * fileP;
+        bool fileOpened;
+
+        fileOpened = FileOpen(&fileP, filename, O_RDONLY);
+        if (fileOpened) {
+            char z[512];
+            while (ConfReadLine(fileP, z, 512)) {
+                char * p;
+                p = &z[0];
+            
+                if (ConfNextToken(&p)) {
+                    const char * mimetype = ConfGetToken(&p);
+                    if (mimetype) {
+                        while (ConfNextToken(&p)) {
+                            const char * const ext = ConfGetToken(&p);
+                            if (ext)
+                                MIMETypeAdd2(MIMETypeP, mimetype, ext);
+                            else
+                                break;
+                        }
+                    }
                 }
             }
-        }
-    };
+            FileClose(fileP);
+            success = TRUE;
+        } else
+            success = FALSE;
+        if (!success)
+            MIMETypeDestroy(MIMETypeP);
+    } else
+        success = FALSE;
 
-    FileClose(&f);
-    return TRUE;
+    if (success)
+        *MIMETypePP = MIMETypeP;
+    else
+        *MIMETypePP = NULL;
 }
 
 /*********************************************************************
 ** Server Configuration File
 *********************************************************************/
 
-abyss_bool ConfReadServerFile(const char *filename,TServer *srv)
-{
-    TFile f;
-    char z[512],*p;
-    char *option;
-    int32_t n,line=0;
+static void
+chdirx(const char * const newdir,
+       bool *       const successP) {
+    
+#if defined(WIN32) && !defined(__BORLANDC__)
+    *successP = _chdir(newdir) == 0;
+#else
+    *successP = chdir(newdir) == 0;
+#endif
+}
+
+
+
+static void
+parseUser(const char *      const p, 
+          struct _TServer * const srvP) {
+#ifdef _UNIX
+    if (p[0] == '#') {
+        int32_t n;
+        
+        if (!ConfReadInt(&p[1], &n, 0, 0))
+            TraceExit("Bad user number '%s'", p);
+        else
+            srvP->uid = n;
+    } else {
+        struct passwd * pwd;
+
+        if (!(pwd = getpwnam(p)))
+            TraceExit("Unknown user '%s'", p);
+        
+        srvP->uid = pwd->pw_uid;
+        if ((int)srvP->gid==(-1))
+            srvP->gid = pwd->pw_gid;
+    };
+#else
+    TraceMsg("User option ignored");
+#endif  /* _UNIX */ 
+}
+
+
+
+static void
+parsePidfile(const char *      const p,
+             struct _TServer * const srvP) {
+#ifdef _UNIX
+    bool succeeded;
+    succeeded = FileOpenCreate(&srvP->pidfileP, p, O_TRUNC | O_WRONLY);
+    if (!succeeded) {
+        srvP->pidfileP = NULL;
+        TraceMsg("Bad PidFile value '%s'", p);
+    };
+#else
+    TraceMsg("PidFile option ignored");
+#endif  /* _UNIX */ 
+}
+
+
+
+abyss_bool
+ConfReadServerFile(const char * const filename,
+                   TServer *    const serverP) {
+
+    struct _TServer * const srvP     = serverP->srvP;
+    BIHandler *       const handlerP = srvP->builtinHandlerP;
+
+    TFile * fileP;
+    char z[512];
+    char * p;
+    unsigned int lineNum;
     TFileStat fs;
 
-    if (!FileOpen(&f,filename,O_RDONLY))
+    if (!FileOpen(&fileP, filename, O_RDONLY))
         return FALSE;
 
-    while (ConfReadLine(&f,z,512))
-    {
-        line++;
-        p=z;
+    lineNum = 0;
+
+    while (ConfReadLine(fileP, z, 512)) {
+        ++lineNum;
+        p = z;
 
         if (ConfNextToken(&p)) {
-            option=ConfGetToken(&p);
-            if (option)
-            {
+            const char * const option = ConfGetToken(&p);
+            if (option) {
                 ConfNextToken(&p);
 
-                if (strcasecmp(option,"port")==0)
-                {
-                    if (ConfReadInt(p,&n,1,65535))
-                        srv->port=n;
+                if (xmlrpc_strcaseeq(option, "port")) {
+                    int32_t n;
+                    if (ConfReadInt(p, &n, 1, 65535))
+                        srvP->port = n;
                     else
-                        TraceExit("Invalid port '%s'",p);
-                }
-                else if (strcasecmp(option,"serverroot")==0)
-                {
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-                    if (_chdir(p))
-#else
-                    if (chdir(p))
-#endif
+                        TraceExit("Invalid port '%s'", p);
+                } else if (xmlrpc_strcaseeq(option, "serverroot")) {
+                    bool success;
+                    chdirx(p, &success);
+                    if (!success)
                         TraceExit("Invalid server root '%s'",p);
-                }
-                else if (strcasecmp(option,"path")==0)
-                {
-                    if (FileStat(p,&fs))
-                        if (fs.st_mode & S_IFDIR)
-                        {
-                            free(srv->filespath);
-                            srv->filespath=strdup(p);
+                } else if (xmlrpc_strcaseeq(option, "path")) {
+                    if (FileStat(p, &fs))
+                        if (fs.st_mode & S_IFDIR) {
+                            HandlerSetFilesPath(handlerP, p);
                             continue;
-                        };
-                    
-                    TraceExit("Invalid path '%s'",p);
-                }
-                else if (strcasecmp(option,"default")==0)
-                {
-                    char *filename;
+                        }
+                    TraceExit("Invalid path '%s'", p);
+                } else if (xmlrpc_strcaseeq(option, "default")) {
+                    const char * filename;
                     
-                    while ((filename=ConfGetToken(&p)))
-                    {
-                        ListAdd(&srv->defaultfilenames,strdup(filename));
+                    while ((filename = ConfGetToken(&p))) {
+                        HandlerAddDefaultFN(handlerP, filename);
                         if (!ConfNextToken(&p))
                             break;
-                    };
-                }
-                else if (strcasecmp(option,"keepalive")==0)
-                {
-                    if (ConfReadInt(p,&n,1,65535))
-                        srv->keepalivemaxconn=n;
-                    else
-                        TraceExit("Invalid KeepAlive value '%s'",p);
-                }
-                else if (strcasecmp(option,"timeout")==0)
-                {
-                    if (ConfReadInt(p,&n,1,3600))
-                    {
-                        srv->keepalivetimeout=n;
-                        /* Must see what to do with that */
-                        srv->timeout=n;
                     }
+                } else if (xmlrpc_strcaseeq(option, "keepalive")) {
+                    int32_t n;
+                    if (ConfReadInt(p, &n, 1, 65535))
+                        srvP->keepalivemaxconn = n;
                     else
-                        TraceExit("Invalid TimeOut value '%s'",p);
-                }
-                else if (strcasecmp(option,"mimetypes")==0)
-                {
-                    if (!ConfReadMIMETypes(p))
-                        TraceExit("Can't read MIME Types file '%s'",p);
-                }
-                else if (strcasecmp(option,"logfile")==0)
-                {
-                    LogOpen(srv,p);
-                }
-                else if (strcasecmp(option,"user")==0)
-                {
-#ifdef _UNIX
-                    if (*p=='#')
-                    {
-                        int32_t n;
-
-                        if (!ConfReadInt(p+1,&n,0,0))
-                            TraceExit("Bad user number '%s'",p);
-                        else
-                            srv->uid=n;
-                    }
+                        TraceExit("Invalid KeepAlive value '%s'", p);
+                } else if (xmlrpc_strcaseeq(option, "timeout")) {
+                    int32_t n;
+                    if (ConfReadInt(p, &n, 1, 3600)) {
+                        srvP->keepalivetimeout = n;
+                        /* Must see what to do with that */
+                        srvP->timeout = n;
+                    } else
+                        TraceExit("Invalid TimeOut value '%s'", p);
+                } else if (xmlrpc_strcaseeq(option, "mimetypes")) {
+                    MIMEType * mimeTypeP;
+                    readMIMETypesFile(p, &mimeTypeP);
+                    if (!mimeTypeP)
+                        TraceExit("Can't read MIME Types file '%s'", p);
                     else
-                    {
-                        struct passwd *pwd;
-
-                        if (!(pwd=getpwnam(p)))
-                            TraceExit("Unknown user '%s'",p);
-        
-                        srv->uid=pwd->pw_uid;
-                        if ((int)srv->gid==(-1))
-                            srv->gid=pwd->pw_gid;
-                    };
-#else
-                    TraceMsg("User option ignored");
-#endif  /* _UNIX */ 
-                }
-                else if (strcasecmp(option,"pidfile")==0)
-                {
-#ifdef _UNIX
-                    if (!FileOpenCreate(&srv->pidfile,p,O_TRUNC | O_WRONLY))
-                    {
-                        srv->pidfile=-1;
-                        TraceMsg("Bad PidFile value '%s'",p);
-                    };
-#else
-                    TraceMsg("PidFile option ignored");
-#endif  /* _UNIX */ 
-                }
-                else if (strcasecmp(option,"advertiseserver")==0)
-                {
-                    if (!ConfReadBool(p,&srv->advertise))
+                        HandlerSetMimeType(handlerP, mimeTypeP);
+                } else if (xmlrpc_strcaseeq(option,"logfile")) {
+                    srvP->logfilename = strdup(p);
+                } else if (xmlrpc_strcaseeq(option,"user")) {
+                    parseUser(p, srvP);
+                } else if (xmlrpc_strcaseeq(option, "pidfile")) {
+                    parsePidfile(p, srvP);
+                } else if (xmlrpc_strcaseeq(option, "advertiseserver")) {
+                    if (!ConfReadBool(p, &srvP->advertise))
                         TraceExit("Invalid boolean value "
                                   "for AdvertiseServer option");
-                }
-                else
-                    TraceExit("Invalid option '%s' at line %d",option,line);
-            };
+                } else
+                    TraceExit("Invalid option '%s' at line %u",
+                              option, lineNum);
+            }
         }
-    };
+    }
 
-    FileClose(&f);
+    FileClose(fileP);
     return TRUE;
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conn.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conn.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/conn.c	Mon May 26 12:59:57 2008
@@ -1,343 +1,525 @@
-/*******************************************************************************
-**
-** conn.c
-**
-** This file is part of the ABYSS Web server project.
-**
-** Copyright (C) 2000 by Moez Mahfoudh <mmoez at bigfoot.com>.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions
-** are met:
-** 1. Redistributions of source code must retain the above copyright
-**    notice, this list of conditions and the following disclaimer.
-** 2. Redistributions in binary form must reproduce the above copyright
-**    notice, this list of conditions and the following disclaimer in the
-**    documentation and/or other materials provided with the distribution.
-** 3. The name of the author may not be used to endorse or promote products
-**    derived from this software without specific prior written permission.
-** 
-** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-** SUCH DAMAGE.
-**
-*******************************************************************************/
+/* Copyright information is at the end of the file. */
 
 #include <time.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <assert.h>
 
+#include "bool.h"
+#include "mallocvar.h"
+#include "xmlrpc-c/util_int.h"
+#include "xmlrpc-c/string_int.h"
+#include "xmlrpc-c/sleep_int.h"
 #include "xmlrpc-c/abyss.h"
+#include "channel.h"
+#include "server.h"
+#include "thread.h"
+#include "file.h"
+
+#include "conn.h"
 
 /*********************************************************************
 ** Conn
 *********************************************************************/
 
-TConn *ConnAlloc()
-{
-    return (TConn *)malloc(sizeof(TConn));
+static TThreadProc connJob;
+
+static void
+connJob(void * const userHandle) {
+/*----------------------------------------------------------------------------
+   This is the root function for a thread that processes a connection
+   (performs HTTP transactions).
+-----------------------------------------------------------------------------*/
+    TConn * const connectionP = userHandle;
+
+    (connectionP->job)(connectionP);
+
+    connectionP->finished = TRUE;
+        /* Note that if we are running in a forked process, setting
+           connectionP->finished has no effect, because it's just our own
+           copy of *connectionP.  In this case, Parent must update his own
+           copy based on a SIGCHLD signal that the OS will generate right
+           after we exit.
+        */
+
+    //ThreadExit(0);
 }
 
-void ConnFree(TConn *c)
-{
-    free(c);
+
+
+static void
+connDone(TConn * const connectionP) {
+
+    /* In the forked case, this is designed to run in the parent
+       process after the child has terminated.
+    */
+    connectionP->finished = TRUE;
+
+    if (connectionP->done)
+        connectionP->done(connectionP);
 }
 
-static uint32_t
-THREAD_ENTRYTYPE ConnJob(TConn *c) {
-    c->connected=TRUE;
-    (c->job)(c);
-    c->connected=FALSE;
-    ThreadExit( &c->thread, 0 );
-    return 0;
-}
-
-abyss_bool ConnCreate2(TConn *             const connectionP, 
-                       TServer *           const serverP,
-                       TSocket             const connectedSocket,
-                       TIPAddr             const peerIpAddr,
-                       void            ( *       func)(TConn *),
-                       enum abyss_foreback const foregroundBackground)
-{
-    abyss_bool retval;
-    
-    connectionP->server     = serverP;
-    connectionP->socket     = connectedSocket;
-    connectionP->peerip     = peerIpAddr;
-    connectionP->buffersize = 0;
-    connectionP->bufferpos  = 0;
-    connectionP->connected  = TRUE;
-    connectionP->job        = func;
-    connectionP->inbytes    = 0;
-    connectionP->outbytes   = 0;
-    connectionP->trace      = getenv("ABYSS_TRACE_CONN");
+
+
+static TThreadDoneFn threadDone;
+
+static void
+threadDone(void * const userHandle) {
+
+    TConn * const connectionP = userHandle;
     
-    switch (foregroundBackground)
-    {
+    connDone(connectionP);
+}
+
+
+
+static void
+makeThread(TConn *             const connectionP,
+           enum abyss_foreback const foregroundBackground,
+           bool                const useSigchld,
+           const char **       const errorP) {
+           
+    switch (foregroundBackground) {
     case ABYSS_FOREGROUND:
         connectionP->hasOwnThread = FALSE;
-        retval = TRUE;
+        *errorP = NULL;
         break;
-    case ABYSS_BACKGROUND:
+    case ABYSS_BACKGROUND: {
+        const char * error;
         connectionP->hasOwnThread = TRUE;
-        retval = ThreadCreate(&connectionP->thread,
-                              (TThreadProc)ConnJob, 
-                              connectionP);
-        break;
-    }
-    return retval;
+        ThreadCreate(&connectionP->threadP, connectionP,
+                     &connJob, &threadDone, useSigchld,
+                     &error);
+        if (error) {
+            xmlrpc_asprintf(errorP, "Unable to create thread to "
+                            "process connection.  %s", error);
+            xmlrpc_strfree(error);
+        } else
+            *errorP = NULL;
+    } break;
+    } /* switch */
 }
 
-abyss_bool ConnCreate(TConn *c, TSocket *s, void (*func)(TConn *))
-{
-    return ConnCreate2(c, c->server, *s, c->peerip, func, ABYSS_BACKGROUND);
+    
+
+void
+ConnCreate(TConn **            const connectionPP,
+           TServer *           const serverP,
+           TChannel *          const channelP,
+           void *              const channelInfoP,
+           TThreadProc *       const job,
+           TThreadDoneFn *     const done,
+           enum abyss_foreback const foregroundBackground,
+           bool                const useSigchld,
+           const char **       const errorP) {
+/*----------------------------------------------------------------------------
+   Create an HTTP connection.
+
+   A connection carries one or more HTTP transactions (request/response).
+
+   *channelP transports the requests and responses.
+
+   The connection handles those HTTP requests.
+
+   The connection handles the requests primarily by running the
+   function 'job' once.  Some connections can do that autonomously, as
+   soon as the connection is created.  Others don't until Caller
+   subsequently calls ConnProcess.  Some connections complete the
+   processing before ConnProcess return, while others may run the
+   connection asynchronously to the creator, in the background, via a
+   TThread thread.  'foregroundBackground' determines which.
+
+   'job' calls methods of the connection to get requests and send
+   responses.
+
+   Some time after the HTTP transactions are all done, 'done' gets
+   called in some context.
+
+   'channelInfoP' == NULL means no channel info supplied.
+-----------------------------------------------------------------------------*/
+    TConn * connectionP;
+
+    MALLOCVAR(connectionP);
+
+    if (connectionP == NULL)
+        xmlrpc_asprintf(errorP, "Unable to allocate memory for a connection "
+                        "descriptor.");
+    else {
+        connectionP->server       = serverP;
+        connectionP->channelP     = channelP;
+        connectionP->channelInfoP = channelInfoP;
+        connectionP->buffer[0]    = '\0';
+        connectionP->buffersize   = 0;
+        connectionP->bufferpos    = 0;
+        connectionP->finished     = FALSE;
+        connectionP->job          = job;
+        connectionP->done         = done;
+        connectionP->inbytes      = 0;
+        connectionP->outbytes     = 0;
+        connectionP->trace        = getenv("ABYSS_TRACE_CONN");
+
+        makeThread(connectionP, foregroundBackground, useSigchld, errorP);
+    }
+    *connectionPP = connectionP;
 }
 
-abyss_bool ConnProcess(TConn *c)
-{
-    abyss_bool retval;
 
-    if (c->hasOwnThread) {
+
+bool
+ConnProcess(TConn * const connectionP) {
+/*----------------------------------------------------------------------------
+   Drive the main processing of a connection -- run the connection's
+   "job" function, which should read HTTP requests from the connection
+   and send HTTP responses.
+
+   If we succeed, we guarantee the connection's "done" function will get
+   called some time after all processing is complete.  It might be before
+   we return or some time after.  If we fail, we guarantee the "done"
+   function will not be called.
+-----------------------------------------------------------------------------*/
+    bool retval;
+
+    if (connectionP->hasOwnThread) {
         /* There's a background thread to handle this connection.  Set
            it running.
         */
-        retval = ThreadRun(&(c->thread));
+        retval = ThreadRun(connectionP->threadP);
     } else {
         /* No background thread.  We just handle it here while Caller waits. */
-        (c->job)(c);
-        c->connected=FALSE;
+        (connectionP->job)(connectionP);
+        connDone(connectionP);
         retval = TRUE;
     }
     return retval;
 }
 
-void ConnClose(TConn *c)
-{
-    if (c->hasOwnThread)
-        ThreadClose(&c->thread);
-}
-
-abyss_bool ConnKill(TConn *c)
-{
-    c->connected=FALSE;
-    return ThreadKill(&(c->thread));
-}
-
-void ConnReadInit(TConn *c)
-{
-    if (c->buffersize>c->bufferpos)
-    {
-        c->buffersize-=c->bufferpos;
-        memmove(c->buffer,c->buffer+c->bufferpos,c->buffersize);
-        c->bufferpos=0;
-    }
-    else
-        c->buffersize=c->bufferpos=0;
 
-    c->inbytes=c->outbytes=0;
+
+void
+ConnWaitAndRelease(TConn * const connectionP) {
+    if (connectionP->hasOwnThread)
+        ThreadWaitAndRelease(connectionP->threadP);
+    
+    free(connectionP);
+}
+
+
+
+bool
+ConnKill(TConn * const connectionP) {
+    connectionP->finished = TRUE;
+    return ThreadKill(connectionP->threadP);
+}
+
+
+
+void
+ConnReadInit(TConn * const connectionP) {
+
+    if (connectionP->buffersize > connectionP->bufferpos) {
+        connectionP->buffersize -= connectionP->bufferpos;
+        memmove(connectionP->buffer,
+                connectionP->buffer + connectionP->bufferpos,
+                connectionP->buffersize);
+        connectionP->bufferpos = 0;
+    } else
+        connectionP->buffersize = connectionP->bufferpos = 0;
+
+    connectionP->buffer[connectionP->buffersize] = '\0';
+
+    connectionP->inbytes = connectionP->outbytes = 0;
+}
+
+
+
+static size_t
+nextLineSize(const char * const string,
+             size_t       const startPos,
+             size_t       const stringSize) {
+/*----------------------------------------------------------------------------
+   Return the length of the line that starts at offset 'startPos' in the
+   string 'string', which is 'stringSize' characters long.
+
+   'string' in not NUL-terminated.
+   
+   A line begins at beginning of string or after a newline character and
+   runs through the next newline character or end of string.  The line
+   includes the newline character at the end, if any.
+-----------------------------------------------------------------------------*/
+    size_t i;
+
+    for (i = startPos; i < stringSize && string[i] != '\n'; ++i);
+
+    if (i < stringSize)
+        ++i;  /* Include the newline */
+
+    return i - startPos;
 }
 
 
 
 static void
-traceSocketRead(const char * const label,
-                const char * const buffer,
-                unsigned int const size) {
+traceBuffer(const char * const label,
+            const char * const buffer,
+            unsigned int const size) {
 
-    unsigned int nonPrintableCount;
-    unsigned int i;
-    
-    nonPrintableCount = 0;  /* Initial value */
-    
-    for (i = 0; i < size; ++i) {
-        if (!isprint(buffer[i]) && buffer[i] != '\n' && buffer[i] != '\r')
-            ++nonPrintableCount;
+    size_t cursor;  /* Index into buffer[] */
+
+    fprintf(stderr, "%s:\n\n", label);
+
+    for (cursor = 0; cursor < size; ) {
+        /* Print one line of buffer */
+
+        size_t const lineSize = nextLineSize(buffer, cursor, size);
+        const char * const printableLine =
+            xmlrpc_makePrintable_lp(&buffer[cursor], lineSize);
+        
+        fprintf(stderr, "%s\n", printableLine);
+
+        cursor += lineSize;
+
+        xmlrpc_strfree(printableLine);
     }
-    if (nonPrintableCount > 0)
-        fprintf(stderr, "%s contains %u nonprintable characters.\n", 
-                label, nonPrintableCount);
+    fprintf(stderr, "\n");
+}
+
+
+
+static void
+traceChannelRead(TConn *      const connectionP,
+                 unsigned int const size) {
+
+    if (connectionP->trace)
+        traceBuffer("READ FROM CHANNEL",
+                    connectionP->buffer + connectionP->buffersize, size);
+}
+
+
+
+static void
+traceChannelWrite(TConn *      const connectionP,
+                  const char * const buffer,
+                  unsigned int const size,
+                  bool         const failed) {
     
-    fprintf(stderr, "%s:\n", label);
-    fprintf(stderr, "%.*s\n", (int)size, buffer);
+    if (connectionP->trace) {
+        const char * const label =
+            failed ? "FAILED TO WRITE TO CHANNEL" : "WROTE TO CHANNEL";
+        traceBuffer(label, buffer, size);
+    }
 }
 
 
 
-abyss_bool
-ConnRead(TConn *  const c,
+static uint32_t
+bufferSpace(TConn * const connectionP) {
+    
+    return BUFFER_SIZE - connectionP->buffersize;
+}
+                    
+
+
+bool
+ConnRead(TConn *  const connectionP,
          uint32_t const timeout) {
+/*----------------------------------------------------------------------------
+   Read some stuff on connection *connectionP from the channel.
 
-    while (SocketWait(&(c->socket),TRUE,FALSE,timeout*1000) == 1) {
-        uint32_t x;
-        uint32_t y;
-        
-        x = SocketAvailableReadBytes(&c->socket);
+   Don't wait more than 'timeout' seconds for data to arrive.  Fail if
+   nothing arrives within that time.
 
-        /* Avoid lost connections */
-        if (x <= 0)
-            break;
-        
-        /* Avoid Buffer overflow and lost Connections */
-        if (x + c->buffersize >= BUFFER_SIZE)
-            x = BUFFER_SIZE-c->buffersize - 1;
-        
-        y = SocketRead(&c->socket, c->buffer + c->buffersize, x);
-        if (y > 0) {
-            if (c->trace)
-                traceSocketRead("READ FROM SOCKET:",
-                                c->buffer + c->buffersize, y);
-
-            c->inbytes += y;
-            c->buffersize += y;
-            c->buffer[c->buffersize] = '\0';
-            return TRUE;
+   'timeout' must be before the end of time.
+-----------------------------------------------------------------------------*/
+    time_t const deadline = time(NULL) + timeout;
+
+    bool cantGetData;
+    bool gotData;
+
+    cantGetData = FALSE;
+    gotData = FALSE;
+    
+    while (!gotData && !cantGetData) {
+        int const timeLeft = (int)(deadline - time(NULL));
+
+        if (timeLeft <= 0)
+            cantGetData = TRUE;
+        else {
+            bool const waitForRead  = TRUE;
+            bool const waitForWrite = FALSE;
+            
+            bool readyForRead;
+            bool failed;
+            
+            ChannelWait(connectionP->channelP, waitForRead, waitForWrite,
+                        timeLeft * 1000, &readyForRead, NULL, &failed);
+            
+            if (failed)
+                cantGetData = TRUE;
+            else {
+                uint32_t bytesRead;
+                bool readFailed;
+
+                ChannelRead(connectionP->channelP,
+                            connectionP->buffer + connectionP->buffersize,
+                            bufferSpace(connectionP) - 1,
+                            &bytesRead, &readFailed);
+
+                if (readFailed)
+                    cantGetData = TRUE;
+                else {
+                    if (bytesRead > 0) {
+                        traceChannelRead(connectionP, bytesRead);
+                        connectionP->inbytes += bytesRead;
+                        connectionP->buffersize += bytesRead;
+                        connectionP->buffer[connectionP->buffersize] = '\0';
+                        gotData = TRUE;
+                    } else
+                        /* Other end has disconnected */
+                        cantGetData = TRUE;
+                }
+            }
         }
-        break;
     }
-    return FALSE;
+    if (gotData)
+        return TRUE;
+    else
+        return FALSE;
 }
 
 
             
-abyss_bool ConnWrite(TConn *c,void *buffer,uint32_t size)
-{
-    char *buf = buffer;
-    int rc, off = 0;
-
-    while (TRUE) {
-        /* try sending data */
-        if ((rc = SocketWrite(&(c->socket),&buf[off],size - off)) <= 0)
-            return FALSE;
-
-        /* increase count */
-        off += rc;
-
-        /* check we're not finished writing */
-        if (off >= size)
-            break;
-    }
+bool
+ConnWrite(TConn *      const connectionP,
+          const void * const buffer,
+          uint32_t     const size) {
+
+    bool failed;
+
+    ChannelWrite(connectionP->channelP, buffer, size, &failed);
 
-    c->outbytes+=size;
-    return TRUE;
+    traceChannelWrite(connectionP, buffer, size, failed);
+
+    if (!failed)
+        connectionP->outbytes += size;
+
+    return !failed;
 }
 
-abyss_bool ConnWriteFromFile(TConn *c,TFile *file,uint64_t start,uint64_t end,
-            void *buffer,uint32_t buffersize,uint32_t rate)
-{
-    uint64_t y,bytesread=0;
-    uint32_t waittime;
 
-    if (rate>0)
-    {
-        if (buffersize>rate)
-            buffersize=rate;
 
-        waittime=(1000*buffersize)/rate;
+bool
+ConnWriteFromFile(TConn *       const connectionP,
+                  const TFile * const fileP,
+                  uint64_t      const start,
+                  uint64_t      const last,
+                  void *        const buffer,
+                  uint32_t      const buffersize,
+                  uint32_t      const rate) {
+/*----------------------------------------------------------------------------
+   Write the contents of the file stream *fileP, from offset 'start'
+   up through 'last', to the HTTP connection *connectionP.
+
+   Meter the reading so as not to read more than 'rate' bytes per second.
+
+   Use the 'bufferSize' bytes at 'buffer' as an internal buffer for this.
+-----------------------------------------------------------------------------*/
+    bool retval;
+    uint32_t waittime;
+    bool success;
+    uint32_t readChunkSize;
+
+    if (rate > 0) {
+        readChunkSize = MIN(buffersize, rate);  /* One second's worth */
+        waittime = (1000 * buffersize) / rate;
+    } else {
+        readChunkSize = buffersize;
+        waittime = 0;
     }
-    else
-        waittime=0;
 
-    if (!FileSeek(file,start,SEEK_SET))
-        return FALSE;
+    success = FileSeek(fileP, start, SEEK_SET);
+    if (!success)
+        retval = FALSE;
+    else {
+        uint64_t const totalBytesToRead = last - start + 1;
+        uint64_t bytesread;
+
+        bytesread = 0;  /* initial value */
+
+        while (bytesread < totalBytesToRead) {
+            uint64_t const bytesLeft     = totalBytesToRead - bytesread;
+            uint64_t const bytesToRead64 = MIN(readChunkSize, bytesLeft);
+            uint32_t const bytesToRead   = (uint32_t)bytesToRead64;
+            
+            uint32_t bytesReadThisTime;
 
-    while (bytesread<=end-start)
-    {
-        y=(end-start+1)-bytesread;
-
-        if (y>buffersize)
-            y=buffersize;
-
-        y=FileRead(file,buffer,y);
-        bytesread+=y;
-
-        if (y>0)
-            ConnWrite(c,buffer,y);
-        else
-            break;
-
-        if (waittime)
-            ThreadWait(waittime);
-    };
-
-    return (bytesread>end-start);
-}
-
-abyss_bool ConnReadLine(TConn *c,char **z,uint32_t timeout)
-{
-    char *p,*t;
-    abyss_bool first=TRUE;
-    clock_t to,start;
-
-    p=*z=c->buffer+c->bufferpos;
-    start=clock();
-
-    for (;;)
-    {
-        to=(clock()-start)/CLOCKS_PER_SEC;
-        if (to>timeout)
-            break;
-
-        if (first)
-        {
-            if (c->bufferpos>=c->buffersize)
-                if (!ConnRead(c,timeout-to))
-                    break;
+            assert(bytesToRead == bytesToRead64); /* readChunkSize is uint32 */
 
-            first=FALSE;
-        }
-        else
-        {
-            if (!ConnRead(c,timeout-to))
+            bytesReadThisTime = FileRead(fileP, buffer, bytesToRead);
+            bytesread += bytesReadThisTime;
+            
+            if (bytesReadThisTime > 0)
+                ConnWrite(connectionP, buffer, bytesReadThisTime);
+            else
                 break;
-        };
+            
+            if (waittime > 0)
+                xmlrpc_millisecond_sleep(waittime);
+        }
+        retval = (bytesread >= totalBytesToRead);
+    }
+    return retval;
+}
+
 
-        t=strchr(p,LF);
-        if (t)
-        {
-            if ((*p!=LF) && (*p!=CR))
-            {
-                if (!*(t+1))
-                    continue;
-
-                p=t;
-
-                if ((*(p+1)==' ') || (*(p+1)=='\t'))
-                {
-                    if (p>*z)
-                        if (*(p-1)==CR)
-                            *(p-1)=' ';
-
-                    *(p++)=' ';
-                    continue;
-                };
-            } else {
-                /* emk - 04 Jan 2001 - Bug fix to leave buffer
-                ** pointing at start of body after reading blank
-                ** line following header. */
-                p=t;
-            }
 
-            c->bufferpos+=p+1-*z;
+TServer *
+ConnServer(TConn * const connectionP) {
+    return connectionP->server;
+}
 
-            if (p>*z)
-                if (*(p-1)==CR)
-                    p--;
 
-            *p='\0';
-            return TRUE;
-        }
-    };
 
-    return FALSE;
+void
+ConnFormatClientAddr(TConn *       const connectionP,
+                     const char ** const clientAddrPP) {
+
+    ChannelFormatPeerInfo(connectionP->channelP, clientAddrPP);
 }
+
+
+
+/*******************************************************************************
+**
+** conn.c
+**
+** This file is part of the ABYSS Web server project.
+**
+** Copyright (C) 2000 by Moez Mahfoudh <mmoez at bigfoot.com>.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+** 
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+** SUCH DAMAGE.
+**
+******************************************************************************/

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/data.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/data.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/data.c	Mon May 26 12:59:57 2008
@@ -36,25 +36,30 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "bool.h"
 #include "mallocvar.h"
+#include "xmlrpc-c/util_int.h"
+#include "xmlrpc-c/string_int.h"
 
 #include "xmlrpc-c/abyss.h"
 
 #include "token.h"
+#include "thread.h"
+
+#include "data.h"
 
-#define safe_free(it) if (it) {free(it);it=NULL;}
 /*********************************************************************
 ** List
 *********************************************************************/
 
-void ListInit(TList *sl)
+void ListInit(TList * const sl)
 {
     sl->item=NULL;
     sl->size=sl->maxsize=0;
     sl->autofree=FALSE;
 }
 
-void ListInitAutoFree(TList *sl)
+void ListInitAutoFree(TList * const sl)
 {
     sl->item=NULL;
     sl->size=sl->maxsize=0;
@@ -70,10 +75,10 @@
         if (sl->autofree) {
             unsigned int i;
             for (i = sl->size; i > 0; --i)
-                safe_free(sl->item[i-1]);
+                free(sl->item[i-1]);
             
         }
-        safe_free(sl->item);
+        free(sl->item);
     }
     sl->item = NULL;
     sl->size = 0;
@@ -88,19 +93,19 @@
     if (sl->item) {
         unsigned int i;
         for (i = sl->size; i > 0; --i)
-            safe_free(sl->item[i-1]);
+            free(sl->item[i-1]);
     }
 }
 
 
 
-abyss_bool
+bool
 ListAdd(TList * const sl,
         void *  const str) {
 /*----------------------------------------------------------------------------
    Add an item to the end of the list.
 -----------------------------------------------------------------------------*/
-    abyss_bool success;
+    bool success;
 
     if (sl->size >= sl->maxsize) {
         uint16_t newSize = sl->maxsize + 16;
@@ -137,43 +142,65 @@
 
 
 
-abyss_bool
-ListAddFromString(TList * const list,
-                  char *  const stringArg) {
-
-    char *t,*p;
-    char * c;
-
-    c = stringArg;
-
-    if (c)
-        while (1)
-        {
-            NextToken(&c);
+bool
+ListAddFromString(TList *      const list,
+                  const char * const stringArg) {
 
-            while (*c==',')
-                c++;
-
-            if (!(t=GetToken(&c)))
-                break;
-
-            p=c-2;
+    bool retval;
+    
+    if (!stringArg)
+        retval = TRUE;
+    else {
+        char * buffer;
+        
+        buffer = strdup(stringArg);
+        if (!buffer)
+            retval = FALSE;
+        else {
+            bool endOfString;
+            bool error;
+            char * c;
+
+            for (c = &buffer[0], endOfString = FALSE, error = FALSE;
+                 !endOfString && !error;
+                ) {
+                const char * t;
+                NextToken((const char **)&c);
+                
+                while (*c == ',')
+                    ++c;
+                
+                t = GetToken(&c);
+                if (!t)
+                    endOfString = TRUE;
+                else {
+                    char * p;
+
+                    for (p = c - 2; *p == ','; --p)
+                        *p = '\0';
+                    
+                    if (t[0] != '\0') {
+                        bool added;
+                        added = ListAdd(list, (void*)t);
+                        
+                        if (!added)
+                            error = TRUE;
+                    }
+                }
+            }
+            retval = !error;
+            xmlrpc_strfree(buffer);
+        }
+    }
+    return retval;
+}
 
-            while (*p==',')
-                *(p--)='\0';
 
-            if (*t)
-                if (!ListAdd(list,t))
-                    return FALSE;
-        };
 
-    return TRUE;
-}
-
-abyss_bool
-ListFindString(TList *    const sl,
-               char *     const str,
-               uint16_t * const indexP)
+bool
+ListFindString(TList *      const sl,
+               const char * const str,
+               uint16_t *   const indexP)
 {
     uint16_t i;
 
@@ -192,8 +219,10 @@
 ** Buffer
 *********************************************************************/
 
-abyss_bool BufferAlloc(TBuffer *buf,uint32_t memsize)
-{
+bool
+BufferAlloc(TBuffer *       const buf,
+            xmlrpc_uint32_t const memsize) {
+
     /* ************** Implement the static buffers ***/
     buf->staticid=0;
     buf->data=(void *)malloc(memsize);
@@ -209,21 +238,28 @@
     };
 }
 
-void BufferFree(TBuffer *buf)
-{
+
+
+void
+BufferFree(TBuffer * const buf) {
+
     if (buf->staticid)
     {
         /* ************** Implement the static buffers ***/
     }
     else
-        safe_free(buf->data);
+        free(buf->data);
 
     buf->size=0;
     buf->staticid=0;
 }
 
-abyss_bool BufferRealloc(TBuffer *buf,uint32_t memsize)
-{
+
+
+bool
+BufferRealloc(TBuffer *       const buf,
+              xmlrpc_uint32_t const memsize) {
+
     if (buf->staticid)
     {
         TBuffer b;
@@ -260,56 +296,83 @@
 ** String
 *********************************************************************/
 
-abyss_bool StringAlloc(TString *s)
-{
-    s->size=0;
-    if (BufferAlloc(&(s->buffer),256))
-    {
-        *(char *)(s->buffer.data)='\0';
+bool
+StringAlloc(TString * const stringP) {
+
+    bool succeeded;
+    
+    stringP->size = 0;
+
+    succeeded = BufferAlloc(&stringP->buffer, 256);
+    if (succeeded) {
+        *(char *)(stringP->buffer.data) = '\0';
         return TRUE;
-    }
-    else
+    } else
         return FALSE;
 }
 
-abyss_bool StringConcat(TString *s,char *s2)
-{
-    uint32_t len=strlen(s2);
 
-    if (len+s->size+1>s->buffer.size)
-        if (!BufferRealloc(&(s->buffer),((len+s->size+1+256)/256)*256))
+
+bool
+StringConcat(TString *    const stringP,
+             const char * const string2) {
+
+    uint32_t const len = strlen(string2);
+
+    if (len + stringP->size + 1 > stringP->buffer.size) {
+        bool succeeded;
+        succeeded = BufferRealloc(
+            &stringP->buffer,
+            ((len + stringP->size + 1 + 256) / 256) * 256);
+        if (!succeeded)
             return FALSE;
-    
-    strcat((char *)(s->buffer.data),s2);
-    s->size+=len;
+    }
+    strcat((char *)(stringP->buffer.data), string2);
+    stringP->size += len;
     return TRUE;
 }
 
-abyss_bool StringBlockConcat(TString *s,char *s2,char **ref)
-{
-    uint32_t len=strlen(s2)+1;
 
-    if (len+s->size>s->buffer.size)
-        if (!BufferRealloc(&(s->buffer),((len+s->size+1+256)/256)*256))
+
+bool
+StringBlockConcat(TString *    const stringP,
+                  const char * const string2,
+                  char **      const ref) {
+
+    uint32_t const len = strlen(string2) + 1;
+
+    if (len + stringP->size > stringP->buffer.size) {
+        bool succeeded;
+        succeeded = BufferRealloc(
+            &stringP->buffer,
+            ((len + stringP->size + 1 + 256) / 256) * 256);
+        if (!succeeded)
             return FALSE;
-    
-    *ref=(char *)(s->buffer.data)+s->size;
-    memcpy(*ref,s2,len);
-    s->size+=len;
+    }
+    *ref = (char *)(stringP->buffer.data) + stringP->size;
+    memcpy(*ref, string2, len);
+    stringP->size += len;
+
     return TRUE;
 }
 
-void StringFree(TString *s)
-{
-    s->size=0;
-    BufferFree(&(s->buffer));
+
+
+void
+StringFree(TString * const stringP) {
+    stringP->size = 0;
+    BufferFree(&stringP->buffer);
 }
 
-char *StringData(TString *s)
-{
-    return (char *)(s->buffer.data);
+
+
+char *
+StringData(TString * const stringP) {
+    return (char *)stringP->buffer.data;
 }
 
+
+
 /*********************************************************************
 ** Hash
 *********************************************************************/
@@ -334,13 +397,13 @@
 ** Table
 *********************************************************************/
 
-void TableInit(TTable *t)
+void TableInit(TTable * const t)
 {
     t->item=NULL;
     t->size=t->maxsize=0;
 }
 
-void TableFree(TTable *t)
+void TableFree(TTable * const t)
 {
     uint16_t i;
 
@@ -349,18 +412,23 @@
         if (t->size)
             for (i=t->size;i>0;i--)
             {
-                safe_free(t->item[i-1].name);
-                safe_free(t->item[i-1].value);
+                free(t->item[i-1].name);
+                free(t->item[i-1].value);
             };
             
-        safe_free(t->item);
+        free(t->item);
     }
 
     TableInit(t);
 }
 
-abyss_bool TableFindIndex(TTable *t,char *name,uint16_t *index)
-{
+
+
+bool
+TableFindIndex(TTable *     const t,
+               const char * const name,
+               uint16_t *   const index) {
+
     uint16_t i,hash=Hash16(name);
 
     if ((t->item) && (t->size>0) && (*index<t->size))
@@ -377,18 +445,23 @@
     return FALSE;
 }
 
-abyss_bool TableAddReplace(TTable *t,char *name,char *value)
-{
+
+
+bool
+TableAddReplace(TTable *     const t,
+                const char * const name,
+                const char * const value) {
+
     uint16_t i=0;
 
     if (TableFindIndex(t,name,&i))
     {
-        safe_free(t->item[i].value);
+        free(t->item[i].value);
         if (value)
             t->item[i].value=strdup(value);
         else
         {
-            safe_free(t->item[i].name);
+            free(t->item[i].name);
             if (--t->size>0)
                 t->item[i]=t->item[t->size];
         };
@@ -401,8 +474,10 @@
 
 
 
-abyss_bool
-TableAdd(TTable *t,char *name,char *value) {
+bool
+TableAdd(TTable *     const t,
+         const char * const name,
+         const char * const value) {
 
     if (t->size>=t->maxsize) {
         TTableItem *newitem;
@@ -427,8 +502,12 @@
     return TRUE;
 }
 
-char *TableFind(TTable *t,char *name)
-{
+
+
+char *
+TableFind(TTable *     const t,
+          const char * const name) {
+
     uint16_t i=0;
 
     if (TableFindIndex(t,name,&i))
@@ -442,103 +521,159 @@
 *********************************************************************/
 
 static TPoolZone *
-PoolZoneAlloc(uint32_t zonesize) {
-    TPoolZone *pz;
-
-    pz=(TPoolZone *)malloc(zonesize+sizeof(TPoolZone));
-    if (pz)
-    {
-        pz->pos=pz->data;
-        pz->maxpos=pz->pos+zonesize;
-        pz->next=pz->prev=NULL;
-    };
+PoolZoneAlloc(uint32_t const zonesize) {
 
-    return pz;
+    TPoolZone * poolZoneP;
+    
+    MALLOCARRAY(poolZoneP, zonesize);
+    if (poolZoneP) {
+        poolZoneP->pos    = &poolZoneP->data[0];
+        poolZoneP->maxpos = poolZoneP->pos + zonesize;
+        poolZoneP->next   = NULL;
+        poolZoneP->prev   = NULL;
+    }
+    return poolZoneP;
 }
 
-abyss_bool PoolCreate(TPool *p,uint32_t zonesize)
-{
-    p->zonesize=zonesize;
-    if (MutexCreate(&p->mutex))
-        if (!(p->firstzone=p->currentzone=PoolZoneAlloc(zonesize)))
-        {
-            MutexFree(&p->mutex);
-            return FALSE;
-        };
-    
-    return TRUE;
+
+
+static void
+PoolZoneFree(TPoolZone * const poolZoneP) {
+
+    free(poolZoneP);
 }
 
-void *PoolAlloc(TPool *p,uint32_t size)
-{
-    TPoolZone *pz,*npz;
-    void *x;
-    uint32_t zonesize;
 
-    if (size==0)
-        return NULL;
 
-    if (!MutexLock(&p->mutex))
-        return NULL;
+bool
+PoolCreate(TPool *  const poolP,
+           uint32_t const zonesize) {
 
-    pz=p->currentzone;
+    bool success;
+    bool mutexCreated;
 
-    if (pz->pos+size<pz->maxpos)
-    {
-        x=pz->pos;
-        pz->pos+=size;
-        MutexUnlock(&p->mutex);
-        return x;
-    };
+    poolP->zonesize = zonesize;
 
-    if (size>p->zonesize)
-        zonesize=size;
-    else
-        zonesize=p->zonesize;
+    mutexCreated = MutexCreate(&poolP->mutexP);
+    if (mutexCreated) {
+        TPoolZone * const firstZoneP = PoolZoneAlloc(zonesize);
 
-    npz=PoolZoneAlloc(zonesize);
-    if (npz)
-    {
-        npz->prev=pz;
-        npz->next=pz->next;
-        pz->next=npz;
-        p->currentzone=npz; 
-        x=npz->data;
-        npz->pos=npz->data+size;
-    }
-    else
-        x=NULL;
+        if (firstZoneP != NULL) {
+            poolP->firstzone   = firstZoneP;
+            poolP->currentzone = firstZoneP;
+            success = TRUE;
+        } else
+            success = FALSE;
+        if (!success)
+            MutexDestroy(poolP->mutexP);
+    } else
+        success = FALSE;
 
-    MutexUnlock(&p->mutex);
-    return x;
+    return success;
 }
 
-void PoolFree(TPool *p)
-{
-    TPoolZone *pz,*npz;
 
-    pz=p->firstzone;
 
-    while (pz)
-    {
-        npz=pz->next;
-        safe_free(pz);
-        pz=npz;
-    };
+void *
+PoolAlloc(TPool *  const poolP,
+          uint32_t const size) {
+/*----------------------------------------------------------------------------
+   Allocate a block of size 'size' from pool 'poolP'.
+-----------------------------------------------------------------------------*/
+    void * retval;
+
+    if (size == 0)
+        retval = NULL;
+    else {
+        bool gotMutexLock;
+
+        gotMutexLock = MutexLock(poolP->mutexP);
+        if (!gotMutexLock)
+            retval = NULL;
+        else {
+            TPoolZone * const curPoolZoneP = poolP->currentzone;
+
+            if (curPoolZoneP->pos + size < curPoolZoneP->maxpos) {
+                retval = curPoolZoneP->pos;
+                curPoolZoneP->pos += size;
+            } else {
+                uint32_t const zonesize = MAX(size, poolP->zonesize);
+
+                TPoolZone * const newPoolZoneP = PoolZoneAlloc(zonesize);
+                if (newPoolZoneP) {
+                    newPoolZoneP->prev = curPoolZoneP;
+                    newPoolZoneP->next = curPoolZoneP->next;
+                    curPoolZoneP->next = newPoolZoneP;
+                    poolP->currentzone = newPoolZoneP;
+                    retval= newPoolZoneP->data;
+                    newPoolZoneP->pos = newPoolZoneP->data + size;
+                } else
+                    retval = NULL;
+            }
+            MutexUnlock(poolP->mutexP);
+        }
+    }
+    return retval;
 }
 
 
 
-char *PoolStrdup(TPool *p,char *s) {
+void
+PoolReturn(TPool *  const poolP,
+           void *   const blockP) {
+/*----------------------------------------------------------------------------
+   Return the block at 'blockP' to the pool 'poolP'.  WE ASSUME THAT IS
+   THE MOST RECENTLY ALLOCATED AND NOT RETURNED BLOCK IN THE POOL.
+-----------------------------------------------------------------------------*/
+    TPoolZone * const curPoolZoneP = poolP->currentzone;
+
+    assert((char*)curPoolZoneP->data < (char*)blockP &&
+           (char*)blockP < (char*)curPoolZoneP->pos);
+
+    curPoolZoneP->pos = blockP;
+
+    if (curPoolZoneP->pos == curPoolZoneP->data) {
+        /* That emptied out the current zone.  Free it and make the previous
+           zone current.
+        */
+
+        assert(curPoolZoneP->prev);  /* entry condition */
+
+        curPoolZoneP->prev->next = NULL;
+
+        PoolZoneFree(curPoolZoneP);
+    }
+}
+
+
+
+void
+PoolFree(TPool * const poolP) {
+
+    TPoolZone * poolZoneP;
+    TPoolZone * nextPoolZoneP;
+    
+    for (poolZoneP = poolP->firstzone; poolZoneP; poolZoneP = nextPoolZoneP) {
+        nextPoolZoneP = poolZoneP->next;
+        free(poolZoneP);
+    }
+    MutexDestroy(poolP->mutexP);
+}
 
-    char *ns;
 
-    if (s) {
-        ns = PoolAlloc(p, strlen(s) + 1);
-        if (ns)
-            strcpy(ns, s);
-    } else
-        ns = NULL;
 
-    return ns;
+const char *
+PoolStrdup(TPool *      const poolP,
+           const char * const origString) {
+
+    char * newString;
+
+    if (origString == NULL)
+        newString = NULL;
+    else {
+        newString = PoolAlloc(poolP, strlen(origString) + 1);
+        if (newString != NULL)
+            strcpy(newString, origString);
+    }
+    return newString;
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/file.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/file.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/file.c	Mon May 26 12:59:57 2008
@@ -32,204 +32,382 @@
 **
 ******************************************************************************/
 
+#include "xmlrpc_config.h"
+#include "mallocvar.h"
+
+#define _CRT_SECURE_NO_WARNINGS
+    /* Tell msvcrt not to warn about functions that are often misused and
+       cause security exposures.
+    */
+
+#define _FILE_OFFSET_BITS 64
+    /* Tell GNU libc to make off_t 64 bits and all the POSIX file functions
+       the versions that handle 64 bit file offsets.
+    */
+#define _LARGE_FILES
+    /* Same as above, but for AIX */
+
 #include <string.h>
 
-#ifdef ABYSS_WIN32
-#include <io.h>
-#else
-/* Must check this
-#include <sys/io.h>
-*/
-#endif  /* ABYSS_WIN32 */
-
-#ifndef ABYSS_WIN32
-#include <dirent.h>
-#endif  /* ABYSS_WIN32 */
+#if MSVCRT
+  #include <io.h>
+  typedef __int64 readwriterc_t;
+#else
+  #include <unistd.h>
+  #include <fcntl.h>
+  #include <dirent.h>
+  #include <sys/stat.h>
+  typedef ssize_t readwriterc_t;
+#endif
 
+#include "bool.h"
+#include "xmlrpc-c/string_int.h"
 #include "xmlrpc-c/abyss.h"
+#include "file.h"
+
+bool const win32 =
+#ifdef WIN32
+TRUE;
+#else
+FALSE;
+#endif
+
+struct TFileFind {
+#ifdef WIN32
+  #if MSVCRT
+      intptr_t handle;
+  #else
+      HANDLE handle;
+  #endif
+#else
+    char path[NAME_MAX+1];
+    DIR * handle;
+#endif
+};
+
+    
 
 /*********************************************************************
 ** File
 *********************************************************************/
 
-abyss_bool FileOpen(TFile *f, const char *name,uint32_t attrib)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return ((*f=_open(name,attrib))!=(-1));
-#else
-    return ((*f=open(name,attrib))!=(-1));
-#endif
+static void
+createFileImage(TFile **     const filePP,
+                const char * const name,
+                uint32_t     const attrib,
+                bool         const createFile,
+                bool *       const succeededP) {
+
+    TFile * fileP;
+
+    MALLOCVAR(fileP);
+    if (fileP == NULL)
+        *succeededP = FALSE;
+    else {
+        int rc;
+
+        if (createFile)
+            rc = open(name, attrib | O_CREAT, S_IWRITE | S_IREAD);
+        else
+            rc = open(name, attrib);
+
+        if (rc < 0)
+            *succeededP = FALSE;
+        else {
+            fileP->fd = rc;
+            *succeededP = TRUE;
+        }
+        if (!*succeededP)
+            free(fileP);
+    }
+    *filePP = fileP;
 }
 
-abyss_bool FileOpenCreate(TFile *f, const char *name, uint32_t attrib)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return ((*f=_open(name,attrib | O_CREAT,_S_IWRITE | _S_IREAD))!=(-1));
-#else
-    return ((*f=open(name,attrib | O_CREAT,S_IWRITE | S_IREAD))!=(-1));
-#endif
+
+
+bool
+FileOpen(TFile **     const filePP,
+         const char * const name,
+         uint32_t     const attrib) {
+
+    bool succeeded;
+
+    createFileImage(filePP, name, attrib, FALSE, &succeeded);
+
+    return succeeded;
 }
 
-abyss_bool FileWrite(TFile *f, void *buffer, uint32_t len)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return (_write(*f,buffer,len)==(int32_t)len);
-#else
-    return (write(*f,buffer,len)==(int32_t)len);
-#endif
+
+
+bool
+FileOpenCreate(TFile **     const filePP,
+               const char * const name,
+               uint32_t     const attrib) {
+
+    bool succeeded;
+
+    createFileImage(filePP, name, attrib, TRUE, &succeeded);
+
+    return succeeded;
 }
 
-int32_t FileRead(TFile *f, void *buffer, uint32_t len)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return (_read(*f,buffer,len));
-#else
-    return (read(*f,buffer,len));
-#endif
+
+
+bool
+FileWrite(const TFile * const fileP,
+          const void *  const buffer,
+          uint32_t      const len) {
+
+    readwriterc_t rc;
+
+    rc = write(fileP->fd, buffer, len);
+
+    return (rc > 0 && (uint32_t)rc == len);
+}
+
+
+
+int32_t
+FileRead(const TFile * const fileP,
+         void *        const buffer,
+         uint32_t      const len) {
+
+    return read(fileP->fd, buffer, len);
 }
 
-abyss_bool FileSeek(TFile *f, uint64_t pos, uint32_t attrib)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return (_lseek(*f,pos,attrib)!=(-1));
+
+
+bool
+FileSeek(const TFile * const fileP,
+         uint64_t      const pos,
+         uint32_t      const attrib) {
+
+    int64_t rc;
+#if MSVCRT
+    rc =  _lseeki64(fileP->fd, pos, attrib);
 #else
-    return (lseek(*f,pos,attrib)!=(-1));
+    rc =  lseek(fileP->fd, pos, attrib);
 #endif
+    return (rc >= 0);
 }
 
-uint64_t FileSize(TFile *f)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return (_filelength(*f));
+
+
+uint64_t
+FileSize(const TFile * const fileP) {
+
+#if MSVCRT
+    return (_filelength(fileP->fd));
 #else
     struct stat fs;
 
-    fstat(*f,&fs);
+    fstat(fileP->fd, &fs);
     return (fs.st_size);
 #endif  
 }
 
-abyss_bool FileClose(TFile *f)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return (_close(*f)!=(-1));
-#else
-    return (close(*f)!=(-1));
-#endif
+
+
+bool
+FileClose(TFile * const fileP) {
+
+    int rc;
+
+    rc = close(fileP->fd);
+
+    if (rc >= 0)
+        free(fileP);
+
+    return (rc >= 0);
 }
 
-abyss_bool FileStat(char *filename,TFileStat *filestat)
-{
-#if defined( ABYSS_WIN32 ) && !defined( __BORLANDC__ )
-    return (_stati64(filename,filestat)!=(-1));
+
+
+bool
+FileStat(const char * const filename,
+         TFileStat *  const filestat) {
+
+    int rc;
+
+#if MSVCRT
+    rc = _stati64(filename,filestat);
 #else
-    return (stat(filename,filestat)!=(-1));
+    rc = stat(filename,filestat);
 #endif
+    return (rc >= 0);
 }
 
-abyss_bool FileFindFirst(TFileFind *filefind,char *path,TFileInfo *fileinfo)
-{
-#ifdef ABYSS_WIN32
-    abyss_bool ret;
-    char *p=path+strlen(path);
 
-    *p='\\';
-    *(p+1)='*';
-    *(p+2)='\0';
-#ifndef __BORLANDC__
-    ret=(((*filefind)=_findfirst(path,fileinfo))!=(-1));
+
+static void
+fileFindFirstWin(TFileFind *  const filefindP ATTR_UNUSED,
+                 const char * const path,
+                 TFileInfo *  const fileinfo  ATTR_UNUSED,
+                 bool *       const retP      ATTR_UNUSED) {
+    const char * search;
+
+    xmlrpc_asprintf(&search, "%s\\*", path);
+
+#if MSVCRT
+    filefindP->handle = _findfirsti64(search, fileinfo);
+    *retP = filefindP->handle != -1;
 #else
-    *filefind = FindFirstFile( path, &fileinfo->data );
-   ret = *filefind != NULL;
-   if( ret )
-   {
-      LARGE_INTEGER li;
-      li.LowPart = fileinfo->data.nFileSizeLow;
-      li.HighPart = fileinfo->data.nFileSizeHigh;
-      strcpy( fileinfo->name, fileinfo->data.cFileName );
-       fileinfo->attrib = fileinfo->data.dwFileAttributes;
-       fileinfo->size   = li.QuadPart;
-      fileinfo->time_write = fileinfo->data.ftLastWriteTime.dwLowDateTime;
-   }
+#ifdef WIN32
+    filefindP->handle = FindFirstFile(search, &fileinfo->data);
+    *retP = filefindP->handle != INVALID_HANDLE_VALUE;
+    if (*retP) {
+        LARGE_INTEGER li;
+        li.LowPart = fileinfo->data.nFileSizeLow;
+        li.HighPart = fileinfo->data.nFileSizeHigh;
+        strcpy( fileinfo->name, fileinfo->data.cFileName );
+        fileinfo->attrib = fileinfo->data.dwFileAttributes;
+        fileinfo->size   = li.QuadPart;
+        fileinfo->time_write = fileinfo->data.ftLastWriteTime.dwLowDateTime;
+    }
 #endif
-    *p='\0';
-    return ret;
-#else
-    strncpy(filefind->path,path,NAME_MAX);
-    filefind->path[NAME_MAX]='\0';
-    filefind->handle=opendir(path);
-    if (filefind->handle)
-        return FileFindNext(filefind,fileinfo);
+#endif
+    xmlrpc_strfree(search);
+}
 
-    return FALSE;
+
+
+static void
+fileFindFirstPosix(TFileFind *  const filefindP,
+                   const char * const path,
+                   TFileInfo *  const fileinfo,
+                   bool *       const retP) {
+    
+#if !MSVCRT
+    strncpy(filefindP->path, path, NAME_MAX);
+    filefindP->path[NAME_MAX] = '\0';
+    filefindP->handle = opendir(path);
+    if (filefindP->handle)
+        *retP = FileFindNext(filefindP, fileinfo);
+    else
+        *retP = FALSE;
 #endif
 }
+    
+
+
+bool
+FileFindFirst(TFileFind ** const filefindPP,
+              const char * const path,
+              TFileInfo *  const fileinfo) {
+
+    bool succeeded;
+
+    TFileFind * filefindP;
 
-abyss_bool FileFindNext(TFileFind *filefind,TFileInfo *fileinfo)
-{
-#ifdef ABYSS_WIN32
+    MALLOCVAR(filefindP);
 
-#ifndef __BORLANDC__
-    return (_findnext(*filefind,fileinfo)!=(-1));
+    if (filefindP == NULL)
+        succeeded = FALSE;
+    else {
+        if (win32)
+            fileFindFirstWin(filefindP, path, fileinfo, &succeeded);
+        else
+            fileFindFirstPosix(filefindP, path, fileinfo, &succeeded);
+        if (!succeeded)
+            free(filefindP);
+    }
+    *filefindPP = filefindP;
+
+    return succeeded;
+}
+
+
+
+static void
+fileFindNextWin(TFileFind * const filefindP ATTR_UNUSED,
+                TFileInfo * const fileinfo  ATTR_UNUSED,
+                bool *      const retvalP   ATTR_UNUSED) {
+
+#if MSVCRT
+    *retvalP = _findnexti64(filefindP->handle, fileinfo) != -1;
 #else
-   abyss_bool ret = FindNextFile( *filefind, &fileinfo->data );
-   if( ret )
-   {
-      LARGE_INTEGER li;
-      li.LowPart = fileinfo->data.nFileSizeLow;
-      li.HighPart = fileinfo->data.nFileSizeHigh;
-      strcpy( fileinfo->name, fileinfo->data.cFileName );
-       fileinfo->attrib = fileinfo->data.dwFileAttributes;
-       fileinfo->size   = li.QuadPart;
-      fileinfo->time_write = fileinfo->data.ftLastWriteTime.dwLowDateTime;
-   }
-    return ret;
+#ifdef WIN32
+    bool found;
+    found = FindNextFile(filefindP->handle, &fileinfo->data);
+    if (found) {
+        LARGE_INTEGER li;
+        li.LowPart = fileinfo->data.nFileSizeLow;
+        li.HighPart = fileinfo->data.nFileSizeHigh;
+        strcpy(fileinfo->name, fileinfo->data.cFileName);
+        fileinfo->attrib = fileinfo->data.dwFileAttributes;
+        fileinfo->size   = li.QuadPart;
+        fileinfo->time_write = fileinfo->data.ftLastWriteTime.dwLowDateTime;
+    }
+    *retvalP = found;
+#endif
 #endif
+}
 
-#else
-    struct dirent *de;
-    /****** Must be changed ***/
-    char z[NAME_MAX+1];
 
-    de=readdir(filefind->handle);
-    if (de)
-    {
+
+static void
+fileFindNextPosix(TFileFind * const filefindP,
+                  TFileInfo * const fileinfoP,
+                  bool *      const retvalP) {
+
+#ifndef WIN32
+    struct dirent * deP;
+
+    deP = readdir(filefindP->handle);
+    if (deP) {
+        char z[NAME_MAX+1];
         struct stat fs;
 
-        strcpy(fileinfo->name,de->d_name);
-        strcpy(z,filefind->path);
-        strncat(z,"/",NAME_MAX);
-        strncat(z,fileinfo->name,NAME_MAX);
-        z[NAME_MAX]='\0';
+        strcpy(fileinfoP->name, deP->d_name);
+        strcpy(z, filefindP->path);
+        strncat(z, "/",NAME_MAX);
+        strncat(z, fileinfoP->name, NAME_MAX);
+        z[NAME_MAX] = '\0';
         
-        stat(z,&fs);
+        stat(z, &fs);
 
         if (fs.st_mode & S_IFDIR)
-            fileinfo->attrib=A_SUBDIR;
+            fileinfoP->attrib = A_SUBDIR;
         else
-            fileinfo->attrib=0;
+            fileinfoP->attrib = 0;
 
-        fileinfo->size=fs.st_size;
-        fileinfo->time_write=fs.st_mtime;
+        fileinfoP->size       = fs.st_size;
+        fileinfoP->time_write = fs.st_mtime;
         
-        return TRUE;
-    };
-
-    return FALSE;
+        *retvalP = TRUE;
+    } else
+        *retvalP = FALSE;
 #endif
 }
 
-void FileFindClose(TFileFind *filefind)
-{
-#ifdef ABYSS_WIN32
 
-#ifndef __BORLANDC__
-    _findclose(*filefind);
+
+bool
+FileFindNext(TFileFind * const filefindP,
+             TFileInfo * const fileinfo) {
+
+    bool retval;
+
+    if (win32)
+        fileFindNextWin(filefindP, fileinfo, &retval);
+    else
+        fileFindNextPosix(filefindP, fileinfo, &retval);
+
+    return retval;
+}
+
+
+
+void
+FileFindClose(TFileFind * const filefindP) {
+#ifdef WIN32
+#if MSVCRT
+    _findclose(filefindP->handle);
 #else
-   FindClose( *filefind );
+   FindClose(filefindP->handle);
 #endif
-
 #else
-    closedir(filefind->handle);
+    closedir(filefindP->handle);
 #endif
+    free(filefindP);
 }

Modified: freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/http.c
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/http.c	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/xmlrpc-c/lib/abyss/src/http.c	Mon May 26 12:59:57 2008
@@ -1,38 +1,7 @@
-/*******************************************************************************
-**
-** http.c
-**
-** This file is part of the ABYSS Web server project.
-**
-** Copyright (C) 2000 by Moez Mahfoudh <mmoez at bigfoot.com>.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions
-** are met:
-** 1. Redistributions of source code must retain the above copyright
-**    notice, this list of conditions and the following disclaimer.
-** 2. Redistributions in binary form must reproduce the above copyright
-**    notice, this list of conditions and the following disclaimer in the
-**    documentation and/or other materials provided with the distribution.
-** 3. The name of the author may not be used to endorse or promote products
-**    derived from this software without specific prior written permission.
-** 
-** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-** SUCH DAMAGE.
-**
-*******************************************************************************/
+/* Copyright information is at the end of the file */
 
 #include <ctype.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -40,8 +9,20 @@
 #include <time.h>
 
 #include "xmlrpc_config.h"
+#include "bool.h"
+#include "mallocvar.h"
+#include "xmlrpc-c/util.h"
+#include "xmlrpc-c/string_int.h"
 #include "xmlrpc-c/abyss.h"
+
+#include "server.h"
+#include "session.h"
+#include "conn.h"
 #include "token.h"
+#include "date.h"
+#include "data.h"
+
+#include "http.h"
 
 /*********************************************************************
 ** Request Parser
@@ -51,446 +32,1057 @@
 ** Request
 *********************************************************************/
 
-void RequestInit(TSession *r,TConn *c)
-{
-    time_t t;
-
-    time(&t);
-    r->date=*gmtime(&t);
-
-    r->keepalive=r->cankeepalive=FALSE;
-    r->query=NULL;
-    r->host=NULL;
-    r->from=NULL;
-    r->useragent=NULL;
-    r->referer=NULL;
-    r->user=NULL;
-    r->port=80;
-    r->versionmajor=0;
-    r->versionminor=9;
-    r->server=c->server;
-    r->conn=c;
-
-    r->done=FALSE;
-
-    r->chunkedwrite=r->chunkedwritemode=FALSE;
-
-    r->requestline=NULL;
-
-    ListInit(&r->cookies);
-    ListInit(&r->ranges);
-    TableInit(&r->request_headers);
-    TableInit(&r->response_headers);
-
-    r->status=0;
-
-    StringAlloc(&(r->header));
-}
-
-void RequestFree(TSession *r)
-{
-    if (r->requestline)
-        free(r->requestline);
-
-    if (r->user)
-        free(r->user);
-
-    ListFree(&r->cookies);
-    ListFree(&r->ranges);
-    TableFree(&r->request_headers);
-    TableFree(&r->response_headers);
-    StringFree(&(r->header));
+static void
+initRequestInfo(TRequestInfo * const requestInfoP,
+                httpVersion    const httpVersion,
+                const char *   const requestLine,
+                TMethod        const httpMethod,
+                const char *   const host,
+                unsigned int   const port,
+                const char *   const path,
+                const char *   const query) {
+/*----------------------------------------------------------------------------
+  Set up the request info structure.  For information that is
+  controlled by headers, use the defaults -- I.e. the value that
+  applies if the request contains no applicable header.
+-----------------------------------------------------------------------------*/
+    XMLRPC_ASSERT_PTR_OK(requestLine);
+    XMLRPC_ASSERT_PTR_OK(path);
+
+    requestInfoP->requestline = strdup(requestLine);
+    requestInfoP->method      = httpMethod;
+    requestInfoP->host        = xmlrpc_strdupnull(host);
+    requestInfoP->port        = port;
+    requestInfoP->uri         = strdup(path);
+    requestInfoP->query       = xmlrpc_strdupnull(query);
+    requestInfoP->from        = NULL;
+    requestInfoP->useragent   = NULL;
+    requestInfoP->referer     = NULL;
+    requestInfoP->user        = NULL;
+
+    if (httpVersion.major > 1 ||
+        (httpVersion.major == 1 && httpVersion.minor >= 1))
+        requestInfoP->keepalive = TRUE;
+    else
+        requestInfoP->keepalive = FALSE;
 }
 
 
 
 static void
-readFirstLineOfRequest(TSession *   const r,
-                       char **      const lineP,
-                       abyss_bool * const errorP) {
+freeRequestInfo(TRequestInfo * const requestInfoP) {
 
-    *errorP = FALSE;
+    xmlrpc_strfreenull(requestInfoP->host);
 
-    /* Ignore CRLFs in the beginning of the request (RFC2068-P30) */
-    do {
-        abyss_bool success;
-        success = ConnReadLine(r->conn, lineP, r->server->timeout);
-        if (!success) {
-            /* Request Timeout */
-            ResponseStatus(r, 408);
-            *errorP = TRUE;
-        }
-    } while ((*lineP)[0] == '\0' && !*errorP);
+    xmlrpc_strfreenull(requestInfoP->user);
+
+    xmlrpc_strfree(requestInfoP->uri);
+
+    xmlrpc_strfree(requestInfoP->requestline);
 }
 
 
 
-static void
-processFirstLineOfRequest(TSession *   const r,
-                          char *       const line1,
-                          abyss_bool * const moreLinesP,
-                          abyss_bool * const errorP) {
-    
+void
+RequestInit(TSession * const sessionP,
+            TConn *    const connectionP) {
+
+    sessionP->validRequest = false;  /* Don't have valid request yet */
+
+    time(&sessionP->date);
+
+    sessionP->conn = connectionP;
+
+    sessionP->responseStarted = FALSE;
+
+    sessionP->chunkedwrite = FALSE;
+    sessionP->chunkedwritemode = FALSE;
+
+    sessionP->continueRequired = FALSE;
+
+    ListInit(&sessionP->cookies);
+    ListInit(&sessionP->ranges);
+    TableInit(&sessionP->request_headers);
+    TableInit(&sessionP->response_headers);
+
+    sessionP->status = 0;  /* No status from handler yet */
+
+    StringAlloc(&(sessionP->header));
+}
+
+
+
+void
+RequestFree(TSession * const sessionP) {
+
+    if (sessionP->validRequest)
+        freeRequestInfo(&sessionP->requestInfo);
+
+    ListFree(&sessionP->cookies);
+    ListFree(&sessionP->ranges);
+    TableFree(&sessionP->request_headers);
+    TableFree(&sessionP->response_headers);
+    StringFree(&(sessionP->header));
+}
+
+
+
+static char *
+firstLfPos(TConn * const connectionP,
+           char *  const lineStart) {
+/*----------------------------------------------------------------------------
+   Return a pointer in the connection's receive buffer to the first
+   LF (linefeed aka newline) character in the buffer at or after 'lineStart'.
+
+   If there is no LF in the buffer at or after 'lineStart', return NULL.
+-----------------------------------------------------------------------------*/
+    const char * const bufferEnd =
+        connectionP->buffer + connectionP->buffersize;
+
     char * p;
-    char * t;
 
-    p = line1;
+    for (p = lineStart; p < bufferEnd && *p != LF; ++p);
 
-    /* Jump over spaces */
-    NextToken(&p);
+    if (p < bufferEnd)
+        return p;
+    else
+        return NULL;
+}
 
-    r->requestline = strdup(p);
-    
-    t = GetToken(&p);
-    if (!t) {
-        /* Bad request */
-        ResponseStatus(r,400);
-        *errorP = TRUE;
-    } else {
-        if (strcmp(t, "GET") == 0)
-            r->method = m_get;
-        else if (strcmp(p, "PUT") == 0)
-            r->method = m_put;
-        else if (strcmp(t, "OPTIONS") == 0)
-            r->method = m_options;
-        else if (strcmp(p, "DELETE") == 0)
-            r->method = m_delete;
-        else if (strcmp(t, "POST") == 0)
-            r->method = m_post;
-        else if (strcmp(p, "TRACE") == 0)
-            r->method = m_trace;
-        else if (strcmp(t, "HEAD") == 0)
-            r->method = m_head;
-        else
-            r->method = m_unknown;
-        
-        /* URI and Query Decoding */
-        NextToken(&p);
-        
-        t=GetToken(&p);
-        if (!t)
-            *errorP = TRUE;
+
+
+static void
+getLineInBuffer(TConn * const connectionP,
+                char *  const lineStart,
+                time_t  const deadline,
+                char ** const lineEndP,
+                bool *  const errorP) {
+/*----------------------------------------------------------------------------
+   Get a line into the connection's read buffer, starting at position
+   'lineStart', if there isn't one already there.   'lineStart' is either
+   within the buffer or just after it.
+
+   Read the channel until we get a full line, except fail if we don't get
+   one by 'deadline'.
+-----------------------------------------------------------------------------*/
+    bool error;
+    char * lfPos;
+
+    assert(lineStart <= connectionP->buffer + connectionP->buffersize);
+
+    error = FALSE;  /* initial value */
+    lfPos = NULL;  /* initial value */
+
+    while (!error && !lfPos) {
+        int const timeLeft = (int)(deadline - time(NULL));
+        assert(timeLeft == deadline - time(NULL));
+        if (timeLeft <= 0)
+            error = TRUE;
         else {
-            r->uri=t;
-        
-            RequestUnescapeURI(r);
-        
-            t=strchr(t,'?');
-            if (t) {
-                *t = '\0';
-                r->query = t+1;
-            }
-        
-            NextToken(&p);
-        
-            /* HTTP Version Decoding */
+            lfPos = firstLfPos(connectionP, lineStart);
+            if (!lfPos)
+                error = !ConnRead(connectionP, timeLeft);
+        }
+    }    
+    *errorP = error;
+    *lineEndP = lfPos + 1;
+}
+
+
+
+static bool
+isContinuationLine(const char * const line) {
+
+    return (line[0] == ' ' || line[0] == '\t');
+}
+
+
+
+static bool
+isEmptyLine(const char * const line) {
+
+    return (line[0] == '\n' || (line[0] == '\r' && line[1] == '\n'));
+}
+
+
+
+static void
+convertLineEnd(char * const lineStart,
+               char * const prevLineStart,
+               char   const newVal) {
+/*----------------------------------------------------------------------------
+   Assuming a line begins at 'lineStart' and the line before it (the
+   "previous line") begins at 'prevLineStart', replace the line
+   delimiter at the end of the previous line with the character 'newVal'.
+
+   The line delimiter is either CRLF or LF.  In the CRLF case, we replace
+   both CR and LF with 'newVal'.
+-----------------------------------------------------------------------------*/
+    assert(lineStart >= prevLineStart + 1);
+    *(lineStart-1) = newVal;
+    if (prevLineStart + 1 < lineStart &&
+        *(lineStart-2) == CR)
+        *(lineStart-2) = newVal;
+}
+
+
+
+static void
+getRestOfHeader(TConn *       const connectionP,
+                char *        const lineEnd,
+                time_t        const deadline,
+                const char ** const headerEndP,
+                bool *        const errorP) {
+/*----------------------------------------------------------------------------
+   Given that the read buffer for connection *connectionP contains (at
+   its current read position) the first line of an HTTP header, which
+   ends at position 'lineEnd', find the rest of it.
+
+   Some or all of the rest of the header may be in the buffer already;
+   we read more from the connection as necessary, but not if it takes past
+   'deadline'.  In the latter case, we fail.
+
+   We return the location of the end of the whole header as *headerEndP.
+   We do not remove the header from the buffer, but we do modify the
+   buffer so as to join the multiple lines of the header into a single
+   line, and to NUL-terminate the header.
+-----------------------------------------------------------------------------*/
+    char * const headerStart = connectionP->buffer + connectionP->bufferpos;
+
+    char * headerEnd;
+        /* End of the header lines we've seen at so far */
+    bool gotWholeHeader;
+    bool error;
+
+    headerEnd = lineEnd;  /* initial value - end of 1st line */
         
-            t = GetToken(&p);
-            if (t) {
-                uint32_t vmin, vmaj;
-                if (sscanf(t, "HTTP/%d.%d", &vmaj, &vmin) != 2) {
-                    /* Bad request */
-                    ResponseStatus(r, 400);
-                    *errorP = TRUE;
-                } else {
-                    r->versionmajor = vmaj;
-                    r->versionminor = vmin;
-                    *errorP = FALSE;
-                }
-                *moreLinesP = TRUE;
+    for (gotWholeHeader = FALSE, error = FALSE;
+         !gotWholeHeader && !error;) {
+
+        char * nextLineEnd;
+
+        /* Note that we are guaranteed, assuming the HTTP stream is
+           valid, that there is at least one more line in it.  Worst
+           case, it's the empty line that marks the end of the headers.
+        */
+        getLineInBuffer(connectionP, headerEnd, deadline,
+                        &nextLineEnd, &error);
+        if (!error) {
+            if (isContinuationLine(headerEnd)) {
+                /* Join previous line to this one */
+                convertLineEnd(headerEnd, headerStart, ' ');
+                /* Add this line to the header */
+                headerEnd = nextLineEnd;
             } else {
-                /* There is not HTTP version, so this is a single
-                   line request.
-                */
-                *errorP = FALSE;
-                *moreLinesP = FALSE;
+                gotWholeHeader = TRUE;
+                *headerEndP = headerEnd;
+
+                /* NUL-terminate the whole header */
+                convertLineEnd(headerEnd, headerStart, '\0');
             }
         }
     }
+    *errorP = error;
 }
 
 
 
-abyss_bool
-RequestRead(TSession * const r) {
-    char *n,*t,*p;
-    abyss_bool ret;
-    abyss_bool error;
-    char * line1;
-    abyss_bool moreLines;
+static void
+readHeader(TConn * const connectionP,
+           time_t  const deadline,
+           bool *  const endOfHeadersP,
+           char ** const headerP,
+           bool *  const errorP) {
+/*----------------------------------------------------------------------------
+   Read an HTTP header, or the end of headers empty line, on connection
+   *connectionP.
+
+   An HTTP header is basically a line, except that if a line starts
+   with white space, it's a continuation of the previous line.  A line
+   is delimited by either LF or CRLF.
+
+   The first line of an HTTP header is never empty; an empty line signals
+   the end of the HTTP headers and beginning of the HTTP body.  We call
+   that empty line the EOH mark.
+
+   We assume the connection is positioned to a header or EOH mark.
+   
+   In the course of reading, we read at least one character past the
+   line delimiter at the end of the header or EOH mark; we may read
+   much more.  But we leave everything after the header or EOH (and
+   its line delimiter) in the internal buffer, with the buffer pointer
+   pointing to it.
+
+   We use stuff already in the internal buffer (perhaps left by a
+   previous call to this subroutine) before reading any more from from
+   the channel.
+
+   We return as *headerP the next header as an ASCIIZ string, with no
+   line delimiter.  That string is stored in the "unused" portion of
+   the connection's internal buffer.  Iff there is no next header, we
+   return *endOfHeadersP == true and nothing meaningful as *headerP.
+-----------------------------------------------------------------------------*/
+    char * const bufferStart = connectionP->buffer + connectionP->bufferpos;
+
+    bool error;
+    char * lineEnd;
+
+    getLineInBuffer(connectionP, bufferStart, deadline, &lineEnd, &error);
+
+    if (!error) {
+        if (isContinuationLine(bufferStart))
+            error = TRUE;
+        else if (isEmptyLine(bufferStart)) {
+            /* Consume the EOH mark from the buffer */
+            connectionP->bufferpos = lineEnd - connectionP->buffer;
+            *endOfHeadersP = TRUE;
+        } else {
+            /* We have the first line of a header; there may be more. */
+
+            const char * headerEnd;
+
+            *endOfHeadersP = FALSE;
+
+            getRestOfHeader(connectionP, lineEnd, deadline,
+                            &headerEnd, &error);
+
+            if (!error) {
+                *headerP = bufferStart;
+
+                /* Consume the header from the buffer (but be careful --
+                   you can't reuse that part of the buffer because the
+                   string we will return is in it!
+                */
+                connectionP->bufferpos = headerEnd - connectionP->buffer;
+            }
+        }
+    }
+    *errorP = error;
+}
 
-    readFirstLineOfRequest(r, &line1, &error);
-    if (error)
-        return FALSE;
+
+
+static void
+skipToNonemptyLine(TConn * const connectionP,
+                   time_t  const deadline,
+                   bool *  const errorP) {
+
+    char * const bufferStart = connectionP->buffer + connectionP->bufferpos;
+
+    bool gotNonEmptyLine;
+    bool error;
+    char * lineStart;
     
-    processFirstLineOfRequest(r, line1, &moreLines, &error);
-    if (error)
-        return FALSE;
-    if (!moreLines)
-        return TRUE;
+    lineStart       = bufferStart;  /* initial value */
+    gotNonEmptyLine = FALSE;        /* initial value */
+    error           = FALSE;        /* initial value */          
+
+    while (!gotNonEmptyLine && !error) {
+        char * lineEnd;
+
+        getLineInBuffer(connectionP, lineStart, deadline, &lineEnd, &error);
+
+        if (!error) {
+            if (!isEmptyLine(lineStart))
+                gotNonEmptyLine = TRUE;
+            else
+                lineStart = lineEnd;
+        }
+    }
+    if (!error) {
+        /* Consume all the empty lines; advance buffer pointer to first
+           non-empty line.
+        */
+        connectionP->bufferpos = lineStart - connectionP->buffer;
+    }
+    *errorP = error;
+}
 
-    /* Headers decoding */
-    ret = TRUE;
 
-    for (;;)
-    {
-        if (!ConnReadLine(r->conn,&p,r->server->timeout))
-        {
-            /* Request Timeout */
-            ResponseStatus(r,408);
-            return FALSE;
-        };
-
-        /* We have reached the empty line so all the request was read */
-        if (!*p)
-            return TRUE;
 
-        NextToken(&p);
-        
-        if (!(n=GetToken(&p)))
-        {
-            /* Bad Request */
-            ResponseStatus(r,400);
-            return FALSE;
-        };
+static void
+readRequestHeader(TSession * const sessionP,
+                  time_t     const deadline,
+                  char **    const requestLineP,
+                  uint16_t * const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+   Read the HTTP request header (aka request header field) from
+   session 'sessionP'.  We read through the session's internal buffer;
+   i.e.  we may get data that was previously read from the network, or
+   we may read more from the network.
+
+   We assume the connection is presently positioned to the beginning of
+   the HTTP document.  We leave it positioned after the request header.
+   
+   We ignore any empty lines at the beginning of the stream, per
+   RFC2616 Section 4.1.
+
+   Fail if we can't get the header before 'deadline'.
+
+   Return as *requestLineP the request header read.  This ASCIIZ string is
+   in the session's internal buffer.
+
+   Return as *httpErrorCodeP the HTTP error code that describes how we
+   are not able to read the request header, or 0 if we can.
+   If we can't, *requestLineP is meaningless.
+-----------------------------------------------------------------------------*/
+    char * line;
+    bool error;
+    bool endOfHeaders;
 
-        /* Valid Field name ? */
-        if (n[strlen(n)-1]!=':')
-        {
-            /* Bad Request */
-            ResponseStatus(r,400);
-            return FALSE;
-        };
+    skipToNonemptyLine(sessionP->conn, deadline, &error);
 
-        n[strlen(n)-1]='\0';
+    if (!error)
+        readHeader(sessionP->conn, deadline, &endOfHeaders, &line, &error);
 
-        NextToken(&p);
+    /* End of headers is delimited by an empty line, and we skipped all
+       the empty lines above, so we could not have encountered EOH:
+    */
+    assert(!endOfHeaders);
 
-        t=n;
-        while (*t)
-        {
-            *t=tolower(*t);
-            t++;
-        };
+    if (error)
+        *httpErrorCodeP = 408;  /* Request Timeout */
+    else {
+        *httpErrorCodeP = 0;
+        *requestLineP = line;
+    }
+}
 
-        t=p;
 
-        TableAdd(&r->request_headers,n,t);
 
-        if (strcmp(n,"connection")==0)
-        {
-            /* must handle the jigsaw TE,keepalive */
-            if (strcasecmp(t,"keep-alive")==0)
-                r->keepalive=TRUE;
+static void
+unescapeUri(char * const uri,
+            bool * const errorP) {
+
+    char * x;
+    char * y;
+
+    x = y = uri;
+    
+    *errorP = FALSE;
+
+    while (*x && !*errorP) {
+        switch (*x) {
+        case '%': {
+            char c;
+            ++x;
+            c = tolower(*x++);
+            if ((c >= '0') && (c <= '9'))
+                c -= '0';
+            else if ((c >= 'a') && (c <= 'f'))
+                c -= 'a' - 10;
             else
-                r->keepalive=FALSE;
-        }
-        else if (strcmp(n,"host")==0)
-            r->host=t;
-        else if (strcmp(n,"from")==0)
-            r->from=t;
-        else if (strcmp(n,"user-agent")==0)
-            r->useragent=t;
-        else if (strcmp(n,"referer")==0)
-            r->referer=t;
-        else if (strcmp(n,"range")==0)
-        {
-            if (strncmp(t,"bytes=",6)==0)
-                if (!ListAddFromString(&(r->ranges),t+6))
-                {
-                    /* Bad Request */
-                    ResponseStatus(r,400);
-                    return FALSE;
-                };
+                *errorP = TRUE;
+
+            if (!*errorP) {
+                char d;
+                d = tolower(*x++);
+                if ((d >= '0') && (d <= '9'))
+                    d -= '0';
+                else if ((d >= 'a') && (d <= 'f'))
+                    d -= 'a' - 10;
+                else
+                    *errorP = TRUE;
+
+                if (!*errorP)
+                    *y++ = ((c << 4) | d);
+            }
+        } break;
+
+        default:
+            *y++ = *x++;
+            break;
         }
-        else if (strcmp(n,"cookies")==0)
-        {
-            if (!ListAddFromString(&(r->cookies),t))
-            {
-                /* Bad Request */
-                ResponseStatus(r,400);
-                return FALSE;
-            };
-        };
-    };
+    }
+    *y = '\0';
 }
 
-char *RequestHeaderValue(TSession *r,char *name)
-{
-    return (TableFind(&r->request_headers,name));
+
+
+static void
+parseHostPort(const char *     const hostport,
+              const char **    const hostP,
+              unsigned short * const portP,
+              uint16_t *       const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+   Parse a 'hostport', a string in the form www.acme.com:8080 .
+
+   Return the host name part (www.acme.com) as *hostP (in newly
+   malloced storage), and the port part (8080) as *portP.
+
+   Default the port to 80 if 'hostport' doesn't have the port part.
+-----------------------------------------------------------------------------*/
+    char * buffer;
+    char * colonPos;
+
+    buffer = strdup(hostport);
+
+    colonPos = strchr(buffer, ':');
+    if (colonPos) {
+        const char * p;
+        uint32_t port;
+
+        *colonPos = '\0';  /* Split hostport at the colon */
+
+        for (p = colonPos + 1, port = 0;
+             isdigit(*p) && port < 65535;
+             (port = port * 10 + (*p - '0')), ++p);
+            
+        if (*p || port == 0)
+            *httpErrorCodeP = 400;  /* Bad Request */
+        else {
+            *hostP = strdup(buffer);
+            *portP = port;
+            *httpErrorCodeP = 0;
+        }
+    } else {
+        *hostP          = strdup(buffer);
+        *portP          = 80;
+        *httpErrorCodeP = 0;
+    }
+    free(buffer);
 }
 
-abyss_bool RequestUnescapeURI(TSession *r)
-{
-    char *x,*y,c,d;
 
-    x=y=r->uri;
 
-    while (1)
-        switch (*x)
+static void
+parseRequestUri(char *           const requestUri,
+                const char **    const hostP,
+                unsigned short * const portP,
+                const char **    const pathP,
+                const char **    const queryP,
+                uint16_t *       const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+  Parse the request URI (in the request line
+  "GET http://www.myserver.com:8080/myfile.cgi?parm HTTP/1.1",
+  "http://www.myserver.com:8080/myfile.cgi?parm" is the request URI).
+
+  Return as *hostP the "www.myserver.com" in the above example.  If
+  that part of the URI doesn't exist, return *hostP == NULL.
+
+  Return as *portP the 8080 in the above example.  If it doesn't exist,
+  return 80.
+
+  Return as *pathP the "/myfile.cgi" in the above example.  If it
+  doesn't exist, return "*".
+
+  Return as *queryP the "parm" in the above example.  If it doesn't
+  exist, return *queryP == NULL.
+
+  Return strings in newly malloc'ed storage.
+
+  Return as *httpErrorCodeP the HTTP error code that describes how the
+  URI is invalid, or 0 if it is valid.  If it's invalid, other return
+  values are meaningless.
+
+  This destroys 'requestUri'.  We should fix that.
+-----------------------------------------------------------------------------*/
+    bool error;
+
+    unescapeUri(requestUri, &error);
+    
+    if (error)
+        *httpErrorCodeP = 400;  /* Bad Request */
+    else {
+        char * requestUriNoQuery;
+           /* The request URI with any query (the stuff marked by a question
+              mark at the end of a request URI) chopped off.
+           */
         {
-        case '\0':
-            *y='\0';
-            return TRUE;
-
-        case '%':
-            x++;
-            c=tolower(*x++);
-            if ((c>='0') && (c<='9'))
-                c-='0';
-            else if ((c>='a') && (c<='f'))
-                c-='a'-10;
-            else
-                return FALSE;
+            /* Split requestUri at the question mark */
+            char * const qmark = strchr(requestUri, '?');
+            
+            if (qmark) {
+                *qmark = '\0';
+                *queryP = strdup(qmark + 1);
+            } else
+                *queryP = NULL;
 
-            d=tolower(*x++);
-            if ((d>='0') && (d<='9'))
-                d-='0';
-            else if ((d>='a') && (d<='f'))
-                d-='a'-10;
-            else
-                return FALSE;
+            requestUriNoQuery = requestUri;
+        }
 
-            *y++=((c << 4) | d);
-            break;
+        if (requestUriNoQuery[0] == '/') {
+            *hostP = NULL;
+            *pathP = strdup(requestUriNoQuery);
+            *portP = 80;
+            *httpErrorCodeP = 0;
+        } else {
+            if (!xmlrpc_strneq(requestUriNoQuery, "http://", 7))
+                *httpErrorCodeP = 400;  /* Bad Request */
+            else {
+                char * const hostportpath = &requestUriNoQuery[7];
+                char * const slashPos = strchr(hostportpath, '/');
+
+                const char * host;
+                const char * path;
+                unsigned short port;
+
+                char * hostport;
+                
+                if (slashPos) {
+                    char * p;
+                    path = strdup(slashPos);
+                    
+                    /* Nul-terminate the host name.  To make space for
+                       it, slide the whole name back one character.
+                       This moves it into the space now occupied by
+                       the end of "http://", which we don't need.
+                    */
+                    for (p = hostportpath; *p != '/'; ++p)
+                        *(p-1) = *p;
+                    *(p-1) = '\0';
+                    
+                    hostport = hostportpath - 1;
+                    *httpErrorCodeP = 0;
+                } else {
+                    path = strdup("*");
+                    hostport = hostportpath;
+                    *httpErrorCodeP = 0;
+                }
+                if (!*httpErrorCodeP)
+                    parseHostPort(hostport, &host, &port, httpErrorCodeP);
+                if (*httpErrorCodeP)
+                    xmlrpc_strfree(path);
+
+                *hostP  = host;
+                *portP  = port;
+                *pathP  = path;
+            }
+        }
+    }
+}
 
-        default:
-            *y++=*x++;
-            break;
-        };
-};
 
 
+static void
+parseRequestLine(char *           const requestLine,
+                 TMethod *        const httpMethodP,
+                 httpVersion *    const httpVersionP,
+                 const char **    const hostP,
+                 unsigned short * const portP,
+                 const char **    const pathP,
+                 const char **    const queryP,
+                 bool *           const moreLinesP,
+                 uint16_t *       const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+   Modifies *requestLine!
+-----------------------------------------------------------------------------*/
+    const char * httpMethodName;
+    char * p;
 
-abyss_bool
-RequestValidURI(TSession *r) {
+    p = requestLine;
 
-    char *p;
+    /* Jump over spaces */
+    NextToken((const char **)&p);
 
-    if (!r->uri)
-        return FALSE;
+    httpMethodName = GetToken(&p);
+    if (!httpMethodName)
+        *httpErrorCodeP = 400;  /* Bad Request */
+    else {
+        char * requestUri;
+
+        if (xmlrpc_streq(httpMethodName, "GET"))
+            *httpMethodP = m_get;
+        else if (xmlrpc_streq(httpMethodName, "PUT"))
+            *httpMethodP = m_put;
+        else if (xmlrpc_streq(httpMethodName, "OPTIONS"))
+            *httpMethodP = m_options;
+        else if (xmlrpc_streq(httpMethodName, "DELETE"))
+            *httpMethodP = m_delete;
+        else if (xmlrpc_streq(httpMethodName, "POST"))
+            *httpMethodP = m_post;
+        else if (xmlrpc_streq(httpMethodName, "TRACE"))
+            *httpMethodP = m_trace;
+        else if (xmlrpc_streq(httpMethodName, "HEAD"))
+            *httpMethodP = m_head;
+        else
+            *httpMethodP = m_unknown;
+        
+        /* URI and Query Decoding */
+        NextToken((const char **)&p);
 
-    if (*(r->uri)!='/') {
-        if (strncmp(r->uri,"http://",7)!=0)
-            return FALSE;
+        requestUri = GetToken(&p);
+        if (!requestUri)
+            *httpErrorCodeP = 400;  /* Bad Request */
         else {
-            r->uri+=7;
-            r->host=r->uri;
-            p=strchr(r->uri,'/');
-
-            if (!p) {
-                r->uri="*";
-                return TRUE;
-            };
-
-            r->uri=p;
-            p=r->host;
-
-            while (*p!='/') {
-                *(p-1)=*p;
-                p++;
-            };
+            const char * host;
+            unsigned short port;
+            const char * path;
+            const char * query;
+
+            parseRequestUri(requestUri, &host, &port, &path, &query,
+                            httpErrorCodeP);
 
-            --p;
-            *p='\0';
+            if (!*httpErrorCodeP) {
+                const char * httpVersion;
 
-            --r->host;
-        };
+                NextToken((const char **)&p);
+        
+                /* HTTP Version Decoding */
+                
+                httpVersion = GetToken(&p);
+                if (httpVersion) {
+                    uint32_t vmin, vmaj;
+                    if (sscanf(httpVersion, "HTTP/%d.%d", &vmaj, &vmin) != 2)
+                        *httpErrorCodeP = 400;  /* Bad Request */
+                    else {
+                        httpVersionP->major = vmaj;
+                        httpVersionP->minor = vmin;
+                        *httpErrorCodeP = 0;  /* no error */
+                    }
+                    *moreLinesP = TRUE;
+                } else {
+                    /* There is no HTTP version, so this is a single
+                       line request.
+                    */
+                    *httpErrorCodeP = 0;  /* no error */
+                    *moreLinesP = FALSE;
+                }
+                if (*httpErrorCodeP) {
+                    xmlrpc_strfree(host);
+                    xmlrpc_strfree(path);
+                    xmlrpc_strfree(query);
+                }
+                *hostP = host;
+                *portP = port;
+                *pathP = path;
+                *queryP = query;
+            }
+        }
+    }
+}
+
+
+
+static void
+strtolower(char * const s) {
+
+    char * t;
+
+    t = &s[0];
+    while (*t) {
+        *t = tolower(*t);
+        ++t;
     }
+}
+
 
-    /* Host and Port Decoding */
-    if (r->host) {
-        p=strchr(r->host,':');
-        if (p) {
-            uint32_t port=0;
-
-            *p='\0';
-            p++;
-            while (isdigit(*p) && (port<65535)) {
-                port=port*10+(*p)-'0';
-                ++p;
-            };
+
+static void
+getFieldNameToken(char **    const pP,
+                  char **    const fieldNameP,
+                  uint16_t * const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+   Assuming that *pP points to the place in an HTTP header where the field
+   name belongs, return the field name and advance *pP past that token.
+
+   The field name is the lower case representation of the value of the
+   field name token.
+-----------------------------------------------------------------------------*/
+    char * fieldName;
+
+    NextToken((const char **)pP);
+    
+    fieldName = GetToken(pP);
+    if (!fieldName)
+        *httpErrorCodeP = 400;  /* Bad Request */
+    else {
+        if (fieldName[strlen(fieldName)-1] != ':')
+            /* Not a valid field name */
+            *httpErrorCodeP = 400;  /* Bad Request */
+        else {
+            fieldName[strlen(fieldName)-1] = '\0';  /* remove trailing colon */
+
+            strtolower(fieldName);
             
-            r->port=port;
+            *httpErrorCodeP = 0;  /* no error */
+            *fieldNameP = fieldName;
+        }
+    }
+}
+
+
+
+static void
+processHeader(const char * const fieldName,
+              char *       const fieldValue,
+              TSession *   const sessionP,
+              uint16_t *   const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+   We may modify *fieldValue, and we put pointers to *fieldValue and
+   *fieldName into *sessionP.
+
+   We must fix this some day.  *sessionP should point to individual
+   malloc'ed strings.
+-----------------------------------------------------------------------------*/
+    *httpErrorCodeP = 0;  /* initial assumption */
+
+    if (xmlrpc_streq(fieldName, "connection")) {
+        if (xmlrpc_strcaseeq(fieldValue, "keep-alive"))
+            sessionP->requestInfo.keepalive = TRUE;
+        else
+            sessionP->requestInfo.keepalive = FALSE;
+    } else if (xmlrpc_streq(fieldName, "host")) {
+        if (sessionP->requestInfo.host) {
+            xmlrpc_strfree(sessionP->requestInfo.host);
+            sessionP->requestInfo.host = NULL;
+        }
+        parseHostPort(fieldValue, &sessionP->requestInfo.host,
+                      &sessionP->requestInfo.port, httpErrorCodeP);
+    } else if (xmlrpc_streq(fieldName, "from"))
+        sessionP->requestInfo.from = fieldValue;
+    else if (xmlrpc_streq(fieldName, "user-agent"))
+        sessionP->requestInfo.useragent = fieldValue;
+    else if (xmlrpc_streq(fieldName, "referer"))
+        sessionP->requestInfo.referer = fieldValue;
+    else if (xmlrpc_streq(fieldName, "range")) {
+        if (xmlrpc_strneq(fieldValue, "bytes=", 6)) {
+            bool succeeded;
+            succeeded = ListAddFromString(&sessionP->ranges, &fieldValue[6]);
+            *httpErrorCodeP = succeeded ? 0 : 400;
+        }
+    } else if (xmlrpc_streq(fieldName, "cookies")) {
+        bool succeeded;
+        succeeded = ListAddFromString(&sessionP->cookies, fieldValue);
+        *httpErrorCodeP = succeeded ? 0 : 400;
+    } else if (xmlrpc_streq(fieldName, "expect")) {
+        if (xmlrpc_strcaseeq(fieldValue, "100-continue"))
+            sessionP->continueRequired = TRUE;
+    }
+}
+
 
-            if (*p || port==0)
-                return FALSE;
-        };
+
+static void
+readAndProcessHeaders(TSession * const sessionP,
+                      time_t     const deadline,
+                      uint16_t * const httpErrorCodeP) {
+/*----------------------------------------------------------------------------
+   Read all the HTTP headers from the session *sessionP, which has at
+   least one header coming.  Update *sessionP to reflect the
+   information in the headers.
+
+   If we find an error in the headers or while trying to read them, we
+   return an appropriate HTTP error code as *httpErrorCodeP.  Otherwise,
+   we return *httpErrorCodeP = 0.
+-----------------------------------------------------------------------------*/
+    bool endOfHeaders;
+
+    assert(!sessionP->validRequest);
+        /* Calling us doesn't make sense if there is already a valid request */
+
+    *httpErrorCodeP = 0;  /* initial assumption */
+    endOfHeaders = false;  /* Caller assures us there is at least one header */
+
+    while (!endOfHeaders && !*httpErrorCodeP) {
+        char * header;
+        bool error;
+        readHeader(sessionP->conn, deadline, &endOfHeaders, &header, &error);
+        if (error)
+            *httpErrorCodeP = 408;  /* Request Timeout */
+        else {
+            if (!endOfHeaders) {
+                char * p;
+                char * fieldName;
+
+                p = &header[0];
+                getFieldNameToken(&p, &fieldName, httpErrorCodeP);
+                if (!*httpErrorCodeP) {
+                    char * fieldValue;
+                    
+                    NextToken((const char **)&p);
+                    
+                    fieldValue = p;
+
+                    TableAdd(&sessionP->request_headers,
+                             fieldName, fieldValue);
+                    
+                    processHeader(fieldName, fieldValue, sessionP,
+                                  httpErrorCodeP);
+                }
+            }
+        }
     }
-    if (strcmp(r->uri,"*")==0)
-        return (r->method!=m_options);
+}
+
+
+
+void
+RequestRead(TSession * const sessionP,
+            uint32_t   const timeout) {
+/*----------------------------------------------------------------------------
+   Read the headers of a new HTTP request (assuming nothing has yet been
+   read on the session).
+
+   Update *sessionP with the information from the headers.
+
+   Leave the connection positioned to the body of the request, ready
+   to be read by an HTTP request handler (via SessionRefillBuffer() and
+   SessionGetReadData()).
+-----------------------------------------------------------------------------*/
+    time_t const deadline = time(NULL) + timeout;
+
+    uint16_t httpErrorCode;  /* zero for no error */
+    char * requestLine;  /* In connection;s internal buffer */
+
+    readRequestHeader(sessionP, deadline, &requestLine, &httpErrorCode);
+    if (!httpErrorCode) {
+        TMethod httpMethod;
+        const char * host;
+        const char * path;
+        const char * query;
+        unsigned short port;
+        bool moreHeaders;
+
+        parseRequestLine(requestLine, &httpMethod, &sessionP->version,
+                         &host, &port, &path, &query,
+                         &moreHeaders, &httpErrorCode);
+
+        if (!httpErrorCode) {
+            initRequestInfo(&sessionP->requestInfo, sessionP->version,
+                            requestLine,
+                            httpMethod, host, port, path, query);
+
+            if (moreHeaders)
+                readAndProcessHeaders(sessionP, deadline, &httpErrorCode);
+
+            if (httpErrorCode == 0)
+                sessionP->validRequest = true;
+
+            xmlrpc_strfreenull(host);
+            xmlrpc_strfree(path);
+            xmlrpc_strfreenull(query);
+        }
+    }
+    if (httpErrorCode)
+        ResponseStatus(sessionP, httpErrorCode);
+}
+
+
+
+char *
+RequestHeaderValue(TSession *   const sessionP,
+                   const char * const name) {
+
+    return (TableFind(&sessionP->request_headers, name));
+}
+
+
+
+bool
+RequestValidURI(TSession * const sessionP) {
+
+    if (!sessionP->requestInfo.uri)
+        return FALSE;
+    
+    if (xmlrpc_streq(sessionP->requestInfo.uri, "*"))
+        return (sessionP->requestInfo.method != m_options);
 
-    if (strchr(r->uri,'*'))
+    if (strchr(sessionP->requestInfo.uri, '*'))
         return FALSE;
 
     return TRUE;
 }
 
 
-abyss_bool RequestValidURIPath(TSession *r)
-{
-    uint32_t i=0;
-    char *p=r->uri;
 
-    if (*p=='/')
-    {
-        i=1;
+bool
+RequestValidURIPath(TSession * const sessionP) {
+
+    uint32_t i;
+    const char * p;
+
+    p = sessionP->requestInfo.uri;
+
+    i = 0;
+
+    if (*p == '/') {
+        i = 1;
         while (*p)
-            if (*(p++)=='/')
-            {
-                if (*p=='/')
+            if (*(p++) == '/') {
+                if (*p == '/')
                     break;
-                else if ((strncmp(p,"./",2)==0) || (strcmp(p,".")==0))
-                    p++;
-                els