From robertj at freeswitch.org  Sun Mar  1 19:19:57 2009
From: robertj at freeswitch.org (FreeSWITCH SVN)
Date: Sun, 01 Mar 2009 21:19:57 -0600
Subject: [Freeswitch-svn] [commit] r12347 -
	freeswitch/trunk/src/mod/endpoints/mod_opal
Message-ID: <E1LdyhB-0004G0-8O@svn.freeswitch.org>

Author: robertj
Date: Sun Mar  1 21:19:57 2009
New Revision: 12347

Log:
Added "jitter-size" to config file to set jitter buffer size.

Fixed transmission of Q.931 Calling-Party-Number, and DisplayName on H.323 Setup. Was previously being set on the wrong connection.

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp
   freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h

Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp	Sun Mar  1 21:19:57 2009
@@ -323,8 +323,6 @@
     m_FreeSwitch->io_routines = &opalfs_io_routines;
     m_FreeSwitch->state_handler = &opalfs_event_handlers;
 
-    SetAudioJitterDelay(800, 3000); // should be config option
-
     silenceDetectParams.m_mode = OpalSilenceDetector::NoSilenceDetection;
 
     if (m_listeners.empty()) {
@@ -411,6 +409,15 @@
                     set_global_dialplan(val);
                 } else if (!strcasecmp(var, "codec-prefs")) {
                     set_global_codec_string(val);
+                } else if (!strcasecmp(var, "jitter-size")) {
+                    char * next;
+                    unsigned minJitter = strtoul(val, &next, 10);
+                    if (minJitter >= 10) {
+                        unsigned maxJitter = minJitter;
+                        if (*next == ',')
+                          maxJitter = atoi(next+1);
+                        SetAudioJitterDelay(minJitter, maxJitter); // In milliseconds
+                    }
                 }
             }
         }
@@ -455,6 +462,12 @@
 }
 
 
+OpalCall * FSManager::CreateCall(void * /*userData*/)
+{
+  return new FSCall(*this);
+}
+
+
 ///////////////////////////////////////////////////////////////////////
 
 FSEndPoint::FSEndPoint(FSManager & manager)
@@ -478,6 +491,32 @@
 
 ///////////////////////////////////////////////////////////////////////
 
+FSCall::FSCall(OpalManager & manager)
+  : OpalCall(manager)
+{
+}
+
+
+PBoolean FSCall::OnSetUp(OpalConnection & connection)
+{
+  // Transfer FS caller_id_number & caller_id_name from the FSConnection
+  // to the protocol connectionm (e.g. H.323) so gets sent correctly
+  // in outgoing packets
+  PSafePtr<FSConnection> local = GetConnectionAs<FSConnection>();
+  if (local != NULL) {
+    PSafePtr<OpalConnection> proto = local->GetOtherPartyConnection();
+    if (proto != NULL) {
+      proto->SetLocalPartyName(local->GetLocalPartyName());
+      proto->SetDisplayName(local->GetDisplayName());
+    }
+  }
+
+  return OpalCall::OnSetUp(connection);
+}
+
+
+///////////////////////////////////////////////////////////////////////
+
 
 FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile)
   : OpalLocalConnection(call, endpoint, NULL)

Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h	Sun Mar  1 21:19:57 2009
@@ -82,6 +82,14 @@
 };
 
 
+class FSCall : public OpalCall {
+    PCLASSINFO(FSCall, OpalCall);
+  public:
+    FSCall(OpalManager & manager);
+    virtual PBoolean OnSetUp(OpalConnection & connection);
+};
+
+
 class FSManager : public OpalManager {
     PCLASSINFO(FSManager, OpalManager);
 
@@ -96,6 +104,8 @@
         return m_FreeSwitch;
     }
 
+    virtual OpalCall * CreateCall(void * userData);
+
   private:
     switch_endpoint_interface_t *m_FreeSwitch;
 
@@ -106,6 +116,7 @@
     list < FSListener > m_listeners;
 };
 
+
 class FSConnection;
 typedef struct {
     switch_timer_t read_timer;


From anthm at freeswitch.org  Mon Mar  2 07:45:00 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 09:45:00 -0600
Subject: [Freeswitch-svn] [commit] r12348 - freeswitch/trunk/src
Message-ID: <E1LeAKC-0003e7-EH@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 09:45:00 2009
New Revision: 12348

Log:
add some more thread joins to avoid races

Modified:
   freeswitch/trunk/src/switch_core_memory.c
   freeswitch/trunk/src/switch_time.c

Modified: freeswitch/trunk/src/switch_core_memory.c
==============================================================================
--- freeswitch/trunk/src/switch_core_memory.c	(original)
+++ freeswitch/trunk/src/switch_core_memory.c	Mon Mar  2 09:45:00 2009
@@ -440,11 +440,17 @@
 	return NULL;
 }
 
+static switch_thread_t *pool_thread_p = NULL;
+
 void switch_core_memory_stop(void)
 {
+	switch_status_t st;
+
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping memory pool queue.\n");
 #ifndef INSTANTLY_DESTROY_POOLS
 	memory_manager.pool_thread_running = -1;
+	switch_thread_join(&st, pool_thread_p);
+	
 	while (memory_manager.pool_thread_running) {
 		switch_cond_next();
 	}
@@ -454,7 +460,6 @@
 switch_memory_pool_t *switch_core_memory_init(void)
 {
 #ifndef INSTANTLY_DESTROY_POOLS
-	switch_thread_t *thread;
 	switch_threadattr_t *thd_attr;
 #endif
 #ifdef PER_POOL_LOCK
@@ -502,7 +507,7 @@
 	switch_threadattr_detach_set(thd_attr, 1);
 
 	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, pool_thread, NULL, memory_manager.memory_pool);
+	switch_thread_create(&pool_thread_p, thd_attr, pool_thread, NULL, memory_manager.memory_pool);
 
 	while (!memory_manager.pool_thread_running) {
 		switch_cond_next();

Modified: freeswitch/trunk/src/switch_time.c
==============================================================================
--- freeswitch/trunk/src/switch_time.c	(original)
+++ freeswitch/trunk/src/switch_time.c	Mon Mar  2 09:45:00 2009
@@ -113,7 +113,7 @@
 
 SWITCH_DECLARE(switch_time_t) switch_micro_time_now(void)
 {
-	return runtime.timestamp ? runtime.timestamp : switch_time_now();
+	return (globals.RUNNING == 1 && runtime.timestamp) ? runtime.timestamp : switch_time_now();
 }
 
 
@@ -195,7 +195,7 @@
 #ifdef DISABLE_1MS_COND
 	do_sleep(1000);
 #else
-	if (!runtime.timestamp || globals.use_cond_yield != 1) {
+	if (globals.RUNNING != 1 || !runtime.timestamp || globals.use_cond_yield != 1) {
 		do_sleep(1000);
 		return;
 	}
@@ -210,7 +210,7 @@
 	switch_time_t want;
 	if (!t) return;
 
-	if (!runtime.timestamp || globals.use_cond_yield != 1) {
+	if (globals.RUNNING != 1 || !runtime.timestamp || globals.use_cond_yield != 1) {
 		do_sleep(t);
 		return;
 	}


From anthm at freeswitch.org  Mon Mar  2 08:09:32 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:09:32 -0600
Subject: [Freeswitch-svn] [commit] r12349 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_socket
Message-ID: <E1LeAhw-000430-8d@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 10:09:32 2009
New Revision: 12349

Log:
MODEVENT-40 ahem `Math

Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c	Mon Mar  2 10:09:32 2009
@@ -1275,10 +1275,6 @@
 	
 	SWITCH_STANDARD_STREAM(stream);
 	
-	if (!strcasecmp(acs->api_cmd, "unload") || !strcasecmp(acs->arg, "mod_event_socket")) {
-		
-	}
-
 	if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) {
 		reply = stream.data;
 	} else {


From mrene at freeswitch.org  Mon Mar  2 08:11:42 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:11:42 -0600
Subject: [Freeswitch-svn] [commit] r12350 - freeswitch/trunk/support-d
Message-ID: <E1LeAk2-00045C-5m@svn.freeswitch.org>

Author: mrene
Date: Mon Mar  2 10:11:42 2009
New Revision: 12350

Log:
New event_dump gdb macro

Modified:
   freeswitch/trunk/support-d/.gdbinit

Modified: freeswitch/trunk/support-d/.gdbinit
==============================================================================
--- freeswitch/trunk/support-d/.gdbinit	(original)
+++ freeswitch/trunk/support-d/.gdbinit	Mon Mar  2 10:11:42 2009
@@ -30,20 +30,6 @@
 Prints the content of a hashtable displaying the key as a string and the value as pointer
 end
 
-define hash_it_int
-	dont-repeat
-	set $i = 0
-	set $x=$arg0->table->first
-	while($x != 0x0)
-		printf "key: %d valueptr: %p\n", $x->pKey, $x->data
-		set $x = $x->next
-		set $i = $i + 1
-	end
-end
-document hash_it_int
-Usage: hash_it_int [hashtable]
-Prints the content of a hashtable displaying the key as an int and the value as pointer
-end
 
 define hash_it_str_x
 	dont-repeat
@@ -62,19 +48,10 @@
 Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member
 end
 
-define hash_it_int_x
-	dont-repeat
-	set $i = 0
-	set $x=$arg0->table->first
+define event_dump
+	set $x = $arg0->headers
 	while($x != 0x0)
-		printf "key: %d\n", $x->pKey
-		print (($arg1*)$x->data)->$arg2
-		printf "\n\n"
+		printf "%s = %s\n", $x->name, $x->value
 		set $x = $x->next
-		set $i = $i + 1
-		end
-end
-document hash_it_int_x
-Usage: hash_it_int_x [hashtable] [value_type] [member]
-Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. 
-end
+	end
+end
\ No newline at end of file


From mrene at freeswitch.org  Mon Mar  2 08:12:36 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:12:36 -0600
Subject: [Freeswitch-svn] [commit] r12351 - freeswitch/trunk/support-d
Message-ID: <E1LeAku-00046e-II@svn.freeswitch.org>

Author: mrene
Date: Mon Mar  2 10:12:36 2009
New Revision: 12351

Log:
Now with a document statement

Modified:
   freeswitch/trunk/support-d/.gdbinit

Modified: freeswitch/trunk/support-d/.gdbinit
==============================================================================
--- freeswitch/trunk/support-d/.gdbinit	(original)
+++ freeswitch/trunk/support-d/.gdbinit	Mon Mar  2 10:12:36 2009
@@ -49,9 +49,14 @@
 end
 
 define event_dump
+	dont-repeat
 	set $x = $arg0->headers
 	while($x != 0x0)
 		printf "%s = %s\n", $x->name, $x->value
 		set $x = $x->next
 	end
+end
+document event_dump
+Usage: event_dump [switch_event_t*]
+Print and event's headers and values
 end
\ No newline at end of file


From mikej at freeswitch.org  Mon Mar  2 08:24:30 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:24:30 -0600
Subject: [Freeswitch-svn] [commit] r12352 - in
	freeswitch/trunk/libs/spandsp: src src/spandsp
	test-data/etsi/fax test-data/itu/fax tests
Message-ID: <E1LeAwQ-0004B2-Hm@svn.freeswitch.org>

Author: mikej
Date: Mon Mar  2 10:24:30 2009
New Revision: 12352

Log:
update to snapshot spandsp-20090301

Modified:
   freeswitch/trunk/libs/spandsp/src/Makefile.am
   freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h
   freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h
   freeswitch/trunk/libs/spandsp/src/spandsp/version.h
   freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in
   freeswitch/trunk/libs/spandsp/src/t4.c
   freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c
   freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c
   freeswitch/trunk/libs/spandsp/tests/t4_tests.c

Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/Makefile.am	(original)
+++ freeswitch/trunk/libs/spandsp/src/Makefile.am	Mon Mar  2 10:24:30 2009
@@ -16,7 +16,7 @@
 ## License along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.127 2009/02/25 15:30:21 steveu Exp $
+## $Id: Makefile.am,v 1.128 2009/03/01 12:49:28 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
@@ -293,6 +293,10 @@
 at_interpreter_dictionary.h: make_at_dictionary$(EXEEXT)
 	./make_at_dictionary$(EXEEXT) >at_interpreter_dictionary.h
 
+t4.$(OBJEXT): spandsp/version.h
+
+t4.lo: spandsp/version.h
+
 v17rx.$(OBJEXT): v17rx_fixed_rrc.h v17rx_floating_rrc.h
 
 v17rx.lo: v17rx_fixed_rrc.h v17rx_floating_rrc.h

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h	Mon Mar  2 10:24:30 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: bit_operations.h,v 1.25 2009/02/24 14:14:03 steveu Exp $
+ * $Id: bit_operations.h,v 1.26 2009/02/26 16:08:50 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h	Mon Mar  2 10:24:30 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fast_convert.h,v 1.5 2009/02/24 14:14:03 steveu Exp $
+ * $Id: fast_convert.h,v 1.6 2009/02/26 16:08:51 steveu Exp $
  */
 
 #if !defined(_SPANDSP_FAST_CONVERT_H_)

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/version.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h	Mon Mar  2 10:24:30 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: version.h.in,v 1.2 2007/04/06 13:20:36 steveu Exp $
+ * $Id: version.h.in,v 1.3 2009/03/01 12:39:02 steveu Exp $
  */
 
 #if !defined(_SPANDSP_VERSION_H_)
@@ -30,8 +30,9 @@
 
 /* The date and time of the version are in UTC form. */
 
-#define SPANDSP_RELEASE_DATE    20090226
-#define SPANDSP_RELEASE_TIME    121601
+#define SPANDSP_RELEASE_DATE            20090301
+#define SPANDSP_RELEASE_TIME            125126
+#define SPANDSP_RELEASE_DATETIME_STRING "20090301 125126"
 
 #endif
 /*- End of file ------------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in	Mon Mar  2 10:24:30 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: version.h.in,v 1.2 2007/04/06 13:20:36 steveu Exp $
+ * $Id: version.h.in,v 1.3 2009/03/01 12:39:02 steveu Exp $
  */
 
 #if !defined(_SPANDSP_VERSION_H_)
@@ -30,8 +30,9 @@
 
 /* The date and time of the version are in UTC form. */
 
-#define SPANDSP_RELEASE_DATE    $SPANDSP_RELEASE_DATE
-#define SPANDSP_RELEASE_TIME    $SPANDSP_RELEASE_TIME
+#define SPANDSP_RELEASE_DATE            $SPANDSP_RELEASE_DATE
+#define SPANDSP_RELEASE_TIME            $SPANDSP_RELEASE_TIME
+#define SPANDSP_RELEASE_DATETIME_STRING "$SPANDSP_RELEASE_DATE $SPANDSP_RELEASE_TIME"
 
 #endif
 /*- End of file ------------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/src/t4.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/t4.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/t4.c	Mon Mar  2 10:24:30 2009
@@ -24,7 +24,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t4.c,v 1.127 2009/02/21 04:27:46 steveu Exp $
+ * $Id: t4.c,v 1.128 2009/03/01 11:47:03 steveu Exp $
  */
 
 /*
@@ -86,6 +86,7 @@
 #include "spandsp/bit_operations.h"
 #include "spandsp/async.h"
 #include "spandsp/t4.h"
+#include "spandsp/version.h"
 
 #include "spandsp/private/logging.h"
 #include "spandsp/private/t4.h"
@@ -205,7 +206,7 @@
     TIFFSetField(t->tiff_file, TIFFTAG_RESOLUTIONUNIT, resunit);
 #endif
     /* TODO: add the version of spandsp */
-    TIFFSetField(t->tiff_file, TIFFTAG_SOFTWARE, "spandsp");
+    TIFFSetField(t->tiff_file, TIFFTAG_SOFTWARE, "Spandsp " SPANDSP_RELEASE_DATETIME_STRING);
     if (gethostname(buf, sizeof(buf)) == 0)
         TIFFSetField(t->tiff_file, TIFFTAG_HOSTCOMPUTER, buf);
 
@@ -330,9 +331,11 @@
     if (t->photo_metric != PHOTOMETRIC_MINISWHITE)
         span_log(&s->logging, SPAN_LOG_FLOW, "%s: Photometric needs swapping.\n", s->file);
     t->fill_order = FILLORDER_LSB2MSB;
+#if 0
     TIFFGetField(t->tiff_file, TIFFTAG_FILLORDER, &t->fill_order);
     if (t->fill_order != FILLORDER_LSB2MSB)
         span_log(&s->logging, SPAN_LOG_FLOW, "%s: Fill order needs swapping.\n", s->file);
+#endif
 
     /* Allow a little range for the X resolution in centimeters. The spec doesn't pin down the
        precise value. The other value should be exact. */

Modified: freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c	(original)
+++ freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c	Mon Mar  2 10:24:30 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: generate_etsi_300_242_pages.c,v 1.3 2009/02/20 12:34:20 steveu Exp $
+ * $Id: generate_etsi_300_242_pages.c,v 1.4 2009/03/01 12:39:02 steveu Exp $
  */
 
 /*! \file */
@@ -177,8 +177,8 @@
     },
 };
 
-int reverse_photo_metric = FALSE;
-int reverse_fill_order = FALSE;
+int photo_metric = PHOTOMETRIC_MINISWHITE;
+int fill_order = FILLORDER_LSB2MSB;
 
 static void clear_row(uint8_t buf[], int width)
 {
@@ -256,13 +256,15 @@
     {
         clear_row(image_buffer, 1728);
         set_pixel_range(image_buffer, 1, start_pixel, start_pixel + 63);
-        if (reverse_photo_metric)
+        if (photo_metric != PHOTOMETRIC_MINISWHITE)
         {
             for (i = 0;  i < 1728/8;  i++)
                 image_buffer[i] = ~image_buffer[i];
         }
-        if (reverse_fill_order)
+#if 0
+        if (fill_order != FILLORDER_LSB2MSB)
             bit_reverse(image_buffer, image_buffer, 1728/8);
+#endif
         if (TIFFWriteScanline(tiff_file, image_buffer, row, 0) < 0)
         {
             printf("Write error at row %d.\n", row);
@@ -558,6 +560,37 @@
     float y_resolution;
     int i;
     int image_length;
+    int opt;
+    int compression;
+
+    compression = T4_COMPRESSION_ITU_T6;
+    photo_metric = PHOTOMETRIC_MINISWHITE;
+    fill_order = FILLORDER_LSB2MSB;
+    while ((opt = getopt(argc, argv, "126ir")) != -1)
+    {
+        switch (opt)
+        {
+        case '1':
+            compression = T4_COMPRESSION_ITU_T4_1D;
+            break;
+        case '2':
+            compression = T4_COMPRESSION_ITU_T4_2D;
+            break;
+        case '6':
+            compression = T4_COMPRESSION_ITU_T6;
+            break;
+        case 'i':
+            photo_metric = PHOTOMETRIC_MINISBLACK;
+            break;
+        case 'r':
+            fill_order = FILLORDER_MSB2LSB;
+            break;
+        default:
+            //usage();
+            exit(2);
+            break;
+        }
+    }
 
     tiff_file = NULL;
     for (i = 0;  sequence[i].name;  i++)
@@ -582,14 +615,8 @@
         TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1);
         TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L);
         TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-        if (reverse_photo_metric)
-            TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
-        else
-            TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
-        if (reverse_fill_order)
-            TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
-        else
-            TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB);
+        TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, photo_metric);
+        TIFFSetField(tiff_file, TIFFTAG_FILLORDER, fill_order);
         x_resolution = sequence[i].x_res/100.0f;
         y_resolution = sequence[i].y_res/100.0f;
         TIFFSetField(tiff_file, TIFFTAG_XRESOLUTION, floorf(x_resolution*2.54f + 0.5f));

Modified: freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c	(original)
+++ freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c	Mon Mar  2 10:24:30 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: generate_sized_pages.c,v 1.2 2008/07/10 13:34:01 steveu Exp $
+ * $Id: generate_sized_pages.c,v 1.3 2009/03/01 12:39:02 steveu Exp $
  */
 
 /*! \file */
@@ -289,6 +289,39 @@
     float x_resolution;
     float y_resolution;
     int i;
+    int opt;
+    int compression;
+    int photo_metric;
+    int fill_order;
+    
+    compression = T4_COMPRESSION_ITU_T6;
+    photo_metric = PHOTOMETRIC_MINISWHITE;
+    fill_order = FILLORDER_LSB2MSB;
+    while ((opt = getopt(argc, argv, "126ir")) != -1)
+    {
+        switch (opt)
+        {
+        case '1':
+            compression = T4_COMPRESSION_ITU_T4_1D;
+            break;
+        case '2':
+            compression = T4_COMPRESSION_ITU_T4_2D;
+            break;
+        case '6':
+            compression = T4_COMPRESSION_ITU_T6;
+            break;
+        case 'i':
+            photo_metric = PHOTOMETRIC_MINISBLACK;
+            break;
+        case 'r':
+            fill_order = FILLORDER_MSB2LSB;
+            break;
+        default:
+            //usage();
+            exit(2);
+            break;
+        }
+    }
 
     for (i = 0;  sequence[i].name;  i++)
     {
@@ -296,15 +329,15 @@
             exit(2);
 
         /* Prepare the directory entry fully before writing the image, or libtiff complains */
-        TIFFSetField(tiff_file, TIFFTAG_COMPRESSION, COMPRESSION_CCITT_T6);
+        TIFFSetField(tiff_file, TIFFTAG_COMPRESSION, compression);
         TIFFSetField(tiff_file, TIFFTAG_IMAGEWIDTH, sequence[i].width);
         TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1);
         TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
         TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1);
         TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L);
         TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-        TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
-        TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB);
+        TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, photo_metric);
+        TIFFSetField(tiff_file, TIFFTAG_FILLORDER, fill_order);
     
         x_resolution = sequence[i].x_res/100.0f;
         y_resolution = sequence[i].y_res/100.0f;

Modified: freeswitch/trunk/libs/spandsp/tests/t4_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/t4_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/t4_tests.c	Mon Mar  2 10:24:30 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t4_tests.c,v 1.67 2009/02/20 12:34:20 steveu Exp $
+ * $Id: t4_tests.c,v 1.68 2009/03/01 12:39:02 steveu Exp $
  */
 
 /*! \file */
@@ -341,6 +341,17 @@
                         break;
                 }
             }
+            else if (sscanf(buf, "%08x  %02x %02x %02x", (unsigned int *) &bit, (unsigned int *) &bit, (unsigned int *) &bit, (unsigned int *) &bit) == 4)
+            {
+                for (i = 0;  i < 16;  i++)
+                {
+                    if (sscanf(&buf[10 + 3*i], "%x", (unsigned int *) &bit) != 1)
+                        break;
+                    bit = bit_reverse8(bit);
+                    if ((end_of_page = t4_rx_put_byte(&receive_state, bit)))
+                        break;
+                }
+            }
             else if (sscanf(buf, "Rx bit %*d - %d", &bit) == 1)
             {
                 if ((end_of_page = t4_rx_put_bit(&receive_state, bit)))


From mikej at freeswitch.org  Mon Mar  2 08:31:34 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:31:34 -0600
Subject: [Freeswitch-svn] [commit] r12353 -
	freeswitch/trunk/libs/libsndfile/src
Message-ID: <E1LeB3G-0004Ef-B8@svn.freeswitch.org>

Author: mikej
Date: Mon Mar  2 10:31:34 2009
New Revision: 12353

Log:
libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134)

Modified:
   freeswitch/trunk/libs/libsndfile/src/create_symbols_file.py   (props changed)


From mrene at freeswitch.org  Mon Mar  2 08:36:59 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:36:59 -0600
Subject: [Freeswitch-svn] [commit] r12354 - freeswitch/trunk/support-d
Message-ID: <E1LeB8V-0004Xk-9S@svn.freeswitch.org>

Author: mrene
Date: Mon Mar  2 10:36:59 2009
New Revision: 12354

Log:
typo

Modified:
   freeswitch/trunk/support-d/.gdbinit

Modified: freeswitch/trunk/support-d/.gdbinit
==============================================================================
--- freeswitch/trunk/support-d/.gdbinit	(original)
+++ freeswitch/trunk/support-d/.gdbinit	Mon Mar  2 10:36:59 2009
@@ -58,5 +58,5 @@
 end
 document event_dump
 Usage: event_dump [switch_event_t*]
-Print and event's headers and values
+Print an event's headers and values
 end
\ No newline at end of file


From brian at freeswitch.org  Mon Mar  2 08:40:22 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:40:22 -0600
Subject: [Freeswitch-svn] [commit] r12355 - freeswitch/trunk/conf/dialplan
Message-ID: <E1LeBBm-0004aT-3t@svn.freeswitch.org>

Author: brian
Date: Mon Mar  2 10:40:21 2009
New Revision: 12355

Log:
 typo

Modified:
   freeswitch/trunk/conf/dialplan/default.xml

Modified: freeswitch/trunk/conf/dialplan/default.xml
==============================================================================
--- freeswitch/trunk/conf/dialplan/default.xml	(original)
+++ freeswitch/trunk/conf/dialplan/default.xml	Mon Mar  2 10:40:21 2009
@@ -368,7 +368,7 @@
     </extension>
 
     <!-- Create a conference on the fly and pull someone in at the same time. --> 
-    <extension name="dyanmic conference">
+    <extension name="dynamic_conference">
       <condition field="destination_number" expression="^5001$">
 	<action application="conference" data="bridge:mydynaconf:sofia/${use_profile}/1234 at conference.freeswitch.org"/>
       </condition>


From brian at freeswitch.org  Mon Mar  2 08:47:09 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 10:47:09 -0600
Subject: [Freeswitch-svn] [commit] r12356 - freeswitch/trunk/conf/dialplan
Message-ID: <E1LeBIL-0004dO-FK@svn.freeswitch.org>

Author: brian
Date: Mon Mar  2 10:47:09 2009
New Revision: 12356

Log:
 typo

Modified:
   freeswitch/trunk/conf/dialplan/default.xml

Modified: freeswitch/trunk/conf/dialplan/default.xml
==============================================================================
--- freeswitch/trunk/conf/dialplan/default.xml	(original)
+++ freeswitch/trunk/conf/dialplan/default.xml	Mon Mar  2 10:47:09 2009
@@ -375,7 +375,7 @@
     </extension>
 
     <extension name="rtp_multicast_page">
-      <condition field="destination_number" expression="^pagegroup$|^7243">
+      <condition field="destination_number" expression="^pagegroup$|^7243$">
 	<action application="answer"/>
 	<action application="esf_page_group"/>
       </condition>


From anthm at freeswitch.org  Mon Mar  2 11:30:41 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 13:30:41 -0600
Subject: [Freeswitch-svn] [commit] r12357 - freeswitch/trunk/src
Message-ID: <E1LeDqb-0006FK-HP@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 13:30:41 2009
New Revision: 12357

Log:
refactor record code in the core

Modified:
   freeswitch/trunk/src/switch_core_media_bug.c
   freeswitch/trunk/src/switch_ivr_async.c

Modified: freeswitch/trunk/src/switch_core_media_bug.c
==============================================================================
--- freeswitch/trunk/src/switch_core_media_bug.c	(original)
+++ freeswitch/trunk/src/switch_core_media_bug.c	Mon Mar  2 13:30:41 2009
@@ -104,105 +104,88 @@
 
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame)
 {
-	uint32_t bytes = 0;
-	uint32_t datalen = 0;
+	switch_size_t bytes = 0, datalen = 0;
 	int16_t *dp, *fp;
 	uint32_t x;
 	size_t rlen = 0;
 	size_t wlen = 0;
 	uint32_t blen;
-	size_t rdlen = 0;
-	uint32_t maxlen;
 	switch_codec_implementation_t read_impl = {0};
-	switch_core_session_get_read_impl(bug->session, &read_impl);
+	int16_t *tp;
 
-	if (bug->raw_read_buffer) {
-		rlen = switch_buffer_inuse(bug->raw_read_buffer);
-	}
+	switch_core_session_get_read_impl(bug->session, &read_impl);
 
-	if (bug->raw_write_buffer) {
-		wlen = switch_buffer_inuse(bug->raw_write_buffer);
-	}
+	bytes = read_impl.decoded_bytes_per_packet;
 
-	if ((bug->raw_read_buffer && bug->raw_write_buffer) && (!rlen && !wlen)) {
+	if (frame->buflen < bytes) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s frame buffer too small!\n", switch_channel_get_name(bug->session->channel));
 		return SWITCH_STATUS_FALSE;
 	}
-
-	maxlen = SWITCH_RECOMMENDED_BUFFER_SIZE > frame->buflen ? frame->buflen : SWITCH_RECOMMENDED_BUFFER_SIZE;
-
-	if ((rdlen = rlen > wlen ? wlen : rlen) > maxlen) {
-		rdlen = maxlen;
-	}
-
-	if (!rdlen) {
-		rdlen = maxlen;
+	
+	if (!(bug->raw_read_buffer && bug->raw_write_buffer)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel));
 	}
-
+	
 	frame->datalen = 0;
-
-	if (rlen) {
-		switch_mutex_lock(bug->read_mutex);
-
-		frame->datalen = (uint32_t) switch_buffer_read(bug->raw_read_buffer, frame->data, rdlen);
-		switch_mutex_unlock(bug->read_mutex);
-	}
-
-	if (wlen) {
-		switch_mutex_lock(bug->write_mutex);
-		datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, rdlen);
-		switch_mutex_unlock(bug->write_mutex);
+	
+	switch_mutex_lock(bug->read_mutex);
+	frame->datalen = (uint32_t) switch_buffer_read(bug->raw_read_buffer, frame->data, bytes);
+	if (frame->datalen < bytes) {
+		memset(((unsigned char *)frame->data) + frame->datalen, 0, bytes - frame->datalen);
+		frame->datalen = bytes;
 	}
-
-
-	bytes = (datalen > frame->datalen) ? datalen : frame->datalen;
-	switch_assert(bytes <= maxlen);
-
-	if (bytes) {
-		int16_t *tp = bug->tmp;
-
-		dp = (int16_t *) bug->data;
-		fp = (int16_t *) frame->data;
-		rlen = frame->datalen / 2;
-		wlen = datalen / 2;
-		blen = bytes / 2;
-
-		if (switch_test_flag(bug, SMBF_STEREO)) {
-			for (x = 0; x < blen; x++) {
-				if (x < rlen) {
-					*(tp++) = *(fp + x);
-				} else {
-					*(tp++) = 0;
-				}
-				if (x < wlen) {
-					*(tp++) = *(dp + x);
-				} else {
-					*(tp++) = 0;
-				}
+	switch_mutex_unlock(bug->read_mutex);
+	
+	switch_mutex_lock(bug->write_mutex);
+	datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes);
+	if (datalen < bytes) {
+		memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen);
+		datalen = bytes;
+	}
+	switch_mutex_unlock(bug->write_mutex);
+
+	tp = bug->tmp;
+	dp = (int16_t *) bug->data;
+	fp = (int16_t *) frame->data;
+	rlen = frame->datalen / 2;
+	wlen = datalen / 2;
+	blen = bytes / 2;
+	
+	if (switch_test_flag(bug, SMBF_STEREO)) {
+		for (x = 0; x < blen; x++) {
+			if (x < rlen) {
+				*(tp++) = *(fp + x);
+			} else {
+				*(tp++) = 0;
 			}
-			memcpy(frame->data, bug->tmp, bytes * 2);
-		} else {
-			for (x = 0; x < blen; x++) {
-				int32_t z = 0;
-
-				if (x < rlen) {
-					z += (int32_t) *(fp + x);
-				}
-				if (x < wlen) {
-					z += (int32_t) *(dp + x);
-				}
-				switch_normalize_to_16bit(z);
-				*(fp + x) = (int16_t) z;
+			if (x < wlen) {
+				*(tp++) = *(dp + x);
+			} else {
+				*(tp++) = 0;
 			}
 		}
+		memcpy(frame->data, bug->tmp, bytes * 2);
+	} else {
+		for (x = 0; x < blen; x++) {
+			int32_t z = 0;
 
-		frame->datalen = bytes;
-		frame->samples = bytes / sizeof(int16_t);
-		frame->rate = read_impl.actual_samples_per_second;
-
-		return SWITCH_STATUS_SUCCESS;
+			if (x < rlen) {
+				z += (int32_t) *(fp + x);
+			}
+			if (x < wlen) {
+				z += (int32_t) *(dp + x);
+			}
+			switch_normalize_to_16bit(z);
+			*(fp + x) = (int16_t) z / 2;
+		}
 	}
 
-	return SWITCH_STATUS_FALSE;
+	frame->datalen = bytes;
+	frame->samples = bytes / sizeof(int16_t);
+	frame->rate = read_impl.actual_samples_per_second;
+	frame->codec = NULL;
+	
+	return SWITCH_STATUS_SUCCESS;
 }
 
 #define MAX_BUG_BUFFER 1024 * 512

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Mon Mar  2 13:30:41 2009
@@ -413,11 +413,6 @@
 static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
 {
 	switch_file_handle_t *fh = (switch_file_handle_t *) user_data;
-	uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	switch_frame_t frame = { 0 };
-
-	frame.data = data;
-	frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 
 	switch (type) {
 	case SWITCH_ABC_TYPE_INIT:
@@ -427,11 +422,16 @@
 			switch_core_file_close(fh);
 		}
 		break;
-	case SWITCH_ABC_TYPE_READ:
+	case SWITCH_ABC_TYPE_READ_PING:
 		if (fh) {
 			switch_size_t len;
 			switch_core_session_t *session = switch_core_media_bug_get_session(bug);
 			switch_channel_t *channel = switch_core_session_get_channel(session);
+			uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
+			switch_frame_t frame = { 0 };
+			
+			frame.data = data;
+			frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 
 			if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) {
 				int doit = 1;
@@ -441,7 +441,7 @@
 
 				if (doit) {
 					len = (switch_size_t) frame.datalen / 2;
-					switch_core_file_write(fh, frame.data, &len);
+					switch_core_file_write(fh, data, &len);
 				}
 			}
 		}
@@ -482,7 +482,7 @@
 	struct eavesdrop_pvt *ep = (struct eavesdrop_pvt *) user_data;
 	uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
 	switch_frame_t frame = { 0 };
-
+	
 	frame.data = data;
 	frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 
@@ -494,7 +494,7 @@
 	case SWITCH_ABC_TYPE_WRITE:
 		break;
 	case SWITCH_ABC_TYPE_READ_PING:
-		if (ep->buffer) {
+		if (ep->buffer) {			
 			if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) {
 				switch_buffer_lock(ep->buffer);
 				switch_buffer_zwrite(ep->buffer, frame.data, frame.datalen);
@@ -821,7 +821,7 @@
 	switch_media_bug_t *bug;
 	switch_status_t status;
 	time_t to = 0;
-	switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM;
+	switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_PING;
 	uint8_t channels;
 	switch_codec_implementation_t read_impl = {0};
     switch_core_session_get_read_impl(session, &read_impl);


From anthm at freeswitch.org  Mon Mar  2 11:43:17 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 13:43:17 -0600
Subject: [Freeswitch-svn] [commit] r12358 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LeE2n-0006KW-V0@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 13:43:17 2009
New Revision: 12358

Log:
MODENDP-192

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Mon Mar  2 13:43:17 2009
@@ -2355,6 +2355,10 @@
 
 	nchannel = switch_core_session_get_channel(nsession);
 
+	if ((hval = switch_event_get_header(var_event, "sip_invite_to_uri"))) {
+		dest_to = switch_core_session_strdup(nsession, hval);
+	}
+
 	if (!strncasecmp(profile_name, "gateway", 7)) {
 		char *gw, *params;
 		sofia_gateway_t *gateway_ptr = NULL;


From anthm at freeswitch.org  Mon Mar  2 12:52:46 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 14:52:46 -0600
Subject: [Freeswitch-svn] [commit] r12359 - in freeswitch/trunk/libs/esl:
	lua perl php python ruby src src/include
Message-ID: <E1LeF82-0007EA-Ql@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 14:52:46 2009
New Revision: 12359

Log:
add some methods

Modified:
   freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
   freeswitch/trunk/libs/esl/perl/ESL.pm
   freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
   freeswitch/trunk/libs/esl/perl/events.pl
   freeswitch/trunk/libs/esl/php/ESL.php
   freeswitch/trunk/libs/esl/php/esl_wrap.cpp
   freeswitch/trunk/libs/esl/php/php_ESL.h
   freeswitch/trunk/libs/esl/python/_ESL.py
   freeswitch/trunk/libs/esl/python/esl_wrap.cpp
   freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
   freeswitch/trunk/libs/esl/src/esl_oop.cpp
   freeswitch/trunk/libs/esl/src/include/esl_oop.h

Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	Mon Mar  2 14:52:46 2009
@@ -2084,6 +2084,56 @@
 }
 
 
+static int _wrap_ESLevent_firstHeader(lua_State* L) {
+  int SWIG_arg = -1;
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  
+  SWIG_check_num_args("firstHeader",1,1)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("firstHeader",1,"ESLevent *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLevent,0))){
+    SWIG_fail_ptr("ESLevent_firstHeader",1,SWIGTYPE_p_ESLevent);
+  }
+  
+  result = (char *)(arg1)->firstHeader();
+  SWIG_arg=0;
+  lua_pushstring(L,(const char*)result); SWIG_arg++;
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
+static int _wrap_ESLevent_nextHeader(lua_State* L) {
+  int SWIG_arg = -1;
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  
+  SWIG_check_num_args("nextHeader",1,1)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("nextHeader",1,"ESLevent *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLevent,0))){
+    SWIG_fail_ptr("ESLevent_nextHeader",1,SWIGTYPE_p_ESLevent);
+  }
+  
+  result = (char *)(arg1)->nextHeader();
+  SWIG_arg=0;
+  lua_pushstring(L,(const char*)result); SWIG_arg++;
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static void swig_delete_ESLevent(void *obj) {
 ESLevent *arg1 = (ESLevent *) obj;
 delete arg1;
@@ -2097,6 +2147,8 @@
     {"addBody", _wrap_ESLevent_addBody}, 
     {"addHeader", _wrap_ESLevent_addHeader}, 
     {"delHeader", _wrap_ESLevent_delHeader}, 
+    {"firstHeader", _wrap_ESLevent_firstHeader}, 
+    {"nextHeader", _wrap_ESLevent_nextHeader}, 
     {0,0}
 };
 static swig_lua_attribute swig_ESLevent_attributes[] = {

Modified: freeswitch/trunk/libs/esl/perl/ESL.pm
==============================================================================
--- freeswitch/trunk/libs/esl/perl/ESL.pm	(original)
+++ freeswitch/trunk/libs/esl/perl/ESL.pm	Mon Mar  2 14:52:46 2009
@@ -89,6 +89,8 @@
 *addBody = *ESLc::ESLevent_addBody;
 *addHeader = *ESLc::ESLevent_addHeader;
 *delHeader = *ESLc::ESLevent_delHeader;
+*firstHeader = *ESLc::ESLevent_firstHeader;
+*nextHeader = *ESLc::ESLevent_nextHeader;
 sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);

Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	Mon Mar  2 14:52:46 2009
@@ -2504,6 +2504,62 @@
 }
 
 
+XS(_wrap_ESLevent_firstHeader) {
+  {
+    ESLevent *arg1 = (ESLevent *) 0 ;
+    char *result = 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: ESLevent_firstHeader(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLevent, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLevent_firstHeader" "', argument " "1"" of type '" "ESLevent *""'"); 
+    }
+    arg1 = reinterpret_cast< ESLevent * >(argp1);
+    result = (char *)(arg1)->firstHeader();
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_ESLevent_nextHeader) {
+  {
+    ESLevent *arg1 = (ESLevent *) 0 ;
+    char *result = 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: ESLevent_nextHeader(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLevent, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLevent_nextHeader" "', argument " "1"" of type '" "ESLevent *""'"); 
+    }
+    arg1 = reinterpret_cast< ESLevent * >(argp1);
+    result = (char *)(arg1)->nextHeader();
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_new_ESLconnection__SWIG_0) {
   {
     char *arg1 = (char *) 0 ;
@@ -3361,6 +3417,8 @@
 {"ESLc::ESLevent_addBody", _wrap_ESLevent_addBody},
 {"ESLc::ESLevent_addHeader", _wrap_ESLevent_addHeader},
 {"ESLc::ESLevent_delHeader", _wrap_ESLevent_delHeader},
+{"ESLc::ESLevent_firstHeader", _wrap_ESLevent_firstHeader},
+{"ESLc::ESLevent_nextHeader", _wrap_ESLevent_nextHeader},
 {"ESLc::new_ESLconnection", _wrap_new_ESLconnection},
 {"ESLc::delete_ESLconnection", _wrap_delete_ESLconnection},
 {"ESLc::ESLconnection_connected", _wrap_ESLconnection_connected},

Modified: freeswitch/trunk/libs/esl/perl/events.pl
==============================================================================
--- freeswitch/trunk/libs/esl/perl/events.pl	(original)
+++ freeswitch/trunk/libs/esl/perl/events.pl	Mon Mar  2 14:52:46 2009
@@ -4,12 +4,18 @@
 
 $con->events("plain", "all");
 
-for(;;) {
+while($con->connected()) {
   #my $e = $con->recvEventTimed(100);
   my $e = $con->recvEvent();
 
   if ($e) {
-    print $e->serialize();
+    #print $e->serialize();
+    my $h = $e->firstHeader();
+    while ($h) {
+      printf "Header: [%s] = [%s]\n", $h, $e->getHeader($h);
+      $h = $e->nextHeader();
+    }
+
   }
 
 }

Modified: freeswitch/trunk/libs/esl/php/ESL.php
==============================================================================
--- freeswitch/trunk/libs/esl/php/ESL.php	(original)
+++ freeswitch/trunk/libs/esl/php/ESL.php	Mon Mar  2 14:52:46 2009
@@ -99,6 +99,14 @@
 	function delHeader($header_name) {
 		return ESLevent_delHeader($this->_cPtr,$header_name);
 	}
+
+	function firstHeader() {
+		return ESLevent_firstHeader($this->_cPtr);
+	}
+
+	function nextHeader() {
+		return ESLevent_nextHeader($this->_cPtr);
+	}
 }
 
 class ESLconnection {

Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp	Mon Mar  2 14:52:46 2009
@@ -1091,7 +1091,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1159,7 +1159,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
   convert_to_long_ex(args[1]);
   arg2 = (int) Z_LVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1213,13 +1213,13 @@
   WRONG_PARAM_COUNT;
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[0]);
   arg1 = (char *) Z_STRVAL_PP(args[0]);
   /*@SWIG@*/;
   
   if(arg_count > 1) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
     convert_to_string_ex(args[1]);
     arg2 = (char *) Z_STRVAL_PP(args[1]);
     /*@SWIG@*/;
@@ -1254,7 +1254,7 @@
     }
   }
   if(arg_count > 1) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
     convert_to_long_ex(args[1]);
     arg2 = (int) Z_LVAL_PP(args[1]);
     /*@SWIG@*/;
@@ -1384,7 +1384,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   if(arg_count > 1) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
     convert_to_string_ex(args[1]);
     arg2 = (char *) Z_STRVAL_PP(args[1]);
     /*@SWIG@*/;
@@ -1460,7 +1460,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1557,7 +1557,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1591,13 +1591,13 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[2]);
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
@@ -1630,7 +1630,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1645,6 +1645,66 @@
 }
 
 
+ZEND_NAMED_FUNCTION(_wrap_ESLevent_firstHeader) {
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  zval **args[1];
+  
+  SWIG_ResetError();
+  if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {
+    WRONG_PARAM_COUNT;
+  }
+  
+  {
+    if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLevent, 0) < 0) {
+      SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLevent_firstHeader. Expected SWIGTYPE_p_ESLevent");
+    }
+  }
+  if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
+  result = (char *)(arg1)->firstHeader();
+  {
+    if(!result) {
+      ZVAL_NULL(return_value);
+    } else {
+      ZVAL_STRING(return_value,result, 1);
+    }
+  }
+  return;
+fail:
+  zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
+}
+
+
+ZEND_NAMED_FUNCTION(_wrap_ESLevent_nextHeader) {
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  zval **args[1];
+  
+  SWIG_ResetError();
+  if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {
+    WRONG_PARAM_COUNT;
+  }
+  
+  {
+    if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLevent, 0) < 0) {
+      SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLevent_nextHeader. Expected SWIGTYPE_p_ESLevent");
+    }
+  }
+  if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
+  result = (char *)(arg1)->nextHeader();
+  {
+    if(!result) {
+      ZVAL_NULL(return_value);
+    } else {
+      ZVAL_STRING(return_value,result, 1);
+    }
+  }
+  return;
+fail:
+  zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
+}
+
+
 ZEND_NAMED_FUNCTION(_wrap_new_ESLconnection__SWIG_0) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -1658,19 +1718,19 @@
   }
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[0]);
   arg1 = (char *) Z_STRVAL_PP(args[0]);
   /*@SWIG@*/;
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[2]);
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
@@ -1696,7 +1756,7 @@
   }
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
   convert_to_long_ex(args[0]);
   arg1 = (int) Z_LVAL_PP(args[0]);
   /*@SWIG@*/;
@@ -1831,7 +1891,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1864,7 +1924,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -1900,13 +1960,13 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   if(arg_count > 2) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
     convert_to_string_ex(args[2]);
     arg3 = (char *) Z_STRVAL_PP(args[2]);
     /*@SWIG@*/;
@@ -1943,13 +2003,13 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   if(arg_count > 2) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
     convert_to_string_ex(args[2]);
     arg3 = (char *) Z_STRVAL_PP(args[2]);
     /*@SWIG@*/;
@@ -2041,7 +2101,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
   convert_to_long_ex(args[1]);
   arg2 = (int) Z_LVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -2075,13 +2135,13 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[2]);
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
@@ -2115,13 +2175,13 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[2]);
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
@@ -2158,20 +2218,20 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
   if(arg_count > 2) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
     convert_to_string_ex(args[2]);
     arg3 = (char *) Z_STRVAL_PP(args[2]);
     /*@SWIG@*/;
     
   }
   if(arg_count > 3) {
-    /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+    /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
     convert_to_string_ex(args[3]);
     arg4 = (char *) Z_STRVAL_PP(args[3]);
     /*@SWIG@*/;
@@ -2205,7 +2265,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -2238,7 +2298,7 @@
   }
   if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
   convert_to_string_ex(args[1]);
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
@@ -2263,7 +2323,7 @@
   }
   
   
-  /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+  /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
   convert_to_long_ex(args[0]);
   arg1 = (int) Z_LVAL_PP(args[0]);
   /*@SWIG@*/;
@@ -2314,6 +2374,8 @@
  SWIG_ZEND_NAMED_FE(eslevent_addbody,_wrap_ESLevent_addBody,NULL)
  SWIG_ZEND_NAMED_FE(eslevent_addheader,_wrap_ESLevent_addHeader,NULL)
  SWIG_ZEND_NAMED_FE(eslevent_delheader,_wrap_ESLevent_delHeader,NULL)
+ SWIG_ZEND_NAMED_FE(eslevent_firstheader,_wrap_ESLevent_firstHeader,NULL)
+ SWIG_ZEND_NAMED_FE(eslevent_nextheader,_wrap_ESLevent_nextHeader,NULL)
  SWIG_ZEND_NAMED_FE(new_eslconnection,_wrap_new_ESLconnection,NULL)
  SWIG_ZEND_NAMED_FE(eslconnection_connected,_wrap_ESLconnection_connected,NULL)
  SWIG_ZEND_NAMED_FE(eslconnection_getinfo,_wrap_ESLconnection_getInfo,NULL)

Modified: freeswitch/trunk/libs/esl/php/php_ESL.h
==============================================================================
--- freeswitch/trunk/libs/esl/php/php_ESL.h	(original)
+++ freeswitch/trunk/libs/esl/php/php_ESL.h	Mon Mar  2 14:52:46 2009
@@ -47,6 +47,8 @@
 ZEND_NAMED_FUNCTION(_wrap_ESLevent_addBody);
 ZEND_NAMED_FUNCTION(_wrap_ESLevent_addHeader);
 ZEND_NAMED_FUNCTION(_wrap_ESLevent_delHeader);
+ZEND_NAMED_FUNCTION(_wrap_ESLevent_firstHeader);
+ZEND_NAMED_FUNCTION(_wrap_ESLevent_nextHeader);
 ZEND_NAMED_FUNCTION(_wrap_new_ESLconnection);
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_connected);
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_getInfo);

Modified: freeswitch/trunk/libs/esl/python/_ESL.py
==============================================================================
--- freeswitch/trunk/libs/esl/python/_ESL.py	(original)
+++ freeswitch/trunk/libs/esl/python/_ESL.py	Mon Mar  2 14:52:46 2009
@@ -60,6 +60,8 @@
     def addBody(*args): return apply(__ESL.ESLevent_addBody, args)
     def addHeader(*args): return apply(__ESL.ESLevent_addHeader, args)
     def delHeader(*args): return apply(__ESL.ESLevent_delHeader, args)
+    def firstHeader(*args): return apply(__ESL.ESLevent_firstHeader, args)
+    def nextHeader(*args): return apply(__ESL.ESLevent_nextHeader, args)
 ESLevent_swigregister = __ESL.ESLevent_swigregister
 ESLevent_swigregister(ESLevent)
 

Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp	Mon Mar  2 14:52:46 2009
@@ -3469,6 +3469,50 @@
 }
 
 
+SWIGINTERN PyObject *_wrap_ESLevent_firstHeader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ESLevent_firstHeader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLevent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLevent_firstHeader" "', argument " "1"" of type '" "ESLevent *""'"); 
+  }
+  arg1 = reinterpret_cast< ESLevent * >(argp1);
+  result = (char *)(arg1)->firstHeader();
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ESLevent_nextHeader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ESLevent_nextHeader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLevent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLevent_nextHeader" "', argument " "1"" of type '" "ESLevent *""'"); 
+  }
+  arg1 = reinterpret_cast< ESLevent * >(argp1);
+  result = (char *)(arg1)->nextHeader();
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *ESLevent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -4174,6 +4218,8 @@
 	 { (char *)"ESLevent_addBody", _wrap_ESLevent_addBody, METH_VARARGS, NULL},
 	 { (char *)"ESLevent_addHeader", _wrap_ESLevent_addHeader, METH_VARARGS, NULL},
 	 { (char *)"ESLevent_delHeader", _wrap_ESLevent_delHeader, METH_VARARGS, NULL},
+	 { (char *)"ESLevent_firstHeader", _wrap_ESLevent_firstHeader, METH_VARARGS, NULL},
+	 { (char *)"ESLevent_nextHeader", _wrap_ESLevent_nextHeader, METH_VARARGS, NULL},
 	 { (char *)"ESLevent_swigregister", ESLevent_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_ESLconnection", _wrap_new_ESLconnection, METH_VARARGS, NULL},
 	 { (char *)"delete_ESLconnection", _wrap_delete_ESLconnection, METH_VARARGS, NULL},

Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	Mon Mar  2 14:52:46 2009
@@ -1902,7 +1902,7 @@
 } 
 
 
-/*@SWIG:/usr/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2591,6 +2591,54 @@
 }
 
 
+SWIGINTERN VALUE
+_wrap_ESLevent_firstHeader(int argc, VALUE *argv, VALUE self) {
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLevent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLevent *","firstHeader", 1, self )); 
+  }
+  arg1 = reinterpret_cast< ESLevent * >(argp1);
+  result = (char *)(arg1)->firstHeader();
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_ESLevent_nextHeader(int argc, VALUE *argv, VALUE self) {
+  ESLevent *arg1 = (ESLevent *) 0 ;
+  char *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLevent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLevent *","nextHeader", 1, self )); 
+  }
+  arg1 = reinterpret_cast< ESLevent * >(argp1);
+  result = (char *)(arg1)->nextHeader();
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 swig_class cESLconnection;
 
 SWIGINTERN VALUE
@@ -3586,6 +3634,8 @@
   rb_define_method(cESLevent.klass, "addBody", VALUEFUNC(_wrap_ESLevent_addBody), -1);
   rb_define_method(cESLevent.klass, "addHeader", VALUEFUNC(_wrap_ESLevent_addHeader), -1);
   rb_define_method(cESLevent.klass, "delHeader", VALUEFUNC(_wrap_ESLevent_delHeader), -1);
+  rb_define_method(cESLevent.klass, "firstHeader", VALUEFUNC(_wrap_ESLevent_firstHeader), -1);
+  rb_define_method(cESLevent.klass, "nextHeader", VALUEFUNC(_wrap_ESLevent_nextHeader), -1);
   cESLevent.mark = 0;
   cESLevent.destroy = (void (*)(void *)) free_ESLevent;
   cESLevent.trackObjects = 0;

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Mon Mar  2 14:52:46 2009
@@ -2,7 +2,7 @@
 #include <esl_oop.h>
 
 #define connection_construct_common() memset(&handle, 0, sizeof(handle)); last_event_obj = NULL
-#define event_construct_common() event = NULL; serialized_string = NULL; mine = 0
+#define event_construct_common() event = NULL; serialized_string = NULL; mine = 0; hp = NULL
 
 void eslSetLogLevel(int level)
 {
@@ -264,6 +264,26 @@
 	}
 }
 
+const char *ESLevent::nextHeader(void)
+{
+	const char *name = NULL;
+
+	if (hp) {
+		name = hp->name;
+		hp = hp->next;
+	}
+
+	return name;
+}
+
+const char *ESLevent::firstHeader(void)
+{
+	if (event) {
+		hp = event->headers;
+	}
+
+	return nextHeader();
+}
 
 const char *ESLevent::serialize(const char *format)
 {

Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h
==============================================================================
--- freeswitch/trunk/libs/esl/src/include/esl_oop.h	(original)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h	Mon Mar  2 14:52:46 2009
@@ -44,6 +44,8 @@
 
 
 class ESLevent {
+ private:
+	esl_event_header_t *hp;
  public:
 	esl_event_t *event;
 	char *serialized_string;
@@ -61,6 +63,8 @@
 	bool addBody(const char *value);
 	bool addHeader(const char *header_name, const char *value);
 	bool delHeader(const char *header_name);
+	const char *firstHeader(void);
+	const char *nextHeader(void);
 };
 
 


From anthm at freeswitch.org  Mon Mar  2 14:19:36 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 16:19:36 -0600
Subject: [Freeswitch-svn] [commit] r12360 - freeswitch/trunk/libs/esl/src
Message-ID: <E1LeGU4-0007tk-RC@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 16:19:36 2009
New Revision: 12360

Log:
ESL-4

Modified:
   freeswitch/trunk/libs/esl/src/esl_oop.cpp

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Mon Mar  2 16:19:36 2009
@@ -69,7 +69,8 @@
 	assert(cmd_buf);
 
 	snprintf(cmd_buf, len, "api %s %s", cmd, arg ? arg : "");
-	*(cmd_buf + len) = '\0';
+	*(cmd_buf + (len + 1)) = '\0';
+
 
 	if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) {
 		esl_event_t *event;


From anthm at freeswitch.org  Mon Mar  2 15:55:00 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 17:55:00 -0600
Subject: [Freeswitch-svn] [commit] r12361 - in freeswitch/trunk/src: .
	mod/endpoints/mod_sofia
Message-ID: <E1LeHyO-0000qu-KZ@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 17:55:00 2009
New Revision: 12361

Log:
FSCORE-297

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/switch_scheduler.c
   freeswitch/trunk/src/switch_time.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Mon Mar  2 17:55:00 2009
@@ -394,9 +394,9 @@
 											(char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0,
 											REG_INVITE, NULL);
 		}
-
+		
 		if (auth_res != AUTH_OK) {
-			switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+			//switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 			nua_respond(nh, SIP_401_UNAUTHORIZED, TAG_END());
 			goto done;
 		}

Modified: freeswitch/trunk/src/switch_scheduler.c
==============================================================================
--- freeswitch/trunk/src/switch_scheduler.c	(original)
+++ freeswitch/trunk/src/switch_scheduler.c	Mon Mar  2 17:55:00 2009
@@ -285,9 +285,11 @@
 	return delcnt;
 }
 
+switch_thread_t *task_thread_p = NULL;
+
 SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void)
 {
-	switch_thread_t *thread;
+
 	switch_threadattr_t *thd_attr;
 
 	switch_core_new_memory_pool(&globals.memory_pool);
@@ -295,7 +297,7 @@
 	switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool);
 
 	switch_threadattr_detach_set(thd_attr, 1);
-	switch_thread_create(&thread, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
+	switch_thread_create(task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
 }
 
 SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)
@@ -303,8 +305,11 @@
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping Task Thread\n");
 	if (globals.task_thread_running == 1) {
 		int sanity = 0;
+		switch_status_t st;
 
 		globals.task_thread_running = -1;
+		
+		switch_thread_join(&st, task_thread_p);
 
 		while (globals.task_thread_running) {
 			switch_yield(100000);

Modified: freeswitch/trunk/src/switch_time.c
==============================================================================
--- freeswitch/trunk/src/switch_time.c	(original)
+++ freeswitch/trunk/src/switch_time.c	Mon Mar  2 17:55:00 2009
@@ -174,7 +174,7 @@
 SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
 {
 
-	if (t < 1000 || t >= 10000) {
+	if (!globals.RUNNING || t < 1000 || t >= 10000) {
 		do_sleep(t);
 		return;
 	}


From anthm at freeswitch.org  Mon Mar  2 15:59:04 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 17:59:04 -0600
Subject: [Freeswitch-svn] [commit] r12362 - freeswitch/trunk/libs/esl/src
Message-ID: <E1LeI2K-0000tY-H2@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 17:59:04 2009
New Revision: 12362

Log:
return nothing on timeout

Modified:
   freeswitch/trunk/libs/esl/src/esl_oop.cpp

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Mon Mar  2 17:59:04 2009
@@ -186,8 +186,7 @@
 		}
     }
 	
-	last_event_obj = new ESLevent("server_disconnected");
-	return last_event_obj;
+	return NULL;
 }
 
 int ESLconnection::filter(const char *header, const char *value)


From anthm at freeswitch.org  Mon Mar  2 16:21:11 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 18:21:11 -0600
Subject: [Freeswitch-svn] [commit] r12363 - freeswitch/trunk/src
Message-ID: <E1LeINj-00011v-4b@svn.freeswitch.org>

Author: anthm
Date: Mon Mar  2 18:21:11 2009
New Revision: 12363

Log:
doh

Modified:
   freeswitch/trunk/src/switch_scheduler.c

Modified: freeswitch/trunk/src/switch_scheduler.c
==============================================================================
--- freeswitch/trunk/src/switch_scheduler.c	(original)
+++ freeswitch/trunk/src/switch_scheduler.c	Mon Mar  2 18:21:11 2009
@@ -297,7 +297,7 @@
 	switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool);
 
 	switch_threadattr_detach_set(thd_attr, 1);
-	switch_thread_create(task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
+	switch_thread_create(&task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
 }
 
 SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)


From mcollins at freeswitch.org  Mon Mar  2 16:28:16 2009
From: mcollins at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 18:28:16 -0600
Subject: [Freeswitch-svn] [commit] r12364 - freeswitch/trunk/build
Message-ID: <E1LeIUa-0001Lj-UJ@svn.freeswitch.org>

Author: mcollins
Date: Mon Mar  2 18:28:16 2009
New Revision: 12364

Log:
Add commented out mod_http to modules.conf.in

Modified:
   freeswitch/trunk/build/modules.conf.in

Modified: freeswitch/trunk/build/modules.conf.in
==============================================================================
--- freeswitch/trunk/build/modules.conf.in	(original)
+++ freeswitch/trunk/build/modules.conf.in	Mon Mar  2 18:28:16 2009
@@ -7,6 +7,7 @@
 applications/mod_enum
 applications/mod_fifo
 #applications/mod_fax
+#applications/mod_http
 applications/mod_voicemail
 #applications/mod_lcr
 applications/mod_limit


From mrene at freeswitch.org  Mon Mar  2 17:52:25 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 02 Mar 2009 19:52:25 -0600
Subject: [Freeswitch-svn] [commit] r12365 - freeswitch/trunk/src
Message-ID: <E1LeJo1-000212-Po@svn.freeswitch.org>

Author: mrene
Date: Mon Mar  2 19:52:25 2009
New Revision: 12365

Log:
Add log message when the softtimer thread exits

Modified:
   freeswitch/trunk/src/switch_time.c

Modified: freeswitch/trunk/src/switch_time.c
==============================================================================
--- freeswitch/trunk/src/switch_time.c	(original)
+++ freeswitch/trunk/src/switch_time.c	Mon Mar  2 19:52:25 2009
@@ -553,7 +553,7 @@
 	globals.RUNNING = 0;
 	switch_mutex_unlock(globals.mutex);
 
-	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Soft timer thread exiting.\n");
 
 	return SWITCH_STATUS_TERM;
 }


From anthm at freeswitch.org  Tue Mar  3 06:17:29 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 08:17:29 -0600
Subject: [Freeswitch-svn] [commit] r12366 - freeswitch/trunk/src
Message-ID: <E1LeVR3-0005Cu-0U@svn.freeswitch.org>

Author: anthm
Date: Tue Mar  3 08:17:28 2009
New Revision: 12366

Log:
FSCORE-316

Modified:
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Mar  3 08:17:28 2009
@@ -1475,7 +1475,7 @@
 			break;
 		}
 		if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) {
-			if ((x + 3) >= len) {
+			if ((x + 3) > len) {
 				break;
 			}
 			buf[x++] = '%';


From anthm at freeswitch.org  Tue Mar  3 06:21:26 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 08:21:26 -0600
Subject: [Freeswitch-svn] [commit] r12367 -
	freeswitch/trunk/src/mod/applications/mod_voicemail
Message-ID: <E1LeVUs-0005Fh-6C@svn.freeswitch.org>

Author: anthm
Date: Tue Mar  3 08:21:26 2009
New Revision: 12367

Log:
MODAPP-225

Modified:
   freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c

Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c	Tue Mar  3 08:21:26 2009
@@ -2886,6 +2886,8 @@
 	args.buf = buf;
 	args.buflen = sizeof(buf);
 
+	switch_ivr_sleep(session, 100, SWITCH_TRUE, NULL);
+
 	if (!switch_strlen_zero(greet_path)) {
 		memset(buf, 0, sizeof(buf));
 		TRY_CODE(switch_ivr_play_file(session, NULL, greet_path, &args));


From brian at freeswitch.org  Tue Mar  3 08:55:08 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 10:55:08 -0600
Subject: [Freeswitch-svn] [commit] r12368 - freeswitch/trunk/src
Message-ID: <E1LeXtc-0006rV-25@svn.freeswitch.org>

Author: brian
Date: Tue Mar  3 10:55:07 2009
New Revision: 12368

Log:
 fix MODAPP-224 

Modified:
   freeswitch/trunk/src/switch_ivr_async.c

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Tue Mar  3 10:55:07 2009
@@ -182,7 +182,14 @@
 		break;
 	case SWITCH_ABC_TYPE_CLOSE:
 		if (dh) {
+			switch_core_session_t *session = switch_core_media_bug_get_session(bug);
+			switch_channel_t *channel;
+
 			switch_core_file_close(&dh->fh);
+
+			if (session && (channel = switch_core_session_get_channel(session))) {
+				switch_channel_set_private(channel, dh->file, NULL);
+			}
 		}
 		break;
 	case SWITCH_ABC_TYPE_READ_REPLACE:
@@ -256,7 +263,14 @@
 		break;
 	case SWITCH_ABC_TYPE_CLOSE:
 		if (dh) {
+			switch_core_session_t *session = switch_core_media_bug_get_session(bug);
+			switch_channel_t *channel;
+
 			switch_core_file_close(&dh->fh);
+
+			if (session && (channel = switch_core_session_get_channel(session))) {
+				switch_channel_set_private(channel, dh->file, NULL);
+			}
 		}
 		break;
 	case SWITCH_ABC_TYPE_WRITE_REPLACE:


From mrene at freeswitch.org  Tue Mar  3 08:58:25 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 10:58:25 -0600
Subject: [Freeswitch-svn] [commit] r12369 - in freeswitch/trunk/src: .
	include
Message-ID: <E1LeXwn-0006tZ-OE@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 10:58:24 2009
New Revision: 12369

Log:
MODAPP-244 bkw stop trying to commit faster than me :P

Modified:
   freeswitch/trunk/src/include/switch_channel.h
   freeswitch/trunk/src/switch_channel.c
   freeswitch/trunk/src/switch_ivr_async.c

Modified: freeswitch/trunk/src/include/switch_channel.h
==============================================================================
--- freeswitch/trunk/src/include/switch_channel.h	(original)
+++ freeswitch/trunk/src/include/switch_channel.h	Tue Mar  3 10:58:24 2009
@@ -410,6 +410,14 @@
 SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key);
 
 /*!
+  \brief Unsets private from a given channel
+  \param channel channel to unsets data from
+  \param key your private data's unique keyname 
+  \return void pointer to channel's private data
+*/
+SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
+
+/*!
   \brief Assign a name to a given channel
   \param channel channel to assign name to
   \param name name to assign

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Tue Mar  3 10:58:24 2009
@@ -565,6 +565,18 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
+SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key)
+{
+	switch_status_t status;
+	switch_assert(channel != NULL);
+	
+	switch_mutex_lock(channel->profile_mutex);
+	status = switch_core_hash_delete(channel->private_hash, key);
+	switch_mutex_unlock(channel->profile_mutex);
+	
+	return status;
+}
+
 SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key)
 {
 	void *val;

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Tue Mar  3 10:58:24 2009
@@ -188,7 +188,7 @@
 			switch_core_file_close(&dh->fh);
 
 			if (session && (channel = switch_core_session_get_channel(session))) {
-				switch_channel_set_private(channel, dh->file, NULL);
+				switch_channel_unset_private(channel, dh->file);
 			}
 		}
 		break;
@@ -269,7 +269,7 @@
 			switch_core_file_close(&dh->fh);
 
 			if (session && (channel = switch_core_session_get_channel(session))) {
-				switch_channel_set_private(channel, dh->file, NULL);
+				switch_channel_unset_private(channel, dh->file);
 			}
 		}
 		break;


From mrene at freeswitch.org  Tue Mar  3 09:01:50 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:01:50 -0600
Subject: [Freeswitch-svn] [commit] r12370 - in freeswitch/trunk/src: .
	include mod/applications/mod_limit mod/endpoints/mod_sofia
Message-ID: <E1LeY06-0007DX-OS@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 11:01:50 2009
New Revision: 12370

Log:
fix doxygen comment

Modified:
   freeswitch/trunk/src/include/switch_channel.h
   freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/switch_core.c
   freeswitch/trunk/src/switch_core_db.c

Modified: freeswitch/trunk/src/include/switch_channel.h
==============================================================================
--- freeswitch/trunk/src/include/switch_channel.h	(original)
+++ freeswitch/trunk/src/include/switch_channel.h	Tue Mar  3 11:01:50 2009
@@ -413,7 +413,7 @@
   \brief Unsets private from a given channel
   \param channel channel to unsets data from
   \param key your private data's unique keyname 
-  \return void pointer to channel's private data
+  \return SWITCH_STATUS_SUCCESS if data was unset
 */
 SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
 

Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	Tue Mar  3 11:01:50 2009
@@ -289,7 +289,7 @@
 
 	sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname);
 	limit_execute_sql(sql, globals.mutex);
-	switch_safe_free(sql);
+	switch_core_db_free(sql);
 
 	switch_xml_free(xml);
 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Tue Mar  3 11:01:50 2009
@@ -3133,7 +3133,7 @@
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL);
 		}
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 
 		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
@@ -3143,7 +3143,7 @@
 			switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL);
 		}
 
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
@@ -3158,21 +3158,21 @@
 			switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL);
 		}
 
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL);
 		}
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname);
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL);
 		}
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		for (x = 0; indexes[x]; x++) {
 			switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL);
@@ -3192,28 +3192,28 @@
 								  mod_sofia_globals.hostname);
 		
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		
 		test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		
 		test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		
 		switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", 
 							NULL, NULL, NULL);

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Tue Mar  3 11:01:50 2009
@@ -758,7 +758,7 @@
 
  end:
 
-	switch_safe_free(mime_path);
+		switch_core_db_free(mime_path);
 
 }
 
@@ -1034,7 +1034,7 @@
 
 	dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
 	switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
-	switch_safe_free(dir_path);
+	switch_core_db_free(dir_path);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);

Modified: freeswitch/trunk/src/switch_core_db.c
==============================================================================
--- freeswitch/trunk/src/switch_core_db.c	(original)
+++ freeswitch/trunk/src/switch_core_db.c	Tue Mar  3 11:01:50 2009
@@ -85,7 +85,7 @@
 		ret = sqlite3_exec(db, sql, callback, data, &err);
 		if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
 			if (sane > 1) {
-				switch_safe_free(err);
+				switch_core_db_free(err);
 				switch_cond_next();
 				continue;
 			}


From mrene at freeswitch.org  Tue Mar  3 09:03:48 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:03:48 -0600
Subject: [Freeswitch-svn] [commit] r12371 - in freeswitch/trunk/src: .
	include mod/applications/mod_limit mod/endpoints/mod_sofia
Message-ID: <E1LeY20-0007Fk-Pw@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 11:03:48 2009
New Revision: 12371

Log:
Revert 12370

Modified:
   freeswitch/trunk/src/include/switch_channel.h
   freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/switch_core.c
   freeswitch/trunk/src/switch_core_db.c

Modified: freeswitch/trunk/src/include/switch_channel.h
==============================================================================
--- freeswitch/trunk/src/include/switch_channel.h	(original)
+++ freeswitch/trunk/src/include/switch_channel.h	Tue Mar  3 11:03:48 2009
@@ -413,7 +413,7 @@
   \brief Unsets private from a given channel
   \param channel channel to unsets data from
   \param key your private data's unique keyname 
-  \return SWITCH_STATUS_SUCCESS if data was unset
+  \return void pointer to channel's private data
 */
 SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
 

Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	Tue Mar  3 11:03:48 2009
@@ -289,7 +289,7 @@
 
 	sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname);
 	limit_execute_sql(sql, globals.mutex);
-	switch_core_db_free(sql);
+	switch_safe_free(sql);
 
 	switch_xml_free(xml);
 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Tue Mar  3 11:03:48 2009
@@ -3133,7 +3133,7 @@
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL);
 		}
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 
 		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
@@ -3143,7 +3143,7 @@
 			switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL);
 		}
 
-		switch_core_db_free(test_sql);
+		free(test_sql);
 		test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
@@ -3158,21 +3158,21 @@
 			switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL);
 		}
 
-		switch_core_db_free(test_sql);
+		free(test_sql);
 		test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL);
 		}
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname);
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL);
 		}
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 		for (x = 0; indexes[x]; x++) {
 			switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL);
@@ -3192,28 +3192,28 @@
 								  mod_sofia_globals.hostname);
 		
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql);
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql);
-		switch_core_db_free(test_sql);
+		free(test_sql);
 		
 		test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql);
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql);
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql);
-		switch_core_db_free(test_sql);
+		free(test_sql);
 
 		
 		test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql);
-		switch_core_db_free(test_sql);
+		free(test_sql);
 		
 		switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", 
 							NULL, NULL, NULL);

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Tue Mar  3 11:03:48 2009
@@ -758,7 +758,7 @@
 
  end:
 
-		switch_core_db_free(mime_path);
+	switch_safe_free(mime_path);
 
 }
 
@@ -1034,7 +1034,7 @@
 
 	dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
 	switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
-	switch_core_db_free(dir_path);
+	switch_safe_free(dir_path);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);

Modified: freeswitch/trunk/src/switch_core_db.c
==============================================================================
--- freeswitch/trunk/src/switch_core_db.c	(original)
+++ freeswitch/trunk/src/switch_core_db.c	Tue Mar  3 11:03:48 2009
@@ -85,7 +85,7 @@
 		ret = sqlite3_exec(db, sql, callback, data, &err);
 		if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
 			if (sane > 1) {
-				switch_core_db_free(err);
+				switch_safe_free(err);
 				switch_cond_next();
 				continue;
 			}


From mrene at freeswitch.org  Tue Mar  3 09:05:18 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:05:18 -0600
Subject: [Freeswitch-svn] [commit] r12372 - freeswitch/trunk/src/include
Message-ID: <E1LeY3S-0007Hx-0V@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 11:05:17 2009
New Revision: 12372

Log:
Fix doxygen comment without messing with the rest

Modified:
   freeswitch/trunk/src/include/switch_channel.h

Modified: freeswitch/trunk/src/include/switch_channel.h
==============================================================================
--- freeswitch/trunk/src/include/switch_channel.h	(original)
+++ freeswitch/trunk/src/include/switch_channel.h	Tue Mar  3 11:05:17 2009
@@ -413,7 +413,7 @@
   \brief Unsets private from a given channel
   \param channel channel to unsets data from
   \param key your private data's unique keyname 
-  \return void pointer to channel's private data
+  \return void SWITCH_STATUS_SUCCESS if data was unset
 */
 SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
 


From mrene at freeswitch.org  Tue Mar  3 09:14:59 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:14:59 -0600
Subject: [Freeswitch-svn] [commit] r12373 - in freeswitch/trunk/src: .
	include
Message-ID: <E1LeYCp-0007LV-0a@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 11:14:58 2009
New Revision: 12373

Log:
Revert 12369 since inserting NULL is the same as deleting in sqlite3

Modified:
   freeswitch/trunk/src/include/switch_channel.h
   freeswitch/trunk/src/switch_channel.c
   freeswitch/trunk/src/switch_ivr_async.c

Modified: freeswitch/trunk/src/include/switch_channel.h
==============================================================================
--- freeswitch/trunk/src/include/switch_channel.h	(original)
+++ freeswitch/trunk/src/include/switch_channel.h	Tue Mar  3 11:14:58 2009
@@ -410,14 +410,6 @@
 SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key);
 
 /*!
-  \brief Unsets private from a given channel
-  \param channel channel to unsets data from
-  \param key your private data's unique keyname 
-  \return void SWITCH_STATUS_SUCCESS if data was unset
-*/
-SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
-
-/*!
   \brief Assign a name to a given channel
   \param channel channel to assign name to
   \param name name to assign

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Tue Mar  3 11:14:58 2009
@@ -565,18 +565,6 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key)
-{
-	switch_status_t status;
-	switch_assert(channel != NULL);
-	
-	switch_mutex_lock(channel->profile_mutex);
-	status = switch_core_hash_delete(channel->private_hash, key);
-	switch_mutex_unlock(channel->profile_mutex);
-	
-	return status;
-}
-
 SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key)
 {
 	void *val;

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Tue Mar  3 11:14:58 2009
@@ -188,7 +188,7 @@
 			switch_core_file_close(&dh->fh);
 
 			if (session && (channel = switch_core_session_get_channel(session))) {
-				switch_channel_unset_private(channel, dh->file);
+				switch_channel_set_private(channel, dh->file, NULL);
 			}
 		}
 		break;
@@ -269,7 +269,7 @@
 			switch_core_file_close(&dh->fh);
 
 			if (session && (channel = switch_core_session_get_channel(session))) {
-				switch_channel_unset_private(channel, dh->file);
+				switch_channel_set_private(channel, dh->file, NULL);
 			}
 		}
 		break;


From mikej at freeswitch.org  Tue Mar  3 09:19:09 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:19:09 -0600
Subject: [Freeswitch-svn] [commit] r12374 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
Message-ID: <E1LeYGr-0007O6-64@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:19:09 2009
New Revision: 12374

Log:
Tue Mar  3 07:56:30 CST 2009  Pekka Pessi <first.last at nokia.com>
  * tport.c: add TPTAG_LOG() and TPTAG_DUMP() to tport_get_params()
  
  Fixed return value from tport_set_params(), too.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:19:09 2009
@@ -1 +1 @@
-Thu Feb 26 12:40:06 CST 2009
+Tue Mar  3 11:18:41 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c	Tue Mar  3 11:19:09 2009
@@ -472,6 +472,7 @@
   tp_name_t const *tpn;
   tport_t *tp;
   unsigned idle;
+  int logging = -1;
 
   BEGIN();
 
@@ -552,6 +553,15 @@
 			TPTAG_IDLE_REF(idle),
 			TAG_END()), 1);
 
+  /* Check that logging tag works */
+  TEST(tport_get_params(tt->tt_srv_tports,
+			TPTAG_LOG_REF(logging),
+			TAG_END()), 1);
+  TEST(tport_set_params(tt->tt_srv_tports,
+			TPTAG_LOG(logging),
+			TAG_END()), 1);
+
+
   for (tp = tport_primaries(tt->tt_srv_tports); tp; tp = tport_next(tp))
     TEST_S(tport_name(tp)->tpn_ident, "server");
 
@@ -1298,6 +1308,7 @@
   TEST_1(pending_client_close > 0);
   tp = tt->tt_rtport;
   pending_server_close = tport_pend(tp, NULL, server_closed_callback, NULL);
+
   TEST_1(pending_server_close > 0);
 
   /* Send a largish message */

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c	Tue Mar  3 11:19:09 2009
@@ -1196,6 +1196,7 @@
   int n;
   tport_params_t const *tpp;
   int connect;
+  tport_master_t *mr = self->tp_master;
 
   if (self == NULL)
     return su_seterrno(EINVAL);
@@ -1227,6 +1228,10 @@
 		      TPTAG_PUBLIC(self->tp_pri ?
 				   self->tp_pri->pri_public : 0)),
 	       TPTAG_TOS(tpp->tpp_tos),
+	       TAG_IF((void *)self == (void *)mr,
+		      TPTAG_LOG(mr->mr_log != 0)),
+	       TAG_IF((void *)self == (void *)mr,
+		      TPTAG_DUMP(mr->mr_dump)),
 	       TAG_END());
 
   ta_end(ta);
@@ -1321,7 +1326,7 @@
   tpp->tpp_pong2ping = pong2ping;
 
   if (memcmp(tpp0, tpp, sizeof tpp) == 0)
-    return n;
+    return n + m;
 
   if (tport_is_secondary(self) &&
       self->tp_params == self->tp_pri->pri_primary->tp_params) {


From mikej at freeswitch.org  Tue Mar  3 09:19:58 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:19:58 -0600
Subject: [Freeswitch-svn] [commit] r12375 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYHe-0007Pc-FC@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:19:58 2009
New Revision: 12375

Log:
Mon Mar  2 11:21:17 CST 2009  Pekka Pessi <first.last at nokia.com>
  * sl_utils_print.c: propagate error from fwrite()



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:19:58 2009
@@ -1 +1 @@
-Tue Mar  3 11:18:41 CST 2009
+Tue Mar  3 11:19:17 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c	Tue Mar  3 11:19:58 2009
@@ -218,11 +218,18 @@
     crlf = su_strnspn(s + n, end - s - n, "\r\n");
     if (prefix)
       fputs(prefix, stream), total += strlen(prefix);
+v v v v v v v
     actual = fwrite(s, 1, n + crlf, stream) ;
     if (actual == 0)
        return -1;
     s += actual;
     total += actual;
+*************
+    if (fwrite(s, 1, n + crlf, stream) < n + crlf)
+      return (issize_t)-1;
+    s += n + crlf;
+    total += n + crlf;
+^ ^ ^ ^ ^ ^ ^
   }
   if (crlf == 0)
     fputs("\n", stream), total++;


From mikej at freeswitch.org  Tue Mar  3 09:20:24 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:20:24 -0600
Subject: [Freeswitch-svn] [commit] r12376 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
Message-ID: <E1LeYI4-0007Rm-SQ@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:20:24 2009
New Revision: 12376

Log:
Thu Feb 26 15:39:37 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nua/check_simple.c: removed extra debug logging, fixed 6.3.4 name



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:20:24 2009
@@ -1 +1 @@
-Tue Mar  3 11:19:17 CST 2009
+Tue Mar  3 11:20:05 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c	Tue Mar  3 11:20:24 2009
@@ -711,7 +711,7 @@
   struct event *response;
   sip_t *sip;
 
-  s2_case("6.3.3", "NOTIFY server - terminate with error response to NOTIFY",
+  s2_case("6.3.4", "NOTIFY server - terminate with error response to NOTIFY",
 	  "NUA receives SUBSCRIBE, sends 202 and NOTIFY. "
 	  "The subscription terminates when watcher "
 	  "returns 481 to second NOTIFY. The queued 3rd NOTIFY gets "
@@ -719,9 +719,6 @@
 
   nh = subscribe_to_nua("presence", SIPTAG_EXPIRES_STR("300"), TAG_END());
 
-  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
-  s2_setup_logs(7);
-
   nua_notify(nh,
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     SIPTAG_PAYLOAD_STR(presence_closed),

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	Tue Mar  3 11:20:24 2009
@@ -1767,11 +1767,23 @@
   else if (nh->nh_soa == NULL) {
     offer_sent = session_get_description(sip, NULL, NULL);
   }
-  /* When 100rel response status was 183 do support for preconditions */
-  else if (ss->ss_precondition && cri->cr_status == 183 &&
-	   cri->cr_offer_sent && cri->cr_answer_recv) {
-    if (soa_generate_offer(nh->nh_soa, 0, NULL) < 0 ||
-	session_include_description(nh->nh_soa, 1, msg, sip) < 0) {
+  else {
+    /* When 100rel response status was 183 do support for preconditions */
+    int send_offer = ss->ss_precondition &&
+      cri->cr_status == 183 && cri->cr_offer_sent && cri->cr_answer_recv;
+
+    if (!send_offer) {
+      tagi_t const *t = tl_find_last(tags, nutag_include_extra_sdp);
+      send_offer = t && t->t_value;
+    }
+
+    if (!send_offer) {
+    }
+    else if (soa_generate_offer(nh->nh_soa, 0, NULL) >= 0 &&
+	     session_include_description(nh->nh_soa, 1, msg, sip) >= 0) {
+      offer_sent = 1;
+    }
+    else {
       status = soa_error_as_sip_response(nh->nh_soa, &phrase);
       SU_DEBUG_3(("nua(%p): PRACK offer: %d %s\n", (void *)nh,
 		  status, phrase));
@@ -1779,9 +1791,6 @@
 		      nua_i_media_error, status, phrase, NULL);
       return nua_client_return(cr, status, phrase, msg);
     }
-    else {
-      offer_sent = 1;
-    }
   }
 
   retval = nua_base_client_request(cr, msg, sip, NULL);


From mikej at freeswitch.org  Tue Mar  3 09:20:55 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:20:55 -0600
Subject: [Freeswitch-svn] [commit] r12377 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
Message-ID: <E1LeYIZ-0007jn-CE@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:20:55 2009
New Revision: 12377

Log:
Thu Feb 26 16:28:28 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nua/check_session.c: added test cases for REFER



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:20:55 2009
@@ -1 +1 @@
-Tue Mar  3 11:20:05 CST 2009
+Tue Mar  3 11:20:37 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Tue Mar  3 11:20:55 2009
@@ -96,9 +96,13 @@
 
   s2_register_teardown();
 
+  mark_point();
+
   nua_shutdown(nua);
   fail_unless(s2_check_event(nua_r_shutdown, 200));
 
+  mark_point();
+
   s2_nua_teardown();
 }
 
@@ -3095,6 +3099,145 @@
   call_teardown();
 }
 
+/* ====================================================================== */
+/* Test cases for REFER */
+
+START_TEST(refer_5_2_1)
+{
+  nua_handle_t *nh;
+  sip_refer_to_t r[1];
+  struct event *refer;
+  struct message *notify;
+
+  s2_case("5.2.1", "Receive REFER",
+	  "Make a call, receive REFER.");
+
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  invite_by_nua(nh, TAG_END());
+
+  *sip_refer_to_init(r)->r_url = *s2->local->a_url;
+  r->r_url->url_user = "bob2";
+
+  s2_request_to(dialog, SIP_METHOD_REFER, NULL,
+		SIPTAG_REFER_TO(r),
+		TAG_END());
+  refer = s2_wait_for_event(nua_i_refer, 202);
+
+  bye_by_nua(nh, TAG_END());
+
+  nua_handle_destroy(nh);
+
+  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+}
+END_TEST
+
+
+START_TEST(refer_5_2_2)
+{
+  nua_handle_t *nh, *nh2;
+  sip_refer_to_t r[1];
+  sip_referred_by_t by[1];
+  struct event *refer, *notified;
+  sip_t const *sip;
+  sip_event_t const *refer_event = NULL;
+  sip_subscription_state_t const *ss;
+  struct message *invite;
+  struct message *notify0, *notify1, *notify2;
+  struct dialog *dialog1, *dialog2;
+
+  s2_case("5.2.2", "Receive REFER",
+	  "Make a call, receive REFER, "
+	  "make another call with automatic NOTIFYs");
+
+  dialog2 = su_home_new(sizeof *dialog2); fail_unless(dialog2 != NULL);
+
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  invite_by_nua(nh, TAG_END());
+
+  *sip_refer_to_init(r)->r_url = *s2->local->a_url;
+  r->r_url->url_user = "bob2";
+
+  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
+  s2_setup_logs(7);
+
+  s2_request_to(dialog, SIP_METHOD_REFER, NULL,
+		SIPTAG_REFER_TO(r),
+		TAG_END());
+  refer = s2_wait_for_event(nua_i_refer, 202);
+  sip = sip_object(refer->data->e_msg);
+  fail_unless(sip && sip->sip_refer_to);
+
+  bye_by_nua(nh, TAG_END());
+
+  dialog1 = dialog, dialog = dialog2;
+
+  *sip_referred_by_init(by)->b_url =
+    *sip->sip_from->a_url;
+
+  fail_unless(tl_gets(refer->data->e_tags,
+		      NUTAG_REFER_EVENT_REF(refer_event),
+		      TAG_END()) == 1);
+
+  nua_notify(nh,
+	     SIPTAG_EVENT(refer_event),
+	     SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
+	     SIPTAG_PAYLOAD_STR("SIP/2.0 100 Trying\r\n"),
+	     NUTAG_SUBSTATE(nua_substate_active),
+	     TAG_END());
+  notify0 = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  fail_unless((ss = notify0->sip->sip_subscription_state) != NULL);
+  fail_unless(su_casematch("active", ss->ss_substate));
+  s2_respond_to(notify0, dialog1, SIP_200_OK, TAG_END());
+  notified = s2_wait_for_event(nua_r_notify, 200);
+
+  nh2 = nua_handle(nua, NULL, NUTAG_URL(r->r_url), TAG_END());
+
+  invite = invite_sent_by_nua(nh2,
+			      NUTAG_REFER_EVENT(refer_event),
+			      NUTAG_NOTIFY_REFER(nh),
+			      SIPTAG_REFERRED_BY(by),
+			      TAG_END());
+  process_offer(invite);
+
+  respond_with_sdp(
+    invite, dialog, SIP_180_RINGING,
+    SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"),
+    TAG_END());
+  fail_unless(s2_check_event(nua_r_invite, 180));
+  fail_unless(s2_check_callstate(nua_callstate_proceeding));
+
+  notify1 = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  s2_respond_to(notify1, dialog1, SIP_200_OK, TAG_END());
+
+  respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
+  s2_free_message(invite);
+  fail_unless(s2_check_event(nua_r_invite, 200));
+  fail_unless(s2_check_callstate(nua_callstate_ready));
+  fail_unless(s2_check_request(SIP_METHOD_ACK));
+
+  notify2 = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  s2_respond_to(notify2, dialog1, SIP_200_OK, TAG_END());
+  fail_unless((ss = notify2->sip->sip_subscription_state) != NULL);
+  fail_unless(su_casematch("terminated", ss->ss_substate));
+
+  nua_handle_destroy(nh);
+  bye_by_nua(nh2, TAG_END());
+  nua_handle_destroy(nh2);
+}
+END_TEST
+
+TCase *refer_tcase(int threading)
+{
+  TCase *tc = tcase_create("5.2 - Call Transfer");
+
+  add_call_fixtures(tc, threading);
+
+  tcase_add_test(tc, refer_5_2_1);
+  tcase_add_test(tc, refer_5_2_2);
+
+  return tc;
+}
 
 /* ====================================================================== */
 
@@ -3137,6 +3280,7 @@
   suite_add_tcase(suite, termination_tcase(threading));
   suite_add_tcase(suite, destroy_tcase(threading));
   suite_add_tcase(suite, options_tcase(threading));
+  suite_add_tcase(suite, refer_tcase(threading));
 
   if (0)			/* Template */
     suite_add_tcase(suite, empty_tcase(threading));


From mrene at freeswitch.org  Tue Mar  3 09:21:00 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:21:00 -0600
Subject: [Freeswitch-svn] [commit] r12378 - freeswitch/trunk/src/include
Message-ID: <E1LeYIe-0007lI-FN@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 11:21:00 2009
New Revision: 12378

Log:
Add doxygen comment to switch_channel_set_private

Modified:
   freeswitch/trunk/src/include/switch_channel.h

Modified: freeswitch/trunk/src/include/switch_channel.h
==============================================================================
--- freeswitch/trunk/src/include/switch_channel.h	(original)
+++ freeswitch/trunk/src/include/switch_channel.h	Tue Mar  3 11:21:00 2009
@@ -398,6 +398,7 @@
   \param key unique keyname to associate your private data to
   \param private_info void pointer to private data
   \return SWITCH_STATUS_SUCCESS if data was set
+  \remarks set NULL to delete your private data
 */
 SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info);
 


From mikej at freeswitch.org  Tue Mar  3 09:21:26 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:21:26 -0600
Subject: [Freeswitch-svn] [commit] r12379 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYJ4-0007mj-N2@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:21:26 2009
New Revision: 12379

Log:
Mon Mar  2 11:58:01 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta.c: use already-resolved transport for CANCEL/ACK to [3456]XX



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:21:26 2009
@@ -1 +1 @@
-Tue Mar  3 11:20:37 CST 2009
+Tue Mar  3 11:21:02 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Tue Mar  3 11:21:26 2009
@@ -7679,7 +7679,17 @@
     }
   }
 
-  if (route_url && !orq->orq_user_tport) {
+  if (tpn) {
+    /* CANCEL or ACK to [3456]XX */
+    invalid = tport_name_dup(home, orq->orq_tpn, tpn);
+#if HAVE_SOFIA_SRESOLV
+    assert(tport_name_is_resolved(orq->orq_tpn));
+#endif
+    resolved = tport_name_is_resolved(orq->orq_tpn);
+    orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
+    scheme = "sip";		/* XXX */
+  }
+  else if (route_url && !orq->orq_user_tport) {
     invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port, route_url);
 
     if (override_tport) {	/* Use transport protocol name from transport  */
@@ -7692,15 +7702,6 @@
     if (route_url != (url_string_t *)agent->sa_default_proxy)
       orq->orq_route = url_hdup(home, route_url->us_url);
   }
-  else if (tpn) {
-    invalid = tport_name_dup(home, orq->orq_tpn, tpn);
-#if HAVE_SOFIA_SRESOLV
-    assert(tport_name_is_resolved(orq->orq_tpn));
-#endif
-    resolved = tport_name_is_resolved(orq->orq_tpn);
-    orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
-    scheme = "sip";		/* XXX */
-  }
   else {
     invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port,
 			     (url_string_t *)sip->sip_request->rq_url);


From mikej at freeswitch.org  Tue Mar  3 09:22:02 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:22:02 -0600
Subject: [Freeswitch-svn] [commit] r12380 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYJe-0007oH-03@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:22:01 2009
New Revision: 12380

Log:
Tue Mar  3 10:40:57 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta: nta_agent_set_params() now returns correct value for tport parameters set



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:22:01 2009
@@ -1 +1 @@
-Tue Mar  3 11:21:02 CST 2009
+Tue Mar  3 11:21:35 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Tue Mar  3 11:22:01 2009
@@ -1537,12 +1537,13 @@
 
   m = 0;
   for (tport = agent->sa_tports; tport; tport = tport_next(tport)) {
-    m = tport_set_params(tport, TAG_NEXT(tags));
+    int m0 = tport_set_params(tport, TAG_NEXT(tags));
+    if (m0 < 0)
+      return m0;
+    if (m0 > m)
+      m = m0;
   }
 
-  if (m == -1)
-    return m;
-
   n += m;
 
   if (aliases != NONE) {


From mikej at freeswitch.org  Tue Mar  3 09:22:36 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:22:36 -0600
Subject: [Freeswitch-svn] [commit] r12381 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYKC-0007pj-1C@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:22:35 2009
New Revision: 12381

Log:
Tue Mar  3 10:47:00 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta: timeout CANCELed INVITE transactions properly
  Ignore-this: 4e7fdc56065dba617352443a9310bb28
  
  Use timer D (instead of timer C) to timeout CANCELed INVITE transactions.
  
  Also, generate 408 Request Timeout to all forks that have not received a
  final response.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:22:35 2009
@@ -1 +1 @@
-Tue Mar  3 11:21:35 CST 2009
+Tue Mar  3 11:22:16 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Tue Mar  3 11:22:35 2009
@@ -556,6 +556,8 @@
 
   nta_outgoing_t       *orq_cancel;     /**< CANCEL transaction */
 
+  nta_outgoing_t       *orq_forking;    /**< Untagged transaction */
+  nta_outgoing_t       *orq_forks;	/**< Tagged transactions */
   uint32_t              orq_rseq;       /**< Latest incoming rseq */
 };
 
@@ -7022,10 +7024,10 @@
 static void outgoing_destroy(nta_outgoing_t *orq);
 su_inline int outgoing_is_queued(nta_outgoing_t const *orq);
 su_inline void outgoing_queue(outgoing_queue_t *queue,
-				  nta_outgoing_t *orq);
+			      nta_outgoing_t *orq);
 su_inline void outgoing_remove(nta_outgoing_t *orq);
 su_inline void outgoing_set_timer(nta_outgoing_t *orq, uint32_t interval);
-su_inline void outgoing_reset_timer(nta_outgoing_t *orq);
+static void outgoing_reset_timer(nta_outgoing_t *orq);
 static size_t outgoing_timer_dk(outgoing_queue_t *q,
 				char const *timer,
 				uint32_t now);
@@ -7043,6 +7045,7 @@
 static void outgoing_trying(nta_outgoing_t *orq);
 static void outgoing_timeout(nta_outgoing_t *orq, uint32_t now);
 static int outgoing_complete(nta_outgoing_t *orq);
+static void outgoing_terminate_invite(nta_outgoing_t *);
 static int outgoing_terminate(nta_outgoing_t *orq);
 static size_t outgoing_mass_destroy(nta_agent_t *sa, outgoing_queue_t *q);
 static void outgoing_estimate_delay(nta_outgoing_t *orq, sip_t *sip);
@@ -7350,8 +7353,7 @@
 
   ta_end(ta);
 
-  if ((cancel_2543 || cancel_408) &&
-      !orq->orq_stateless && !orq->orq_destroyed)
+  if ((cancel_2543 || cancel_408) && !orq->orq_stateless)
     outgoing_reply(orq, SIP_487_REQUEST_CANCELLED, 1);
 
   if (msg) {
@@ -7369,8 +7371,11 @@
     if (delay_sending)
       orq->orq_cancel = cancel;
 
-    if (cancel)
+    if (cancel) {
+      if (!delay_sending)
+	outgoing_complete(orq);
       return cancel;
+    }
 
     msg_destroy(msg);
   }
@@ -7684,6 +7689,7 @@
     /* CANCEL or ACK to [3456]XX */
     invalid = tport_name_dup(home, orq->orq_tpn, tpn);
 #if HAVE_SOFIA_SRESOLV
+    /* We send ACK or CANCEL only if original request was really sent */
     assert(tport_name_is_resolved(orq->orq_tpn));
 #endif
     resolved = tport_name_is_resolved(orq->orq_tpn);
@@ -8318,8 +8324,8 @@
 /** @internal
  * Test if an outgoing transaction is in a queue.
  */
-su_inline
-int outgoing_is_queued(nta_outgoing_t const *orq)
+su_inline int
+outgoing_is_queued(nta_outgoing_t const *orq)
 {
   return orq && orq->orq_queue;
 }
@@ -8330,9 +8336,9 @@
  * Insert a client transaction into a queue and set the corresponding
  * timeout at the same time.
  */
-su_inline
-void outgoing_queue(outgoing_queue_t *queue,
-		    nta_outgoing_t *orq)
+static void
+outgoing_queue(outgoing_queue_t *queue,
+	       nta_outgoing_t *orq)
 {
   if (orq->orq_queue == queue) {
     assert(queue->q_timeout == 0);
@@ -8422,7 +8428,7 @@
     orq->orq_agent->sa_out.re_t1 = rq;
 }
 
-su_inline
+static
 void outgoing_reset_timer(nta_outgoing_t *orq)
 {
   if (orq->orq_rprev) {
@@ -8541,8 +8547,10 @@
   /* Application is expected to handle 200 OK statelessly
      => kill transaction immediately */
   else if (orq->orq_method == sip_method_invite && !orq->orq_completed
-	   /* (unless we the transaction has been canceled) */
-	   && !orq->orq_canceled) {
+	   /* (unless transaction has been canceled) */
+	   && !orq->orq_canceled
+	   /* or it has been forked */
+	   && !orq->orq_forking && !orq->orq_forks) {
     orq->orq_destroyed = 1;
     outgoing_terminate(orq);
   }
@@ -8717,12 +8725,11 @@
     SU_DEBUG_5(("nta: timer %s fired, %s %s (%u)\n",
 		timer, "CANCEL and timeout",
 		orq->orq_method_name, orq->orq_cseq->cs_seq));
-
+    /*
+     * If the client transaction has received a provisional response, the
+     * proxy MUST generate a CANCEL request matching that transaction.
+     */
     nta_outgoing_tcancel(orq, NULL, NULL, TAG_NULL());
-
-    outgoing_timeout(orq, now);
-
-    assert(q->q_head != orq);
   }
 
   return timeout;
@@ -8731,16 +8738,18 @@
 /** @internal Signal transaction timeout to the application. */
 void outgoing_timeout(nta_outgoing_t *orq, uint32_t now)
 {
-  nta_outgoing_t *cancel;
+  nta_outgoing_t *cancel = NULL;
 
-  if (outgoing_other_destinations(orq)) {
+  if (orq->orq_status || orq->orq_canceled)
+    ;
+  else if (outgoing_other_destinations(orq)) {
     SU_DEBUG_5(("%s(%p): %s\n", "nta", (void *)orq,
 		"try next after timeout"));
     outgoing_try_another(orq);
     return;
   }
 
-  cancel = orq->orq_cancel; orq->orq_cancel = NULL;
+  cancel = orq->orq_cancel, orq->orq_cancel = NULL;
   orq->orq_agent->sa_stats->as_tout_request++;
 
   outgoing_reply(orq, SIP_408_REQUEST_TIMEOUT, 0);
@@ -8753,15 +8762,19 @@
  *
  * @return True if transaction was free()d.
  */
-static
-int outgoing_complete(nta_outgoing_t *orq)
+static int
+outgoing_complete(nta_outgoing_t *orq)
 {
   orq->orq_completed = 1;
 
   outgoing_reset_timer(orq); /* Timer A / Timer E */
 
-  if (orq->orq_stateless || orq->orq_reliable)
+  if (orq->orq_stateless)
     return outgoing_terminate(orq);
+  if (orq->orq_reliable) {
+    if (orq->orq_method != sip_method_invite || !orq->orq_agent->sa_is_a_uas)
+      return outgoing_terminate(orq);
+  }
 
   if (orq->orq_method == sip_method_invite) {
     if (orq->orq_queue != orq->orq_agent->sa_out.inv_completed)
@@ -8793,12 +8806,52 @@
     SU_DEBUG_5(("nta: timer %s fired, %s %s (%u)\n", timer,
 		"terminate", orq->orq_method_name, orq->orq_cseq->cs_seq));
 
-    outgoing_terminate(orq);
+    if (orq->orq_method == sip_method_invite)
+      outgoing_terminate_invite(orq);
+    else
+      outgoing_terminate(orq);
   }
 
   return terminated;
 }
 
+
+/** Terminate an INVITE client transaction. */
+static void
+outgoing_terminate_invite(nta_outgoing_t *original)
+{
+  nta_outgoing_t *orq = original;
+
+  while (original->orq_forks) {
+    orq = original->orq_forks;
+    original->orq_forks = orq->orq_forks;
+
+    assert(orq->orq_forking == original);
+
+    SU_DEBUG_5(("nta: timer %s fired, %s %s (%u);tag=%s\n", "D",
+		"terminate", orq->orq_method_name, orq->orq_cseq->cs_seq,
+		orq->orq_tag));
+
+    if (outgoing_terminate(orq))
+      continue;
+
+    if (orq->orq_status < 200) {
+      /* Fork has timed out */
+      orq->orq_agent->sa_stats->as_tout_request++;
+      outgoing_reply(orq, SIP_408_REQUEST_TIMEOUT, 0);
+    }
+  }
+
+  if (outgoing_terminate(orq = original))
+    return;
+
+  if (orq->orq_status < 200) {
+    /* Original INVITE has timed out */
+    orq->orq_agent->sa_stats->as_tout_request++;
+    outgoing_reply(orq, SIP_408_REQUEST_TIMEOUT, 0);
+  }
+}
+
 /** Terminate a client transaction. */
 static
 int outgoing_terminate(nta_outgoing_t *orq)
@@ -8946,46 +8999,38 @@
 }
 
 /** Process a response message. */
-int outgoing_recv(nta_outgoing_t *orq,
+int outgoing_recv(nta_outgoing_t *_orq,
 		  int status,
 		  msg_t *msg,
 		  sip_t *sip)
 {
+  nta_outgoing_t *orq = _orq->orq_forking ? _orq->orq_forking : _orq;
   nta_agent_t *sa = orq->orq_agent;
-  short orq_status = orq->orq_status;
   int internal = sip == NULL || (sip->sip_flags & NTA_INTERNAL_MSG) != 0;
   int uas = sa->sa_is_a_uas;
 
+  assert(!internal || status >= 300);
+  assert(orq == _orq || orq->orq_method == sip_method_invite);
+
   if (status < 100) status = 100;
 
   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);
 
   if (orq->orq_cancel) {
     nta_outgoing_t *cancel;
-
     cancel = orq->orq_cancel; orq->orq_cancel = NULL;
-
     cancel->orq_delayed = 0;
 
-    if (status < 200)
+    if (status < 200) {
       outgoing_send(cancel, 0);
-    else
+      outgoing_complete(orq);
+    }
+    else {
       outgoing_reply(cancel, SIP_481_NO_TRANSACTION, 0);
-
-    if (status < 300 && orq->orq_destroyed &&
-	orq->orq_method == sip_method_invite) {
-      outgoing_terminate(orq);      /* We can now kill transaction */
-      if (status == 100) {
-	msg_destroy(msg);
-	return 0;
-      }
-      return -1;
     }
   }
 
@@ -8998,9 +9043,12 @@
 
   /* The state machines */
   if (orq->orq_method == sip_method_invite) {
+    nta_outgoing_t *original = orq;
 
-    if (uas && orq->orq_destroyed && 200 <= status && status < 300) {
-      if (su_strcasecmp(sip->sip_to->a_tag, orq->orq_tag) != 0) {
+    orq = _orq;
+
+    if (orq->orq_destroyed && 200 <= status && status < 300) {
+      if (uas && su_strcasecmp(sip->sip_to->a_tag, orq->orq_tag) != 0) {
         /* Orphan 200 Ok to INVITE. ACK and BYE it */
         SU_DEBUG_5(("nta: Orphan 200 Ok send ACK&BYE\n"));
         return nta_msg_ackbye(sa, msg);
@@ -9008,38 +9056,41 @@
       return -1;  /* Proxy statelessly (RFC3261 section 16.11) */
     }
 
-    outgoing_reset_timer(orq);
+    outgoing_reset_timer(original);
 
     if (status < 200) {
-      if (orq->orq_queue == sa->sa_out.inv_calling) {
-	orq->orq_status = status;
-	outgoing_queue(sa->sa_out.inv_proceeding, orq);
+      original->orq_status = status;
+      orq->orq_status = status;
+      if (original->orq_queue == sa->sa_out.inv_calling) {
+	outgoing_queue(sa->sa_out.inv_proceeding, original);
       }
-      else if (orq->orq_queue == sa->sa_out.inv_proceeding) {
-	orq->orq_status = status;
+      else if (original->orq_queue == sa->sa_out.inv_proceeding) {
 	if (sa->sa_out.inv_proceeding->q_timeout) {
-	  outgoing_remove(orq);
-	  outgoing_queue(sa->sa_out.inv_proceeding, orq);
+	  outgoing_remove(original);
+	  outgoing_queue(sa->sa_out.inv_proceeding, original);
 	}
       }
+    }
 
+    if (status < 200) {
       /* Handle 100rel */
-      if (sip && sip->sip_rseq)
+      if (sip && sip->sip_rseq) {
 	if (outgoing_recv_reliable(orq, msg, sip) < 0) {
 	  msg_destroy(msg);
 	  return 0;
 	}
+      }
     }
     else {
       /* Final response */
       if (status >= 300 && !internal)
-	outgoing_ack(orq, sip);
+	outgoing_ack(original, sip);
 
-      if (!orq->orq_completed) {
-	if (outgoing_complete(orq))
+      if (!original->orq_completed) {
+	if (outgoing_complete(original))
 	  return 0;
 
-	if (sip && uas) {
+	if (uas && sip && orq == original) {
 	  /*
 	   * We silently discard duplicate final responses to INVITE below
 	   * with outgoing_duplicate()
@@ -9049,7 +9100,7 @@
 	}
       }
       /* Retransmission or response from another fork */
-      else {
+      else if (orq->orq_status >= 200) {
 	/* Once 2xx has been received, non-2xx will not be forwarded */
 	if (status >= 300)
 	  return outgoing_duplicate(orq, msg, sip);
@@ -9072,7 +9123,7 @@
     /* Non-INVITE */
     if (orq->orq_queue == sa->sa_out.trying ||
 	orq->orq_queue == sa->sa_out.resolving) {
-      assert(orq_status < 200); (void)orq_status;
+      assert(orq->orq_status < 200);
 
       if (status < 200) {
 	/* @RFC3261 17.1.2.1:
@@ -11066,9 +11117,20 @@
 
   if (orq == NULL || to_tag == NULL)
     return NULL;
+
   if (orq->orq_to->a_tag) {
-    SU_DEBUG_1(("%s: transaction %p already in dialog\n", __func__,
-		(void *)orq));
+    SU_DEBUG_1(("%s: transaction %p (CSeq: %s %u) already in dialog\n", __func__,
+		(void *)orq, orq->orq_cseq->cs_method_name, orq->orq_cseq->cs_seq));
+    return NULL;
+  }
+  if (orq->orq_method != sip_method_invite) {
+    SU_DEBUG_1(("%s: transaction %p (CSeq: %s %u) cannot be tagged\n", __func__,
+		(void *)orq, orq->orq_cseq->cs_method_name, orq->orq_cseq->cs_seq));
+    return NULL;
+  }
+  if (orq->orq_status < 100) {
+    SU_DEBUG_1(("%s: transaction %p (CSeq: %s %u) still calling\n", __func__,
+		(void *)orq, orq->orq_cseq->cs_method_name, orq->orq_cseq->cs_seq));
     return NULL;
   }
 
@@ -11098,17 +11160,12 @@
   tagged->orq_request      = msg_ref_create(orq->orq_request);
   tagged->orq_response     = msg_ref_create(orq->orq_response);
   tagged->orq_cancel       = NULL;
-
-  tagged->orq_pending = tport_pend(orq->orq_tport,
-				   orq->orq_request,
-				   outgoing_tport_error,
-				   tagged);
-  if (tagged->orq_pending < 0)
-    tagged->orq_pending = 0;
+  tagged->orq_forking      = orq;
+  tagged->orq_forks        = orq->orq_forks;
+  orq->orq_forks = tagged;
 
   tagged->orq_rseq = 0;
 
-  outgoing_queue(orq->orq_queue, tagged);
   outgoing_insert(agent, tagged);
 
   return tagged;


From mikej at freeswitch.org  Tue Mar  3 09:23:03 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:23:03 -0600
Subject: [Freeswitch-svn] [commit] r12382 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYKd-0007rG-Ll@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:23:03 2009
New Revision: 12382

Log:
Tue Mar  3 10:47:40 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta_tag.c: fixed NTATAG_TIMER_C() documentation



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:23:03 2009
@@ -1 +1 @@
-Tue Mar  3 11:22:16 CST 2009
+Tue Mar  3 11:22:42 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c	Tue Mar  3 11:23:03 2009
@@ -634,7 +634,7 @@
  *    instead if NTATAG_TIMER_C(0) is given.
  *
  * @par Default Value
- *   - 180000 (milliseconds, 3 minutes)
+ *   - 185000 (milliseconds, 3 minutes)
  *
  * @sa @RFC3261 sections 13.3.1.1, 16.7 and 16.8,
  * NTATAG_UA(1), NTATAG_TIMER_C(),


From mikej at freeswitch.org  Tue Mar  3 09:23:31 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:23:31 -0600
Subject: [Freeswitch-svn] [commit] r12383 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYL5-0007sd-9s@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:23:31 2009
New Revision: 12383

Log:
Tue Mar  3 10:49:51 CST 2009  Pekka Pessi <first.last at nokia.com>
  * test_nta.c: timer C now CANCELs INVITE transaction
  Ignore-this: 8de2e5747e7ae0e62e2d8ad9aeb0cbed
  
  408 response is not generated (unless CANCEL times out, too.)



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:23:31 2009
@@ -1 +1 @@
-Tue Mar  3 11:22:42 CST 2009
+Tue Mar  3 11:23:11 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c	Tue Mar  3 11:23:31 2009
@@ -530,7 +530,7 @@
 {
   agent_t *ag = c->c_ag;
 
-  for (ag->ag_canceled = 0; !ag->ag_canceled;) {
+  for (ag->ag_canceled = 0; !ag->ag_canceled || c->c_status < 200;) {
     if (tstflags & tst_verbatim) {
       fputs(".", stdout); fflush(stdout);
     }
@@ -3612,8 +3612,9 @@
 				SIPTAG_PAYLOAD(sdp),
 				TAG_END()));
 
-    /* Run until 1) server gets CANCEL and 2) client gets 408 */
-    TEST_1(!client_run_until_canceled(ctx, 408));
+    /* Run until 1) server gets CANCEL and 2) client gets 487 */
+    /* Note: this has been changed in 1.12.11 */
+    TEST_1(!client_run_until_canceled(ctx, 487));
 
     TEST_1(ag->ag_canceled != 0);
     TEST_P(ag->ag_latest_leg, ag->ag_server_leg);


From mikej at freeswitch.org  Tue Mar  3 09:24:01 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:24:01 -0600
Subject: [Freeswitch-svn] [commit] r12384 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
Message-ID: <E1LeYLZ-0007u3-6Y@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:24:01 2009
New Revision: 12384

Log:
Tue Mar  3 10:56:34 CST 2009  Pekka Pessi <first.last at nokia.com>
  * test_soa.c: ignore fgets() return value. really.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:24:01 2009
@@ -1 +1 @@
-Tue Mar  3 11:23:11 CST 2009
+Tue Mar  3 11:23:38 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c	Tue Mar  3 11:24:01 2009
@@ -2504,10 +2504,11 @@
 #endif
 
   if (o_attach) {
-    char line[10];
+    char line[10], *cr;
     printf("%s: pid %u\n", name, getpid());
     printf("<Press RETURN to continue>\n");
-    fgets(line, sizeof line, stdin);
+    cr = fgets(line, sizeof line, stdin);
+    (void)cr;
   }
 #if HAVE_ALARM
   else if (o_alarm) {


From mikej at freeswitch.org  Tue Mar  3 09:25:03 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:25:03 -0600
Subject: [Freeswitch-svn] [commit] r12385 - freeswitch/trunk/libs/sofia-sip
Message-ID: <E1LeYMZ-0007vz-4L@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:25:03 2009
New Revision: 12385

Log:
Tue Mar  3 11:03:53 CST 2009  Pekka Pessi <first.last at nokia.com>
  * RELEASE: describe nta changes with forking, timer C, timer D, and CANCEL



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/RELEASE

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:25:03 2009
@@ -1 +1 @@
-Tue Mar  3 11:23:38 CST 2009
+Tue Mar  3 11:24:11 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/RELEASE
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/RELEASE	(original)
+++ freeswitch/trunk/libs/sofia-sip/RELEASE	Tue Mar  3 11:25:03 2009
@@ -25,6 +25,16 @@
 
 libsofia-sip-ua:
 - **template**: Added foobar() function (sofia-sip/foobar.h).
+- Timing out CANCELed INVITE client transactions is now done with timer D.
+  Previously, the INVITE client transactions were restarted instead of
+  timing out under certain circumstances.
+- An INVITE transaction that has been timed out with stack timer C is now
+  CANCELed automatically. Previously, such the INVITE client transactions
+  were restarted instead of timing out under certain circumstances.
+- Timing out forked INVITE client transactions is now done by stack.
+  The stack generates a 408 response to each INVITE transaction fork that
+  has not received a final response within 32 seconds (or 64 times SIP T1)
+  after first final response to the INVITE was received.
 - The mp_len type was changed from usize_t to unsigned.
   The change is binary-incompatible on 64-bit platforms when compiled with
   the configure opetion --disable-size-compat
@@ -42,6 +52,7 @@
   - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter()
   - t_filter_with(), t_any_filter()
   - sres_record_class()
+  - u2s_alloc()
 
 libsofia-sip-ua-glib:
 - No ABI/API changes, compatible with 1.12.0. Note, libsofia-sip-ua-glib


From mikej at freeswitch.org  Tue Mar  3 09:25:39 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:25:39 -0600
Subject: [Freeswitch-svn] [commit] r12386 - in
	freeswitch/trunk/libs/sofia-sip: . s2check
Message-ID: <E1LeYN9-0007xO-A1@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:25:39 2009
New Revision: 12386

Log:
Tue Mar  3 11:04:23 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2check/Makefile.am: more clue about name



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:25:39 2009
@@ -1 +1 @@
-Tue Mar  3 11:24:11 CST 2009
+Tue Mar  3 11:25:14 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am	Tue Mar  3 11:25:39 2009
@@ -1,5 +1,5 @@
 #
-# Makefile.am for Sofia-SIP module and unit testing
+# Makefile.am for "Sofia-SIP 2 Check", module and unit testing library
 #
 # Copyright (C) 2009 Nokia Corporation
 # Contact: Pekka Pessi <pekka.pessi at nokia.com>


From mikej at freeswitch.org  Tue Mar  3 09:26:13 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:26:13 -0600
Subject: [Freeswitch-svn] [commit] r12387 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1LeYNh-0007ys-Oh@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:26:13 2009
New Revision: 12387

Log:
Tue Mar  3 07:47:19 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta: calculate timer D correctly
  Ignore-this: f43d9dcc11fb6a19c3674a6da35ee7ec
  
  Timer D is either 32 seconds or 64 times T1, whichever is larger.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:26:13 2009
@@ -1 +1 @@
-Tue Mar  3 11:25:14 CST 2009
+Tue Mar  3 11:25:58 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Tue Mar  3 11:26:13 2009
@@ -860,7 +860,7 @@
   ta_start(ta, tag, value);
 
   if ((agent = su_home_new(sizeof(*agent)))) {
-    unsigned timer_c;
+    unsigned timer_c = 0, timer_d = 32000;
 
     agent->sa_root = root;
     agent->sa_callback = callback;
@@ -925,6 +925,11 @@
 
     agent->sa_out.re_t1 = &agent->sa_out.re_list;
 
+    if (agent->sa_use_timer_c || !agent->sa_is_a_uas)
+      timer_c = agent->sa_timer_c;
+    if (timer_d < agent->sa_t1x64)
+      timer_d = agent->sa_t1x64;
+
     outgoing_queue_init(agent->sa_out.delayed, 0);
     outgoing_queue_init(agent->sa_out.resolving, 0);
     outgoing_queue_init(agent->sa_out.trying, agent->sa_t1x64); /* F */
@@ -932,10 +937,8 @@
     outgoing_queue_init(agent->sa_out.terminated, 0);
     /* Special queues (states) for outgoing INVITE transactions */
     outgoing_queue_init(agent->sa_out.inv_calling, agent->sa_t1x64); /* B */
-    timer_c = (agent->sa_use_timer_c || !agent->sa_is_a_uas)
-      ? agent->sa_timer_c : 0;
     outgoing_queue_init(agent->sa_out.inv_proceeding, timer_c); /* C */
-    outgoing_queue_init(agent->sa_out.inv_completed, 32000); /* Timer D */
+    outgoing_queue_init(agent->sa_out.inv_completed, timer_d); /* D */
 
     if (leg_htable_resize(agent->sa_home, agent->sa_dialogs, 0) < 0 ||
 	leg_htable_resize(agent->sa_home, agent->sa_defaults, 0) < 0 ||
@@ -1446,6 +1449,7 @@
   unsigned sip_t4     = agent->sa_t4;
   unsigned sip_t1x64  = agent->sa_t1x64;
   unsigned timer_c    = agent->sa_timer_c;
+  unsigned timer_d    = 32000;
   unsigned graylist   = agent->sa_graylist;
   unsigned blacklist  = agent->sa_blacklist;
   int ua              = agent->sa_is_a_uas;
@@ -1646,6 +1650,9 @@
     agent->sa_timer_c = timer_c;
     outgoing_queue_adjust(agent, agent->sa_out.inv_proceeding, timer_c);
   }
+  if (timer_d < sip_t1x64)
+    timer_d = sip_t1x64;
+  outgoing_queue_adjust(agent, agent->sa_out.inv_completed, timer_d);
 
   if (graylist > 24 * 60 * 60)
     graylist = 24 * 60 * 60;


From mikej at freeswitch.org  Tue Mar  3 09:27:41 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 11:27:41 -0600
Subject: [Freeswitch-svn] [commit] r12388 - in
	freeswitch/trunk/libs/sofia-sip: . s2check
Message-ID: <E1LeYP7-0008Gv-Ql@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 11:27:41 2009
New Revision: 12388

Log:
Tue Mar  3 10:37:30 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2check: added s2base.[hc], s2sip.[hc]
  Ignore-this: 6a32b36a47a6f9dd2b5fec7c7375c564
  
  Moved nua/test_s2 code here.



Added:
   freeswitch/trunk/libs/sofia-sip/s2check/s2base.c
   freeswitch/trunk/libs/sofia-sip/s2check/s2base.h
   freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c
   freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h
Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:27:41 2009
@@ -1 +1 @@
-Tue Mar  3 11:25:58 CST 2009
+Tue Mar  3 11:27:12 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am	Tue Mar  3 11:27:41 2009
@@ -19,6 +19,8 @@
 # Rules for building the targets
 
 libs2_a_SOURCES = 	s2check.h s2tcase.c \
+			s2base.h s2base.c \
+			s2sip.c s2sip.h \
 			s2_localinfo.h s2_localinfo.c \
 			s2dns.h s2dns.c \
 			s2util.h s2time.c

Added: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c	Tue Mar  3 11:27:41 2009
@@ -0,0 +1,198 @@
+/*
+ * This file is part of the Sofia-SIP package
+ *
+ * Copyright (C) 2008 Nokia Corporation.
+ *
+ * Contact: Pekka Pessi <pekka.pessi at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+/**@CFILE s2base.c
+ * @brief Common check-based tester for Sofia SIP modules
+ *
+ * @author Pekka Pessi <Pekka.Pessi at nokia.com>
+ *
+ * @date Created: Wed Apr 30 12:48:27 EEST 2008 ppessi
+ */
+
+#include "config.h"
+
+#undef NDEBUG
+
+#define TP_MAGIC_T struct tp_magic_s
+
+#include "s2base.h"
+
+#include <sofia-sip/sip_header.h>
+#include <sofia-sip/sip_status.h>
+#include <sofia-sip/msg_addr.h>
+#include <sofia-sip/su_log.h>
+#include <sofia-sip/su_tagarg.h>
+#include <sofia-sip/su_alloc.h>
+#include <sofia-sip/su_string.h>
+#include <sofia-sip/sresolv.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+#include <time.h>
+
+#if HAVE_SYS_TIME_H
+#include <sys/time.h> /* Get struct timeval */
+#endif
+
+#if HAVE_CLOCK_GETTIME
+static double
+now(void)
+{
+  struct timespec tv;
+
+#if CLOCK_MONOTONIC
+  if (clock_gettime(CLOCK_MONOTONIC, &tv) != 0)
+#endif
+    clock_gettime(CLOCK_REALTIME, &tv);
+
+  return tv.tv_sec * 1.0 + tv.tv_nsec * 1e-9;
+}
+#elif HAVE_GETTIMEOFDAY
+static double
+now(void)
+{
+  struct timespec tv;
+
+  gettimeofday(&tv, NULL);
+
+  return tv.tv_sec * 1.0 + tv.tv_usec * 1e-6;
+}
+
+#else
+#error no gettimeofday for test timing
+#endif
+
+/* -- Module globals ---------------------------------------------------- */
+
+struct s2base *s2base;
+
+char const *s2_tester = "s2_tester";
+int s2_start_stop;
+
+char const *_s2_suite = "X";
+char const *_s2_case = "0.0";
+
+static struct {
+  double setup, start, done, toredown;
+} stamps;
+
+void s2_suite(char const *name)
+{
+  _s2_suite = name;
+}
+
+/** Basic setup for test cases */
+void s2_setup(char const *label)
+{
+  assert(s2base == NULL);
+
+  stamps.setup = now();
+
+  if (s2_start_stop > 1) {
+    printf("%s - setup %s test case\n", s2_tester, label ? label : "next");
+  }
+
+  su_init();
+
+  s2base = su_home_new(sizeof *s2base);
+  assert(s2base != NULL);
+
+  s2base->root = su_root_create(s2base);
+  assert(s2base->root != NULL);
+}
+
+void s2_case(char const *number,
+	     char const *title,
+	     char const *description)
+{
+  stamps.start = now();
+
+  _s2_case = number;
+  if (s2_start_stop)
+    printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title);
+}
+
+SOFIAPUBVAR su_log_t nua_log[];
+SOFIAPUBVAR su_log_t soa_log[];
+SOFIAPUBVAR su_log_t nea_log[];
+SOFIAPUBVAR su_log_t nta_log[];
+SOFIAPUBVAR su_log_t tport_log[];
+SOFIAPUBVAR su_log_t su_log_default[];
+
+void
+s2_setup_logs(int level)
+{
+  assert(s2base);
+
+  su_log_soft_set_level(nua_log, level);
+  su_log_soft_set_level(soa_log, level);
+  su_log_soft_set_level(su_log_default, level);
+  su_log_soft_set_level(nea_log, level);
+  su_log_soft_set_level(nta_log, level);
+  su_log_soft_set_level(tport_log, level);
+}
+
+void s2_step(void)
+{
+  su_root_step(s2base->root, 10);
+}
+
+static char const *s2_teardown_label = NULL;
+
+void
+s2_teardown_started(char const *label)
+{
+  stamps.done = now();
+
+  if (!s2_teardown_label) {
+    s2_teardown_label = label;
+    if (s2_start_stop > 1) {
+      double ms = (stamps.done - stamps.start) * 1000.0;
+      printf("%s - tearing down %s test case (%g ms)\n", s2_tester, label, ms);
+    }
+  }
+}
+
+void
+s2_teardown(void)
+{
+  struct s2base *_zap = s2base;
+
+  s2base = NULL;
+
+  su_root_destroy(_zap->root);
+  su_deinit();
+
+  stamps.toredown = now();
+
+  if (s2_start_stop > 1) {
+    double ms = (stamps.toredown - stamps.setup) * 1000.0;
+    printf("%s - %s test case tore down (total %g ms)\n", s2_tester,
+	   s2_teardown_label ? s2_teardown_label : "previous", ms);
+  }
+
+  s2_teardown_label = NULL;
+}

Added: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h	Tue Mar  3 11:27:41 2009
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the Sofia-SIP package
+ *
+ * Copyright (C) 2008 Nokia Corporation.
+ *
+ * Contact: Pekka Pessi <pekka.pessi at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef S2BASE_H
+#define S2BASE_H
+
+#include <sofia-sip/su_wait.h>
+#include <sofia-sip/su_alloc.h>
+#include "s2util.h"
+
+extern struct s2base
+{
+  su_home_t home[1];
+  su_root_t *root;
+} *s2base;
+
+extern char const *s2_tester, *_s2_suite, *_s2_case;
+extern int s2_start_stop;
+
+void s2_suite(char const *label);
+void s2_setup(char const *label);
+
+void s2_setup_logs(int level);
+
+void s2_step(void);
+
+void s2_case(char const *tag,
+	     char const *title,
+	     char const *description);
+
+void s2_teardown_started(char const *label);
+void s2_teardown(void);
+
+#endif

Added: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c	Tue Mar  3 11:27:41 2009
@@ -0,0 +1,815 @@
+/*
+ * This file is part of the Sofia-SIP package
+ *
+ * Copyright (C) 2008 Nokia Corporation.
+ *
+ * Contact: Pekka Pessi <pekka.pessi at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+/**@CFILE s2sip.c
+ * @brief Check-Based Test Suite for Sofia SIP
+ *
+ * @author Pekka Pessi <Pekka.Pessi at nokia.com>
+ *
+ * @date Created: Wed Apr 30 12:48:27 EEST 2008 ppessi
+ */
+
+#include "config.h"
+
+#undef NDEBUG
+
+#define TP_STACK_T struct s2sip
+#define TP_MAGIC_T struct tp_magic_s
+#define SU_ROOT_MAGIC_T struct s2sip
+
+#include "s2sip.h"
+#include "s2base.h"
+#include "s2dns.h"
+
+#include <sofia-sip/sip_header.h>
+#include <sofia-sip/sip_status.h>
+#include <sofia-sip/msg_addr.h>
+#include <sofia-sip/su_log.h>
+#include <sofia-sip/su_tagarg.h>
+#include <sofia-sip/su_alloc.h>
+#include <sofia-sip/su_string.h>
+#include <sofia-sip/sresolv.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+#include <time.h>
+
+
+/* -- Module types ------------------------------------------------------ */
+
+struct tp_magic_s
+{
+  sip_via_t *via;
+  sip_contact_t *contact;
+};
+
+/* -- Module prototypes ------------------------------------------------- */
+
+static msg_t *s2_msg(int flags);
+static int s2_complete_response(msg_t *response,
+				int status, char const *phrase,
+				msg_t *request);
+
+/* -- Module globals ---------------------------------------------------- */
+
+struct s2sip *s2sip;
+
+/* ---------------------------------------------------------------------- */
+
+char *
+s2_sip_generate_tag(su_home_t *home)
+{
+  static unsigned s2_tag_generator = 0;
+
+  return su_sprintf(home, "tag=%s-%s/%u", _s2_suite, _s2_case, ++s2_tag_generator);
+}
+
+/* ---------------------------------------------------------------------- */
+/* SIP messages */
+
+struct message *
+s2_sip_remove_message(struct message *m)
+{
+  if ((*m->prev = m->next))
+    m->next->prev = m->prev;
+
+  m->prev = NULL, m->next = NULL;
+
+  return m;
+}
+
+void
+s2_sip_free_message(struct message *m)
+{
+  if (m) {
+    if (m->prev) {
+      if ((*m->prev = m->next))
+	m->next->prev = m->prev;
+    }
+    msg_destroy(m->msg);
+    tport_unref(m->tport);
+    free(m);
+  }
+}
+
+void s2_sip_flush_messages(void)
+{
+  while (s2sip->received) {
+    s2_sip_free_message(s2sip->received);
+  }
+}
+
+struct message *
+s2_sip_next_response(void)
+{
+  struct message *m;
+
+  for (;;) {
+    for (m = s2sip->received; m; m = m->next) {
+      if (m->sip->sip_status)
+	return s2_sip_remove_message(m);
+    }
+    s2_step();
+  }
+}
+
+struct message *
+s2_sip_wait_for_response(int status, sip_method_t method, char const *name)
+{
+  struct message *m;
+
+  for (;;) {
+    for (m = s2sip->received; m; m = m->next) {
+      if (!m->sip->sip_status)
+	continue;
+
+      if (status != 0 && m->sip->sip_status->st_status != status)
+	continue;
+
+      if (method == sip_method_unknown && name == NULL)
+	break;
+
+      if (m->sip->sip_cseq == NULL)
+	continue;
+
+      if (m->sip->sip_cseq->cs_method != method)
+	continue;
+      if (name == NULL)
+	break;
+      if (strcmp(m->sip->sip_cseq->cs_method_name, name) == 0)
+	break;
+    }
+
+    if (m)
+      return s2_sip_remove_message(m);
+
+    s2_step();
+  }
+}
+
+int
+s2_sip_check_response(int status, sip_method_t method, char const *name)
+{
+  struct message *m = s2_sip_wait_for_response(status, method, name);
+  s2_sip_free_message(m);
+  return m != NULL;
+}
+
+int
+s2_check_in_response(struct dialog *dialog,
+		     int status, sip_method_t method, char const *name)
+{
+  struct message *m = s2_sip_wait_for_response(status, method, name);
+  s2_sip_update_dialog(dialog, m);
+  s2_sip_free_message(m);
+  return m != NULL;
+}
+
+struct message *
+s2_sip_next_request(sip_method_t method, char const *name)
+{
+  struct message *m;
+
+  for (m = s2sip->received; m; m = m->next) {
+    if (m->sip->sip_request)
+      if (method == sip_method_unknown && name == NULL)
+	return s2_sip_remove_message(m);
+
+    if (m->sip->sip_request->rq_method == method &&
+	strcmp(m->sip->sip_request->rq_method_name, name) == 0)
+      return s2_sip_remove_message(m);
+  }
+
+  return NULL;
+}
+
+struct message *
+s2_sip_wait_for_request(sip_method_t method, char const *name)
+{
+  return s2_sip_wait_for_request_timeout(method, name, (unsigned)-1);
+}
+
+struct message *
+s2_sip_wait_for_request_timeout(sip_method_t method, char const *name, unsigned steps)
+{
+  struct message *m;
+
+  for (; steps > 0; steps--, s2_step()) {
+    for (m = s2sip->received; m; m = m->next) {
+      if (m->sip->sip_request) {
+	if (method == sip_method_unknown && name == NULL)
+	  return s2_sip_remove_message(m);
+
+	if (m->sip->sip_request->rq_method == method &&
+	    strcmp(m->sip->sip_request->rq_method_name, name) == 0)
+	  return s2_sip_remove_message(m);
+      }
+    }
+  }
+
+  return NULL;
+}
+
+int
+s2_sip_check_request(sip_method_t method, char const *name)
+{
+  struct message *m = s2_sip_wait_for_request(method, name);
+  if (m) s2_sip_free_message(m);
+  return m != NULL;
+}
+
+int
+s2_sip_check_request_timeout(sip_method_t method,
+			     char const *name,
+			     unsigned timeout)
+{
+  struct message *m = s2_sip_wait_for_request_timeout(method, name, timeout);
+  if (m) s2_sip_free_message(m);
+  return m != NULL;
+}
+
+void
+s2_sip_save_uas_dialog(struct dialog *d, sip_t *sip)
+{
+  if (d && !d->local) {
+    assert(sip->sip_request);
+    d->local = sip_from_dup(d->home, sip->sip_to);
+    if (d->local->a_tag == NULL)
+      sip_from_tag(d->home, d->local, s2_sip_generate_tag(d->home));
+    d->remote = sip_to_dup(d->home, sip->sip_from);
+    d->call_id = sip_call_id_dup(d->home, sip->sip_call_id);
+    d->rseq = sip->sip_cseq->cs_seq;
+    /* d->route = sip_route_dup(d->home, sip->sip_record_route); */
+    d->target = sip_contact_dup(d->home, sip->sip_contact);
+  }
+}
+
+struct message *
+s2_sip_respond_to(struct message *m, struct dialog *d,
+	      int status, char const *phrase,
+	      tag_type_t tag, tag_value_t value, ...)
+{
+  ta_list ta;
+  msg_t *reply;
+  sip_t *sip;
+  su_home_t *home;
+  tp_name_t tpn[1];
+  char *rport;
+
+  assert(m); assert(m->msg); assert(m->tport);
+  assert(100 <= status && status < 700);
+
+  s2_sip_save_uas_dialog(d, m->sip);
+
+  ta_start(ta, tag, value);
+
+  reply = s2_msg(0); sip = sip_object(reply); home = msg_home(reply);
+
+  assert(reply && home && sip);
+
+  if (sip_add_tl(reply, sip, ta_tags(ta)) < 0) {
+    abort();
+  }
+
+  s2_complete_response(reply, status, phrase, m->msg);
+
+  if (sip->sip_status && sip->sip_status->st_status > 100 &&
+      sip->sip_to && !sip->sip_to->a_tag &&
+      sip->sip_cseq && sip->sip_cseq->cs_method != sip_method_cancel) {
+    char const *ltag = NULL;
+
+    if (d && d->local)
+      ltag = d->local->a_tag;
+
+    if (ltag == NULL)
+      ltag = s2_sip_generate_tag(home);
+
+    if (sip_to_tag(msg_home(reply), sip->sip_to, ltag) < 0) {
+      assert(!"add To tag");
+    }
+  }
+
+  if (d && !d->contact) {
+    d->contact = sip_contact_dup(d->home, sip->sip_contact);
+  }
+
+  *tpn = *tport_name(m->tport);
+
+  rport = su_sprintf(home, "rport=%u",
+		     ntohs(((su_sockaddr_t *)
+			    msg_addrinfo(m->msg)->ai_addr)->su_port));
+
+  if (s2sip->server_uses_rport &&
+      sip->sip_via->v_rport &&
+      sip->sip_via->v_rport[0] == '\0') {
+    msg_header_add_param(home, sip->sip_via->v_common, rport);
+  }
+
+  tpn->tpn_port = rport + strlen("rport=");
+
+  tport_tsend(m->tport, reply, tpn, TPTAG_MTU(INT_MAX), ta_tags(ta));
+  msg_destroy(reply);
+
+  ta_end(ta);
+
+  return m;
+}
+
+/** Add headers from the request to the response message. */
+static int
+s2_complete_response(msg_t *response,
+		     int status, char const *phrase,
+		     msg_t *request)
+{
+  su_home_t *home = msg_home(response);
+  sip_t *response_sip = sip_object(response);
+  sip_t const *request_sip = sip_object(request);
+
+  int incomplete = 0;
+
+  if (!response_sip || !request_sip || !request_sip->sip_request)
+    return -1;
+
+  if (!response_sip->sip_status)
+    response_sip->sip_status = sip_status_create(home, status, phrase, NULL);
+  if (!response_sip->sip_via)
+    response_sip->sip_via = sip_via_dup(home, request_sip->sip_via);
+  if (!response_sip->sip_from)
+    response_sip->sip_from = sip_from_dup(home, request_sip->sip_from);
+  if (!response_sip->sip_to)
+    response_sip->sip_to = sip_to_dup(home, request_sip->sip_to);
+  if (!response_sip->sip_call_id)
+    response_sip->sip_call_id =
+      sip_call_id_dup(home, request_sip->sip_call_id);
+  if (!response_sip->sip_cseq)
+    response_sip->sip_cseq = sip_cseq_dup(home, request_sip->sip_cseq);
+
+  if (!response_sip->sip_record_route && request_sip->sip_record_route)
+    sip_add_dup(response, response_sip, (void*)request_sip->sip_record_route);
+
+  incomplete = sip_complete_message(response) < 0;
+
+  msg_serialize(response, (msg_pub_t *)response_sip);
+
+  if (incomplete ||
+      !response_sip->sip_status ||
+      !response_sip->sip_via ||
+      !response_sip->sip_from ||
+      !response_sip->sip_to ||
+      !response_sip->sip_call_id ||
+      !response_sip->sip_cseq ||
+      !response_sip->sip_content_length ||
+      !response_sip->sip_separator ||
+      (request_sip->sip_record_route && !response_sip->sip_record_route))
+    return -1;
+
+  return 0;
+}
+
+/* Send request (updating dialog).
+ *
+ * Return zero upon success, nonzero upon failure.
+ */
+int
+s2_sip_request_to(struct dialog *d,
+	      sip_method_t method, char const *name,
+	      tport_t *tport,
+	      tag_type_t tag, tag_value_t value, ...)
+{
+  ta_list ta;
+  tagi_t const *tags;
+
+  msg_t *msg = s2_msg(0);
+  sip_t *sip = sip_object(msg);
+  url_t const *target = NULL;
+  sip_cseq_t cseq[1];
+  sip_via_t via[1]; char const *v_params[8];
+  sip_content_length_t l[1];
+  tp_name_t tpn[1];
+  tp_magic_t *magic;
+  int user_via = 0;
+
+  ta_start(ta, tag, value);
+  tags = ta_args(ta);
+
+  if (sip_add_tagis(msg, sip, &tags) < 0)
+    goto error;
+
+  if (sip->sip_request)
+    target = sip->sip_request->rq_url;
+  else if (d->target)
+    target = d->target->m_url;
+  else if (s2sip->sut.contact)
+    target = s2sip->sut.contact->m_url;
+  else
+    target = NULL;
+
+  if (target == NULL)
+    goto error;
+
+  if (!sip->sip_request) {
+    sip_request_t *rq;
+    rq = sip_request_create(msg_home(msg), method, name,
+			    (url_string_t *)target, NULL);
+    sip_header_insert(msg, sip, (sip_header_t *)rq);
+  }
+
+  if (!d->local && sip->sip_from)
+    d->local = sip_from_dup(d->home, sip->sip_from);
+  if (!d->contact && sip->sip_contact)
+    d->contact = sip_contact_dup(d->home, sip->sip_contact);
+  if (!d->remote && sip->sip_to)
+    d->remote = sip_to_dup(d->home, sip->sip_to);
+  if (!d->target && sip->sip_request)
+    d->target = sip_contact_create(d->home,
+				   (url_string_t *)sip->sip_request->rq_url,
+				   NULL);
+  if (!d->call_id && sip->sip_call_id)
+    d->call_id = sip_call_id_dup(d->home, sip->sip_call_id);
+  if (!d->lseq && sip->sip_cseq)
+    d->lseq = sip->sip_cseq->cs_seq;
+
+  if (!d->local)
+    d->local = sip_from_dup(d->home, s2sip->aor);
+  if (!d->contact)
+    d->contact = sip_contact_dup(d->home, s2sip->contact);
+  if (!d->remote)
+    d->remote = sip_to_dup(d->home, s2sip->sut.aor);
+  if (!d->call_id)
+    d->call_id = sip_call_id_create(d->home, NULL);
+  assert(d->local && d->contact);
+  assert(d->remote && d->target);
+  assert(d->call_id);
+
+  if (tport == NULL)
+    tport = d->tport;
+
+  if (tport == NULL)
+    tport = s2sip->sut.tport;
+
+  if (tport == NULL && d->target->m_url->url_type == url_sips)
+    tport = s2sip->tls.tport;
+
+  if (tport == NULL)
+    tport = s2sip->udp.tport;
+  else if (tport == NULL)
+    tport = s2sip->tcp.tport;
+  else if (tport == NULL)
+    tport = s2sip->tls.tport;
+
+  assert(tport);
+
+  *tpn = *tport_name(tport);
+
+  if (tport_is_primary(tport)) {
+    tpn->tpn_host = target->url_host;
+    tpn->tpn_port = url_port(target);
+    if (!tpn->tpn_port || !tpn->tpn_port[0])
+      tpn->tpn_port = url_port_default(target->url_type);
+  }
+
+  magic = tport_magic(tport);
+  assert(magic != NULL);
+
+  sip_cseq_init(cseq);
+  cseq->cs_method = method;
+  cseq->cs_method_name = name;
+
+  if (d->invite && (method == sip_method_ack || method == sip_method_cancel)) {
+    cseq->cs_seq = sip_object(d->invite)->sip_cseq->cs_seq;
+  }
+  else {
+    cseq->cs_seq = ++d->lseq;
+  }
+
+  if (sip->sip_via) {
+    user_via = 1;
+  }
+  else if (d->invite && method == sip_method_cancel) {
+    *via = *sip_object(d->invite)->sip_via;
+  }
+  else {
+    *via = *magic->via;
+    via->v_params = v_params;
+    v_params[0] = su_sprintf(msg_home(msg), "branch=z9hG4bK%lx", ++s2sip->tid);
+    v_params[1] = NULL;
+  }
+
+  sip_content_length_init(l);
+  if (sip->sip_payload)
+    l->l_length = sip->sip_payload->pl_len;
+
+  if (d->local->a_tag == NULL) {
+    char const *ltag = s2_sip_generate_tag(d->home);
+
+    if (sip_from_tag(d->home, d->local, ltag) < 0) {
+      assert(!"add To tag");
+    }
+
+    if (sip->sip_from && sip->sip_from->a_tag == NULL) {
+      if (sip_from_tag(msg_home(msg), sip->sip_from, ltag) < 0) {
+	assert(!"add To tag");
+      }
+    }
+  }
+
+  sip_add_tl(msg, sip,
+	     TAG_IF(!sip->sip_from, SIPTAG_FROM(d->local)),
+	     TAG_IF(!sip->sip_contact, SIPTAG_CONTACT(d->contact)),
+	     TAG_IF(!sip->sip_to, SIPTAG_TO(d->remote)),
+	     TAG_IF(!sip->sip_call_id, SIPTAG_CALL_ID(d->call_id)),
+	     TAG_IF(!sip->sip_cseq, SIPTAG_CSEQ(cseq)),
+	     TAG_IF(!user_via, SIPTAG_VIA(via)),
+	     TAG_IF(!sip->sip_content_length, SIPTAG_CONTENT_LENGTH(l)),
+	     TAG_IF(!sip->sip_separator, SIPTAG_SEPARATOR_STR("\r\n")),
+	     TAG_END());
+
+  msg_serialize(msg, NULL);
+
+  if (method == sip_method_invite) {
+    msg_destroy(d->invite);
+    d->invite = msg_ref_create(msg);
+  }
+
+  tport = tport_tsend(tport, msg, tpn, ta_tags(ta));
+  ta_end(ta);
+
+  if (d->tport != tport) {
+    tport_unref(d->tport);
+    d->tport = tport_ref(tport);
+  }
+
+  return tport ? 0 : -1;
+
+ error:
+  ta_end(ta);
+  return -1;
+}
+
+/** Save information from response.
+ *
+ * Send ACK for error messages to INVITE.
+ */
+int s2_sip_update_dialog(struct dialog *d, struct message *m)
+{
+  int status = 0;
+
+  if (m->sip->sip_status)
+    status = m->sip->sip_status->st_status;
+
+  if (100 < status && status < 300) {
+    d->remote = sip_to_dup(d->home, m->sip->sip_to);
+    if (m->sip->sip_contact)
+      d->contact = sip_contact_dup(d->home, m->sip->sip_contact);
+  }
+
+  if (300 <= status && m->sip->sip_cseq &&
+      m->sip->sip_cseq->cs_method == sip_method_invite &&
+      d->invite) {
+    msg_t *ack = s2_msg(0);
+    sip_t *sip = sip_object(ack);
+    sip_t *invite = sip_object(d->invite);
+    sip_request_t rq[1];
+    sip_cseq_t cseq[1];
+    tp_name_t tpn[1];
+
+    *rq = *invite->sip_request;
+    rq->rq_method = sip_method_ack, rq->rq_method_name = "ACK";
+    *cseq = *invite->sip_cseq;
+    cseq->cs_method = sip_method_ack, cseq->cs_method_name = "ACK";
+
+    sip_add_tl(ack, sip,
+	       SIPTAG_REQUEST(rq),
+	       SIPTAG_VIA(invite->sip_via),
+	       SIPTAG_FROM(invite->sip_from),
+	       SIPTAG_TO(invite->sip_to),
+	       SIPTAG_CALL_ID(invite->sip_call_id),
+	       SIPTAG_CSEQ(cseq),
+	       SIPTAG_CONTENT_LENGTH_STR("0"),
+	       SIPTAG_SEPARATOR_STR("\r\n"),
+	       TAG_END());
+
+    *tpn = *tport_name(d->tport);
+    if (!tport_is_secondary(d->tport) ||
+	!tport_is_clear_to_send(d->tport)) {
+      tpn->tpn_host = rq->rq_url->url_host;
+      tpn->tpn_port = rq->rq_url->url_port;
+    }
+
+    msg_serialize(ack, NULL);
+    tport_tsend(d->tport, ack, tpn, TAG_END());
+  }
+
+  return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+/* tport interface */
+static void
+s2_sip_stack_recv(struct s2sip *s2,
+	      tport_t *tp,
+	      msg_t *msg,
+	      tp_magic_t *magic,
+	      su_time_t now)
+{
+  struct message *next = calloc(1, sizeof *next), **prev;
+
+  next->msg = msg;
+  next->sip = sip_object(msg);
+  next->when = now;
+  next->tport = tport_ref(tp);
+
+#if 0
+  if (next->sip->sip_request)
+    printf("%s: sent: %s\n", s2tester, next->sip->sip_request->rq_method_name);
+  else
+    printf("%s: sent: SIP/2.0 %u %s\n", s2tester,
+	   next->sip->sip_status->st_status,
+	   next->sip->sip_status->st_phrase);
+#endif
+
+  for (prev = &s2->received; *prev; prev = &(*prev)->next)
+    ;
+
+  next->prev = prev, *prev = next;
+}
+
+static void
+s2_sip_stack_error(struct s2sip *s2,
+	       tport_t *tp,
+	       int errcode,
+	       char const *remote)
+{
+  fprintf(stderr, "%s(%p): error %d (%s) from %s\n",
+	  "s2_sip_error",
+	  (void *)tp, errcode, su_strerror(errcode),
+	  remote ? remote : "<unknown destination>");
+}
+
+static msg_t *
+s2_sip_stack_alloc(struct s2sip *s2sip, int flags,
+	       char const data[], usize_t size,
+	       tport_t const *tport,
+	       tp_client_t *tpc)
+{
+  return msg_create(s2sip->mclass, flags | s2sip->flags);
+}
+
+static msg_t *
+s2_msg(int flags)
+{
+  return msg_create(s2sip->mclass, flags | s2sip->flags);
+}
+
+tp_stack_class_t const s2_sip_stack[1] =
+  {{
+      /* tpac_size */ (sizeof s2_sip_stack),
+      /* tpac_recv */  s2_sip_stack_recv,
+      /* tpac_error */ s2_sip_stack_error,
+      /* tpac_alloc */ s2_sip_stack_alloc,
+  }};
+
+static char const *default_protocols[] = { "udp", "tcp", NULL };
+
+/** Setup for SIP transports  */
+void s2_sip_setup(char const *hostname,
+		 char const * const *protocols,
+		 tag_type_t tag, tag_value_t value, ...)
+{
+  su_home_t *home;
+  ta_list ta;
+  tp_name_t tpn[1];
+  int bound;
+  tport_t *tp;
+
+  assert(s2base != NULL);
+  assert(s2sip == NULL);
+
+  s2sip = su_home_new(sizeof *s2sip);
+  home = s2sip->home;
+
+  s2sip->root = su_root_clone(s2base->root, s2sip);
+
+  s2sip->aor = sip_from_format(home, "Bob <sip:bob@%s>",
+			       hostname ? hostname : "example.net");
+  if (hostname == NULL)
+    hostname = "127.0.0.1";
+  s2sip->hostname = hostname;
+  s2sip->tid = (unsigned long)time(NULL) * 510633671UL;
+
+  ta_start(ta, tag, value);
+
+  s2sip->master = tport_tcreate(s2sip, s2_sip_stack, s2sip->root,
+				TPTAG_LOG(getenv("S2_TPORT_LOG") != NULL),
+				ta_tags(ta));
+  assert(s2sip->master);
+  s2sip->mclass = sip_default_mclass();
+  s2sip->flags = 0;
+
+  memset(tpn, 0, (sizeof tpn));
+  tpn->tpn_proto = "*";
+  tpn->tpn_host = "*";
+  tpn->tpn_port = "*";
+
+  if (protocols == NULL)
+    protocols = default_protocols;
+
+  bound = tport_tbind(s2sip->master, tpn, protocols,
+		      TPTAG_SERVER(1),
+		      ta_tags(ta));
+  assert(bound != -1);
+
+  tp = tport_primaries(s2sip->master);
+
+  *tpn = *tport_name(tp);
+  s2sip->contact = sip_contact_format(home, "<sip:%s:%s>",
+				      tpn->tpn_host,
+				      tpn->tpn_port);
+
+  for (;tp; tp = tport_next(tp)) {
+    sip_via_t *v;
+    sip_contact_t *m;
+    tp_magic_t *magic;
+
+    if (tport_magic(tp))
+      continue;
+
+    *tpn = *tport_name(tp);
+
+    v = sip_via_format(home, "SIP/2.0/%s %s:%s",
+		       tpn->tpn_proto,
+		       tpn->tpn_host,
+		       tpn->tpn_port);
+    assert(v != NULL);
+    if (!su_casenmatch(tpn->tpn_proto, "tls", 3)) {
+      m = sip_contact_format(home, "<sip:%s:%s;transport=%s>",
+			     tpn->tpn_host,
+			     tpn->tpn_port,
+			     tpn->tpn_proto);
+      if (s2sip->udp.contact == NULL && su_casematch(tpn->tpn_proto, "udp")) {
+	s2sip->udp.tport = tport_ref(tp);
+	s2sip->udp.contact = m;
+      }
+      if (s2sip->tcp.contact == NULL && su_casematch(tpn->tpn_proto, "tcp")) {
+	s2sip->tcp.tport = tport_ref(tp);
+	s2sip->tcp.contact = m;
+      }
+    }
+    else if (!su_casematch(tpn->tpn_proto, "tls")) {
+      m = sip_contact_format(s2sip->home, "<sips:%s:%s;transport=%s>",
+			     tpn->tpn_host,
+			     tpn->tpn_port,
+			     tpn->tpn_proto);
+    }
+    else {
+      m = sip_contact_format(s2sip->home, "<sips:%s:%s>",
+			     tpn->tpn_host,
+			     tpn->tpn_port);
+      if (s2sip->tls.contact == NULL) {
+	s2sip->tls.tport = tport_ref(tp);
+	s2sip->tls.contact = m;
+      }
+    }
+    assert(m != NULL);
+
+    magic = su_zalloc(home, (sizeof *magic));
+    magic->via = v, magic->contact = m;
+
+    if (s2sip->contact == NULL)
+      s2sip->contact = m;
+
+    tport_set_magic(tp, magic);
+  }
+}
+
+void
+s2_sip_teardown(void)
+{
+  if (s2sip) {
+    tport_destroy(s2sip->master), s2sip->master = NULL;
+    su_root_destroy(s2sip->root), s2sip->root = NULL;
+  }
+}

Added: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h	Tue Mar  3 11:27:41 2009
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the Sofia-SIP package
+ *
+ * Copyright (C) 2008 Nokia Corporation.
+ *
+ * Contact: Pekka Pessi <pekka.pessi at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef S2SIP_H
+#define S2SIP_H
+
+#include <sofia-sip/su_wait.h>
+#include <sofia-sip/sip.h>
+#include <sofia-sip/tport.h>
+#include <sofia-sip/nua.h>
+
+#include "s2util.h"
+
+extern struct s2sip
+{
+  su_home_t home[1];
+
+  su_root_t *root;
+  msg_mclass_t const *mclass;
+  int flags;
+
+  int server_uses_rport;
+
+  char const *hostname;
+  tport_t *master;
+
+  sip_to_t *aor;
+  sip_contact_t *contact;
+
+  struct {
+    sip_contact_t *contact;
+    tport_t *tport;
+  } udp, tcp, tls;
+
+  struct {
+    sip_to_t *aor;
+    sip_contact_t *contact;
+    tport_t *tport;
+  } sut;
+
+  struct message {
+    struct message *next, **prev;
+    msg_t *msg;
+    sip_t *sip;
+    tport_t *tport;
+    su_time_t when;
+  } *received;
+
+  unsigned long tid;
+} *s2sip;
+
+struct dialog
+{
+  su_home_t home[1];
+  sip_from_t *local;
+  sip_to_t *remote;
+  sip_call_id_t *call_id;
+  uint32_t lseq, rseq;
+  sip_contact_t *target;
+  sip_route_t *route;
+  sip_contact_t *contact;
+
+  tport_t *tport;
+  msg_t *invite;		/* latest invite sent */
+};
+
+extern tp_stack_class_t const s2_sip_stack[1];
+
+char *s2_sip_generate_tag(su_home_t *home);
+
+struct message *s2_sip_remove_message(struct message *m);
+void s2_sip_free_message(struct message *m);
+void s2_sip_flush_messages(void);
+
+struct message *s2_sip_next_response(void);
+struct message *s2_sip_wait_for_response(int status, sip_method_t , char const *);
+int s2_sip_check_response(int status, sip_method_t method, char const *name);
+
+struct message *s2_sip_next_request(sip_method_t method, char const *name);
+struct message *s2_sip_wait_for_request(sip_method_t method, char const *name);
+struct message *s2_sip_wait_for_request_timeout(sip_method_t, char const *,
+					    unsigned timeout);
+int s2_sip_check_request(sip_method_t method, char const *name);
+int s2_sip_check_request_timeout(sip_method_t method, char const *, unsigned timeout);
+
+void s2_sip_save_uas_dialog(struct dialog *d, sip_t *sip);
+
+struct message *s2_sip_respond_to(struct message *m, struct dialog *d,
+			      int status, char const *phrase,
+			      tag_type_t tag, tag_value_t value, ...);
+
+int s2_sip_request_to(struct dialog *d,
+		  sip_method_t method, char const *name,
+		  tport_t *tport,
+		  tag_type_t tag, tag_value_t value, ...);
+
+int s2_sip_update_dialog(struct dialog *d, struct message *response);
+
+void s2_sip_setup(char const *hostname,
+		 char const * const *protocols,
+		 tag_type_t tag, tag_value_t value, ...);
+void s2_sip_teardown(void);
+
+#endif


From brian at freeswitch.org  Tue Mar  3 10:03:26 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 12:03:26 -0600
Subject: [Freeswitch-svn] [commit] r12390 - freeswitch/trunk/src
Message-ID: <E1LeYxi-0000Nh-0c@svn.freeswitch.org>

Author: brian
Date: Tue Mar  3 12:03:25 2009
New Revision: 12390

Log:
 FSCORE-317 

Modified:
   freeswitch/trunk/src/switch_core_speech.c

Modified: freeswitch/trunk/src/switch_core_speech.c
==============================================================================
--- freeswitch/trunk/src/switch_core_speech.c	(original)
+++ freeswitch/trunk/src/switch_core_speech.c	Tue Mar  3 12:03:25 2009
@@ -154,7 +154,7 @@
 	if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_DONE)) {
 		switch_clear_flag(sh, SWITCH_SPEECH_FLAG_DONE);
 		*datalen = 0;
-		return SWITCH_STATUS_FALSE;
+		return SWITCH_STATUS_BREAK;
 	}
 
  more:


From mrene at freeswitch.org  Tue Mar  3 11:01:21 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 13:01:21 -0600
Subject: [Freeswitch-svn] [commit] r12391 - in freeswitch/trunk/src: .
	include
Message-ID: <E1LeZrl-0000zn-Cn@svn.freeswitch.org>

Author: mrene
Date: Tue Mar  3 13:01:21 2009
New Revision: 12391

Log:
Add switch_vmprintf

Modified:
   freeswitch/trunk/src/include/switch_core_db.h
   freeswitch/trunk/src/switch_core_db.c

Modified: freeswitch/trunk/src/include/switch_core_db.h
==============================================================================
--- freeswitch/trunk/src/include/switch_core_db.h	(original)
+++ freeswitch/trunk/src/include/switch_core_db.h	Tue Mar  3 13:01:21 2009
@@ -541,6 +541,11 @@
  */
 SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...);
 
+/*!
+ * \see switch_mprintf
+ */
+SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:

Modified: freeswitch/trunk/src/switch_core_db.c
==============================================================================
--- freeswitch/trunk/src/switch_core_db.c	(original)
+++ freeswitch/trunk/src/switch_core_db.c	Tue Mar  3 13:01:21 2009
@@ -180,6 +180,12 @@
 	return z;
 }
 
+SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap)
+{
+
+	return sqlite3_vmprintf(zFormat, ap);
+}
+
 SWITCH_DECLARE(switch_core_db_t *) switch_core_db_open_file(char *filename)
 {
 	switch_core_db_t *db;


From anthm at freeswitch.org  Tue Mar  3 12:16:05 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 14:16:05 -0600
Subject: [Freeswitch-svn] [commit] r12392 - in freeswitch/trunk: .
	conf/autoload_configs libs/esl/perl src
	src/mod/applications/mod_enum src/mod/endpoints/mod_sofia
Message-ID: <E1Leb25-0006sV-EP@svn.freeswitch.org>

Author: anthm
Date: Tue Mar  3 14:16:05 2009
New Revision: 12392

Log:
FSCORE-297 FSCORE-305 FSCORE-315

Modified:
   freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml
   freeswitch/trunk/libs/esl/perl/ESL.pm
   freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
   freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/switch_core.c
   freeswitch/trunk/src/switch_rtp.c

Changes in other areas also in this revision:
Modified:
   freeswitch/trunk/   (props changed)

Modified: freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml	Tue Mar  3 14:16:05 2009
@@ -3,8 +3,8 @@
     <!-- The port where you want to run the http service (default 8080) -->
     <param name="http-port" value="8080"/>
     <!-- if all 3 of the following params exist all http traffic will require auth -->
-    <param name="auth-realm" value="freeswitch"/>
-    <param name="auth-user" value="freeswitch"/>
-    <param name="auth-pass" value="works"/>
+    <!-- <param name="auth-realm" value="freeswitch"/> -->
+    <!-- <param name="auth-user" value="freeswitch"/> -->
+    <!-- <param name="auth-pass" value="works"/> -->
   </settings>
 </configuration>

Modified: freeswitch/trunk/libs/esl/perl/ESL.pm
==============================================================================
--- freeswitch/trunk/libs/esl/perl/ESL.pm	(original)
+++ freeswitch/trunk/libs/esl/perl/ESL.pm	Tue Mar  3 14:16:05 2009
@@ -1,8 +1,5 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
-#
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
-
 package ESL;
 require Exporter;
 require DynaLoader;

Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	Tue Mar  3 14:16:05 2009
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.29
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -12,7 +12,7 @@
 #define SWIG_CASTRANK_MODE
 
 #ifdef __cplusplus
-template<typename T> class SwigValueWrapper {
+template<class T> class SwigValueWrapper {
     T *tt;
 public:
     SwigValueWrapper() : tt(0) { }
@@ -25,10 +25,6 @@
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
 };
-
-template <typename T> T SwigValueInit() {
-  return T();
-}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -38,14 +34,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
 # else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#   define SWIGTEMPLATEDISAMBIGUATOR 
 # endif
 #endif
 
@@ -124,16 +120,10 @@
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
@@ -143,7 +133,7 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "4"
+#define SWIG_RUNTIME_VERSION "2"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -178,7 +168,6 @@
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
-#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -319,10 +308,10 @@
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *, int *);
+typedef void *(*swig_converter_func)(void *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store information on one type */
+/* Structure to store inforomation on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -367,7 +356,7 @@
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (int)((l1 - f1) - (l2 - f2));
+  return (l1 - f1) - (l2 - f2);
 }
 
 /*
@@ -449,8 +438,8 @@
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
 }
 
 /* 
@@ -803,10 +792,6 @@
 #  endif
 #endif /* !INT2PTR */
 
-#ifndef SvPV_nolen
-# define SvPV_nolen(x) SvPV(x,PL_na)
-#endif
-
 #ifndef get_sv
 #  define get_sv perl_get_sv
 #endif
@@ -955,11 +940,6 @@
 
 /* SWIG Perl macros */
 
-/* Macro to declare an XS function */
-#ifndef XSPROTO
-#   define XSPROTO(name) void name(pTHX_ CV* cv)
-#endif
-
 /* Macro to call an XS function */
 #ifdef PERL_OBJECT 
 #  define SWIG_CALLXS(_name) _name(cv,pPerl) 
@@ -971,50 +951,51 @@
 #  endif 
 #endif 
 
+/* Note: SwigMagicFuncHack is a typedef used to get the C++ compiler to just shut up already */
+
 #ifdef PERL_OBJECT
 #define MAGIC_PPERL  CPerlObj *pPerl = (CPerlObj *) this;
+typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
+typedef int (CPerlObj::*SwigMagicFuncHack)(SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
 #define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
 #define SWIGCLASS_STATIC
-
-#else /* PERL_OBJECT */
-
+#else
 #define MAGIC_PPERL
 #define SWIGCLASS_STATIC static SWIGUNUSED
-
 #ifndef MULTIPLICITY
 #define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
+typedef int (*SwigMagicFunc)(SV *, MAGIC *);
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef int (*SwigMagicFunc)(SV *, MAGIC *);
+typedef int (*SwigMagicFuncHack)(SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
-#else /* MULTIPLICITY */
 
+#else
 #define SWIG_MAGIC(a,b) (struct interpreter *interp, SV *a, MAGIC *b)
-
+typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
+typedef int (*SwigMagicFuncHack)(struct interpreter *, SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* MULTIPLICITY */
-#endif /* PERL_OBJECT */
+#endif
+#endif
 
 /* Workaround for bug in perl 5.6.x croak and earlier */
 #if (PERL_VERSION < 8)
@@ -1038,35 +1019,6 @@
 #endif
 
 
-/* 
-   Define how strict is the cast between strings and integers/doubles
-   when overloading between these types occurs.
-   
-   The default is making it as strict as possible by using SWIG_AddCast
-   when needed.
-   
-   You can use -DSWIG_PERL_NO_STRICT_STR2NUM at compilation time to
-   disable the SWIG_AddCast, making the casting between string and
-   numbers less strict.
-
-   In the end, we try to solve the overloading between strings and
-   numerical types in the more natural way, but if you can avoid it,
-   well, avoid it using %rename, for example.
-*/
-#ifndef SWIG_PERL_NO_STRICT_STR2NUM
-# ifndef SWIG_PERL_STRICT_STR2NUM
-#  define SWIG_PERL_STRICT_STR2NUM
-# endif
-#endif
-#ifdef SWIG_PERL_STRICT_STR2NUM
-/* string takes precedence */
-#define SWIG_Str2NumCast(x) SWIG_AddCast(x)  
-#else
-/* number takes precedence */
-#define SWIG_Str2NumCast(x) x
-#endif
-
-
 
 #include <stdlib.h>
 
@@ -1083,7 +1035,7 @@
 
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeProxyCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) 
+  SWIG_TypeCheck_Template(( (!iter->type->clientdata && (strcmp((char*)iter->type->name, c) == 0)) 
 			    || (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0))), ty);
 }
 
@@ -1141,11 +1093,7 @@
     if (!tc) {
       return SWIG_ERROR;
     }
-    {
-      int newmemory = 0;
-      *ptr = SWIG_TypeCast(tc,voidptr,&newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
-    }
+    *ptr = SWIG_TypeCast(tc,voidptr);
   } else {
     *ptr = voidptr;
   }
@@ -1235,7 +1183,7 @@
   const char  *c = 0;
 
   if ((!obj) || (!SvOK(obj))) return SWIG_ERROR;
-  c = SvPV_nolen(obj);
+  c = SvPV(obj, PL_na);
   /* Pointer values must start with leading underscore */
   if (*c != '_') return SWIG_ERROR;
   c++;
@@ -1252,7 +1200,7 @@
 #define SWIG_croak(x)    { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; }
 
 
-typedef XSPROTO(SwigPerlWrapper);
+typedef XS(SwigPerlWrapper);
 typedef SwigPerlWrapper *SwigPerlWrapperPtr;
 
 /* Structure for command table */
@@ -1305,8 +1253,8 @@
   sv_magic(sv,sv,'U',(char *) name,strlen(name));
   mg = mg_find(sv,'U');
   mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
-  mg->mg_virtual->svt_get = (SwigMagicFunc) get;
-  mg->mg_virtual->svt_set = (SwigMagicFunc) set;
+  mg->mg_virtual->svt_get = (SwigMagicFuncHack) get;
+  mg->mg_virtual->svt_set = (SwigMagicFuncHack) set;
   mg->mg_virtual->svt_len = 0;
   mg->mg_virtual->svt_clear = 0;
   mg->mg_virtual->svt_free = 0;
@@ -1320,7 +1268,7 @@
 
   /* first check if pointer already created */
   if (!type_pointer) {
-    pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, FALSE | GV_ADDMULTI);
+    pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, FALSE);
     if (pointer && SvOK(pointer)) {
       type_pointer = INT2PTR(swig_type_info **, SvIV(pointer));
     }
@@ -1334,7 +1282,7 @@
   SV *pointer;
 
   /* create a new pointer */
-  pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TRUE | GV_ADDMULTI);
+  pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TRUE);
   sv_setiv(pointer, PTR2IV(module));
 }
 
@@ -1429,12 +1377,6 @@
 #ifdef check
   #undef check
 #endif
-#ifdef seekdir
-  #undef seekdir
-#endif
-#ifdef open
-  #undef open
-#endif
 
 
 
@@ -1463,8 +1405,7 @@
 #define SWIG_name   "ESLc::boot_ESL"
 #define SWIG_prefix "ESLc::"
 
-#define SWIGVERSION 0x010335 
-#define SWIG_VERSION SWIGVERSION
+#define SWIGVERSION 0x010329 
 
 
 #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
@@ -1493,7 +1434,7 @@
 
 
 SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor(void)
+SWIG_pchar_descriptor()
 {
   static int init = 0;
   static swig_type_info* info = 0;
@@ -1547,8 +1488,16 @@
 SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 {
   SV *obj = sv_newmortal();
-  if (carray) {
-    sv_setpvn(obj, carray, size);
+  if (size && carray) {
+    if (carray[size - 1] == 0) {
+      sv_setpv(obj, carray);
+    } else {
+      char *tmp = (new char[size + 1]);
+      memcpy(tmp, carray, size);
+      tmp[size] = 0;
+      sv_setpv(obj, tmp);
+      delete[] tmp;
+    }
   } else {
     sv_setsv(obj, &PL_sv_undef);
   }
@@ -1564,12 +1513,14 @@
 
 
 #include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-#   define LLONG_MAX __LONG_LONG_MAX__
-#   define LLONG_MIN (-LLONG_MAX - 1LL)
-#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
+#ifndef LLONG_MIN
+# define LLONG_MIN	LONG_LONG_MIN
+#endif
+#ifndef LLONG_MAX
+# define LLONG_MAX	LONG_LONG_MAX
+#endif
+#ifndef ULLONG_MAX
+# define ULLONG_MAX	ULONG_LONG_MAX
 #endif
 
 
@@ -1583,7 +1534,7 @@
     if (val) *val = (double) SvIV(obj);
     return SWIG_AddCast(SWIG_OK);
   } else {
-    const char *nptr = SvPV_nolen(obj);
+    const char *nptr = SvPV(obj, PL_na);
     if (nptr) {
       char *endptr;
       double v = strtod(nptr, &endptr);
@@ -1593,7 +1544,7 @@
       } else {
 	if (*endptr == '\0') {
 	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
+	  return SWIG_AddCast(SWIG_OK);
 	}
       }
     }
@@ -1646,19 +1597,17 @@
     return SWIG_OK;
   } else {
     int dispatch = 0;
-    const char *nptr = SvPV_nolen(obj);
+    const char *nptr = SvPV(obj, PL_na);
     if (nptr) {
       char *endptr;
-      long v;
-      errno = 0;
-      v = strtol(nptr, &endptr,0);
+      long v = strtol(nptr, &endptr,0);
       if (errno == ERANGE) {
 	errno = 0;
 	return SWIG_OverflowError;
       } else {
 	if (*endptr == '\0') {
 	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
+	  return SWIG_AddCast(SWIG_OK);
 	}
       }
     }
@@ -1719,10 +1668,6 @@
   return obj;
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef PERL_OBJECT
 #define MAGIC_CLASS _wrap_ESL_var::
 class _wrap_ESL_var : public CPerlObj {
@@ -1742,10 +1687,6 @@
 #endif
 
 #ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
 extern "C" {
 #endif
 XS(_wrap_ESLevent_event_set) {
@@ -1838,11 +1779,11 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_serialized_string_set" "', argument " "2"" of type '" "char *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     if (arg1->serialized_string) delete[] arg1->serialized_string;
     if (arg2) {
-      size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1;
-      arg1->serialized_string = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size)));
+      size_t size = strlen(arg2) + 1;
+      arg1->serialized_string = reinterpret_cast< char* >(memcpy((new char[size]), arg2, sizeof(char)*(size)));
     } else {
       arg1->serialized_string = 0;
     }
@@ -1876,7 +1817,7 @@
     }
     arg1 = reinterpret_cast< ESLevent * >(argp1);
     result = (char *) ((arg1)->serialized_string);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
     
     XSRETURN(argvi);
   fail:
@@ -1973,13 +1914,13 @@
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ESLevent" "', argument " "1"" of type '" "char const *""'");
     }
-    arg1 = reinterpret_cast< char * >(buf1);
+    arg1 = buf1;
     if (items > 1) {
       res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
       if (!SWIG_IsOK(res2)) {
         SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ESLevent" "', argument " "2"" of type '" "char const *""'");
       }
-      arg2 = reinterpret_cast< char * >(buf2);
+      arg2 = buf2;
     }
     result = (ESLevent *)new ESLevent((char const *)arg1,(char const *)arg2);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
@@ -2222,10 +2163,10 @@
       if (!SWIG_IsOK(res2)) {
         SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_serialize" "', argument " "2"" of type '" "char const *""'");
       }
-      arg2 = reinterpret_cast< char * >(buf2);
+      arg2 = buf2;
     }
     result = (char *)(arg1)->serialize((char const *)arg2);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     XSRETURN(argvi);
@@ -2306,9 +2247,9 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_getHeader" "', argument " "2"" of type '" "char *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (char *)(arg1)->getHeader(arg2);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     XSRETURN(argvi);
@@ -2338,7 +2279,7 @@
     }
     arg1 = reinterpret_cast< ESLevent * >(argp1);
     result = (char *)(arg1)->getBody();
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
     
     XSRETURN(argvi);
   fail:
@@ -2366,7 +2307,7 @@
     }
     arg1 = reinterpret_cast< ESLevent * >(argp1);
     result = (char *)(arg1)->getType();
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
     
     XSRETURN(argvi);
   fail:
@@ -2401,7 +2342,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_addBody" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (bool)(arg1)->addBody((char const *)arg2);
     ST(argvi) = SWIG_From_bool  SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
     
@@ -2444,12 +2385,12 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_addHeader" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLevent_addHeader" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = reinterpret_cast< char * >(buf3);
+    arg3 = buf3;
     result = (bool)(arg1)->addHeader((char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_From_bool  SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
     
@@ -2490,7 +2431,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_delHeader" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (bool)(arg1)->delHeader((char const *)arg2);
     ST(argvi) = SWIG_From_bool  SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
     
@@ -2585,17 +2526,17 @@
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ESLconnection" "', argument " "1"" of type '" "char const *""'");
     }
-    arg1 = reinterpret_cast< char * >(buf1);
+    arg1 = buf1;
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ESLconnection" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ESLconnection" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = reinterpret_cast< char * >(buf3);
+    arg3 = buf3;
     result = (ESLconnection *)new ESLconnection((char const *)arg1,(char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLconnection, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
@@ -2826,7 +2767,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_send" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (int)(arg1)->send((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -2865,7 +2806,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendRecv" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -3116,12 +3057,12 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_filter" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = reinterpret_cast< char * >(buf3);
+    arg3 = buf3;
     result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3166,12 +3107,12 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_events" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_events" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = reinterpret_cast< char * >(buf3);
+    arg3 = buf3;
     result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3220,20 +3161,20 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_execute" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     if (items > 2) {
       res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
       if (!SWIG_IsOK(res3)) {
         SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_execute" "', argument " "3"" of type '" "char const *""'");
       }
-      arg3 = reinterpret_cast< char * >(buf3);
+      arg3 = buf3;
     }
     if (items > 3) {
       res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
       if (!SWIG_IsOK(res4)) {
         SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ESLconnection_execute" "', argument " "4"" of type '" "char const *""'");
       }
-      arg4 = reinterpret_cast< char * >(buf4);
+      arg4 = buf4;
     }
     result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
@@ -3277,7 +3218,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setBlockingExecute" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (int)(arg1)->setBlockingExecute((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3316,7 +3257,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setEventLock" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = reinterpret_cast< char * >(buf2);
+    arg2 = buf2;
     result = (int)(arg1)->setEventLock((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3452,7 +3393,7 @@
  * structures together.
  *
  * The generated swig_type_info structures are assigned staticly to an initial 
- * array. We just loop through that array, and handle each type individually.
+ * array. We just loop though that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
  * cast linked list. The cast data is initially stored in something like a
@@ -3490,58 +3431,32 @@
 #define SWIGRUNTIME_DEBUG
 #endif
 
-
 SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
-  swig_module_info *module_head, *iter;
-  int found, init;
+  swig_module_info *module_head;
+  static int init_run = 0;
   
   clientdata = clientdata;
   
-  /* check to see if the circular list has been setup, if not, set it up */
-  if (swig_module.next==0) {
-    /* Initialize the swig_module */
-    swig_module.type_initial = swig_type_initial;
-    swig_module.cast_initial = swig_cast_initial;
-    swig_module.next = &swig_module;
-    init = 1;
-  } else {
-    init = 0;
-  }
+  if (init_run) return;
+  init_run = 1;
+  
+  /* Initialize the swig_module */
+  swig_module.type_initial = swig_type_initial;
+  swig_module.cast_initial = swig_cast_initial;
   
   /* Try and load any already created modules */
   module_head = SWIG_GetModule(clientdata);
-  if (!module_head) {
-    /* This is the first module loaded for this interpreter */
-    /* so set the swig module into the interpreter */
-    SWIG_SetModule(clientdata, &swig_module);
-    module_head = &swig_module;
-  } else {
-    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    found=0;
-    iter=module_head;
-    do {
-      if (iter==&swig_module) {
-        found=1;
-        break;
-      }
-      iter=iter->next;
-    } while (iter!= module_head);
-    
-    /* if the is found in the list, then all is done and we may leave */
-    if (found) return;
-    /* otherwise we must add out module into the list */
+  if (module_head) {
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
+  } else {
+    /* This is the first module loaded */
+    swig_module.next = &swig_module;
+    SWIG_SetModule(clientdata, &swig_module);
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
-       a different interpreter, but not yet have a pointer in this interpreter.
-       In this case, we do not want to continue adding types... everything should be
-       set up already */
-  if (init == 0) return;
-  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -3695,7 +3610,7 @@
   /* Install variables */
   for (i = 0; swig_variables[i].name; i++) {
     SV *sv;
-    sv = get_sv((char*) swig_variables[i].name, TRUE | 0x2 | GV_ADDMULTI);
+    sv = get_sv((char*) swig_variables[i].name, TRUE | 0x2);
     if (swig_variables[i].type) {
       SWIG_MakePtr(sv,(void *)1, *swig_variables[i].type,0);
     } else {
@@ -3707,7 +3622,7 @@
   /* Install constant */
   for (i = 0; swig_constants[i].type; i++) {
     SV *sv;
-    sv = get_sv((char*)swig_constants[i].name, TRUE | 0x2 | GV_ADDMULTI);
+    sv = get_sv((char*)swig_constants[i].name, TRUE | 0x2);
     switch(swig_constants[i].type) {
     case SWIG_INT:
       sv_setiv(sv, (IV) swig_constants[i].lvalue);

Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c	Tue Mar  3 14:16:05 2009
@@ -93,9 +93,9 @@
 	route = switch_core_alloc(globals.pool, sizeof(*route));
 
 
-	route->service = strdup(service);
-	route->regex = strdup(regex);
-	route->replace = strdup(replace);
+	route->service = switch_core_strdup(globals.pool, service);
+	route->regex = switch_core_strdup(globals.pool, regex);
+	route->replace = switch_core_strdup(globals.pool, replace);
 
 	switch_mutex_lock(MUTEX);
 	if (!globals.route_order) {

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Tue Mar  3 14:16:05 2009
@@ -2964,12 +2964,12 @@
 	
 	while (mod_sofia_globals.threads) {
 		switch_cond_next();
-		if (++sanity >= 10000) {
+		if (++sanity >= 60000) {
 			break;
 		}
 	}
 
-	switch_yield(1000000);
+	//switch_yield(1000000);
 	su_deinit();
 
 	switch_mutex_lock(mod_sofia_globals.hash_mutex);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Mar  3 14:16:05 2009
@@ -662,7 +662,7 @@
 	return NULL;
 }
 
-void launch_sofia_worker_thread(sofia_profile_t *profile)
+switch_thread_t *launch_sofia_worker_thread(sofia_profile_t *profile)
 {
 	switch_thread_t *thread;
 	switch_threadattr_t *thd_attr = NULL;
@@ -680,6 +680,8 @@
 			break;
 		}
 	}
+
+	return thread;
 }
 
 void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void *obj)
@@ -693,6 +695,8 @@
 	int use_timer = !sofia_test_pflag(profile, PFLAG_DISABLE_TIMER);
 	const char *supported = NULL;
 	int sanity;
+	switch_thread_t *worker_thread;
+	switch_status_t st;
 
 	switch_mutex_lock(mod_sofia_globals.mutex);
 	mod_sofia_globals.threads++;
@@ -823,7 +827,7 @@
 	profile->started = switch_epoch_time_now(NULL);
 
 	sofia_set_pflag_locked(profile, PFLAG_RUNNING);
-	launch_sofia_worker_thread(profile);
+	worker_thread = launch_sofia_worker_thread(profile);
 
 	switch_yield(1000000);
 
@@ -850,15 +854,11 @@
 	sofia_reg_unregister(profile);
 	nua_shutdown(profile->nua);
 	su_root_run(profile->s_root);
-	nua_shutdown(profile->nua);
-	su_root_run(profile->s_root);
-
+	
 	sofia_clear_pflag_locked(profile, PFLAG_RUNNING);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Waiting for worker thread\n");
 
-	while (sofia_test_pflag(profile, PFLAG_WORKER_RUNNING)) {
-		switch_yield(100000);
-	}
+	switch_thread_join(&st, worker_thread);
 	
 	sanity = 4;
 	while (profile->inuse) {
@@ -3243,10 +3243,7 @@
 	case nua_callstate_terminating:
 		if (status == 488 || switch_channel_get_state(channel) == CS_HIBERNATE) {
 			tech_pvt->q850_cause = SWITCH_CAUSE_MANDATORY_IE_MISSING;
-		} else if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
-			sofia_set_flag_locked(tech_pvt, TFLAG_BYE);
 		}
-		break;
 	case nua_callstate_terminated:
 		if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
 			sofia_set_flag_locked(tech_pvt, TFLAG_BYE);
@@ -3274,17 +3271,17 @@
 				switch_channel_hangup(channel, cause);
 			}
 		}
-
-		if (tech_pvt->sofia_private) {
-			tech_pvt->sofia_private = NULL;
-		}
-
-		tech_pvt->nh = NULL;
-		
-
-		if (nh) {
-			nua_handle_bind(nh, NULL);
-			nua_handle_destroy(nh);
+		if (ss_state == nua_callstate_terminated) {
+			if (tech_pvt->sofia_private) {
+				tech_pvt->sofia_private = NULL;
+			}
+			
+			tech_pvt->nh = NULL;
+			
+			if (nh) {
+				nua_handle_bind(nh, NULL);
+				nua_handle_destroy(nh);
+			}
 		}
 		break;
 	}

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Tue Mar  3 14:16:05 2009
@@ -249,6 +249,20 @@
 	return val;
 }
 
+static void switch_core_unset_variables(void)
+{
+	switch_hash_index_t *hi;
+    const void *var;
+    void *val;
+
+	switch_mutex_lock(runtime.global_var_mutex);
+	for (hi = switch_hash_first(NULL, runtime.global_vars); hi; hi = switch_hash_next(hi)) {
+		switch_hash_this(hi, &var, NULL, &val);
+		free(val);
+	}
+	switch_mutex_unlock(runtime.global_var_mutex);
+}
+
 SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value)
 {
 	char *val;
@@ -1488,6 +1502,7 @@
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n");
 	switch_log_shutdown();
 
+	switch_core_unset_variables();
 	switch_core_memory_stop();
 
 	if (runtime.console && runtime.console != stdout && runtime.console != stderr) {

Modified: freeswitch/trunk/src/switch_rtp.c
==============================================================================
--- freeswitch/trunk/src/switch_rtp.c	(original)
+++ freeswitch/trunk/src/switch_rtp.c	Tue Mar  3 14:16:05 2009
@@ -409,7 +409,26 @@
 
 SWITCH_DECLARE(void) switch_rtp_shutdown(void)
 {
+	switch_core_port_allocator_t *alloc = NULL;
+	switch_hash_index_t *hi;
+    const void *var;
+    void *val;
+
+	switch_mutex_lock(port_lock);
+
+	for (hi = switch_hash_first(NULL, alloc_hash); hi; hi = switch_hash_next(hi)) {
+		switch_hash_this(hi, &var, NULL, &val);
+		if ((alloc = (switch_core_port_allocator_t *) val)) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroy port allocator for %s\n", (char *)var);
+			switch_core_port_allocator_destroy(&alloc);
+		}
+	}
+
 	switch_core_hash_destroy(&alloc_hash);
+	switch_mutex_unlock(port_lock);
+
+	crypto_kernel_shutdown();
+
 }
 
 SWITCH_DECLARE(switch_port_t) switch_rtp_set_start_port(switch_port_t port)


From brian at freeswitch.org  Tue Mar  3 12:20:27 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 14:20:27 -0600
Subject: [Freeswitch-svn] [commit] r12393 - in freeswitch/trunk:
	conf/autoload_configs libs/esl/perl
Message-ID: <E1Leb6J-0006vJ-LI@svn.freeswitch.org>

Author: brian
Date: Tue Mar  3 14:20:27 2009
New Revision: 12393

Log:
 revert 

Modified:
   freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml
   freeswitch/trunk/libs/esl/perl/ESL.pm
   freeswitch/trunk/libs/esl/perl/esl_wrap.cpp

Modified: freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml	Tue Mar  3 14:20:27 2009
@@ -3,8 +3,8 @@
     <!-- The port where you want to run the http service (default 8080) -->
     <param name="http-port" value="8080"/>
     <!-- if all 3 of the following params exist all http traffic will require auth -->
-    <!-- <param name="auth-realm" value="freeswitch"/> -->
-    <!-- <param name="auth-user" value="freeswitch"/> -->
-    <!-- <param name="auth-pass" value="works"/> -->
+    <param name="auth-realm" value="freeswitch"/>
+    <param name="auth-user" value="freeswitch"/>
+    <param name="auth-pass" value="works"/>
   </settings>
 </configuration>

Modified: freeswitch/trunk/libs/esl/perl/ESL.pm
==============================================================================
--- freeswitch/trunk/libs/esl/perl/ESL.pm	(original)
+++ freeswitch/trunk/libs/esl/perl/ESL.pm	Tue Mar  3 14:20:27 2009
@@ -1,5 +1,8 @@
-# This file was created automatically by SWIG 1.3.29.
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.35
+#
 # Don't modify this file, modify the SWIG interface instead.
+
 package ESL;
 require Exporter;
 require DynaLoader;

Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	Tue Mar  3 14:20:27 2009
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.29
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -12,7 +12,7 @@
 #define SWIG_CASTRANK_MODE
 
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
+template<typename T> class SwigValueWrapper {
     T *tt;
 public:
     SwigValueWrapper() : tt(0) { }
@@ -25,6 +25,10 @@
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -34,14 +38,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -120,10 +124,16 @@
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
@@ -133,7 +143,7 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "2"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -168,6 +178,7 @@
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -308,10 +319,10 @@
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -356,7 +367,7 @@
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -438,8 +449,8 @@
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -792,6 +803,10 @@
 #  endif
 #endif /* !INT2PTR */
 
+#ifndef SvPV_nolen
+# define SvPV_nolen(x) SvPV(x,PL_na)
+#endif
+
 #ifndef get_sv
 #  define get_sv perl_get_sv
 #endif
@@ -940,6 +955,11 @@
 
 /* SWIG Perl macros */
 
+/* Macro to declare an XS function */
+#ifndef XSPROTO
+#   define XSPROTO(name) void name(pTHX_ CV* cv)
+#endif
+
 /* Macro to call an XS function */
 #ifdef PERL_OBJECT 
 #  define SWIG_CALLXS(_name) _name(cv,pPerl) 
@@ -951,51 +971,50 @@
 #  endif 
 #endif 
 
-/* Note: SwigMagicFuncHack is a typedef used to get the C++ compiler to just shut up already */
-
 #ifdef PERL_OBJECT
 #define MAGIC_PPERL  CPerlObj *pPerl = (CPerlObj *) this;
-typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef int (CPerlObj::*SwigMagicFuncHack)(SV *, MAGIC *);
+typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
 #define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
 #define SWIGCLASS_STATIC
-#else
+
+#else /* PERL_OBJECT */
+
 #define MAGIC_PPERL
 #define SWIGCLASS_STATIC static SWIGUNUSED
+
 #ifndef MULTIPLICITY
 #define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
-typedef int (*SwigMagicFunc)(SV *, MAGIC *);
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef int (*SwigMagicFuncHack)(SV *, MAGIC *);
+typedef int (*SwigMagicFunc)(SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
+#else /* MULTIPLICITY */
 
-#else
 #define SWIG_MAGIC(a,b) (struct interpreter *interp, SV *a, MAGIC *b)
-typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef int (*SwigMagicFuncHack)(struct interpreter *, SV *, MAGIC *);
+typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
-#endif
-#endif
+#endif /* MULTIPLICITY */
+#endif /* PERL_OBJECT */
 
 /* Workaround for bug in perl 5.6.x croak and earlier */
 #if (PERL_VERSION < 8)
@@ -1019,6 +1038,35 @@
 #endif
 
 
+/* 
+   Define how strict is the cast between strings and integers/doubles
+   when overloading between these types occurs.
+   
+   The default is making it as strict as possible by using SWIG_AddCast
+   when needed.
+   
+   You can use -DSWIG_PERL_NO_STRICT_STR2NUM at compilation time to
+   disable the SWIG_AddCast, making the casting between string and
+   numbers less strict.
+
+   In the end, we try to solve the overloading between strings and
+   numerical types in the more natural way, but if you can avoid it,
+   well, avoid it using %rename, for example.
+*/
+#ifndef SWIG_PERL_NO_STRICT_STR2NUM
+# ifndef SWIG_PERL_STRICT_STR2NUM
+#  define SWIG_PERL_STRICT_STR2NUM
+# endif
+#endif
+#ifdef SWIG_PERL_STRICT_STR2NUM
+/* string takes precedence */
+#define SWIG_Str2NumCast(x) SWIG_AddCast(x)  
+#else
+/* number takes precedence */
+#define SWIG_Str2NumCast(x) x
+#endif
+
+
 
 #include <stdlib.h>
 
@@ -1035,7 +1083,7 @@
 
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeProxyCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(( (!iter->type->clientdata && (strcmp((char*)iter->type->name, c) == 0)) 
+  SWIG_TypeCheck_Template(( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) 
 			    || (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0))), ty);
 }
 
@@ -1093,7 +1141,11 @@
     if (!tc) {
       return SWIG_ERROR;
     }
-    *ptr = SWIG_TypeCast(tc,voidptr);
+    {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc,voidptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
+    }
   } else {
     *ptr = voidptr;
   }
@@ -1183,7 +1235,7 @@
   const char  *c = 0;
 
   if ((!obj) || (!SvOK(obj))) return SWIG_ERROR;
-  c = SvPV(obj, PL_na);
+  c = SvPV_nolen(obj);
   /* Pointer values must start with leading underscore */
   if (*c != '_') return SWIG_ERROR;
   c++;
@@ -1200,7 +1252,7 @@
 #define SWIG_croak(x)    { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; }
 
 
-typedef XS(SwigPerlWrapper);
+typedef XSPROTO(SwigPerlWrapper);
 typedef SwigPerlWrapper *SwigPerlWrapperPtr;
 
 /* Structure for command table */
@@ -1253,8 +1305,8 @@
   sv_magic(sv,sv,'U',(char *) name,strlen(name));
   mg = mg_find(sv,'U');
   mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
-  mg->mg_virtual->svt_get = (SwigMagicFuncHack) get;
-  mg->mg_virtual->svt_set = (SwigMagicFuncHack) set;
+  mg->mg_virtual->svt_get = (SwigMagicFunc) get;
+  mg->mg_virtual->svt_set = (SwigMagicFunc) set;
   mg->mg_virtual->svt_len = 0;
   mg->mg_virtual->svt_clear = 0;
   mg->mg_virtual->svt_free = 0;
@@ -1268,7 +1320,7 @@
 
   /* first check if pointer already created */
   if (!type_pointer) {
-    pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, FALSE);
+    pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, FALSE | GV_ADDMULTI);
     if (pointer && SvOK(pointer)) {
       type_pointer = INT2PTR(swig_type_info **, SvIV(pointer));
     }
@@ -1282,7 +1334,7 @@
   SV *pointer;
 
   /* create a new pointer */
-  pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TRUE);
+  pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TRUE | GV_ADDMULTI);
   sv_setiv(pointer, PTR2IV(module));
 }
 
@@ -1377,6 +1429,12 @@
 #ifdef check
   #undef check
 #endif
+#ifdef seekdir
+  #undef seekdir
+#endif
+#ifdef open
+  #undef open
+#endif
 
 
 
@@ -1405,7 +1463,8 @@
 #define SWIG_name   "ESLc::boot_ESL"
 #define SWIG_prefix "ESLc::"
 
-#define SWIGVERSION 0x010329 
+#define SWIGVERSION 0x010335 
+#define SWIG_VERSION SWIGVERSION
 
 
 #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
@@ -1434,7 +1493,7 @@
 
 
 SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor()
+SWIG_pchar_descriptor(void)
 {
   static int init = 0;
   static swig_type_info* info = 0;
@@ -1488,16 +1547,8 @@
 SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 {
   SV *obj = sv_newmortal();
-  if (size && carray) {
-    if (carray[size - 1] == 0) {
-      sv_setpv(obj, carray);
-    } else {
-      char *tmp = (new char[size + 1]);
-      memcpy(tmp, carray, size);
-      tmp[size] = 0;
-      sv_setpv(obj, tmp);
-      delete[] tmp;
-    }
+  if (carray) {
+    sv_setpvn(obj, carray, size);
   } else {
     sv_setsv(obj, &PL_sv_undef);
   }
@@ -1513,14 +1564,12 @@
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN	LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX	LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX	ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -1534,7 +1583,7 @@
     if (val) *val = (double) SvIV(obj);
     return SWIG_AddCast(SWIG_OK);
   } else {
-    const char *nptr = SvPV(obj, PL_na);
+    const char *nptr = SvPV_nolen(obj);
     if (nptr) {
       char *endptr;
       double v = strtod(nptr, &endptr);
@@ -1544,7 +1593,7 @@
       } else {
 	if (*endptr == '\0') {
 	  if (val) *val = v;
-	  return SWIG_AddCast(SWIG_OK);
+	  return SWIG_Str2NumCast(SWIG_OK);
 	}
       }
     }
@@ -1597,17 +1646,19 @@
     return SWIG_OK;
   } else {
     int dispatch = 0;
-    const char *nptr = SvPV(obj, PL_na);
+    const char *nptr = SvPV_nolen(obj);
     if (nptr) {
       char *endptr;
-      long v = strtol(nptr, &endptr,0);
+      long v;
+      errno = 0;
+      v = strtol(nptr, &endptr,0);
       if (errno == ERANGE) {
 	errno = 0;
 	return SWIG_OverflowError;
       } else {
 	if (*endptr == '\0') {
 	  if (val) *val = v;
-	  return SWIG_AddCast(SWIG_OK);
+	  return SWIG_Str2NumCast(SWIG_OK);
 	}
       }
     }
@@ -1668,6 +1719,10 @@
   return obj;
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef PERL_OBJECT
 #define MAGIC_CLASS _wrap_ESL_var::
 class _wrap_ESL_var : public CPerlObj {
@@ -1687,6 +1742,10 @@
 #endif
 
 #ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 XS(_wrap_ESLevent_event_set) {
@@ -1779,11 +1838,11 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_serialized_string_set" "', argument " "2"" of type '" "char *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     if (arg1->serialized_string) delete[] arg1->serialized_string;
     if (arg2) {
-      size_t size = strlen(arg2) + 1;
-      arg1->serialized_string = reinterpret_cast< char* >(memcpy((new char[size]), arg2, sizeof(char)*(size)));
+      size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1;
+      arg1->serialized_string = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size)));
     } else {
       arg1->serialized_string = 0;
     }
@@ -1817,7 +1876,7 @@
     }
     arg1 = reinterpret_cast< ESLevent * >(argp1);
     result = (char *) ((arg1)->serialized_string);
-    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
     XSRETURN(argvi);
   fail:
@@ -1914,13 +1973,13 @@
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ESLevent" "', argument " "1"" of type '" "char const *""'");
     }
-    arg1 = buf1;
+    arg1 = reinterpret_cast< char * >(buf1);
     if (items > 1) {
       res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
       if (!SWIG_IsOK(res2)) {
         SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ESLevent" "', argument " "2"" of type '" "char const *""'");
       }
-      arg2 = buf2;
+      arg2 = reinterpret_cast< char * >(buf2);
     }
     result = (ESLevent *)new ESLevent((char const *)arg1,(char const *)arg2);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
@@ -2163,10 +2222,10 @@
       if (!SWIG_IsOK(res2)) {
         SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_serialize" "', argument " "2"" of type '" "char const *""'");
       }
-      arg2 = buf2;
+      arg2 = reinterpret_cast< char * >(buf2);
     }
     result = (char *)(arg1)->serialize((char const *)arg2);
-    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     XSRETURN(argvi);
@@ -2247,9 +2306,9 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_getHeader" "', argument " "2"" of type '" "char *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (char *)(arg1)->getHeader(arg2);
-    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     XSRETURN(argvi);
@@ -2279,7 +2338,7 @@
     }
     arg1 = reinterpret_cast< ESLevent * >(argp1);
     result = (char *)(arg1)->getBody();
-    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
     XSRETURN(argvi);
   fail:
@@ -2307,7 +2366,7 @@
     }
     arg1 = reinterpret_cast< ESLevent * >(argp1);
     result = (char *)(arg1)->getType();
-    ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
     XSRETURN(argvi);
   fail:
@@ -2342,7 +2401,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_addBody" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (bool)(arg1)->addBody((char const *)arg2);
     ST(argvi) = SWIG_From_bool  SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
     
@@ -2385,12 +2444,12 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_addHeader" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLevent_addHeader" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = buf3;
+    arg3 = reinterpret_cast< char * >(buf3);
     result = (bool)(arg1)->addHeader((char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_From_bool  SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
     
@@ -2431,7 +2490,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_delHeader" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (bool)(arg1)->delHeader((char const *)arg2);
     ST(argvi) = SWIG_From_bool  SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
     
@@ -2526,17 +2585,17 @@
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ESLconnection" "', argument " "1"" of type '" "char const *""'");
     }
-    arg1 = buf1;
+    arg1 = reinterpret_cast< char * >(buf1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ESLconnection" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ESLconnection" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = buf3;
+    arg3 = reinterpret_cast< char * >(buf3);
     result = (ESLconnection *)new ESLconnection((char const *)arg1,(char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLconnection, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
@@ -2767,7 +2826,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_send" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (int)(arg1)->send((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -2806,7 +2865,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendRecv" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -3057,12 +3116,12 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_filter" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = buf3;
+    arg3 = reinterpret_cast< char * >(buf3);
     result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3107,12 +3166,12 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_events" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_events" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = buf3;
+    arg3 = reinterpret_cast< char * >(buf3);
     result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3161,20 +3220,20 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_execute" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     if (items > 2) {
       res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
       if (!SWIG_IsOK(res3)) {
         SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_execute" "', argument " "3"" of type '" "char const *""'");
       }
-      arg3 = buf3;
+      arg3 = reinterpret_cast< char * >(buf3);
     }
     if (items > 3) {
       res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
       if (!SWIG_IsOK(res4)) {
         SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ESLconnection_execute" "', argument " "4"" of type '" "char const *""'");
       }
-      arg4 = buf4;
+      arg4 = reinterpret_cast< char * >(buf4);
     }
     result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
@@ -3218,7 +3277,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setBlockingExecute" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (int)(arg1)->setBlockingExecute((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3257,7 +3316,7 @@
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setEventLock" "', argument " "2"" of type '" "char const *""'");
     }
-    arg2 = buf2;
+    arg2 = reinterpret_cast< char * >(buf2);
     result = (int)(arg1)->setEventLock((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -3393,7 +3452,7 @@
  * structures together.
  *
  * The generated swig_type_info structures are assigned staticly to an initial 
- * array. We just loop though that array, and handle each type individually.
+ * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
  * cast linked list. The cast data is initially stored in something like a
@@ -3431,32 +3490,58 @@
 #define SWIGRUNTIME_DEBUG
 #endif
 
+
 SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
-  swig_module_info *module_head;
-  static int init_run = 0;
+  swig_module_info *module_head, *iter;
+  int found, init;
   
   clientdata = clientdata;
   
-  if (init_run) return;
-  init_run = 1;
-  
-  /* Initialize the swig_module */
-  swig_module.type_initial = swig_type_initial;
-  swig_module.cast_initial = swig_cast_initial;
+  /* check to see if the circular list has been setup, if not, set it up */
+  if (swig_module.next==0) {
+    /* Initialize the swig_module */
+    swig_module.type_initial = swig_type_initial;
+    swig_module.cast_initial = swig_cast_initial;
+    swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
+  }
   
   /* Try and load any already created modules */
   module_head = SWIG_GetModule(clientdata);
-  if (module_head) {
+  if (!module_head) {
+    /* This is the first module loaded for this interpreter */
+    /* so set the swig module into the interpreter */
+    SWIG_SetModule(clientdata, &swig_module);
+    module_head = &swig_module;
+  } else {
+    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
+    found=0;
+    iter=module_head;
+    do {
+      if (iter==&swig_module) {
+        found=1;
+        break;
+      }
+      iter=iter->next;
+    } while (iter!= module_head);
+    
+    /* if the is found in the list, then all is done and we may leave */
+    if (found) return;
+    /* otherwise we must add out module into the list */
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
-  } else {
-    /* This is the first module loaded */
-    swig_module.next = &swig_module;
-    SWIG_SetModule(clientdata, &swig_module);
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -3610,7 +3695,7 @@
   /* Install variables */
   for (i = 0; swig_variables[i].name; i++) {
     SV *sv;
-    sv = get_sv((char*) swig_variables[i].name, TRUE | 0x2);
+    sv = get_sv((char*) swig_variables[i].name, TRUE | 0x2 | GV_ADDMULTI);
     if (swig_variables[i].type) {
       SWIG_MakePtr(sv,(void *)1, *swig_variables[i].type,0);
     } else {
@@ -3622,7 +3707,7 @@
   /* Install constant */
   for (i = 0; swig_constants[i].type; i++) {
     SV *sv;
-    sv = get_sv((char*)swig_constants[i].name, TRUE | 0x2);
+    sv = get_sv((char*)swig_constants[i].name, TRUE | 0x2 | GV_ADDMULTI);
     switch(swig_constants[i].type) {
     case SWIG_INT:
       sv_setiv(sv, (IV) swig_constants[i].lvalue);


From anthm at freeswitch.org  Tue Mar  3 12:55:39 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 14:55:39 -0600
Subject: [Freeswitch-svn] [commit] r12395 -
	freeswitch/trunk/src/mod/applications/mod_dptools
Message-ID: <E1LebeN-0007NZ-Ty@svn.freeswitch.org>

Author: anthm
Date: Tue Mar  3 14:55:39 2009
New Revision: 12395

Log:
FSCORE-313

Modified:
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	Tue Mar  3 14:55:39 2009
@@ -2238,6 +2238,8 @@
 	unsigned int timelimit = 60;
 	switch_channel_t *new_channel = NULL;
 	switch_event_t *params = NULL;
+	char stupid[128] = "";
+
 	if (switch_strlen_zero(outbound_profile->destination_number)) {
 		goto done;
 	}
@@ -2357,7 +2359,11 @@
 			myflags |= SOF_NOBLOCK;
 		}
 
-		if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, 
+		switch_snprintf(stupid, sizeof(stupid), "user/%s", user);
+		if (switch_stristr(stupid, d_dest)) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Waddya Daft? You almost called '%s' in an infinate loop!\n", stupid);
+			cause = SWITCH_CAUSE_INVALID_IE_CONTENTS;
+		} else if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, 
 								 cid_name_override, cid_num_override, NULL, var_event, myflags) == SWITCH_STATUS_SUCCESS) {
 			const char *context;
 			switch_caller_profile_t *cp;


From brian at freeswitch.org  Tue Mar  3 13:47:19 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 15:47:19 -0600
Subject: [Freeswitch-svn] [commit] r12396 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LecSN-0007tz-6I@svn.freeswitch.org>

Author: brian
Date: Tue Mar  3 15:47:18 2009
New Revision: 12396

Log:
 you can't join a detached thread later on

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Mar  3 15:47:18 2009
@@ -669,7 +669,6 @@
 	int x = 0;
 
 	switch_threadattr_create(&thd_attr, profile->pool);
-	switch_threadattr_detach_set(thd_attr, 1);
 	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
 	switch_threadattr_priority_increase(thd_attr);
 	switch_thread_create(&thread, thd_attr, sofia_profile_worker_thread_run, profile, profile->pool);


From mikej at freeswitch.org  Tue Mar  3 14:00:18 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 16:00:18 -0600
Subject: [Freeswitch-svn] [commit] r12397 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
Message-ID: <E1Lecew-0007yw-Ui@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 16:00:18 2009
New Revision: 12397

Log:
Tue Mar  3 11:30:32 CST 2009  Pekka Pessi <first.last at nokia.com>
  * check_nua: added test case for CANCELed INVITE timing out



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 16:00:18 2009
@@ -1 +1 @@
-Tue Mar  3 11:27:12 CST 2009
+Tue Mar  3 15:59:49 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Tue Mar  3 16:00:18 2009
@@ -1005,6 +1005,53 @@
 }
 END_TEST
 
+
+START_TEST(cancel_2_2_8)
+{
+  nua_handle_t *nh;
+  struct message *invite, *cancel;
+  int timeout;
+
+  s2_case("2.2.8", "CANCEL and INVITE times out",
+	  "NUA is caller, NUA sends CANCEL after receiving 180 "
+	  "but UAS never responds.");
+
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
+
+  nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
+	     TAG_END());
+  fail_unless(s2_check_callstate(nua_callstate_calling));
+
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
+  process_offer(invite);
+  respond_with_sdp(
+    invite, dialog, SIP_180_RINGING,
+    SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"),
+    TAG_END());
+  fail_unless(s2_check_event(nua_r_invite, 180));
+  fail_unless(s2_check_callstate(nua_callstate_proceeding));
+
+  nua_cancel(nh, TAG_END());
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
+  s2_sip_free_message(cancel);
+  fail_if(!cancel);
+
+  /* Now, time out both CANCEL and INVITE */
+  for (timeout = 0; timeout < 34; timeout++) {
+    s2_nua_fast_forward(1, s2base->root);
+    cancel = s2_sip_next_request(SIP_METHOD_CANCEL);
+    if (cancel)
+      s2_sip_free_message(cancel);
+  }
+
+  fail_unless(s2_check_event(nua_r_cancel, 408));
+  fail_unless(s2_check_event(nua_r_invite, 408));
+  fail_unless(s2_check_callstate(nua_callstate_terminated));
+  nua_handle_destroy(nh);
+}
+END_TEST
+
+
 TCase *cancel_tcase(int threading)
 {
   TCase *tc = tcase_create("2.2 - CANCEL");
@@ -1017,6 +1064,7 @@
   if (XXX) tcase_add_test(tc, cancel_2_2_5);
   tcase_add_test(tc, cancel_2_2_6);
   tcase_add_test(tc, cancel_2_2_7);
+  tcase_add_test(tc, cancel_2_2_8);
 
   return tc;
 }


From mikej at freeswitch.org  Tue Mar  3 14:00:57 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 16:00:57 -0600
Subject: [Freeswitch-svn] [commit] r12398 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
Message-ID: <E1LecfZ-0008Gr-1k@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 16:00:56 2009
New Revision: 12398

Log:
Tue Mar  3 12:15:01 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nua: check_nua now uses s2base.h and s2sip.h



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 16:00:56 2009
@@ -1 +1 @@
-Tue Mar  3 15:59:49 CST 2009
+Tue Mar  3 16:00:35 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am	Tue Mar  3 16:00:56 2009
@@ -55,8 +55,6 @@
 check_nua_LDADD = 	$(nua_libs) ${top_builddir}/s2check/libs2.a \
 			@CHECK_LIBS@
 
-check_nua_CFLAGS = 	$(CFLAGS) -I$(top_srcdir)/s2check
-
 nua_libs = 		libnua.la  \
 			../iptsec/libiptsec.la \
 			../ipt/libipt.la \
@@ -84,6 +82,6 @@
 
 include $(top_srcdir)/rules/sofia.am
 
-INCLUDES = ${INTERNAL_INCLUDES}
+INCLUDES = ${INTERNAL_INCLUDES} -I$(top_srcdir)/s2check
 
 TAG_DLL_FLAGS =		LIST=nua_tag_list

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c	Tue Mar  3 16:00:56 2009
@@ -71,7 +71,7 @@
                      NUTAG_OUTBOUND("no-options-keepalive, no-validate"),
 		     TAG_END());
 
-  soa = soa_create(NULL, s2->root, NULL);
+  soa = soa_create(NULL, s2base->root, NULL);
 
   fail_if(!soa);
 
@@ -148,7 +148,7 @@
   fail_if(soa_get_local_sdp(soa, NULL, &body, &bodylen) != 1);
 
   ta_start(ta, tag, value);
-  s2_respond_to(request, dialog, status, phrase,
+  s2_sip_respond_to(request, dialog, status, phrase,
 		SIPTAG_CONTENT_TYPE_STR("application/sdp"),
 		SIPTAG_PAYLOAD_STR(body),
 		SIPTAG_CONTENT_DISPOSITION_STR("session"),
@@ -168,7 +168,7 @@
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  return s2_wait_for_request(SIP_METHOD_INVITE);
+  return s2_sip_wait_for_request(SIP_METHOD_INVITE);
 }
 
 static void
@@ -182,10 +182,10 @@
   nua_bye(nh, ta_tags(ta));
   ta_end(ta);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 }
@@ -208,7 +208,7 @@
           "sends an ACK request with a To header identical to the "
           "received one for each received Success (200 OK) responses.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
 
@@ -218,17 +218,17 @@
 
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   respond_with_sdp(invite, d2, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, d2, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, d2, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   bye_by_nua(d1, nh, TAG_END());
 
@@ -248,39 +248,39 @@
           "that matches the transaction, still answer with an "
           "ACK request until timer D set to at least 32 second expires.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
 
-  s2_respond_to(invite, d1, 404, "First not found", TAG_END());
+  s2_sip_respond_to(invite, d1, 404, "First not found", TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 404));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(5, s2->root);
+  s2_nua_fast_forward(5, s2base->root);
 
-  s2_respond_to(invite, d1, 404, "Not found after 5 seconds", TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  s2_sip_respond_to(invite, d1, 404, "Not found after 5 seconds", TAG_END());
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(5, s2->root);
+  s2_nua_fast_forward(5, s2base->root);
 
-  s2_respond_to(invite, d1, 404, "Not found after 10 seconds", TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  s2_sip_respond_to(invite, d1, 404, "Not found after 10 seconds", TAG_END());
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(21, s2->root);
+  s2_nua_fast_forward(21, s2base->root);
 
-  s2_respond_to(invite, d1, 404, "Not found after 31 seconds", TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  s2_sip_respond_to(invite, d1, 404, "Not found after 31 seconds", TAG_END());
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(5, s2->root);
+  s2_nua_fast_forward(5, s2base->root);
 
   /* Wake up nua thread and let it time out INVITE transaction */
   nua_set_params(s2->nua, TAG_END());
   s2_check_event(nua_r_set_params, 0);
 
-  s2_respond_to(invite, d1, 404, "Not found after 32 seconds", TAG_END());
-  s2_free_message(invite);
-  fail_if(s2_check_request_timeout(SIP_METHOD_ACK, 500));
+  s2_sip_respond_to(invite, d1, 404, "Not found after 32 seconds", TAG_END());
+  s2_sip_free_message(invite);
+  fail_if(s2_sip_check_request_timeout(SIP_METHOD_ACK, 3));
 
   nua_handle_destroy(nh);
 }
@@ -299,7 +299,7 @@
           "on receipt of a retransmitted Success (200 OK) "
           "responses does not send an ACK request.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
 
@@ -309,29 +309,29 @@
 
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(5, s2->root);
+  s2_nua_fast_forward(5, s2base->root);
   respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(5, s2->root);
+  s2_nua_fast_forward(5, s2base->root);
   respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(21, s2->root);
+  s2_nua_fast_forward(20, s2base->root);
   respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  s2_fast_forward(5, s2->root);
+  /* Stack times out the INVITE transaction */
+  s2_nua_fast_forward(5, s2base->root);
 
-  /* Wake up nua thread and let it time out INVITE transaction */
-  nua_set_params(s2->nua, TAG_END());
-  s2_check_event(nua_r_set_params, 0);
-
-  respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
-  fail_if(s2_check_request_timeout(SIP_METHOD_ACK, 500));
+  respond_with_sdp(invite, d1, SIP_200_OK,
+		   SIPTAG_SUBJECT_STR("Stray 200 OK"),
+		   TAG_END());
+  s2_sip_free_message(invite);
+  mark_point();
+  fail_if(s2_sip_check_request_timeout(SIP_METHOD_ACK, 3));
 
   bye_by_nua(d1, nh, TAG_END());
 

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c	Tue Mar  3 16:00:56 2009
@@ -33,6 +33,7 @@
 
 #include "config.h"
 
+#include "test_s2.h"
 #include "check_nua.h"
 
 #include <stdlib.h>
@@ -43,8 +44,6 @@
 #include <fnmatch.h>
 #endif
 
-#include "test_s2.h"
-
 static void usage(int exitcode)
 {
   fprintf(exitcode ? stderr : stdout,
@@ -62,6 +61,8 @@
 
   s2_tester = "check_nua";
 
+  s2_suite("N2");
+
   if (getenv("CHECK_NUA_VERBOSE"))
     s2_start_stop = strtoul(getenv("CHECK_NUA_VERBOSE"), NULL, 10);
 

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c	Tue Mar  3 16:00:56 2009
@@ -75,7 +75,7 @@
 		     TPTAG_PINGPONG(20000),
 		     TPTAG_KEEPALIVE(10000),
 		     TAG_END());
-  tport_set_params(s2->tcp.tport, TPTAG_PONG2PING(1), TAG_END());
+  tport_set_params(s2sip->tcp.tport, TPTAG_PONG2PING(1), TAG_END());
 }
 
 static void pingpong_thread_setup(void)
@@ -121,12 +121,12 @@
 
   nua_register(nh, TAG_END());
 
-  fail_unless((m = s2_wait_for_request(SIP_METHOD_REGISTER)) != NULL, NULL);
+  fail_unless((m = s2_sip_wait_for_request(SIP_METHOD_REGISTER)) != NULL, NULL);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_403_FORBIDDEN,
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   nua_handle_destroy(nh);
 
@@ -156,38 +156,38 @@
 
   nua_register(nh, TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
-  s2_respond_to(m, NULL,
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
+  s2_sip_respond_to(m, NULL,
 		SIP_407_PROXY_AUTH_REQUIRED,
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
   s2_check_event(nua_r_register, 407);
 
   nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
-  s2_respond_to(m, NULL,
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
+  s2_sip_respond_to(m, NULL,
 		SIP_401_UNAUTHORIZED,
 		SIPTAG_WWW_AUTHENTICATE_STR(s2_auth2_digest_str),
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
   s2_check_event(nua_r_register, 401);
 
   nua_authenticate(nh, NUTAG_AUTH(s2_auth2_credentials), TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   fail_if(!m->sip->sip_authorization);
   fail_if(!m->sip->sip_proxy_authorization);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   assert(s2->registration->contact != NULL);
   s2_check_event(nua_r_register, 200);
@@ -237,32 +237,32 @@
 
   nua_register(nh, TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   fail_if(!m->sip->sip_contact || m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   assert(s2->registration->contact != NULL);
   s2_check_event(nua_r_register, 100);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   fail_if(!m->sip->sip_contact || !m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   fail_unless(s2->registration->contact != NULL);
   fail_if(s2->registration->contact->m_next != NULL);
@@ -286,19 +286,19 @@
   nua_register(nh, ta_tags(ta));
   ta_end(ta);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
-  s2_respond_to(m, NULL,
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
+  s2_sip_respond_to(m, NULL,
 		SIP_401_UNAUTHORIZED,
 		SIPTAG_WWW_AUTHENTICATE_STR(s2_auth_digest_str),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_r_register, 401);
 
   nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   fail_if(!m->sip->sip_authorization);
   /* should not unregister the previous contact
@@ -307,12 +307,12 @@
   fail_if(m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   assert(s2->registration->contact != NULL);
   s2_check_event(nua_r_register, 200);
@@ -350,61 +350,61 @@
 
   mark_point();
 
-  m = s2_wait_for_request(SIP_METHOD_OPTIONS);
+  m = s2_sip_wait_for_request(SIP_METHOD_OPTIONS);
   fail_if(!m);
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_407_PROXY_AUTH_REQUIRED,
 		SIPTAG_VIA(natted_via(m)),
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
   mark_point();
 
-  m = s2_wait_for_request(SIP_METHOD_OPTIONS);
+  m = s2_sip_wait_for_request(SIP_METHOD_OPTIONS);
   fail_if(!m); fail_if(!m->sip->sip_proxy_authorization);
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
-  su_root_step(s2->root, 20); su_root_step(s2->root, 20);
-  s2_fast_forward(120, s2->root);	  /* Default keepalive interval */
+  su_root_step(s2base->root, 20); su_root_step(s2base->root, 20);
+  s2_nua_fast_forward(120, s2base->root);	  /* Default keepalive interval */
   mark_point();
 
-  m = s2_wait_for_request(SIP_METHOD_OPTIONS);
-  s2_respond_to(m, NULL,
+  m = s2_sip_wait_for_request(SIP_METHOD_OPTIONS);
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
-  su_root_step(s2->root, 20); su_root_step(s2->root, 20);
-  s2_fast_forward(120, s2->root);	  /* Default keepalive interval */
+  su_root_step(s2base->root, 20); su_root_step(s2base->root, 20);
+  s2_nua_fast_forward(120, s2base->root);	  /* Default keepalive interval */
   mark_point();
 
   receive_natted = "received=4.255.255.10";
 
-  m = s2_wait_for_request(SIP_METHOD_OPTIONS);
-  s2_respond_to(m, NULL,
+  m = s2_sip_wait_for_request(SIP_METHOD_OPTIONS);
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_i_outbound, 0);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   fail_if(!m->sip->sip_contact || !m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_r_register, 200);
 
@@ -434,33 +434,33 @@
 
   receive_natted = "received=4.255.255.10";
 
-  s2_fast_forward(3600, s2->root);
+  s2_nua_fast_forward(3600, s2base->root);
   mark_point();
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_r_register, 100);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   fail_if(!m->sip->sip_contact || !m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   fail_unless(s2->registration->contact != NULL);
   fail_if(s2->registration->contact->m_next != NULL);
@@ -484,28 +484,28 @@
 
   mark_point();
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   fail_if(!m->sip->sip_contact || m->sip->sip_contact->m_next);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		400, "Bad Contact",
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_r_register, 100);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   fail_unless(s2->registration->contact != NULL);
   fail_if(s2->registration->contact->m_next != NULL);
@@ -530,34 +530,34 @@
 
   nh = nua_handle(nua, NULL, TAG_END());
 
-  nua_register(nh, NUTAG_PROXY(s2->tcp.contact->m_url), TAG_END());
+  nua_register(nh, NUTAG_PROXY(s2sip->tcp.contact->m_url), TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_contact || m->sip->sip_contact->m_next);
   fail_if(!tport_is_tcp(m->tport));
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   assert(s2->registration->contact != NULL);
   s2_check_event(nua_r_register, 100);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m);
   fail_if(!m->sip->sip_contact || !m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   fail_unless(s2->registration->contact != NULL);
   fail_if(s2->registration->contact->m_next != NULL);
@@ -581,7 +581,7 @@
 
   mark_point();
   s2->registration->nh = nh;
-  make_auth_natted_register(nh, NUTAG_PROXY(s2->tcp.contact->m_url), TAG_END());
+  make_auth_natted_register(nh, NUTAG_PROXY(s2sip->tcp.contact->m_url), TAG_END());
   fail_if(!tport_is_tcp(s2->registration->tport));
   s2_register_teardown();
 }
@@ -604,38 +604,38 @@
   mark_point();
   s2->registration->nh = nh;
   make_auth_natted_register(
-    nh, NUTAG_PROXY(s2->tcp.contact->m_url),
+    nh, NUTAG_PROXY(s2sip->tcp.contact->m_url),
     NUTAG_OUTBOUND("no-options-keepalive, no-validate"),
     TAG_END());
   fail_if(!tport_is_tcp(s2->registration->tport));
   tport_shutdown(s2->registration->tport, 2);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   /* The "NAT binding" changed when new TCP connection is established */
   /* => NUA re-REGISTERs with newly detected contact */
   s2_check_event(nua_r_register, 100);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   fail_if(!m->sip->sip_contact || !m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_r_register, 200);
 
@@ -667,22 +667,22 @@
 
   /* NTA tries with UDP, we drop them */
   for (;;) {
-    m = s2_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
+    m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
     if (!tport_is_udp(m->tport)) /* Drop UDP */
       break;
-    s2_free_message(m);
-    s2_fast_forward(4, s2->root);
+    s2_sip_free_message(m);
+    s2_nua_fast_forward(4, s2base->root);
   }
 
   tcp = tport_ref(m->tport);
 
   /* Respond to request over TCP */
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_401_UNAUTHORIZED,
 		SIPTAG_WWW_AUTHENTICATE_STR(s2_auth_digest_str),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
   s2_check_event(nua_r_register, 401);
   nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
 
@@ -690,32 +690,32 @@
   tport_set_params(tcp, TPTAG_PONG2PING(0), TAG_END());
 
   /* Now request over UDP ... registering TCP contact! */
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   s2_save_register(m);
   fail_unless(
     url_has_param(s2->registration->contact->m_url, "transport=tcp"));
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   /* NUA detects oops... re-registers UDP */
   s2_check_event(nua_r_register, 100);
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   fail_if(!m); fail_if(!m->sip->sip_authorization);
   fail_if(!m->sip->sip_contact || !m->sip->sip_contact->m_next);
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		SIPTAG_VIA(natted_via(m)),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   s2_check_event(nua_r_register, 200);
 
@@ -726,10 +726,10 @@
   {
     int i;
     for (i = 0; i < 5; i++) {
-      su_root_step(s2->root, 5);
-      su_root_step(s2->root, 5);
-      su_root_step(s2->root, 5);
-      s2_fast_forward(5, s2->root);
+      su_root_step(s2base->root, 5);
+      su_root_step(s2base->root, 5);
+      su_root_step(s2base->root, 5);
+      s2_nua_fast_forward(5, s2base->root);
     }
   }
 

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Tue Mar  3 16:00:56 2009
@@ -68,7 +68,7 @@
                      NUTAG_OUTBOUND("no-options-keepalive, no-validate"),
 		     TAG_END());
 
-  soa = soa_create(NULL, s2->root, NULL);
+  soa = soa_create(NULL, s2base->root, NULL);
 
   fail_if(!soa);
 
@@ -161,7 +161,7 @@
   fail_if(soa_get_local_sdp(soa, NULL, &body, &bodylen) != 1);
 
   ta_start(ta, tag, value);
-  s2_respond_to(request, dialog, status, phrase,
+  s2_sip_respond_to(request, dialog, status, phrase,
 		SIPTAG_CONTENT_TYPE_STR("application/sdp"),
 		SIPTAG_PAYLOAD_STR(body),
 		SIPTAG_CONTENT_DISPOSITION_STR("session"),
@@ -184,7 +184,7 @@
 
   ta_start(ta, tag, value);
   fail_if(
-    s2_request_to(dialog, method, name, tport,
+    s2_sip_request_to(dialog, method, name, tport,
 		  SIPTAG_CONTENT_TYPE_STR("application/sdp"),
 		  SIPTAG_PAYLOAD_STR(body),
 		  ta_tags(ta)));
@@ -203,7 +203,7 @@
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  return s2_wait_for_request(SIP_METHOD_INVITE);
+  return s2_sip_wait_for_request(SIP_METHOD_INVITE);
 }
 
 static uint32_t s2_rseq;
@@ -233,7 +233,7 @@
       ta_tags(ta));
   }
   else {
-    s2_respond_to(
+    s2_sip_respond_to(
       invite, dialog, status, phrase,
       SIPTAG_REQUIRE_STR("100rel"),
       SIPTAG_RSEQ(rs),
@@ -243,7 +243,7 @@
 
   fail_unless(s2_check_event(nua_r_invite, status));
 
-  return s2_wait_for_request(SIP_METHOD_PRACK);
+  return s2_sip_wait_for_request(SIP_METHOD_PRACK);
 }
 
 static void
@@ -267,10 +267,10 @@
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 }
 
 static nua_handle_t *
@@ -295,7 +295,7 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
 
   nua_respond(nh, SIP_180_RINGING,
@@ -303,23 +303,23 @@
 	      TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_early));
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_update_dialog(dialog, response);
+  s2_sip_update_dialog(dialog, response);
   process_answer(response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_respond(nh, SIP_200_OK, TAG_END());
 
   fail_unless(s2_check_callstate(nua_callstate_completed));
 
-  response = s2_wait_for_response(200, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE);
 
   fail_if(!response);
-  s2_update_dialog(dialog, response);
-  s2_free_message(response);
+  s2_sip_update_dialog(dialog, response);
+  s2_sip_free_message(response);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
 
   fail_unless(s2_check_event(nua_i_ack, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -338,10 +338,10 @@
   nua_bye(nh, ta_tags(ta));
   ta_end(ta);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 }
@@ -359,19 +359,19 @@
   nua_bye(nh, ta_tags(ta));
   ta_end(ta);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
+  s2_sip_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(bye);
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 407));
 
   nua_authenticate(nh, NUTAG_AUTH("Digest:\"s2test\":abc:abc"), TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
   fail_if(s2->events);
@@ -391,14 +391,14 @@
   nua_cancel(nh, ta_tags(ta));
   ta_end(ta);
 
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
   fail_unless(s2_check_event(nua_r_cancel, 200));
 
-  s2_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   fail_unless(s2_check_event(nua_r_invite, 487));
 }
@@ -410,12 +410,12 @@
   ta_list ta;
 
   ta_start(ta, tag, value);
-  fail_if(s2_request_to(dialog, SIP_METHOD_BYE, NULL, ta_tags(ta)));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, ta_tags(ta)));
   ta_end(ta);
 
   fail_unless(s2_check_event(nua_i_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
-  fail_unless(s2_check_response(200, SIP_METHOD_BYE));
+  fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE));
 }
 
 /* ====================================================================== */
@@ -430,7 +430,7 @@
   s2_case("2.1.1", "Basic call",
 	  "NUA sends INVITE, NUA sends BYE");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite_by_nua(nh, TAG_END());
 
@@ -448,7 +448,7 @@
   s2_case("2.1.2.1", "Basic call",
 	  "NUA sends INVITE, NUA receives BYE");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite_by_nua(nh, TAG_END());
 
@@ -465,11 +465,11 @@
   s2_case("2.1.2.2", "Basic call over TCP",
 	  "NUA sends INVITE, NUA receives BYE");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local),
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor),
 		  TAG_END());
 
   invite_by_nua(nh,
-		NUTAG_PROXY(s2->tcp.contact->m_url),
+		NUTAG_PROXY(s2sip->tcp.contact->m_url),
 		TAG_END());
 
   bye_to_nua(nh, TAG_END());
@@ -502,7 +502,7 @@
   s2_case("2.1.3.2", "Incoming call over TCP",
 	  "NUA receives INVITE and BYE");
 
-  dialog->tport = s2->tcp.tport;
+  dialog->tport = s2sip->tcp.tport;
 
   nh = invite_to_nua(TAG_END());
 
@@ -569,44 +569,44 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
 
   nua_respond(nh, SIP_180_RINGING,
 	      /* Dialog-specific proxy is saved */
-	      NUTAG_PROXY(s2->tcp.contact->m_url),
+	      NUTAG_PROXY(s2sip->tcp.contact->m_url),
 	      SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	      TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_early));
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_update_dialog(dialog, response);
+  s2_sip_update_dialog(dialog, response);
   process_answer(response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_respond(nh, SIP_200_OK, TAG_END());
 
   fail_unless(s2_check_callstate(nua_callstate_completed));
 
-  response = s2_wait_for_response(200, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE);
 
   fail_if(!response);
-  s2_update_dialog(dialog, response);
-  s2_free_message(response);
+  s2_sip_update_dialog(dialog, response);
+  s2_sip_free_message(response);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
 
   fail_unless(s2_check_event(nua_i_ack, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
 
   nua_bye(nh, TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
   /* Check that NUA used dialog-specific proxy with BYE */
   fail_unless(tport_is_tcp(bye->tport));
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
@@ -623,7 +623,7 @@
   s2_case("2.1.7", "Call lookup",
 	  "Test dialog and call-id lookup");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite_by_nua(nh, TAG_END());
 
@@ -656,11 +656,11 @@
   s2_case("2.1.8", "Call using NUTAG_PROXY()",
 	  "Test handle-specific NUTAG_PROXY().");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(
     nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
-    NUTAG_PROXY(s2->tcp.contact->m_url), TAG_END());
+    NUTAG_PROXY(s2sip->tcp.contact->m_url), TAG_END());
 
   process_offer(invite);
   respond_with_sdp(
@@ -672,10 +672,10 @@
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_unless(ack && tport_is_tcp(ack->tport));
 
   bye_by_nua(nh, TAG_END());
@@ -715,23 +715,23 @@
   s2_case("2.2.1", "Cancel call",
 	  "NUA is caller, NUA sends CANCEL immediately");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	     TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_calling));
   nua_cancel(nh, TAG_END());
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
-  fail_if(s2->received != NULL);
-  s2_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  fail_if(s2sip->received != NULL);
+  s2_sip_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
-  s2_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   fail_unless(s2_check_event(nua_r_invite, 487));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
@@ -751,15 +751,15 @@
   s2_case("2.2.2", "Canceled call",
 	  "NUA is caller, NUA sends CANCEL after receiving 100");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	     TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
 
   cancel_by_nua(nh, invite, dialog, TAG_END());
 
@@ -778,13 +778,13 @@
   s2_case("2.2.3", "Canceled call",
 	  "NUA is caller, NUA sends CANCEL after receiving 180");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	     TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   process_offer(invite);
   respond_with_sdp(
     invite, dialog, SIP_180_RINGING,
@@ -810,13 +810,13 @@
 	  "NUA is caller, NUA sends CANCEL after receiving 180 "
 	  "but UAS already sent 200 OK.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	     TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   process_offer(invite);
   respond_with_sdp(
     invite, dialog, SIP_180_RINGING,
@@ -826,16 +826,16 @@
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   nua_cancel(nh, TAG_END());
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
 
-  s2_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END());
+  s2_sip_free_message(cancel);
   fail_unless(s2_check_event(nua_r_cancel, 481));
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   fail_unless(s2_check_callstate(nua_callstate_ready));
 
@@ -858,14 +858,14 @@
     "but UAS already sent 200 OK.\n"
     "Test case checks that NUA really sends BYE after nua_bye() is called\n");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	     NUTAG_AUTOACK(0),
 	     TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   process_offer(invite);
   respond_with_sdp(
     invite, dialog, SIP_180_RINGING,
@@ -875,23 +875,23 @@
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   nua_bye(nh, TAG_END());
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
 
-  s2_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END());
+  s2_sip_free_message(cancel);
   fail_unless(s2_check_event(nua_r_cancel, 481));
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   fail_unless(s2_check_callstate(nua_callstate_terminating));
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
@@ -919,7 +919,7 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
 
   nua_respond(nh, SIP_180_RINGING,
@@ -927,22 +927,22 @@
 	      TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_early));
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_update_dialog(dialog, response);
+  s2_sip_update_dialog(dialog, response);
   process_answer(response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END()));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END()));
   fail_unless(s2_check_event(nua_i_cancel, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
-  response = s2_wait_for_response(200, SIP_METHOD_CANCEL);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_CANCEL);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  response = s2_wait_for_response(487, SIP_METHOD_INVITE);
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  response = s2_sip_wait_for_response(487, SIP_METHOD_INVITE);
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
 
@@ -974,7 +974,7 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
 
   nua_respond(nh, SIP_180_RINGING,
@@ -982,22 +982,22 @@
 	      TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_early));
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_update_dialog(dialog, response);
+  s2_sip_update_dialog(dialog, response);
   process_answer(response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END()));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END()));
   fail_unless(s2_check_event(nua_i_cancel, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
-  response = s2_wait_for_response(200, SIP_METHOD_CANCEL);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_CANCEL);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  response = s2_wait_for_response(487, SIP_METHOD_INVITE);
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  response = s2_sip_wait_for_response(487, SIP_METHOD_INVITE);
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
 
@@ -1082,7 +1082,7 @@
   struct message *invite, *ack;
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   process_offer(invite);
   respond_with_sdp(
     invite, dialog, SIP_200_OK,
@@ -1090,12 +1090,12 @@
     SIPTAG_REQUIRE_STR("timer"),
     SIPTAG_RECORD_ROUTE(rr),
     TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   if (rr == NULL)
-    s2_free_message(ack);
+    s2_sip_free_message(ack);
   return ack;
 }
 
@@ -1106,7 +1106,7 @@
   struct message *ack;
 
   sip_record_route_init(rr);
-  *rr->r_url = *s2->contact->m_url;
+  *rr->r_url = *s2sip->contact->m_url;
   rr->r_url->url_user = "record";
   rr->r_url->url_params = "lr";
 
@@ -1121,11 +1121,11 @@
     SIPTAG_REQUIRE_STR("timer"),
     TAG_END());
 
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
   ack = invite_timer_round(nh, "300;refresher=uac", rr);
   fail_if(ack->sip->sip_route &&
 	  su_strmatch(ack->sip->sip_route->r_url->url_user, "record"));
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
   invite_timer_round(nh, "300;refresher=uac", NULL);
 
   bye_by_nua(nh, TAG_END());
@@ -1149,9 +1149,9 @@
     SIPTAG_REQUIRE_STR("timer"),
     TAG_END());
 
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
   invite_timer_round(nh, "300", NULL);
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
   invite_timer_round(nh, "300", NULL);
 
   bye_by_nua(nh, TAG_END());
@@ -1190,11 +1190,11 @@
           "receives 200, send ACK.");
 
   sip_record_route_init(rr);
-  *rr->r_url = *s2->contact->m_url;
+  *rr->r_url = *s2sip->contact->m_url;
   rr->r_url->url_user = "record";
   rr->r_url->url_params = "lr";
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(
     nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
@@ -1205,8 +1205,8 @@
 			      SIP_183_SESSION_PROGRESS,
 			      SIPTAG_RECORD_ROUTE(rr),
 			      TAG_END());
-  s2_respond_to(prack, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
   fail_unless(s2_check_event(nua_r_prack, 200));
 
@@ -1216,23 +1216,23 @@
   fail_unless(prack->sip->sip_route != NULL);
   fail_unless(su_strmatch(prack->sip->sip_route->r_url->url_user, "record"));
 
-  s2_respond_to(prack, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
   fail_unless(s2_check_event(nua_r_prack, 200));
 
   /* Change the record-route */
   rr->r_url->url_user = "record2";
-  s2_respond_to(invite, dialog, SIP_200_OK,
+  s2_sip_respond_to(invite, dialog, SIP_200_OK,
 		SIPTAG_RECORD_ROUTE(rr),
 		TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
   fail_unless(su_strmatch(ack->sip->sip_route->r_url->url_user, "record2"));
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
   bye_to_nua(nh, TAG_END());
 
@@ -1252,7 +1252,7 @@
 	  "receives 180, sends PRACK, receives 200 for it, "
           "receives 200, send ACK.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(
     nh,
@@ -1269,24 +1269,24 @@
   prack = respond_with_100rel(invite, dialog, with_sdp = 0,
 			      SIP_183_SESSION_PROGRESS,
 			      TAG_END());
-  s2_respond_to(prack, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
   fail_unless(s2_check_event(nua_r_prack, 200));
 
   prack = respond_with_100rel(invite, dialog, with_sdp = 0,
 			      SIP_180_RINGING,
 			      TAG_END());
-  s2_respond_to(prack, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
   fail_unless(s2_check_event(nua_r_prack, 200));
 
-  s2_respond_to(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   bye_to_nua(nh, TAG_END());
 
@@ -1321,7 +1321,7 @@
 	  "receives 180, sends PRACK, receives 200 for it, "
           "receives 200, send ACK.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(
     nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
@@ -1338,11 +1338,11 @@
     prack, dialog, SIP_200_OK,
     SIPTAG_REQUIRE_STR("100rel"),
     TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_event(nua_r_prack, 200));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
-  update = s2_wait_for_request(SIP_METHOD_UPDATE);
+  update = s2_sip_wait_for_request(SIP_METHOD_UPDATE);
   /* UPDATE sent by stack, stack sends event for it */
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
@@ -1350,7 +1350,7 @@
   respond_with_sdp(
     update, dialog, SIP_200_OK,
     TAG_END());
-  s2_free_message(update), update = NULL;
+  s2_sip_free_message(update), update = NULL;
 
   fail_unless(s2_check_event(nua_r_update, 200));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
@@ -1358,16 +1358,16 @@
   prack = respond_with_100rel(invite, dialog, with_sdp = 0,
 			      SIP_180_RINGING,
 			      TAG_END());
-  s2_respond_to(prack, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
   fail_unless(s2_check_event(nua_r_prack, 200));
 
-  s2_respond_to(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   bye_to_nua(nh, TAG_END());
 
@@ -1391,7 +1391,7 @@
 	  "sends UPDATE, "
 	  "receives 200 to UPDATE.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(
     nh,
@@ -1416,24 +1416,24 @@
   rack->ra_method_name = invite->sip->sip_cseq->cs_method_name;
 
   nua_prack(nh, SIPTAG_RACK(rack), TAG_END());
-  prack = s2_wait_for_request(SIP_METHOD_PRACK);
+  prack = s2_sip_wait_for_request(SIP_METHOD_PRACK);
   process_offer(prack);
 
-  s2_respond_to(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_completing));
 
   respond_with_sdp(
     prack, dialog, SIP_200_OK,
     TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_event(nua_r_prack, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  update = s2_wait_for_request(SIP_METHOD_UPDATE);
+  update = s2_sip_wait_for_request(SIP_METHOD_UPDATE);
   /* UPDATE sent by stack, stack sends event for it */
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
@@ -1441,7 +1441,7 @@
   respond_with_sdp(
     update, dialog, SIP_200_OK,
     TAG_END());
-  s2_free_message(update), update = NULL;
+  s2_sip_free_message(update), update = NULL;
 
   fail_unless(s2_check_event(nua_r_update, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -1467,7 +1467,7 @@
 	  "receives 200 to UPDATE, "
 	  "sends ACK.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(
     nh,
@@ -1492,21 +1492,21 @@
   rack->ra_method_name = invite->sip->sip_cseq->cs_method_name;
 
   nua_prack(nh, SIPTAG_RACK(rack), TAG_END());
-  prack = s2_wait_for_request(SIP_METHOD_PRACK);
+  prack = s2_sip_wait_for_request(SIP_METHOD_PRACK);
   process_offer(prack);
   respond_with_sdp(
     prack, dialog, SIP_200_OK,
     TAG_END());
-  s2_free_message(prack), prack = NULL;
+  s2_sip_free_message(prack), prack = NULL;
   fail_unless(s2_check_event(nua_r_prack, 200));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
-  update = s2_wait_for_request(SIP_METHOD_UPDATE);
+  update = s2_sip_wait_for_request(SIP_METHOD_UPDATE);
   /* UPDATE sent by stack, stack sends event for it */
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
-  s2_respond_to(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_completing));
 
@@ -1514,11 +1514,11 @@
   respond_with_sdp(
     update, dialog, SIP_200_OK,
     TAG_END());
-  s2_free_message(update), update = NULL;
+  s2_sip_free_message(update), update = NULL;
 
   fail_unless(s2_check_event(nua_r_update, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
   bye_to_nua(nh, TAG_END());
 
@@ -1560,15 +1560,15 @@
   for (i = 0; i < 2; i++) {
     fail_unless(s2_check_callstate(nua_callstate_calling));
 
-    invite = s2_wait_for_request(SIP_METHOD_INVITE);
+    invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
     fail_if(!invite);
     process_offer(invite);
     respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-    s2_free_message(invite);
+    s2_sip_free_message(invite);
 
-    ack = s2_wait_for_request(SIP_METHOD_ACK);
+    ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
     fail_if(!ack);
-    s2_free_message(ack);
+    s2_sip_free_message(ack);
 
     fail_unless(s2_check_event(nua_r_invite, 200));
     fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -1597,40 +1597,40 @@
   soa_generate_offer(soa, 1, NULL);
   request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END());
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
   respond_with_sdp(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR,
 		   SIPTAG_RETRY_AFTER_STR("8"),
 		   TAG_END());
-  s2_free_message(invite);
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  s2_sip_free_message(invite);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
-  response = s2_wait_for_response(491, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(491, SIP_METHOD_INVITE);
   fail_if(!response);
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
-  s2_free_message(response);
+  s2_sip_free_message(response);
   fail_if(soa_process_reject(soa, NULL) < 0);
 
   /* We get nua_r_invite with 100 trying (and 500 in sip->sip_status) */
   fail_unless(s2_check_event(nua_r_invite, 100));
 
-  s2_fast_forward(10, s2->root);
+  s2_nua_fast_forward(10, s2base->root);
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   process_offer(invite);
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
   bye_by_nua(nh, TAG_END());
 
@@ -1652,7 +1652,7 @@
   nh = invite_to_nua(
     TAG_END());
 
-  s2_request_to(dialog, SIP_METHOD_INVITE, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_INVITE, NULL,
 		SIPTAG_USER_AGENT_STR("evil (evil) evil"),
 		TAG_END());
 
@@ -1660,24 +1660,24 @@
 
   fail_unless(s2_check_callstate(nua_callstate_completed));
 
-  response = s2_wait_for_response(200, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE);
 
   fail_if(!response);
-  s2_update_dialog(dialog, response);
+  s2_sip_update_dialog(dialog, response);
   fail_if(!response->sip->sip_content_type);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
 
   fail_unless(s2_check_event(nua_i_ack, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
 
-  s2_fast_forward(10, s2->root);
+  s2_nua_fast_forward(10, s2base->root);
 
   nua_set_hparams(nh, NUTAG_REFRESH_WITHOUT_SDP(1), TAG_END());
   fail_unless(s2_check_event(nua_r_set_params, 200));
 
-  s2_request_to(dialog, SIP_METHOD_INVITE, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_INVITE, NULL,
 		SIPTAG_USER_AGENT_STR("evil (evil) evil"),
 		TAG_END());
 
@@ -1685,14 +1685,14 @@
 
   fail_unless(s2_check_callstate(nua_callstate_completed));
 
-  response = s2_wait_for_response(200, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE);
 
   fail_if(!response);
-  s2_update_dialog(dialog, response);
+  s2_sip_update_dialog(dialog, response);
   fail_if(response->sip->sip_content_type);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END()));
 
   fail_unless(s2_check_event(nua_i_ack, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -1719,17 +1719,17 @@
 
   nua_invite(nh, SIPTAG_PAYLOAD_STR(""), TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_calling));
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
   fail_if(invite->sip->sip_content_type);
   soa_generate_offer(soa, 1, NULL);
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
   process_answer(ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -1764,7 +1764,7 @@
   struct message *invite, *ack;
 
   s2_case("3.1.1", "Call failure", "Call fails with 403 response");
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local),
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor),
 		  TAG_END());
 
   nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
@@ -1772,17 +1772,17 @@
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
-  s2_respond_to(invite, NULL, SIP_403_FORBIDDEN,
+  s2_sip_respond_to(invite, NULL, SIP_403_FORBIDDEN,
 		SIPTAG_TO_STR("UAS Changed <sip:To at Header.field.invalid>"),
 		TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
   fail_if(strcmp(ack->sip->sip_to->a_display, "UAS Changed"));
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
   fail_unless(s2_check_event(nua_r_invite, 403));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
@@ -1800,7 +1800,7 @@
   s2_case("3.1.2", "Call fails after too many retries",
 	  "Call fails after 4 times 500 Retry-After");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local),
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor),
 		  NUTAG_RETRY_COUNT(3),
 		  TAG_END());
 
@@ -1809,17 +1809,17 @@
 
   for (i = 0;; i++) {
     fail_unless(s2_check_callstate(nua_callstate_calling));
-    invite = s2_wait_for_request(SIP_METHOD_INVITE);
+    invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
     fail_if(!invite);
-    s2_respond_to(invite, NULL, SIP_500_INTERNAL_SERVER_ERROR,
+    s2_sip_respond_to(invite, NULL, SIP_500_INTERNAL_SERVER_ERROR,
 		  SIPTAG_RETRY_AFTER_STR("5"),
 		  TAG_END());
-    s2_free_message(invite);
-    fail_unless(s2_check_request(SIP_METHOD_ACK));
+    s2_sip_free_message(invite);
+    fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
     if (i == 3)
       break;
     fail_unless(s2_check_event(nua_r_invite, 100));
-    s2_fast_forward(5, s2->root);
+    s2_nua_fast_forward(5, s2base->root);
   }
 
   fail_unless(s2_check_event(nua_r_invite, 500));
@@ -1835,7 +1835,7 @@
   struct message *invite;
 
   s2_case("3.2.1", "Re-INVITE failure", "Re-INVITE fails with 403 response");
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local),
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor),
 		  TAG_END());
 
   invite_by_nua(nh, TAG_END());
@@ -1844,12 +1844,12 @@
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
-  s2_respond_to(invite, NULL, SIP_403_FORBIDDEN, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, NULL, SIP_403_FORBIDDEN, TAG_END());
+  s2_sip_free_message(invite);
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
   fail_unless(s2_check_event(nua_r_invite, 403));
   /* Return to previous state */
   fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -1868,7 +1868,7 @@
   s2_case("3.2.2", "Re-INVITE fails after too many retries",
 	  "Call fails after 4 times 500 Retry-After");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local),
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor),
 		  NUTAG_RETRY_COUNT(3),
 		  TAG_END());
 
@@ -1879,26 +1879,26 @@
 
   for (i = 0;; i++) {
     fail_unless(s2_check_callstate(nua_callstate_calling));
-    invite = s2_wait_for_request(SIP_METHOD_INVITE);
+    invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
     fail_if(!invite);
-    s2_respond_to(invite, NULL, SIP_500_INTERNAL_SERVER_ERROR,
+    s2_sip_respond_to(invite, NULL, SIP_500_INTERNAL_SERVER_ERROR,
 		  SIPTAG_RETRY_AFTER_STR("5"),
 		  TAG_END());
-    s2_free_message(invite);
-    fail_unless(s2_check_request(SIP_METHOD_ACK));
+    s2_sip_free_message(invite);
+    fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
     if (i == 3)
       break;
     fail_unless(s2_check_event(nua_r_invite, 100));
-    s2_fast_forward(5, s2->root);
+    s2_nua_fast_forward(5, s2base->root);
   }
 
   fail_unless(s2_check_event(nua_r_invite, 500));
   /* Graceful termination */
   fail_unless(s2_check_callstate(nua_callstate_terminating));
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
@@ -1913,7 +1913,7 @@
   struct message *invite;
 
   s2_case("3.2.3", "Re-INVITE failure", "Re-INVITE fails with 491 response");
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local),
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor),
 		  TAG_END());
 
   invite_by_nua(nh, TAG_END());
@@ -1922,11 +1922,11 @@
 
   fail_unless(s2_check_callstate(nua_callstate_calling));
 
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
-  s2_respond_to(invite, NULL, SIP_491_REQUEST_PENDING, TAG_END());
-  s2_free_message(invite);
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  s2_sip_respond_to(invite, NULL, SIP_491_REQUEST_PENDING, TAG_END());
+  s2_sip_free_message(invite);
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
   fail_unless(s2_check_event(nua_r_invite, 491));
   /* Return to previous state */
   fail_unless(s2_check_callstate(nua_callstate_ready));
@@ -1971,12 +1971,12 @@
 
   nua_bye(nh, TAG_END());
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
+  s2_sip_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(bye);
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 407));
 
   soa_generate_offer(soa, 1, NULL);
@@ -1984,11 +1984,11 @@
   request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END());
 
   do {
-    r481 = s2_wait_for_response(0, SIP_METHOD_INVITE);
+    r481 = s2_sip_wait_for_response(0, SIP_METHOD_INVITE);
   }
   while (r481->sip->sip_status->st_status < 200);
 
-  s2_update_dialog(dialog, r481); /* send ACK */
+  s2_sip_update_dialog(dialog, r481); /* send ACK */
 
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
@@ -2010,22 +2010,22 @@
   s2_flush_events();
 
   nua_bye(nh, TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
 
   request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END());
   do {
-    r481 = s2_wait_for_response(0, SIP_METHOD_INVITE);
+    r481 = s2_sip_wait_for_response(0, SIP_METHOD_INVITE);
   }
   while (r481->sip->sip_status->st_status < 200);
 
-  s2_update_dialog(dialog, r481); /* send ACK */
+  s2_sip_update_dialog(dialog, r481); /* send ACK */
 
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
-  s2_respond_to(bye, dialog, SIP_200_OK,
+  s2_sip_respond_to(bye, dialog, SIP_200_OK,
 		TAG_END());
-  s2_free_message(bye);
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
 
   nua_handle_destroy(nh);
@@ -2051,22 +2051,22 @@
   s2_flush_events();
 
   nua_bye(nh, TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
 
-  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
   i_bye = s2_wait_for_event(nua_i_bye, 100);
   fail_if(!i_bye);
 
   nua_respond(nh, 200, "OKOK", NUTAG_WITH(i_bye->data->e_msg), TAG_END());
 
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
-  fail_unless(s2_check_response(200, SIP_METHOD_BYE));
+  fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE));
 
   nua_handle_destroy(nh);
 }
@@ -2089,23 +2089,23 @@
   fail_unless(s2_check_event(nua_r_set_params, 200));
   s2_flush_events();
 
-  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
   i_bye = s2_wait_for_event(nua_i_bye, 100);
   fail_if(!i_bye);
 
   nua_bye(nh, TAG_END());
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
 
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
   nua_respond(nh, 200, "OKOK", NUTAG_WITH(i_bye->data->e_msg), TAG_END());
-  fail_unless(s2_check_response(200, SIP_METHOD_BYE));
+  fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE));
 
   nua_handle_destroy(nh);
 }
@@ -2128,23 +2128,23 @@
   fail_unless(s2_check_event(nua_r_set_params, 200));
   s2_flush_events();
 
-  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
   i_bye = s2_wait_for_event(nua_i_bye, 100);
   fail_if(!i_bye);
 
   nua_bye(nh, TAG_END());
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
 
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
 
   nua_handle_destroy(nh);
-  fail_unless(s2_check_response(500, SIP_METHOD_BYE));
+  fail_unless(s2_sip_check_response(500, SIP_METHOD_BYE));
 }
 END_TEST
 
@@ -2165,22 +2165,22 @@
   s2_flush_events();
 
   request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END());
-  fail_unless(s2_check_response(100, SIP_METHOD_INVITE));
+  fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE));
   nua_bye(nh, TAG_END());
   fail_unless(s2_check_event(nua_i_invite, 100));
   fail_unless(s2_check_callstate(nua_callstate_received));
 
   do {
-    r486 = s2_wait_for_response(0, SIP_METHOD_INVITE);
+    r486 = s2_sip_wait_for_response(0, SIP_METHOD_INVITE);
   }
   while (r486->sip->sip_status->st_status < 200);
-  s2_update_dialog(dialog, r486); /* send ACK */
+  s2_sip_update_dialog(dialog, r486); /* send ACK */
   fail_unless(r486->sip->sip_status->st_status == 486);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   nua_handle_destroy(nh);
 }
@@ -2203,21 +2203,21 @@
   s2_flush_events();
 
   request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END());
-  fail_unless(s2_check_response(100, SIP_METHOD_INVITE));
+  fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE));
   nua_bye(nh, TAG_END());
   fail_unless(s2_check_event(nua_i_invite, 100));
   fail_unless(s2_check_callstate(nua_callstate_received));
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   do {
-    r486 = s2_wait_for_response(0, SIP_METHOD_INVITE);
+    r486 = s2_sip_wait_for_response(0, SIP_METHOD_INVITE);
   }
   while (r486->sip->sip_status->st_status < 200);
-  s2_update_dialog(dialog, r486); /* send ACK */
+  s2_sip_update_dialog(dialog, r486); /* send ACK */
   fail_unless(r486->sip->sip_status->st_status == 486);
 
   nua_handle_destroy(nh);
@@ -2232,14 +2232,14 @@
   s2_case("4.1.8", "BYE followed by response to INVITE",
 	  "NUA receives INVITE, sends BYE at same time");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite_by_nua(nh, NUTAG_AUTOANSWER(0), TAG_END());
 
   s2_flush_events();
 
   request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END());
-  fail_unless(s2_check_response(100, SIP_METHOD_INVITE));
+  fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE));
   nua_bye(nh, TAG_END());
   fail_unless(s2_check_event(nua_i_invite, 100));
   fail_unless(s2_check_callstate(nua_callstate_received));
@@ -2247,16 +2247,16 @@
   nua_respond(nh, SIP_486_BUSY_HERE, TAG_END());
 
   do {
-    r486 = s2_wait_for_response(0, SIP_METHOD_INVITE);
+    r486 = s2_sip_wait_for_response(0, SIP_METHOD_INVITE);
   }
   while (r486->sip->sip_status->st_status < 200);
-  s2_update_dialog(dialog, r486); /* send ACK */
+  s2_sip_update_dialog(dialog, r486); /* send ACK */
   fail_unless(r486->sip->sip_status->st_status == 486);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   nua_handle_destroy(nh);
 }
@@ -2279,29 +2279,29 @@
   s2_flush_events();
 
   nua_bye(nh, TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
 
-  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  s2_sip_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));
+  fail_unless(s2_sip_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);
+  su_root_step(s2base->root, 10);
+  su_root_step(s2base->root, 10);
+  su_root_step(s2base->root, 10);
 
   mark_point();
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   mark_point();
   while (su_home_check_alloc((su_home_t *)nua, (void *)nh)) {
-    su_root_step(s2->root, 10);
+    su_root_step(s2base->root, 10);
   }
 }
 END_TEST
@@ -2323,37 +2323,37 @@
   s2_flush_events();
 
   nua_invite(nh, TAG_END());
-  invite = s2_wait_for_request(SIP_METHOD_INVITE);
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
   fail_if(!invite);
-  s2_respond_to(invite, dialog, SIP_501_NOT_IMPLEMENTED, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_501_NOT_IMPLEMENTED, TAG_END());
+  s2_sip_free_message(invite);
 
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_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());
+  s2_sip_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));
+  fail_unless(s2_sip_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);
+  su_root_step(s2base->root, 10);
+  su_root_step(s2base->root, 10);
+  su_root_step(s2base->root, 10);
 
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
   while (su_home_check_alloc((su_home_t *)nua, (void *)nh)) {
-    su_root_step(s2->root, 10);
+    su_root_step(s2base->root, 10);
   }
 }
 END_TEST
@@ -2367,29 +2367,29 @@
   s2_case("4.1.11", "Receive BYE in completing state",
 	  "NUA sends INVITE, receives 200, receives BYE.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_completing));
 
-  s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END());
+  s2_sip_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));
+  fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE));
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
   nua_handle_destroy(nh);
 }
@@ -2411,26 +2411,26 @@
     SIPTAG_REQUIRE_STR("timer"),
     TAG_END());
 
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
   invite_timer_round(nh, "300", NULL);
 
   nua_bye(nh, TAG_END());
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
+  s2_sip_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(bye);
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 407));
 
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
 
   nua_authenticate(nh, NUTAG_AUTH("Digest:\"s2test\":abc:abc"), TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
   fail_if(s2->events);
@@ -2455,28 +2455,28 @@
     SIPTAG_REQUIRE_STR("timer"),
     TAG_END());
 
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
   invite_timer_round(nh, "300", NULL);
 
-  s2_fast_forward(140, s2->root);
+  s2_nua_fast_forward(140, s2base->root);
 
   nua_bye(nh, TAG_END());
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
+  s2_sip_respond_to(bye, dialog, SIP_407_PROXY_AUTH_REQUIRED,
 		SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
 		TAG_END());
-  s2_free_message(bye);
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 407));
 
-  s2_fast_forward(160, s2->root);
+  s2_nua_fast_forward(160, s2base->root);
 
   nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
   fail_unless(s2_check_event(nua_r_bye, 200));
   fail_unless(s2_check_callstate(nua_callstate_terminated));
   fail_if(s2->events);
@@ -2518,22 +2518,22 @@
   s2_case("4.3.1", "Destroy handle after INVITE sent",
 	  "NUA sends INVITE, handle gets destroyed.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
   process_offer(invite);
 
   nua_handle_destroy(nh);
 
-  s2_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
 
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+  s2_sip_free_message(invite);
 
-  s2_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
 }
 END_TEST
 
@@ -2546,23 +2546,23 @@
   s2_case("4.3.2", "Destroy handle in calling state",
 	  "NUA sends INVITE, receives 180, handle gets destroyed.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   nua_handle_destroy(nh);
 
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+  s2_sip_free_message(invite);
 
-  s2_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
 }
 END_TEST
 
@@ -2574,11 +2574,11 @@
   s2_case("4.3.3", "Destroy handle in completing state",
 	  "NUA sends INVITE, receives 200, handle gets destroyed.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
@@ -2588,16 +2588,16 @@
 
   nua_handle_destroy(nh);
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 }
 END_TEST
 
@@ -2610,11 +2610,11 @@
   s2_case("4.3.3", "Destroy handle in ready state ",
 	  "NUA sends INVITE, receives 200, handle gets destroyed.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
@@ -2623,20 +2623,20 @@
   fail_unless(s2_check_callstate(nua_callstate_completing));
 
   nua_ack(nh, TAG_END());
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
   fail_unless(s2_check_callstate(nua_callstate_ready));
 
   nua_handle_destroy(nh);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 }
 END_TEST
 
@@ -2656,15 +2656,15 @@
 
   nua_handle_destroy(nh);
 
-  s2_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_100_TRYING, TAG_END());
 
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+  s2_sip_free_message(invite);
 
-  s2_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
 }
 END_TEST
 
@@ -2681,19 +2681,19 @@
 
   invite = invite_sent_by_nua(nh, TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   nua_handle_destroy(nh);
 
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
-  s2_free_message(invite);
+  s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+  s2_sip_free_message(invite);
 
-  s2_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
 }
 END_TEST
 
@@ -2710,7 +2710,7 @@
 
   invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
@@ -2720,16 +2720,16 @@
 
   nua_handle_destroy(nh);
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 }
 END_TEST
 
@@ -2739,15 +2739,12 @@
   nua_handle_t *nh;
   struct message *invite, *ack, *bye;
 
-  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
-  s2_setup_logs(7);
-
   s2_case("4.3.8", "Destroy handle after INVITE sent",
 	  "NUA sends INVITE, handle gets destroyed, "
 	  "but remote end returns 200 OK. "
 	  "Make sure nua tries to release call properly.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
   process_offer(invite);
@@ -2755,16 +2752,16 @@
   nua_handle_destroy(nh);
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 }
 END_TEST
 
@@ -2774,40 +2771,37 @@
   nua_handle_t *nh;
   struct message *invite, *cancel, *ack, *bye;
 
-  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
-  s2_setup_logs(7);
-
   s2_case("4.3.9", "Destroy handle in calling state",
 	  "NUA sends INVITE, receives 180, handle gets destroyed, "
 	  "but remote end returns 200 OK. "
 	  "Make sure nua tries to release call properly.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
 
   invite = invite_sent_by_nua(nh, TAG_END());
   process_offer(invite);
-  s2_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
+  s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END());
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
   nua_handle_destroy(nh);
 
-  cancel = s2_wait_for_request(SIP_METHOD_CANCEL);
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
   fail_if(!cancel);
-  s2_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END());
-  s2_free_message(cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END());
+  s2_sip_free_message(cancel);
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
 
-  ack = s2_wait_for_request(SIP_METHOD_ACK);
+  ack = s2_sip_wait_for_request(SIP_METHOD_ACK);
   fail_if(!ack);
-  s2_free_message(ack);
+  s2_sip_free_message(ack);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 }
 END_TEST
 
@@ -2831,18 +2825,18 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_handle_destroy(nh);
 
-  response = s2_wait_for_response(480, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(480, SIP_METHOD_INVITE);
   fail_if(!response);
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
-  s2_free_message(response);
+  s2_sip_free_message(response);
 }
 END_TEST
 
@@ -2866,24 +2860,24 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_respond(nh, SIP_180_RINGING, TAG_END());
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_handle_destroy(nh);
 
-  response = s2_wait_for_response(480, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(480, SIP_METHOD_INVITE);
   fail_if(!response);
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
-  s2_free_message(response);
+  s2_sip_free_message(response);
 }
 END_TEST
 
@@ -2907,37 +2901,37 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_respond(nh, SIP_180_RINGING,
 	      SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	      TAG_END());
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   fail_unless(s2_check_callstate(nua_callstate_early));
 
   nua_respond(nh, SIP_200_OK, TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_completed));
 
-  response = s2_wait_for_response(200, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE);
   fail_if(!response);
 
   nua_handle_destroy(nh);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 }
 END_TEST
 
@@ -2961,37 +2955,37 @@
 
   s2_free_event(invite);
 
-  response = s2_wait_for_response(100, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_respond(nh, SIP_180_RINGING,
 	      SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
 	      TAG_END());
 
-  response = s2_wait_for_response(180, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(180, SIP_METHOD_INVITE);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   fail_unless(s2_check_callstate(nua_callstate_early));
 
   nua_respond(nh, SIP_200_OK, TAG_END());
   fail_unless(s2_check_callstate(nua_callstate_completed));
 
-  response = s2_wait_for_response(200, SIP_METHOD_INVITE);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE);
   fail_if(!response);
 
   nua_handle_destroy(nh);
 
-  bye = s2_wait_for_request(SIP_METHOD_BYE);
+  bye = s2_sip_wait_for_request(SIP_METHOD_BYE);
   fail_if(!bye);
-  s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(bye);
+  s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(bye);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL,
 			SIPTAG_VIA(sip_object(dialog->invite)->sip_via),
 			TAG_END()));
-  s2_free_message(response);
+  s2_sip_free_message(response);
 }
 END_TEST
 
@@ -3037,23 +3031,23 @@
   s2_case("5.1.1", "Test nua_respond() API",
 	  "Test nua_respond() API with OPTIONS.");
 
-  s2_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END());
 
   options = s2_wait_for_event(nua_i_options, 200);
   fail_unless(options != NULL);
   nh = options->nh; fail_if(!nh);
 
-  response = s2_wait_for_response(200, SIP_METHOD_OPTIONS);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_OPTIONS);
 
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_handle_destroy(nh);
 
   nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END());
   fail_unless(s2_check_event(nua_r_set_params, 200));
 
-  s2_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END());
 
   options = s2_wait_for_event(nua_i_options, 100);
   fail_unless(options != NULL);
@@ -3061,9 +3055,9 @@
 
   nua_respond(nh, 202, "okok", NUTAG_WITH_SAVED(options->event), TAG_END());
 
-  response = s2_wait_for_response(202, SIP_METHOD_OPTIONS);
+  response = s2_sip_wait_for_response(202, SIP_METHOD_OPTIONS);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_handle_destroy(nh);
 }
@@ -3099,7 +3093,7 @@
   nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END());
   fail_unless(s2_check_event(nua_r_set_params, 200));
 
-  s2_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END());
 
   options = s2_wait_for_event(nua_i_options, 100);
   fail_unless(options != NULL);
@@ -3109,9 +3103,9 @@
   pthread_join(tid, &thread_return);
   fail_unless(thread_return == (void *)options);
 
-  response = s2_wait_for_response(202, SIP_METHOD_OPTIONS);
+  response = s2_sip_wait_for_response(202, SIP_METHOD_OPTIONS);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_handle_destroy(nh);
 }
@@ -3160,13 +3154,13 @@
   s2_case("5.2.1", "Receive REFER",
 	  "Make a call, receive REFER.");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   invite_by_nua(nh, TAG_END());
 
-  *sip_refer_to_init(r)->r_url = *s2->local->a_url;
+  *sip_refer_to_init(r)->r_url = *s2sip->aor->a_url;
   r->r_url->url_user = "bob2";
 
-  s2_request_to(dialog, SIP_METHOD_REFER, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_REFER, NULL,
 		SIPTAG_REFER_TO(r),
 		TAG_END());
   refer = s2_wait_for_event(nua_i_refer, 202);
@@ -3175,8 +3169,8 @@
 
   nua_handle_destroy(nh);
 
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
-  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
+  s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
 }
 END_TEST
 
@@ -3200,16 +3194,13 @@
 
   dialog2 = su_home_new(sizeof *dialog2); fail_unless(dialog2 != NULL);
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   invite_by_nua(nh, TAG_END());
 
-  *sip_refer_to_init(r)->r_url = *s2->local->a_url;
+  *sip_refer_to_init(r)->r_url = *s2sip->aor->a_url;
   r->r_url->url_user = "bob2";
 
-  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
-  s2_setup_logs(7);
-
-  s2_request_to(dialog, SIP_METHOD_REFER, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_REFER, NULL,
 		SIPTAG_REFER_TO(r),
 		TAG_END());
   refer = s2_wait_for_event(nua_i_refer, 202);
@@ -3233,10 +3224,10 @@
 	     SIPTAG_PAYLOAD_STR("SIP/2.0 100 Trying\r\n"),
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     TAG_END());
-  notify0 = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify0 = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless((ss = notify0->sip->sip_subscription_state) != NULL);
   fail_unless(su_casematch("active", ss->ss_substate));
-  s2_respond_to(notify0, dialog1, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(notify0, dialog1, SIP_200_OK, TAG_END());
   notified = s2_wait_for_event(nua_r_notify, 200);
 
   nh2 = nua_handle(nua, NULL, NUTAG_URL(r->r_url), TAG_END());
@@ -3255,17 +3246,17 @@
   fail_unless(s2_check_event(nua_r_invite, 180));
   fail_unless(s2_check_callstate(nua_callstate_proceeding));
 
-  notify1 = s2_wait_for_request(SIP_METHOD_NOTIFY);
-  s2_respond_to(notify1, dialog1, SIP_200_OK, TAG_END());
+  notify1 = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
+  s2_sip_respond_to(notify1, dialog1, SIP_200_OK, TAG_END());
 
   respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END());
-  s2_free_message(invite);
+  s2_sip_free_message(invite);
   fail_unless(s2_check_event(nua_r_invite, 200));
   fail_unless(s2_check_callstate(nua_callstate_ready));
-  fail_unless(s2_check_request(SIP_METHOD_ACK));
+  fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
 
-  notify2 = s2_wait_for_request(SIP_METHOD_NOTIFY);
-  s2_respond_to(notify2, dialog1, SIP_200_OK, TAG_END());
+  notify2 = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
+  s2_sip_respond_to(notify2, dialog1, SIP_200_OK, TAG_END());
   fail_unless((ss = notify2->sip->sip_subscription_state) != NULL);
   fail_unless(su_casematch("terminated", ss->ss_substate));
 
@@ -3296,10 +3287,10 @@
   s2_case("0.0.0", "Empty test case",
 	  "Detailed explanation for empty test case.");
 
-  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
+  tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END());
   s2_setup_logs(7);
   s2_setup_logs(0);
-  tport_set_params(s2->master, TPTAG_LOG(0), TAG_END());
+  tport_set_params(s2sip->master, TPTAG_LOG(0), TAG_END());
 }
 END_TEST
 

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c	Tue Mar  3 16:00:56 2009
@@ -56,7 +56,6 @@
 /* ====================================================================== */
 
 static nua_t *nua;
-static soa_session_t *soa = NULL;
 static struct dialog *dialog = NULL;
 
 #define CRLF "\r\n"
@@ -138,7 +137,7 @@
   ta_list ta;
 
   ta_start(ta, tag, value);
-  s2_respond_to(subscribe, dialog, status, phrase,
+  s2_sip_respond_to(subscribe, dialog, status, phrase,
 		ta_tags(ta));
   ta_end(ta);
 
@@ -156,15 +155,15 @@
   ta_list ta;
 
   ta_start(ta, tag, value);
-  fail_if(s2_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
 			SIPTAG_CONTENT_TYPE_STR(event_mime_type),
 			SIPTAG_PAYLOAD_STR(event_state),
 			ta_tags(ta)));
   ta_end(ta);
 
-  response = s2_wait_for_response(200, SIP_METHOD_NOTIFY);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_NOTIFY);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   event = s2_wait_for_event(nua_i_notify, 200); fail_if(!event);
   fail_unless(s2_check_substate(event, expect_substate));
@@ -186,7 +185,7 @@
   char const *substate_str = subscription_state;
   char const *expires = "600";
 
-  subscribe = s2_wait_for_request(SIP_METHOD_SUBSCRIBE);
+  subscribe = s2_sip_wait_for_request(SIP_METHOD_SUBSCRIBE);
   if (event_type)
     fail_if(!subscribe->sip->sip_event ||
 	    strcmp(event_type, subscribe->sip->sip_event->o_type));
@@ -200,7 +199,7 @@
   ta_start(ta, tag, value);
 
   if (send_notify_before_response) {
-    s2_save_uas_dialog(dialog, subscribe->sip);
+    s2_sip_save_uas_dialog(dialog, subscribe->sip);
     notify = notify_to_nua(substate,
 			   SIPTAG_EVENT(subscribe->sip->sip_event),
 			   SIPTAG_SUBSCRIPTION_STATE_STR(substate_str),
@@ -223,7 +222,7 @@
 			   ta_tags(ta));
   }
 
-  s2_free_message(subscribe);
+  s2_sip_free_message(subscribe);
 
   return notify;
 }
@@ -235,15 +234,15 @@
   struct event *event;
 
   nua_unsubscribe(nh, TAG_END());
-  subscribe = s2_wait_for_request(SIP_METHOD_SUBSCRIBE);
+  subscribe = s2_sip_wait_for_request(SIP_METHOD_SUBSCRIBE);
 
-  s2_respond_to(subscribe, dialog, SIP_200_OK, SIPTAG_EXPIRES_STR("0"), TAG_END());
+  s2_sip_respond_to(subscribe, dialog, SIP_200_OK, SIPTAG_EXPIRES_STR("0"), TAG_END());
 
   event = s2_wait_for_event(nua_r_unsubscribe, 200); fail_if(!event);
   fail_unless(s2_check_substate(event, nua_substate_active));
   s2_free_event(event);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
 			SIPTAG_EVENT(subscribe->sip->sip_event),
 			SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=tiemout"),
 			SIPTAG_CONTENT_TYPE_STR(event_mime_type),
@@ -254,9 +253,9 @@
   fail_unless(s2_check_substate(event, nua_substate_terminated));
   s2_free_event(event);
 
-  response = s2_wait_for_response(200, SIP_METHOD_NOTIFY);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_NOTIFY);
   fail_if(!response);
-  s2_free_message(response); s2_free_message(subscribe);
+  s2_sip_free_message(response); s2_sip_free_message(subscribe);
 }
 
 /* ====================================================================== */
@@ -269,7 +268,7 @@
   s2_case("6.1.1", "Basic subscription",
 	  "NUA sends SUBSCRIBE, waits for NOTIFY, sends un-SUBSCRIBE");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), TAG_END());
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_free_event(notify);
@@ -291,15 +290,15 @@
 
   send_notify_before_response = 1;
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), TAG_END());
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_free_event(notify);
 
   /* Wait for refresh */
-  s2_fast_forward(600, s2->root);
-  subscribe = s2_wait_for_request(SIP_METHOD_SUBSCRIBE);
-  s2_respond_to(subscribe, dialog, SIP_200_OK,
+  s2_nua_fast_forward(600, s2base->root);
+  subscribe = s2_sip_wait_for_request(SIP_METHOD_SUBSCRIBE);
+  s2_sip_respond_to(subscribe, dialog, SIP_200_OK,
 		SIPTAG_EXPIRES_STR("600"),
 		TAG_END());
 
@@ -307,7 +306,7 @@
   fail_unless(s2_check_substate(event, nua_substate_active));
   s2_free_event(event);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
 			SIPTAG_EVENT(subscribe->sip->sip_event),
 			SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=600"),
 			SIPTAG_CONTENT_TYPE_STR(event_mime_type),
@@ -316,9 +315,9 @@
   event = s2_wait_for_event(nua_i_notify, 200); fail_if(!event);
   fail_unless(s2_check_substate(event, nua_substate_active));
   s2_free_event(event);
-  response = s2_wait_for_response(200, SIP_METHOD_NOTIFY);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_NOTIFY);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   unsubscribe_by_nua(nh, TAG_END());
 
@@ -336,21 +335,21 @@
 	  "NUA sends SUBSCRIBE, waits for NOTIFY, "
 	  "gets NOTIFY terminating the subscription,");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), TAG_END());
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_free_event(notify);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
 			SIPTAG_EVENT_STR(event_type),
 			SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=noresource"),
 			TAG_END()));
   event = s2_wait_for_event(nua_i_notify, 200); fail_if(!event);
   fail_unless(s2_check_substate(event, nua_substate_terminated));
   s2_free_event(event);
-  response = s2_wait_for_response(200, SIP_METHOD_NOTIFY);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_NOTIFY);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_handle_destroy(nh);
 }
@@ -366,25 +365,25 @@
 	  "NUA sends SUBSCRIBE, waits for NOTIFY, "
 	  "gets NOTIFY terminating the subscription,");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), TAG_END());
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_free_event(notify);
 
-  fail_if(s2_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
+  fail_if(s2_sip_request_to(dialog, SIP_METHOD_NOTIFY, NULL,
 			SIPTAG_EVENT_STR(event_type),
 			SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=deactivated"),
 			TAG_END()));
   event = s2_wait_for_event(nua_i_notify, 200); fail_if(!event);
   fail_unless(s2_check_substate(event, nua_substate_embryonic));
   s2_free_event(event);
-  response = s2_wait_for_response(200, SIP_METHOD_NOTIFY);
+  response = s2_sip_wait_for_response(200, SIP_METHOD_NOTIFY);
   fail_if(!response);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   su_home_unref((void *)dialog), dialog = su_home_new(sizeof *dialog); fail_if(!dialog);
 
-  s2_fast_forward(5, s2->root);
+  s2_nua_fast_forward(5, s2base->root);
   /* nua re-establishes the subscription */
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_free_event(notify);
@@ -423,7 +422,7 @@
   s2_case("6.2.1", "Event fetch - NOTIFY after 202",
 	  "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), SIPTAG_EXPIRES_STR("0"), TAG_END());
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_check_substate(notify, nua_substate_terminated);
@@ -442,7 +441,7 @@
 
   send_notify_before_response = 1;
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), SIPTAG_EXPIRES_STR("0"), TAG_END());
   notify = subscription_by_nua(nh, nua_substate_embryonic, TAG_END());
   s2_check_substate(notify, nua_substate_terminated);
@@ -460,18 +459,18 @@
   s2_case("6.2.3", "Event fetch - no NOTIFY",
 	  "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY, times out");
 
-  nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
   nua_subscribe(nh, SIPTAG_EVENT_STR(event_type), SIPTAG_EXPIRES_STR("0"), TAG_END());
-  subscribe = s2_wait_for_request(SIP_METHOD_SUBSCRIBE);
-  s2_respond_to(subscribe, dialog, SIP_202_ACCEPTED,
+  subscribe = s2_sip_wait_for_request(SIP_METHOD_SUBSCRIBE);
+  s2_sip_respond_to(subscribe, dialog, SIP_202_ACCEPTED,
 		SIPTAG_EXPIRES_STR("0"), TAG_END());
-  s2_free_message(subscribe);
+  s2_sip_free_message(subscribe);
 
   event = s2_wait_for_event(nua_r_subscribe, 202); fail_if(!event);
   fail_unless(s2_check_substate(event, nua_substate_embryonic));
   s2_free_event(event);
 
-  s2_fast_forward(600, s2->root);
+  s2_nua_fast_forward(600, s2base->root);
 
   event = s2_wait_for_event(nua_i_notify, 408); fail_if(!event);
   fail_unless(s2_check_substate(event, nua_substate_terminated));
@@ -513,7 +512,7 @@
   s2_check_event(nua_r_set_params, 200);
 
   ta_start(ta, tag, value);
-  s2_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
 		SIPTAG_EVENT_STR(event),
 		ta_tags(ta));
   ta_end(ta);
@@ -525,10 +524,10 @@
 	      TAG_END());
   s2_free_event(subscribe);
 
-  response = s2_wait_for_response(202, SIP_METHOD_SUBSCRIBE);
-  s2_update_dialog(dialog, response);
+  response = s2_sip_wait_for_response(202, SIP_METHOD_SUBSCRIBE);
+  s2_sip_update_dialog(dialog, response);
   fail_unless(response->sip->sip_expires != NULL);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   return nh;
 }
@@ -544,24 +543,24 @@
 	  "NUA receives SUBSCRIBE, sends 202 and NOTIFY. "
 	  "First NOTIFY terminates subscription. ");
 
-  s2_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
-		SIPTAG_EVENT_STR("presence"),
-		TAG_END());
+  s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
+		    SIPTAG_EVENT_STR("presence"),
+		    TAG_END());
   /* 489 Bad Event by default */
-  s2_check_response(489, SIP_METHOD_SUBSCRIBE);
+  s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE);
 
   nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"), TAG_END());
   s2_check_event(nua_r_set_params, 200);
 
-  s2_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
 		SIPTAG_EVENT_STR("presence"),
 		TAG_END());
-  s2_check_response(489, SIP_METHOD_SUBSCRIBE);
+  s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE);
 
   nua_set_params(nua, SIPTAG_ALLOW_EVENTS_STR("presence"), TAG_END());
   s2_check_event(nua_r_set_params, 200);
 
-  s2_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
 		SIPTAG_EVENT_STR("presence"),
 		TAG_END());
   subscribe = s2_wait_for_event(nua_i_subscribe, 100);
@@ -571,11 +570,11 @@
 	      TAG_END());
   s2_free_event(subscribe);
 
-  s2_check_response(403, SIP_METHOD_SUBSCRIBE);
+  s2_sip_check_response(403, SIP_METHOD_SUBSCRIBE);
 
   nua_handle_destroy(nh);
 
-  s2_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
+  s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
 		SIPTAG_EVENT_STR("presence"),
 		TAG_END());
   subscribe = s2_wait_for_event(nua_i_subscribe, 100);
@@ -585,22 +584,22 @@
 	      TAG_END());
   s2_free_event(subscribe);
 
-  response = s2_wait_for_response(202, SIP_METHOD_SUBSCRIBE);
-  s2_update_dialog(dialog, response);
+  response = s2_sip_wait_for_response(202, SIP_METHOD_SUBSCRIBE);
+  s2_sip_update_dialog(dialog, response);
   fail_unless(response->sip->sip_expires != NULL);
-  s2_free_message(response);
+  s2_sip_free_message(response);
 
   nua_notify(nh,
 	     NUTAG_SUBSTATE(nua_substate_terminated),
 	     SIPTAG_PAYLOAD_STR(presence_closed),
 	     TAG_END());
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "terminated"));
-  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
 
   s2_check_event(nua_r_notify, 200);
   nua_handle_destroy(nh);
@@ -610,8 +609,7 @@
 START_TEST(notify_6_3_2)
 {
   nua_handle_t *nh;
-  struct event *subscribe;
-  struct message *notify, *response;
+  struct message *notify;
   sip_t *sip;
 
   s2_case("6.3.2", "NOTIFY server - automatic subscription termination",
@@ -624,24 +622,24 @@
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     SIPTAG_PAYLOAD_STR(presence_closed),
 	     TAG_END());
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "active"));
-  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
   s2_check_event(nua_r_notify, 200);
 
-  s2_fast_forward(300, s2->root);
+  s2_nua_fast_forward(300, s2base->root);
 
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "terminated"));
-  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
   s2_check_event(nua_r_notify, 200);
 
   nua_handle_destroy(nh);
@@ -677,26 +675,26 @@
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     SIPTAG_PAYLOAD_STR(presence_closed),
 	     TAG_END());
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "active"));
-  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
   s2_check_event(nua_r_notify, 200);
 
   nua_notify(nh,
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     SIPTAG_PAYLOAD_STR(presence_closed),
 	     TAG_END());
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "active"));
-  s2_respond_to(notify, dialog, SIP_481_NO_TRANSACTION, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_481_NO_TRANSACTION, TAG_END());
   response = s2_wait_for_event(nua_r_notify, 481);
   fail_unless(s2_event_substate(response) == nua_substate_terminated);
 
@@ -723,13 +721,13 @@
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     SIPTAG_PAYLOAD_STR(presence_closed),
 	     TAG_END());
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "active"));
-  s2_respond_to(notify, dialog, SIP_200_OK, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
   s2_check_event(nua_r_notify, 200);
 
   nua_notify(nh,
@@ -740,13 +738,13 @@
 	     NUTAG_SUBSTATE(nua_substate_active),
 	     SIPTAG_PAYLOAD_STR(presence_closed),
 	     TAG_END());
-  notify = s2_wait_for_request(SIP_METHOD_NOTIFY);
+  notify = s2_sip_wait_for_request(SIP_METHOD_NOTIFY);
   fail_unless(notify != NULL);
   sip = notify->sip;
   fail_unless(sip->sip_subscription_state != NULL);
   fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
 			  "active"));
-  s2_respond_to(notify, dialog, SIP_481_NO_TRANSACTION, TAG_END());
+  s2_sip_respond_to(notify, dialog, SIP_481_NO_TRANSACTION, TAG_END());
   response = s2_wait_for_event(nua_r_notify, 481);
   fail_unless(s2_event_substate(response) == nua_substate_terminated);
   response = s2_wait_for_event(nua_r_notify, 481);
@@ -783,10 +781,10 @@
   s2_case("0.0.0", "Empty test case",
 	  "Detailed explanation for empty test case.");
 
-  tport_set_params(s2->master, TPTAG_LOG(1), TAG_END());
+  tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END());
   s2_setup_logs(7);
   s2_setup_logs(0);
-  tport_set_params(s2->master, TPTAG_LOG(0), TAG_END());
+  tport_set_params(s2sip->master, TPTAG_LOG(0), TAG_END());
 }
 
 END_TEST

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c	Tue Mar  3 16:00:56 2009
@@ -54,33 +54,11 @@
 #include <limits.h>
 #include <time.h>
 
-char const *s2_tester = "s2_tester";
-int s2_start_stop;
+/* -- Globals -------------------------------------------------------------- */
 
-/* -- Module types ------------------------------------------------------ */
+struct s2nua *s2;
 
-struct tp_magic_s
-{
-  sip_via_t *via;
-  sip_contact_t *contact;
-};
-
-/* -- Module prototypes ------------------------------------------------- */
-
-static msg_t *s2_msg(int flags);
-static int s2_complete_response(msg_t *response,
-				int status, char const *phrase,
-				msg_t *request);
-static char *s2_generate_tag(su_home_t *home);
-
-/* -- Module globals ---------------------------------------------------- */
-
-struct tester *s2;
-
-static char const *_s2case = "0.0";
-static unsigned s2_tag_generator = 0;
-
-/* -- Globals ----------------------------------------------------------- */
+int s2_nua_thread = 0;
 
 unsigned s2_default_registration_duration = 3600;
 
@@ -108,8 +86,6 @@
 
 char const s2_auth3_credentials[] = "Digest:\"s2test3\":abc:abc";
 
-int s2_nua_thread = 0;
-
 /* -- NUA events -------------------------------------------------------- */
 
 struct event *s2_remove_event(struct event *e)
@@ -148,7 +124,7 @@
     if (s2->events)
       return s2_remove_event(s2->events);
 
-    su_root_step(s2->root, 100);
+    su_root_step(s2base->root, 100);
   }
 }
 
@@ -165,7 +141,7 @@
       return s2_remove_event(e);
     }
 
-    su_root_step(s2->root, 100);
+    su_root_step(s2base->root, 100);
   }
 }
 
@@ -230,862 +206,6 @@
   *prev = e, e->prev = prev;
 }
 
-/* ---------------------------------------------------------------------- */
-/* SIP messages sent by nua */
-
-struct message *
-s2_remove_message(struct message *m)
-{
-  if ((*m->prev = m->next))
-    m->next->prev = m->prev;
-
-  m->prev = NULL, m->next = NULL;
-
-  return m;
-}
-
-void
-s2_free_message(struct message *m)
-{
-  if (m) {
-    if (m->prev) {
-      if ((*m->prev = m->next))
-	m->next->prev = m->prev;
-    }
-    msg_destroy(m->msg);
-    tport_unref(m->tport);
-    free(m);
-  }
-}
-
-void s2_flush_messages(void)
-{
-  while (s2->received) {
-    s2_free_message(s2->received);
-  }
-}
-
-struct message *
-s2_next_response(void)
-{
-  struct message *m;
-
-  for (;;) {
-    for (m = s2->received; m; m = m->next) {
-      if (m->sip->sip_status)
-	return s2_remove_message(m);
-    }
-    su_root_step(s2->root, 100);
-  }
-}
-
-struct message *
-s2_wait_for_response(int status, sip_method_t method, char const *name)
-{
-  struct message *m;
-
-  for (;;) {
-    for (m = s2->received; m; m = m->next) {
-      if (!m->sip->sip_status)
-	continue;
-
-      if (status != 0 && m->sip->sip_status->st_status != status)
-	continue;
-
-      if (method == sip_method_unknown && name == NULL)
-	break;
-
-      if (m->sip->sip_cseq == NULL)
-	continue;
-
-      if (m->sip->sip_cseq->cs_method != method)
-	continue;
-      if (name == NULL)
-	break;
-      if (strcmp(m->sip->sip_cseq->cs_method_name, name) == 0)
-	break;
-    }
-
-    if (m)
-      return s2_remove_message(m);
-
-    su_root_step(s2->root, 100);
-  }
-}
-
-int
-s2_check_response(int status, sip_method_t method, char const *name)
-{
-  struct message *m = s2_wait_for_response(status, method, name);
-  s2_free_message(m);
-  return m != NULL;
-}
-
-
-struct message *
-s2_next_request(void)
-{
-  struct message *m;
-
-  for (;;) {
-    for (m = s2->received; m; m = m->next) {
-      if (m->sip->sip_request)
-	return s2_remove_message(m);
-    }
-
-    su_root_step(s2->root, 100);
-  }
-
-  return NULL;
-}
-
-struct message *
-s2_wait_for_request(sip_method_t method, char const *name)
-{
-  return s2_wait_for_request_timeout(method, name, -1);
-}
-
-struct message *
-s2_wait_for_request_timeout(sip_method_t method, char const *name, int timeout)
-{
-  struct message *m;
-  int t = timeout;
-
-  for (;;) {
-    for (m = s2->received; m; m = m->next) {
-      if (m->sip->sip_request) {
-	if (method == sip_method_unknown && name == NULL)
-	  return s2_remove_message(m);
-
-	if (m->sip->sip_request->rq_method == method &&
-	    strcmp(m->sip->sip_request->rq_method_name, name) == 0)
-	  return s2_remove_message(m);
-      }
-    }
-
-    su_root_step(s2->root, 100);
-    if (timeout != -1 && ((t -= 100) <= 0))
-        break;
-  }
-
-  return NULL;
-}
-
-int
-s2_check_request(sip_method_t method, char const *name)
-{
-  struct message *m = s2_wait_for_request(method, name);
-  s2_free_message(m);
-  return m != NULL;
-}
-
-int
-s2_check_request_timeout(sip_method_t method, char const *name, int timeout)
-{
-  struct message *m = s2_wait_for_request_timeout(method, name, timeout);
-  s2_free_message(m);
-  return m != NULL;
-}
-
-void
-s2_save_uas_dialog(struct dialog *d, sip_t *sip)
-{
-  if (d && !d->local) {
-    assert(sip->sip_request);
-    d->local = sip_from_dup(d->home, sip->sip_to);
-    if (d->local->a_tag == NULL)
-      sip_from_tag(d->home, d->local, s2_generate_tag(d->home));
-    d->remote = sip_to_dup(d->home, sip->sip_from);
-    d->call_id = sip_call_id_dup(d->home, sip->sip_call_id);
-    d->rseq = sip->sip_cseq->cs_seq;
-    /* d->route = sip_route_dup(d->home, sip->sip_record_route); */
-    d->target = sip_contact_dup(d->home, sip->sip_contact);
-  }
-}
-
-struct message *
-s2_respond_to(struct message *m, struct dialog *d,
-	      int status, char const *phrase,
-	      tag_type_t tag, tag_value_t value, ...)
-{
-  ta_list ta;
-  msg_t *reply;
-  sip_t *sip;
-  su_home_t *home;
-  tp_name_t tpn[1];
-  char *rport;
-
-  assert(m); assert(m->msg); assert(m->tport);
-  assert(100 <= status && status < 700);
-
-  s2_save_uas_dialog(d, m->sip);
-
-  ta_start(ta, tag, value);
-
-  reply = s2_msg(0); sip = sip_object(reply); home = msg_home(reply);
-
-  assert(reply && home && sip);
-
-  if (sip_add_tl(reply, sip, ta_tags(ta)) < 0) {
-    abort();
-  }
-
-  s2_complete_response(reply, status, phrase, m->msg);
-
-  if (sip->sip_status && sip->sip_status->st_status > 100 &&
-      sip->sip_to && !sip->sip_to->a_tag &&
-      sip->sip_cseq && sip->sip_cseq->cs_method != sip_method_cancel) {
-    char const *ltag = NULL;
-
-    if (d && d->local)
-      ltag = d->local->a_tag;
-
-    if (ltag == NULL)
-      ltag = s2_generate_tag(home);
-
-    if (sip_to_tag(msg_home(reply), sip->sip_to, ltag) < 0) {
-      assert(!"add To tag");
-    }
-  }
-
-  if (d && !d->contact) {
-    d->contact = sip_contact_dup(d->home, sip->sip_contact);
-  }
-
-  *tpn = *tport_name(m->tport);
-
-  rport = su_sprintf(home, "rport=%u",
-		     ntohs(((su_sockaddr_t *)
-			    msg_addrinfo(m->msg)->ai_addr)->su_port));
-
-  if (s2->server_uses_rport &&
-      sip->sip_via->v_rport &&
-      sip->sip_via->v_rport[0] == '\0') {
-    msg_header_add_param(home, sip->sip_via->v_common, rport);
-  }
-
-  tpn->tpn_port = rport + strlen("rport=");
-
-  tport_tsend(m->tport, reply, tpn, TPTAG_MTU(INT_MAX), ta_tags(ta));
-  msg_destroy(reply);
-
-  ta_end(ta);
-
-  return m;
-}
-
-/** Add headers from the request to the response message. */
-static int
-s2_complete_response(msg_t *response,
-		     int status, char const *phrase,
-		     msg_t *request)
-{
-  su_home_t *home = msg_home(response);
-  sip_t *response_sip = sip_object(response);
-  sip_t const *request_sip = sip_object(request);
-
-  int incomplete = 0;
-
-  if (!response_sip || !request_sip || !request_sip->sip_request)
-    return -1;
-
-  if (!response_sip->sip_status)
-    response_sip->sip_status = sip_status_create(home, status, phrase, NULL);
-  if (!response_sip->sip_via)
-    response_sip->sip_via = sip_via_dup(home, request_sip->sip_via);
-  if (!response_sip->sip_from)
-    response_sip->sip_from = sip_from_dup(home, request_sip->sip_from);
-  if (!response_sip->sip_to)
-    response_sip->sip_to = sip_to_dup(home, request_sip->sip_to);
-  if (!response_sip->sip_call_id)
-    response_sip->sip_call_id =
-      sip_call_id_dup(home, request_sip->sip_call_id);
-  if (!response_sip->sip_cseq)
-    response_sip->sip_cseq = sip_cseq_dup(home, request_sip->sip_cseq);
-
-  if (!response_sip->sip_record_route && request_sip->sip_record_route)
-    sip_add_dup(response, response_sip, (void*)request_sip->sip_record_route);
-
-  incomplete = sip_complete_message(response) < 0;
-
-  msg_serialize(response, (msg_pub_t *)response_sip);
-
-  if (incomplete ||
-      !response_sip->sip_status ||
-      !response_sip->sip_via ||
-      !response_sip->sip_from ||
-      !response_sip->sip_to ||
-      !response_sip->sip_call_id ||
-      !response_sip->sip_cseq ||
-      !response_sip->sip_content_length ||
-      !response_sip->sip_separator ||
-      (request_sip->sip_record_route && !response_sip->sip_record_route))
-    return -1;
-
-  return 0;
-}
-
-/* Send request (updating dialog).
- *
- * Return zero upon success, nonzero upon failure.
- */
-int
-s2_request_to(struct dialog *d,
-	      sip_method_t method, char const *name,
-	      tport_t *tport,
-	      tag_type_t tag, tag_value_t value, ...)
-{
-  ta_list ta;
-  tagi_t const *tags;
-
-  msg_t *msg = s2_msg(0);
-  sip_t *sip = sip_object(msg);
-  url_t const *target = NULL;
-  sip_cseq_t cseq[1];
-  sip_via_t via[1]; char const *v_params[8];
-  sip_content_length_t l[1];
-  tp_name_t tpn[1];
-  tp_magic_t *magic;
-  int user_via = 0;
-
-  ta_start(ta, tag, value);
-  tags = ta_args(ta);
-
-  if (sip_add_tagis(msg, sip, &tags) < 0)
-    goto error;
-
-  if (sip->sip_request)
-    target = sip->sip_request->rq_url;
-  else if (d->target)
-    target = d->target->m_url;
-  else if (s2->registration->contact)
-    target = s2->registration->contact->m_url;
-  else
-    target = NULL;
-
-  if (target == NULL)
-    goto error;
-
-  if (!sip->sip_request) {
-    sip_request_t *rq;
-    rq = sip_request_create(msg_home(msg), method, name,
-			    (url_string_t *)target, NULL);
-    sip_header_insert(msg, sip, (sip_header_t *)rq);
-  }
-
-  if (!d->local && sip->sip_from)
-    d->local = sip_from_dup(d->home, sip->sip_from);
-  if (!d->contact && sip->sip_contact)
-    d->contact = sip_contact_dup(d->home, sip->sip_contact);
-  if (!d->remote && sip->sip_to)
-    d->remote = sip_to_dup(d->home, sip->sip_to);
-  if (!d->target && sip->sip_request)
-    d->target = sip_contact_create(d->home,
-				   (url_string_t *)sip->sip_request->rq_url,
-				   NULL);
-  if (!d->call_id && sip->sip_call_id)
-    d->call_id = sip_call_id_dup(d->home, sip->sip_call_id);
-  if (!d->lseq && sip->sip_cseq)
-    d->lseq = sip->sip_cseq->cs_seq;
-
-  if (!d->local)
-    d->local = sip_from_dup(d->home, s2->local);
-  if (!d->contact)
-    d->contact = sip_contact_dup(d->home, s2->contact);
-  if (!d->remote)
-    d->remote = sip_to_dup(d->home, s2->registration->aor);
-  if (!d->call_id)
-    d->call_id = sip_call_id_create(d->home, NULL);
-  assert(d->local && d->contact);
-  assert(d->remote && d->target);
-  assert(d->call_id);
-
-  if (tport == NULL)
-    tport = d->tport;
-
-  if (tport == NULL)
-    tport = s2->registration->tport;
-
-  if (tport == NULL && d->target->m_url->url_type == url_sips)
-    tport = s2->tls.tport;
-
-  if (tport == NULL)
-    tport = s2->udp.tport;
-  else if (tport == NULL)
-    tport = s2->tcp.tport;
-  else if (tport == NULL)
-    tport = s2->tls.tport;
-
-  assert(tport);
-
-  *tpn = *tport_name(tport);
-
-  if (tport_is_primary(tport)) {
-    tpn->tpn_host = target->url_host;
-    tpn->tpn_port = url_port(target);
-    if (!tpn->tpn_port || !tpn->tpn_port[0])
-      tpn->tpn_port = url_port_default(target->url_type);
-  }
-
-  magic = tport_magic(tport);
-  assert(magic != NULL);
-
-  sip_cseq_init(cseq);
-  cseq->cs_method = method;
-  cseq->cs_method_name = name;
-
-  if (d->invite && (method == sip_method_ack || method == sip_method_cancel)) {
-    cseq->cs_seq = sip_object(d->invite)->sip_cseq->cs_seq;
-  }
-  else {
-    cseq->cs_seq = ++d->lseq;
-  }
-
-  if (sip->sip_via) {
-    user_via = 1;
-  }
-  else if (d->invite && method == sip_method_cancel) {
-    *via = *sip_object(d->invite)->sip_via;
-  }
-  else {
-    *via = *magic->via;
-    via->v_params = v_params;
-    v_params[0] = su_sprintf(msg_home(msg), "branch=z9hG4bK%lx", ++s2->tid);
-    v_params[1] = NULL;
-  }
-
-  sip_content_length_init(l);
-  if (sip->sip_payload)
-    l->l_length = sip->sip_payload->pl_len;
-
-  if (d->local->a_tag == NULL) {
-    char const *ltag = s2_generate_tag(d->home);
-
-    if (sip_from_tag(d->home, d->local, ltag) < 0) {
-      assert(!"add To tag");
-    }
-
-    if (sip->sip_from && sip->sip_from->a_tag == NULL) {
-      if (sip_from_tag(msg_home(msg), sip->sip_from, ltag) < 0) {
-	assert(!"add To tag");
-      }
-    }
-  }
-
-  sip_add_tl(msg, sip,
-	     TAG_IF(!sip->sip_from, SIPTAG_FROM(d->local)),
-	     TAG_IF(!sip->sip_contact, SIPTAG_CONTACT(d->contact)),
-	     TAG_IF(!sip->sip_to, SIPTAG_TO(d->remote)),
-	     TAG_IF(!sip->sip_call_id, SIPTAG_CALL_ID(d->call_id)),
-	     TAG_IF(!sip->sip_cseq, SIPTAG_CSEQ(cseq)),
-	     TAG_IF(!user_via, SIPTAG_VIA(via)),
-	     TAG_IF(!sip->sip_content_length, SIPTAG_CONTENT_LENGTH(l)),
-	     TAG_IF(!sip->sip_separator, SIPTAG_SEPARATOR_STR("\r\n")),
-	     TAG_END());
-
-  msg_serialize(msg, NULL);
-
-  if (method == sip_method_invite) {
-    msg_destroy(d->invite);
-    d->invite = msg_ref_create(msg);
-  }
-
-  tport = tport_tsend(tport, msg, tpn, ta_tags(ta));
-  ta_end(ta);
-
-  if (d->tport != tport) {
-    tport_unref(d->tport);
-    d->tport = tport_ref(tport);
-  }
-
-  return tport ? 0 : -1;
-
- error:
-  ta_end(ta);
-  return -1;
-}
-
-/** Save information from response.
- *
- * Send ACK for error messages to INVITE.
- */
-int s2_update_dialog(struct dialog *d, struct message *m)
-{
-  int status = 0;
-
-  if (m->sip->sip_status)
-    status = m->sip->sip_status->st_status;
-
-  if (100 < status && status < 300) {
-    d->remote = sip_to_dup(d->home, m->sip->sip_to);
-    if (m->sip->sip_contact)
-      d->contact = sip_contact_dup(d->home, m->sip->sip_contact);
-  }
-
-  if (300 <= status && m->sip->sip_cseq &&
-      m->sip->sip_cseq->cs_method == sip_method_invite &&
-      d->invite) {
-    msg_t *ack = s2_msg(0);
-    sip_t *sip = sip_object(ack);
-    sip_t *invite = sip_object(d->invite);
-    sip_request_t rq[1];
-    sip_cseq_t cseq[1];
-    tp_name_t tpn[1];
-
-    *rq = *invite->sip_request;
-    rq->rq_method = sip_method_ack, rq->rq_method_name = "ACK";
-    *cseq = *invite->sip_cseq;
-    cseq->cs_method = sip_method_ack, cseq->cs_method_name = "ACK";
-
-    sip_add_tl(ack, sip,
-	       SIPTAG_REQUEST(rq),
-	       SIPTAG_VIA(invite->sip_via),
-	       SIPTAG_FROM(invite->sip_from),
-	       SIPTAG_TO(invite->sip_to),
-	       SIPTAG_CALL_ID(invite->sip_call_id),
-	       SIPTAG_CSEQ(cseq),
-	       SIPTAG_CONTENT_LENGTH_STR("0"),
-	       SIPTAG_SEPARATOR_STR("\r\n"),
-	       TAG_END());
-
-    *tpn = *tport_name(d->tport);
-    if (!tport_is_secondary(d->tport) ||
-	!tport_is_clear_to_send(d->tport)) {
-      tpn->tpn_host = rq->rq_url->url_host;
-      tpn->tpn_port = rq->rq_url->url_port;
-    }
-
-    msg_serialize(ack, NULL);
-    tport_tsend(d->tport, ack, tpn, TAG_END());
-  }
-
-  return 0;
-}
-
-/* ---------------------------------------------------------------------- */
-
-int
-s2_save_register(struct message *rm)
-{
-  sip_contact_t *contact, *m, **m_prev;
-  sip_expires_t const *ex;
-  sip_date_t const *date;
-  sip_time_t now = rm->when.tv_sec, expires;
-
-  msg_header_free_all(s2->home, (msg_header_t *)s2->registration->aor);
-  msg_header_free_all(s2->home, (msg_header_t *)s2->registration->contact);
-  tport_unref(s2->registration->tport);
-
-  s2->registration->aor = NULL;
-  s2->registration->contact = NULL;
-  s2->registration->tport = NULL;
-
-  if (rm == NULL)
-    return 0;
-
-  assert(rm && rm->sip && rm->sip->sip_request);
-  assert(rm->sip->sip_request->rq_method == sip_method_register);
-
-  ex = rm->sip->sip_expires;
-  date = rm->sip->sip_date;
-
-  contact = sip_contact_dup(s2->home, rm->sip->sip_contact);
-
-  for (m_prev = &contact; *m_prev;) {
-    m = *m_prev;
-
-    expires = sip_contact_expires(m, ex, date,
-				  s2_default_registration_duration,
-				  now);
-    if (expires) {
-      char *p = su_sprintf(s2->home, "expires=%lu", (unsigned long)expires);
-      msg_header_add_param(s2->home, m->m_common, p);
-      m_prev = &m->m_next;
-    }
-    else {
-      *m_prev = m->m_next;
-      m->m_next = NULL;
-      msg_header_free(s2->home, (msg_header_t *)m);
-    }
-  }
-
-  if (contact == NULL)
-    return 0;
-
-  s2->registration->aor = sip_to_dup(s2->home, rm->sip->sip_to);
-  s2->registration->contact = contact;
-  s2->registration->tport = tport_ref(rm->tport);
-
-  return 0;
-}
-
-/* ---------------------------------------------------------------------- */
-
-static char *
-s2_generate_tag(su_home_t *home)
-{
-  s2_tag_generator += 1;
-
-  return su_sprintf(home, "tag=N2-%s/%u", _s2case, s2_tag_generator);
-}
-
-void s2_case(char const *number,
-	     char const *title,
-	     char const *description)
-{
-  _s2case = number;
-
-  if (s2_start_stop)
-    printf("%s - starting %s %s\n", s2_tester, number, title);
-}
-
-/* ---------------------------------------------------------------------- */
-/* tport interface */
-static void
-s2_stack_recv(struct tester *s2,
-	      tport_t *tp,
-	      msg_t *msg,
-	      tp_magic_t *magic,
-	      su_time_t now)
-{
-  struct message *next = calloc(1, sizeof *next), **prev;
-
-  next->msg = msg;
-  next->sip = sip_object(msg);
-  next->when = now;
-  next->tport = tport_ref(tp);
-
-#if 0
-  if (next->sip->sip_request)
-    printf("nua sent: %s\n", next->sip->sip_request->rq_method_name);
-  else
-    printf("nua sent: SIP/2.0 %u %s\n",
-	   next->sip->sip_status->st_status,
-	   next->sip->sip_status->st_phrase);
-#endif
-
-  for (prev = &s2->received; *prev; prev = &(*prev)->next)
-    ;
-
-  next->prev = prev, *prev = next;
-}
-
-static void
-s2_stack_error(struct tester *s2,
-	       tport_t *tp,
-	       int errcode,
-	       char const *remote)
-{
-  fprintf(stderr, "%s(%p): error %d (%s) from %s\n",
-	  "nua_tester_error",
-	  (void *)tp, errcode, su_strerror(errcode),
-	  remote ? remote : "<unknown destination>");
-}
-
-static msg_t *
-s2_stack_alloc(struct tester *s2, int flags,
-	       char const data[], usize_t size,
-	       tport_t const *tport,
-	       tp_client_t *tpc)
-{
-  return msg_create(s2->mclass, flags | s2->flags);
-}
-
-static msg_t *
-s2_msg(int flags)
-{
-  return msg_create(s2->mclass, flags | s2->flags);
-}
-
-tp_stack_class_t const s2_stack[1] =
-  {{
-      /* tpac_size */ (sizeof s2_stack),
-      /* tpac_recv */  s2_stack_recv,
-      /* tpac_error */ s2_stack_error,
-      /* tpac_alloc */ s2_stack_alloc,
-  }};
-
-/** Basic setup for test cases */
-void s2_setup_base(char const *label, char const *hostname)
-{
-  assert(s2 == NULL);
-
-  if (s2_start_stop > 1) {
-    printf("%s - setup %s test case\n", s2_tester, label ? label : "next");
-  }
-
-  su_init();
-
-  s2 = su_home_new(sizeof *s2);
-
-  assert(s2 != NULL);
-
-  s2->root = su_root_create(s2);
-
-  assert(s2->root != NULL);
-
-  s2->local = sip_from_format(s2->home, "Bob <sip:bob@%s>",
-			     hostname ? hostname : "example.net");
-
-  if (hostname == NULL)
-    hostname = "127.0.0.1";
-
-  s2->hostname = hostname;
-  s2->tid = (unsigned long)time(NULL) * 510633671UL;
-
-}
-
-SOFIAPUBVAR su_log_t nua_log[];
-SOFIAPUBVAR su_log_t soa_log[];
-SOFIAPUBVAR su_log_t nea_log[];
-SOFIAPUBVAR su_log_t nta_log[];
-SOFIAPUBVAR su_log_t tport_log[];
-SOFIAPUBVAR su_log_t su_log_default[];
-
-void
-s2_setup_logs(int level)
-{
-  assert(s2);
-
-  su_log_soft_set_level(nua_log, level);
-  su_log_soft_set_level(soa_log, level);
-  su_log_soft_set_level(su_log_default, level);
-  su_log_soft_set_level(nea_log, level);
-  su_log_soft_set_level(nta_log, level);
-  su_log_soft_set_level(tport_log, level);
-}
-
-static char const * default_protocols[] = { "udp", "tcp", NULL };
-
-void
-s2_setup_tport(char const * const *protocols,
-	       tag_type_t tag, tag_value_t value, ...)
-{
-  ta_list ta;
-  tp_name_t tpn[1];
-  int bound;
-  tport_t *tp;
-
-  assert(s2 != NULL);
-
-  ta_start(ta, tag, value);
-
-  if (s2->master == NULL) {
-    s2->master = tport_tcreate(s2, s2_stack, s2->root,
-			       TPTAG_LOG(getenv("S2_TPORT_LOG") != NULL),
-			       ta_tags(ta));
-
-    if (s2->master == NULL) {
-      assert(s2->master);
-    }
-    s2->mclass = sip_default_mclass();
-    s2->flags = 0;
-  }
-
-  memset(tpn, 0, (sizeof tpn));
-  tpn->tpn_proto = "*";
-  tpn->tpn_host = s2->hostname;
-  tpn->tpn_port = "*";
-
-  if (protocols == NULL)
-    protocols = default_protocols;
-
-  bound = tport_tbind(s2->master, tpn, protocols,
-		      TPTAG_SERVER(1),
-		      ta_tags(ta));
-  assert(bound != -1);
-
-  tp = tport_primaries(s2->master);
-
-  if (protocols == default_protocols && s2->contact == NULL) {
-    *tpn = *tport_name(tp);
-    s2->contact = sip_contact_format(s2->home, "<sip:%s:%s>",
-				    tpn->tpn_host,
-				    tpn->tpn_port);
-  }
-
-  for (;tp; tp = tport_next(tp)) {
-    sip_via_t *v;
-    sip_contact_t *m;
-    tp_magic_t *magic;
-
-    if (tport_magic(tp))
-      continue;
-
-    *tpn = *tport_name(tp);
-
-    v = sip_via_format(s2->home, "SIP/2.0/%s %s:%s",
-		       tpn->tpn_proto,
-		       tpn->tpn_host,
-		       tpn->tpn_port);
-    assert(v != NULL);
-    if (!su_casenmatch(tpn->tpn_proto, "tls", 3)) {
-      m = sip_contact_format(s2->home, "<sip:%s:%s;transport=%s>",
-			     tpn->tpn_host,
-			     tpn->tpn_port,
-			     tpn->tpn_proto);
-      if (s2->udp.contact == NULL && su_casematch(tpn->tpn_proto, "udp")) {
-	s2->udp.tport = tport_ref(tp);
-	s2->udp.contact = m;
-      }
-      if (s2->tcp.contact == NULL && su_casematch(tpn->tpn_proto, "tcp")) {
-	s2->tcp.tport = tport_ref(tp);
-	s2->tcp.contact = m;
-      }
-    }
-    else if (!su_casematch(tpn->tpn_proto, "tls")) {
-      m = sip_contact_format(s2->home, "<sips:%s:%s;transport=%s>",
-			     tpn->tpn_host,
-			     tpn->tpn_port,
-			     tpn->tpn_proto);
-    }
-    else {
-      m = sip_contact_format(s2->home, "<sips:%s:%s>",
-			     tpn->tpn_host,
-			     tpn->tpn_port);
-      if (s2->tls.contact == NULL) {
-	s2->tls.tport = tport_ref(tp);
-	s2->tls.contact = m;
-      }
-    }
-    assert(m != NULL);
-
-    magic = su_zalloc(s2->home, (sizeof *magic));
-    magic->via = v, magic->contact = m;
-
-    if (s2->contact == NULL)
-      s2->contact = m;
-
-    tport_set_magic(tp, magic);
-  }
-}
-
-static char const *s2_teardown_label = NULL;
-
-void
-s2_teardown_started(char const *label)
-{
-  if (!s2_teardown_label) {
-    s2_teardown_label = label;
-    if (s2_start_stop > 1) {
-      printf("%s - tearing down %s test case\n", s2_tester, label);
-    }
-  }
-}
-
-void
-s2_teardown(void)
-{
-  s2 = NULL;
-  su_deinit();
-
-  if (s2_start_stop > 1) {
-    printf("%s - %s test case tore down\n", s2_tester,
-	   s2_teardown_label ? s2_teardown_label : "previous");
-  }
-
-  s2_teardown_label = NULL;
-}
 
 /* ====================================================================== */
 
@@ -1094,27 +214,31 @@
 {
   ta_list ta;
 
-  s2_setup_base(label, NULL);
-  s2_dns_setup(s2->root);
+  s2_setup(label);
+
+  s2 = su_home_new(sizeof *s2);
+
+  s2_dns_setup(s2base->root);
 
   s2_setup_logs(0);
-  s2_setup_tport(NULL, TAG_END());
-  assert(s2->contact);
+  s2_sip_setup("example.org", NULL, TAG_END());
+  assert(s2sip->contact);
+
   s2_dns_domain("example.org", 1,
-		"s2", 1, s2->udp.contact->m_url,
-		"s2", 1, s2->tcp.contact->m_url,
+		"s2", 1, s2sip->udp.contact->m_url,
+		"s2", 1, s2sip->tcp.contact->m_url,
 		NULL);
 
   /* enable/disable multithreading */
-  su_root_threading(s2->root, s2_nua_thread);
+  su_root_threading(s2base->root, s2_nua_thread);
 
   ta_start(ta, tag, value);
   s2->nua =
-    nua_create(s2->root,
+    nua_create(s2base->root,
 	       s2_nua_callback,
 	       s2,
 	       SIPTAG_FROM_STR("Alice <sip:alice at example.org>"),
-	       /* NUTAG_PROXY((url_string_t *)s2->contact->m_url), */
+	       /* NUTAG_PROXY((url_string_t *)s2sip->contact->m_url), */
 	       /* Use internal DNS server */
 	       NUTAG_PROXY("sip:example.org"),
 	       /* Force sresolv to use localhost and s2dns as DNS server */
@@ -1129,12 +253,33 @@
   return s2->nua;
 }
 
+void
+s2_nua_fast_forward(unsigned long seconds,
+		    su_root_t *steproot)
+{
+  s2_fast_forward(seconds, NULL);
+
+  if (s2_nua_thread)
+    /* Wake up nua thread */
+    nua_handle_by_call_id(s2->nua, NULL);
+
+  if (steproot)
+    su_root_step(steproot, 0);
+}
+
 void s2_nua_teardown(void)
 {
-  nua_destroy(s2->nua);
-  s2->nua = NULL;
+  if (s2) {
+    struct s2nua *zap = s2;
+    nua_destroy(s2->nua), s2->nua = NULL;
+    s2 = NULL;
+    su_home_unref(zap->home);
+  }
+
   s2_dns_teardown();
+  s2_sip_teardown();
   s2_teardown();
+
 }
 
 /* ====================================================================== */
@@ -1160,15 +305,16 @@
 
   nua_register(nh, TAG_END());
 
-  m = s2_wait_for_request(SIP_METHOD_REGISTER);
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
   assert(m);
+
   s2_save_register(m);
 
-  s2_respond_to(m, NULL,
+  s2_sip_respond_to(m, NULL,
 		SIP_200_OK,
 		SIPTAG_CONTACT(s2->registration->contact),
 		TAG_END());
-  s2_free_message(m);
+  s2_sip_free_message(m);
 
   assert(s2->registration->contact != NULL);
   s2_check_event(nua_r_register, 200);
@@ -1193,15 +339,15 @@
 
     nua_unregister(nh, TAG_END());
 
-    m = s2_wait_for_request(SIP_METHOD_REGISTER); assert(m);
+    m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); assert(m);
     s2_save_register(m);
-    s2_respond_to(m, NULL,
+    s2_sip_respond_to(m, NULL,
 		  SIP_200_OK,
 		  SIPTAG_CONTACT(s2->registration->contact),
 		  TAG_END());
     assert(s2->registration->contact == NULL);
 
-    s2_free_message(m);
+    s2_sip_free_message(m);
 
     s2_check_event(nua_r_unregister, 200);
 
@@ -1209,3 +355,62 @@
     s2->registration->nh = NULL;
   }
 }
+
+int
+s2_save_register(struct message *rm)
+{
+  sip_contact_t *contact, *m, **m_prev;
+  sip_expires_t const *ex;
+  sip_date_t const *date;
+  sip_time_t now = rm->when.tv_sec, expires;
+
+  msg_header_free_all(s2->home, (msg_header_t *)s2->registration->aor);
+  msg_header_free_all(s2->home, (msg_header_t *)s2->registration->contact);
+  tport_unref(s2->registration->tport);
+
+  s2->registration->aor = NULL;
+  s2->registration->contact = NULL;
+  s2->registration->tport = NULL;
+
+  if (rm == NULL)
+    return 0;
+
+  assert(rm && rm->sip && rm->sip->sip_request);
+  assert(rm->sip->sip_request->rq_method == sip_method_register);
+
+  ex = rm->sip->sip_expires;
+  date = rm->sip->sip_date;
+
+  contact = sip_contact_dup(s2->home, rm->sip->sip_contact);
+
+  for (m_prev = &contact; *m_prev;) {
+    m = *m_prev;
+
+    expires = sip_contact_expires(m, ex, date,
+				  s2_default_registration_duration,
+				  now);
+    if (expires) {
+      char *p = su_sprintf(s2->home, "expires=%lu", (unsigned long)expires);
+      msg_header_add_param(s2->home, m->m_common, p);
+      m_prev = &m->m_next;
+    }
+    else {
+      *m_prev = m->m_next;
+      m->m_next = NULL;
+      msg_header_free(s2->home, (msg_header_t *)m);
+    }
+  }
+
+  if (contact == NULL)
+    return 0;
+
+  s2->registration->aor = sip_to_dup(s2->home, rm->sip->sip_to);
+  s2->registration->contact = contact;
+  s2->registration->tport = tport_ref(rm->tport);
+
+  s2sip->sut.aor = s2->registration->aor;
+  s2sip->sut.contact = s2->registration->contact;
+  s2sip->sut.tport = s2->registration->tport;
+
+  return 0;
+}

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h	Tue Mar  3 16:00:56 2009
@@ -24,42 +24,20 @@
 #ifndef S2TESTER_H
 #define S2TESTER_H
 
-#define TP_STACK_T struct tester
-#define SU_ROOT_MAGIC_T struct tester
-
 #include <sofia-sip/su_wait.h>
 #include <sofia-sip/sip.h>
 #include <sofia-sip/tport.h>
 #include <sofia-sip/nua.h>
+#include <sofia-sip/su_string.h>
 
+#include "s2base.h"
 #include "s2util.h"
+#include "s2sip.h"
 
-struct tester
+struct s2nua
 {
   su_home_t home[1];
 
-  su_root_t *root;
-  msg_mclass_t const *mclass;
-  int flags;
-
-  char const *hostname;
-  tport_t *master;
-
-  sip_to_t *local;
-  sip_contact_t *contact;
-  struct {
-    sip_contact_t *contact;
-    tport_t *tport;
-  } udp, tcp, tls;
-
-  struct message {
-    struct message *next, **prev;
-    msg_t *msg;
-    sip_t *sip;
-    tport_t *tport;
-    su_time_t when;
-  } *received;
-
   nua_t *nua;
 
   struct event {
@@ -76,33 +54,8 @@
     sip_contact_t *contact;
     tport_t *tport;
   } registration[1];
-
-  unsigned long tid;
-
-  /* Settings */
-  int server_uses_rport;
 };
 
-struct dialog
-{
-  su_home_t home[1];
-  sip_from_t *local;
-  sip_to_t *remote;
-  sip_call_id_t *call_id;
-  uint32_t lseq, rseq;
-  sip_contact_t *target;
-  sip_route_t *route;
-  sip_contact_t *contact;
-
-  tport_t *tport;
-  msg_t *invite;		/* latest invite sent */
-};
-
-extern char const *s2_tester;
-extern int s2_start_stop;
-extern struct tester *s2;
-extern tp_stack_class_t const s2_stack[1];
-
 extern unsigned s2_default_registration_duration;
 extern char const s2_auth_digest_str[];
 extern char const s2_auth_credentials[];
@@ -115,9 +68,7 @@
 
 extern int s2_nua_thread;
 
-void s2_case(char const *tag,
-	    char const *title,
-	    char const *description);
+extern struct s2nua *s2;
 
 struct event *s2_remove_event(struct event *);
 void s2_free_event(struct event *);
@@ -127,54 +78,23 @@
 struct event *s2_wait_for_event(nua_event_t event, int status);
 int s2_check_event(nua_event_t event, int status);
 int s2_check_callstate(enum nua_callstate state);
-
-struct message *s2_remove_message(struct message *m);
-void s2_free_message(struct message *m);
-void s2_flush_messages(void);
-
-struct message *s2_next_response(void);
-struct message *s2_wait_for_response(int status, sip_method_t , char const *);
-int s2_check_response(int status, sip_method_t method, char const *name);
-
-struct message *s2_next_request(void);
-struct message *s2_wait_for_request(sip_method_t method, char const *name);
-struct message *s2_wait_for_request_timeout(sip_method_t, char const *,
-					    int timeout);
-int s2_check_request(sip_method_t method, char const *name);
-int s2_check_request_timeout(sip_method_t method, char const *, int timeout);
-
 int s2_check_substate(struct event *e, enum nua_substate state);
 
 #define SIP_METHOD_UNKNOWN sip_method_unknown, NULL
 
-void s2_save_uas_dialog(struct dialog *d, sip_t *sip);
-
-struct message *s2_respond_to(struct message *m, struct dialog *d,
-			      int status, char const *phrase,
-			      tag_type_t tag, tag_value_t value, ...);
-
-int s2_request_to(struct dialog *d,
-		  sip_method_t method, char const *name,
-		  tport_t *tport,
-		  tag_type_t tag, tag_value_t value, ...);
-
-int s2_update_dialog(struct dialog *d, struct message *response);
-
-int s2_save_register(struct message *m);
-
 void s2_flush_all(void);
 
-void s2_setup_base(char const *label, char const *hostname);
-void s2_setup_logs(int level);
-void s2_setup_tport(char const * const *protocols,
-		    tag_type_t tag, tag_value_t value, ...);
-void s2_teardown(void);
-
 nua_t *s2_nua_setup(char const *label, tag_type_t tag, tag_value_t value, ...);
 
-void s2_teardown_started(char const *label);
 void s2_nua_teardown(void);
+
+void s2_nua_fast_forward(unsigned long seconds,
+			 su_root_t *steproot);
+
+int s2_save_register(struct message *m);
+
 void s2_register_setup(void);
 void s2_register_teardown(void);
 
 #endif
+


From mikej at freeswitch.org  Tue Mar  3 14:01:25 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 16:01:25 -0600
Subject: [Freeswitch-svn] [commit] r12399 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
Message-ID: <E1Lecg1-0008Ip-VK@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 16:01:25 2009
New Revision: 12399

Log:
Tue Mar  3 12:18:30 CST 2009  Pekka Pessi <first.last at nokia.com>
  * check_session.c: more CANCEL timeout cases



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 16:01:25 2009
@@ -1 +1 @@
-Tue Mar  3 16:00:35 CST 2009
+Tue Mar  3 16:01:07 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Tue Mar  3 16:01:25 2009
@@ -96,10 +96,11 @@
 
   s2_register_teardown();
 
-  mark_point();
-
-  nua_shutdown(nua);
-  fail_unless(s2_check_event(nua_r_shutdown, 200));
+  if (s2->shutdown == 0) {
+    mark_point();
+    nua_shutdown(nua);
+    fail_unless(s2_check_event(nua_r_shutdown, 200));
+  }
 
   mark_point();
 
@@ -1051,6 +1052,110 @@
 }
 END_TEST
 
+START_TEST(cancel_2_2_9)
+{
+  nua_handle_t *nh;
+  struct message *invite, *cancel;
+  int timeout;
+
+  s2_case("2.2.9", "CANCEL a RFC2543 UA",
+	  "NUA is caller, NUA sends CANCEL after receiving 180, "
+	  "UAS sends 200 OK to CANCEL but no response to INVITE.");
+
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
+
+  nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
+	     TAG_END());
+  fail_unless(s2_check_callstate(nua_callstate_calling));
+
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
+  process_offer(invite);
+  respond_with_sdp(
+    invite, dialog, SIP_180_RINGING,
+    SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"),
+    TAG_END());
+  fail_unless(s2_check_event(nua_r_invite, 180));
+  fail_unless(s2_check_callstate(nua_callstate_proceeding));
+
+  nua_cancel(nh, TAG_END());
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
+  fail_if(!cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
+
+  /* Time out INVITE */
+  for (timeout = 0; timeout < 34; timeout++) {
+    s2_nua_fast_forward(1, s2base->root);
+  }
+
+  fail_unless(s2_check_event(nua_r_invite, 408));
+  fail_unless(s2_check_callstate(nua_callstate_terminated));
+  nua_handle_destroy(nh);
+}
+END_TEST
+
+START_TEST(cancel_2_2_10)
+{
+  nua_handle_t *nh;
+  struct message *invite, *cancel;
+  struct event *event;
+  int timeout;
+
+  s2_case("2.2.10", "CANCEL and INVITE times out",
+	  "NUA is caller, NUA sends CANCEL after receiving 180 "
+	  "but UAS never responds.");
+
+  nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
+
+  nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
+	     TAG_END());
+  fail_unless(s2_check_callstate(nua_callstate_calling));
+
+  invite = s2_sip_wait_for_request(SIP_METHOD_INVITE);
+  process_offer(invite);
+  respond_with_sdp(
+    invite, dialog, SIP_180_RINGING,
+    SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"),
+    TAG_END());
+  fail_unless(s2_check_event(nua_r_invite, 180));
+  fail_unless(s2_check_callstate(nua_callstate_proceeding));
+
+  nua_cancel(nh, TAG_END());
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
+  s2_sip_free_message(cancel);
+  fail_if(!cancel);
+
+  nua_cancel(nh, TAG_END());
+  cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
+  fail_if(!cancel);
+  s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+  s2_sip_free_message(cancel);
+
+  s2_register_teardown();
+
+  nua_set_params(s2->nua, NUTAG_SHUTDOWN_EVENTS(1), TAG_END());
+  fail_unless(s2_check_event(nua_r_set_params, 200));
+
+  nua_shutdown(s2->nua);
+  event = s2_wait_for_event(nua_r_shutdown, 100);
+  fail_unless(event != NULL);
+  s2_free_event(event);
+
+  /* Time out */
+  for (timeout = 0; timeout < 34; timeout++) {
+    s2_nua_fast_forward(5, s2base->root);
+    nua_shutdown(s2->nua);
+    event = s2_wait_for_event(nua_r_shutdown, 0);
+    fail_unless(event != NULL);
+    if (event->data->e_status >= 200)
+      break;
+  }
+
+  s2->shutdown = 200;
+}
+END_TEST
+
+
 
 TCase *cancel_tcase(int threading)
 {
@@ -1065,6 +1170,8 @@
   tcase_add_test(tc, cancel_2_2_6);
   tcase_add_test(tc, cancel_2_2_7);
   tcase_add_test(tc, cancel_2_2_8);
+  tcase_add_test(tc, cancel_2_2_9);
+  tcase_add_test(tc, cancel_2_2_10);
 
   return tc;
 }

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h	Tue Mar  3 16:01:25 2009
@@ -40,6 +40,8 @@
 
   nua_t *nua;
 
+  int shutdown;
+
   struct event {
     struct event *next, **prev;
     nua_saved_event_t event[1];


From mikej at freeswitch.org  Tue Mar  3 14:02:55 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 16:02:55 -0600
Subject: [Freeswitch-svn] [commit] r12400 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
Message-ID: <E1LechT-0008KQ-O7@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 16:02:55 2009
New Revision: 12400

Log:
Tue Mar  3 12:23:35 CST 2009  Della Betta Filippo <filippo DOT dellabetta AT telecomitalia DOT it>
  * su_uniqueid.c: srand() must be called per-thread on windows



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 16:02:55 2009
@@ -1 +1 @@
-Tue Mar  3 16:01:07 CST 2009
+Tue Mar  3 16:01:38 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c	Tue Mar  3 16:02:55 2009
@@ -73,8 +73,13 @@
 #include "sofia-sip/su_time.h"
 #include "sofia-sip/su_uniqueid.h"
 
+#ifdef SU_HAVE_WINSOCK
+#define PERTHREAD __declspec(thread)
+#else
+#define PERTHREAD
+#endif
 /* For random number generator */
-static int initialized = 0;
+static PERTHREAD int initialized = 0;
 
 static void init(void);
 static void init_node(void);


From mikej at freeswitch.org  Tue Mar  3 15:00:52 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 17:00:52 -0600
Subject: [Freeswitch-svn] [commit] r12401 - freeswitch/trunk/libs/esl/python
Message-ID: <E1LedbY-0000no-QG@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 17:00:52 2009
New Revision: 12401

Log:
revert 12339

Added:
   freeswitch/trunk/libs/esl/python/ESL.py
Removed:
   freeswitch/trunk/libs/esl/python/_ESL.py
Modified:
   freeswitch/trunk/libs/esl/python/Makefile
   freeswitch/trunk/libs/esl/python/esl_wrap.cpp

Added: freeswitch/trunk/libs/esl/python/ESL.py
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/esl/python/ESL.py	Tue Mar  3 17:00:52 2009
@@ -0,0 +1,99 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.35
+#
+# Don't modify this file, modify the SWIG interface instead.
+# This file is compatible with both classic and new-style classes.
+
+import _ESL
+import new
+new_instancemethod = new.instancemethod
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+class ESLevent:
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ESLevent, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ESLevent, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["event"] = _ESL.ESLevent_event_set
+    __swig_getmethods__["event"] = _ESL.ESLevent_event_get
+    __swig_setmethods__["serialized_string"] = _ESL.ESLevent_serialized_string_set
+    __swig_getmethods__["serialized_string"] = _ESL.ESLevent_serialized_string_get
+    __swig_setmethods__["mine"] = _ESL.ESLevent_mine_set
+    __swig_getmethods__["mine"] = _ESL.ESLevent_mine_get
+    def __init__(self, *args): 
+        this = apply(_ESL.new_ESLevent, args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _ESL.delete_ESLevent
+    __del__ = lambda self : None;
+    def serialize(*args): return apply(_ESL.ESLevent_serialize, args)
+    def setPriority(*args): return apply(_ESL.ESLevent_setPriority, args)
+    def getHeader(*args): return apply(_ESL.ESLevent_getHeader, args)
+    def getBody(*args): return apply(_ESL.ESLevent_getBody, args)
+    def getType(*args): return apply(_ESL.ESLevent_getType, args)
+    def addBody(*args): return apply(_ESL.ESLevent_addBody, args)
+    def addHeader(*args): return apply(_ESL.ESLevent_addHeader, args)
+    def delHeader(*args): return apply(_ESL.ESLevent_delHeader, args)
+    def firstHeader(*args): return apply(_ESL.ESLevent_firstHeader, args)
+    def nextHeader(*args): return apply(_ESL.ESLevent_nextHeader, args)
+ESLevent_swigregister = _ESL.ESLevent_swigregister
+ESLevent_swigregister(ESLevent)
+
+class ESLconnection:
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ESLconnection, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ESLconnection, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = apply(_ESL.new_ESLconnection, args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _ESL.delete_ESLconnection
+    __del__ = lambda self : None;
+    def connected(*args): return apply(_ESL.ESLconnection_connected, args)
+    def getInfo(*args): return apply(_ESL.ESLconnection_getInfo, args)
+    def send(*args): return apply(_ESL.ESLconnection_send, args)
+    def sendRecv(*args): return apply(_ESL.ESLconnection_sendRecv, args)
+    def api(*args): return apply(_ESL.ESLconnection_api, args)
+    def bgapi(*args): return apply(_ESL.ESLconnection_bgapi, args)
+    def sendEvent(*args): return apply(_ESL.ESLconnection_sendEvent, args)
+    def recvEvent(*args): return apply(_ESL.ESLconnection_recvEvent, args)
+    def recvEventTimed(*args): return apply(_ESL.ESLconnection_recvEventTimed, args)
+    def filter(*args): return apply(_ESL.ESLconnection_filter, args)
+    def events(*args): return apply(_ESL.ESLconnection_events, args)
+    def execute(*args): return apply(_ESL.ESLconnection_execute, args)
+    def setBlockingExecute(*args): return apply(_ESL.ESLconnection_setBlockingExecute, args)
+    def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args)
+ESLconnection_swigregister = _ESL.ESLconnection_swigregister
+ESLconnection_swigregister(ESLconnection)
+
+eslSetLogLevel = _ESL.eslSetLogLevel
+
+

Modified: freeswitch/trunk/libs/esl/python/Makefile
==============================================================================
--- freeswitch/trunk/libs/esl/python/Makefile	(original)
+++ freeswitch/trunk/libs/esl/python/Makefile	Tue Mar  3 17:00:52 2009
@@ -4,7 +4,7 @@
 all: _ESL.so
 
 esl_wrap.cpp:
-	swig -module _ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig -module ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp	Tue Mar  3 17:00:52 2009
@@ -2515,11 +2515,11 @@
 #endif
 
 /*-----------------------------------------------
-              @(target):= __ESL.so
+              @(target):= _ESL.so
   ------------------------------------------------*/
-#define SWIG_init    init__ESL
+#define SWIG_init    init_ESL
 
-#define SWIG_name    "__ESL"
+#define SWIG_name    "_ESL"
 
 #define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION


From brian at freeswitch.org  Tue Mar  3 16:06:52 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 18:06:52 -0600
Subject: [Freeswitch-svn] [commit] r12402 - freeswitch/trunk/src
Message-ID: <E1LeedQ-0001PF-Lz@svn.freeswitch.org>

Author: brian
Date: Tue Mar  3 18:06:52 2009
New Revision: 12402

Log:
FSCORE-297 tony fixed this via telephone blind.. its not ME.

Modified:
   freeswitch/trunk/src/switch_core.c
   freeswitch/trunk/src/switch_time.c

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Tue Mar  3 18:06:52 2009
@@ -1525,9 +1525,7 @@
 
 	if (runtime.memory_pool) {
 		apr_pool_destroy(runtime.memory_pool);
-		if (switch_test_flag((&runtime), SCF_RESTART)) {
-			apr_terminate();
-		}
+		apr_terminate();
 	}
 	
 	return switch_test_flag((&runtime), SCF_RESTART) ? SWITCH_STATUS_RESTART : SWITCH_STATUS_SUCCESS;

Modified: freeswitch/trunk/src/switch_time.c
==============================================================================
--- freeswitch/trunk/src/switch_time.c	(original)
+++ freeswitch/trunk/src/switch_time.c	Tue Mar  3 18:06:52 2009
@@ -762,7 +762,7 @@
 	timer_interface->timer_destroy = timer_destroy;
 
 	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_NOUNLOAD;
+	return SWITCH_STATUS_SUCCESS;
 }
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
@@ -790,7 +790,7 @@
 		switch_core_destroy_memory_pool(&TIMEZONES_LIST.pool);
 	}
 
-	return SWITCH_STATUS_NOUNLOAD;
+	return SWITCH_STATUS_SUCCESS;
 }
 
 


From anthm at freeswitch.org  Tue Mar  3 20:19:34 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 22:19:34 -0600
Subject: [Freeswitch-svn] [commit] r12403 - in freeswitch/trunk/src: .
	include mod/event_handlers/mod_cdr_csv
	mod/event_handlers/mod_radius_cdr mod/xml_int/mod_xml_cdr
Message-ID: <E1LeiZy-0003ck-0z@svn.freeswitch.org>

Author: anthm
Date: Tue Mar  3 22:19:33 2009
New Revision: 12403

Log:
add new state for CDR and leg_delay_start originate var and fix FSCORE-315

Modified:
   freeswitch/trunk/src/include/switch_module_interfaces.h
   freeswitch/trunk/src/include/switch_types.h
   freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
   freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
   freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
   freeswitch/trunk/src/switch_channel.c
   freeswitch/trunk/src/switch_core_state_machine.c
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/include/switch_module_interfaces.h
==============================================================================
--- freeswitch/trunk/src/include/switch_module_interfaces.h	(original)
+++ freeswitch/trunk/src/include/switch_module_interfaces.h	Tue Mar  3 22:19:33 2009
@@ -55,7 +55,8 @@
 	SWITCH_SHN_ON_CONSUME_MEDIA,
 	SWITCH_SHN_ON_HIBERNATE,
 	SWITCH_SHN_ON_RESET,
-	SWITCH_SHN_ON_PARK
+	SWITCH_SHN_ON_PARK,
+	SWITCH_SHN_ON_REPORTING
 } switch_state_handler_name_t;
 
 struct switch_state_handler_table {
@@ -79,6 +80,8 @@
 	switch_state_handler_t on_reset;
 	/*! executed when the state changes to park */
 	switch_state_handler_t on_park;
+	/*! executed when the state changes to reporting */
+	switch_state_handler_t on_reporting;
 	void *padding[10];
 };
 

Modified: freeswitch/trunk/src/include/switch_types.h
==============================================================================
--- freeswitch/trunk/src/include/switch_types.h	(original)
+++ freeswitch/trunk/src/include/switch_types.h	Tue Mar  3 22:19:33 2009
@@ -753,17 +753,18 @@
   \enum switch_channel_state_t
   \brief Channel States (these are the defaults, CS_SOFT_EXECUTE, CS_EXCHANGE_MEDIA, and CS_CONSUME_MEDIA are often overridden by specific apps)
 <pre>
-CS_NEW       - Channel is newly created 
-CS_INIT      - Channel has been initilized
-CS_ROUTING   - Channel is looking for an extension to execute
-CS_SOFT_EXECUTE  - Channel is ready to execute from 3rd party control
-CS_EXECUTE   - Channel is executing it's dialplan 
+CS_NEW       - Channel is newly created.
+CS_INIT      - Channel has been initilized.
+CS_ROUTING   - Channel is looking for an extension to execute.
+CS_SOFT_EXECUTE  - Channel is ready to execute from 3rd party control.
+CS_EXECUTE   - Channel is executing it's dialplan.
 CS_EXCHANGE_MEDIA  - Channel is exchanging media with another channel.
 CS_PARK      - Channel is accepting media awaiting commands.
 CS_CONSUME_MEDIA		 - Channel is consuming all media and dropping it.
-CS_HIBERNATE - Channel is in a sleep state
-CS_RESET 	 - Channel is in a reset state
-CS_HANGUP    - Channel is flagged for hangup and ready to end
+CS_HIBERNATE - Channel is in a sleep state.
+CS_RESET 	 - Channel is in a reset state.
+CS_HANGUP    - Channel is flagged for hangup and ready to end.
+CS_HANGUP    - Channel is ready to collect call detail.
 CS_DONE      - Channel is ready to be destroyed and out of the state machine
 </pre>
  */
@@ -779,6 +780,7 @@
 	CS_HIBERNATE,
 	CS_RESET,
 	CS_HANGUP,
+	CS_REPORTING,
 	CS_DONE,
 	CS_NONE
 } switch_channel_state_t;
@@ -851,6 +853,7 @@
 	CF_VERBOSE_EVENTS,
 	CF_PAUSE_BUGS,
 	CF_DIVERT_EVENTS,
+	CF_BLOCK_STATE,
 	/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
 	CF_FLAG_MAX
 } switch_channel_flag_t;

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c	Tue Mar  3 22:19:33 2009
@@ -165,7 +165,7 @@
 	switch_mutex_unlock(fd->mutex);
 }
 
-static switch_status_t my_on_hangup(switch_core_session_t *session)
+static switch_status_t my_on_reporting(switch_core_session_t *session)
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
@@ -286,9 +286,14 @@
 	/*.on_init */ NULL,
 	/*.on_routing */ NULL,
 	/*.on_execute */ NULL,
-	/*.on_hangup */ my_on_hangup,
+	/*.on_hangup */ NULL,
 	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL
+	/*.on_soft_execute */ NULL,
+	/*.on_consume_media*/ NULL,
+	/*.on_hibernate*/ NULL,
+	/*.on_reset*/ NULL,
+	/*.on_park*/ NULL,
+	/*.on_reporting*/ my_on_reporting
 };
 
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c	Tue Mar  3 22:19:33 2009
@@ -371,7 +371,7 @@
 	return (retval);
 }
 
-static switch_status_t my_on_hangup(switch_core_session_t *session)
+static switch_status_t my_on_reporting(switch_core_session_t *session)
 {
 	switch_xml_t cdr;
 	switch_channel_t *channel = switch_core_session_get_channel(session);
@@ -406,7 +406,7 @@
 
 	switch_thread_rwlock_rdlock(globals.rwlock);
 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_hangup\n");
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_reporting\n");
 
 	rad_config = my_radius_init();
 
@@ -705,9 +705,14 @@
 	/*.on_init */ NULL,
 	/*.on_routing */ my_on_routing,
 	/*.on_execute */ NULL,
-	/*.on_hangup */ my_on_hangup,
+	/*.on_hangup */ NULL,
 	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL
+	/*.on_soft_execute */ NULL,
+	/*.on_consume_media*/ NULL,
+	/*.on_hibernate*/ NULL,
+	/*.on_reset*/ NULL,
+	/*.on_park*/ NULL,
+	/*.on_reporting*/ my_on_reporting
 };
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load)

Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c	(original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c	Tue Mar  3 22:19:33 2009
@@ -66,7 +66,7 @@
 	return size * nitems;
 }
 
-static switch_status_t my_on_hangup(switch_core_session_t *session)
+static switch_status_t my_on_reporting(switch_core_session_t *session)
 {
 	switch_xml_t cdr;
 	char *xml_text = NULL;
@@ -264,9 +264,14 @@
 	/*.on_init */ NULL,
 	/*.on_routing */ NULL,
 	/*.on_execute */ NULL,
-	/*.on_hangup */ my_on_hangup,
+	/*.on_hangup */ NULL,
 	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL
+	/*.on_soft_execute */ NULL,
+	/*.on_consume_media*/ NULL,
+	/*.on_hibernate*/ NULL,
+	/*.on_reset*/ NULL,
+	/*.on_park*/ NULL,
+	/*.on_reporting*/ my_on_reporting
 };
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Tue Mar  3 22:19:33 2009
@@ -767,7 +767,7 @@
 			return SWITCH_STATUS_FALSE;
 		}
 
-		if (!switch_channel_ready(channel)) {
+		if (switch_channel_down(channel)) {
 			return SWITCH_STATUS_FALSE;
 		}
 
@@ -925,6 +925,7 @@
 	"CS_HIBERNATE",
 	"CS_RESET",
 	"CS_HANGUP",
+	"CS_REPORTING",
 	"CS_DONE",
 	NULL
 };
@@ -1177,6 +1178,16 @@
 
 	case CS_HANGUP:
 		switch (state) {
+		case CS_REPORTING:
+		case CS_DONE:
+			ok++;
+		default:
+			break;
+		}
+		break;
+
+	case CS_REPORTING:
+		switch (state) {
 		case CS_DONE:
 			ok++;
 		default:
@@ -1573,6 +1584,9 @@
 																	 const char *file, const char *func, int line, switch_call_cause_t hangup_cause)
 {
 	switch_assert(channel != NULL);
+
+	switch_channel_clear_flag(channel, CF_BLOCK_STATE);
+
 	switch_mutex_lock(channel->state_mutex);
 
 	if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) {
@@ -1609,6 +1623,7 @@
 	}
 
 	switch_mutex_unlock(channel->state_mutex);
+
 	return channel->state;
 }
 

Modified: freeswitch/trunk/src/switch_core_state_machine.c
==============================================================================
--- freeswitch/trunk/src/switch_core_state_machine.c	(original)
+++ freeswitch/trunk/src/switch_core_state_machine.c	Tue Mar  3 22:19:33 2009
@@ -47,6 +47,13 @@
 					  switch_channel_get_name(session->channel), switch_channel_cause2str(switch_channel_get_cause(session->channel)));
 }
 
+static void switch_core_standard_on_reporting(switch_core_session_t *session)
+{
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard REPORTING, cause: %s\n",
+					  switch_channel_get_name(session->channel), switch_channel_cause2str(switch_channel_get_cause(session->channel)));
+}
+
 static void switch_core_standard_on_reset(switch_core_session_t *session)
 {
 
@@ -373,28 +380,29 @@
 	switch_mutex_lock(session->mutex);
 
 	while ((state = switch_channel_get_state(session->channel)) != CS_DONE) {
+
+		switch_channel_wait_for_flag(session->channel, CF_BLOCK_STATE, SWITCH_FALSE, 0, NULL);
+		
 		midstate = state;
-		if (state != switch_channel_get_running_state(session->channel) || state == CS_HANGUP) {
+		if (state != switch_channel_get_running_state(session->channel) || state >= CS_HANGUP) {
 			int index = 0;
 			int proceed = 1;
 			int global_proceed = 1;
 			int do_extra_handlers = 1;
-
+			
 			switch_channel_set_running_state(session->channel, state);
 			switch_channel_clear_flag(session->channel, CF_TRANSFER);
 			switch_channel_clear_flag(session->channel, CF_REDIRECT);
 
 			switch (state) {
-			case CS_NEW:		/* Just created, Waiting for first instructions */
+			case CS_NEW: /* Just created, Waiting for first instructions */
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State NEW\n", switch_channel_get_name(session->channel));
 				break;
 			case CS_DONE:
 				goto done;
-			case CS_HANGUP:	/* Deactivate and end the thread */
+			case CS_REPORTING: /* Call Detail */
 				{
 					const char *var = switch_channel_get_variable(session->channel, SWITCH_PROCESS_CDR_VARIABLE);
-					const char *hook_var;
-					switch_core_session_t *use_session = NULL;
 					
 					if (!switch_strlen_zero(var)) {
 						if (!strcasecmp(var, "a_only")) {
@@ -410,6 +418,16 @@
 						}
 					}
 
+					STATE_MACRO(reporting, "REPORTING");
+					
+					switch_channel_set_state(session->channel, CS_DONE);
+				}
+				goto done;
+			case CS_HANGUP:	/* Deactivate and end the thread */
+				{
+					const char *hook_var;
+					switch_core_session_t *use_session = NULL;
+					
 					switch_core_media_bug_remove_all(session);
 					
 					STATE_MACRO(hangup, "HANGUP");
@@ -448,7 +466,8 @@
 						switch_safe_free(stream.data);
 					}
 				}
-				goto done;
+				switch_channel_set_state(session->channel, CS_REPORTING);
+				break;
 			case CS_INIT:		/* Basic setup tasks */
 				STATE_MACRO(init, "INIT");
 				break;

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Tue Mar  3 22:19:33 2009
@@ -86,6 +86,7 @@
 	uint8_t answered;
 	uint32_t per_channel_timelimit_sec;
 	uint32_t per_channel_progress_timelimit_sec;
+	uint32_t per_channel_delay_start;
 } originate_status_t;
 
 
@@ -177,7 +178,7 @@
 		goto wbreak;
 	}
 
-	if (!switch_channel_ready(channel)) {
+	if (switch_channel_up(channel)) {
 		switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 		goto wbreak;
 	}
@@ -228,6 +229,11 @@
 	time_t elapsed = switch_epoch_time_now(NULL) - start;
 
 	for (i = 0; i < max; i++) {
+		if (originate_status[i].peer_channel && originate_status[i].per_channel_delay_start && elapsed > originate_status[i].per_channel_delay_start) {
+			switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
+			originate_status[i].per_channel_delay_start = 0;
+		}
+
 		if (originate_status[i].peer_channel && switch_channel_up(originate_status[i].peer_channel)) {
 			if (originate_status[i].per_channel_progress_timelimit_sec && elapsed > originate_status[i].per_channel_progress_timelimit_sec &&
 				!(
@@ -1493,6 +1499,15 @@
 							originate_status[i].per_channel_progress_timelimit_sec = (uint32_t) val;
 						}
 					}
+
+					if ((vvar = switch_channel_get_variable(originate_status[i].peer_channel, "leg_delay_start"))) {
+						int val = atoi(vvar);
+						if (val > 0) {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg delay start to %d\n", 
+											  switch_channel_get_name(originate_status[0].peer_channel), val);
+							originate_status[i].per_channel_delay_start = (uint32_t) val;
+						}
+					}
 				}
 
 				if (!table) {
@@ -1511,11 +1526,9 @@
 				}
 
 				if (!switch_core_session_running(originate_status[i].peer_session)) {
-					/*if (!(flags & SOF_NOBLOCK)) {
-					  switch_channel_set_state(originate_status[i].peer_channel, CS_ROUTING);
-					  }
-					  } else {
-					*/
+					if (originate_status[i].per_channel_delay_start) {
+						switch_channel_set_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
+					}
 					switch_core_session_thread_launch(originate_status[i].peer_session);
 				}
 			}
@@ -1842,6 +1855,8 @@
 					continue;
 				}
 
+				switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
+
 				if (switch_channel_test_flag(originate_status[i].peer_channel, CF_TRANSFER) 
 					|| switch_channel_test_flag(originate_status[i].peer_channel, CF_REDIRECT) 
 					|| switch_channel_test_flag(originate_status[i].peer_channel, CF_BRIDGED) ||
@@ -1867,7 +1882,7 @@
 							}
 						}
 					}
-					if (switch_channel_ready(originate_status[i].peer_channel)) {
+					if (switch_channel_up(originate_status[i].peer_channel)) {
 						if (caller_channel && i == 0) {
 							holding = switch_channel_get_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE);
 							holding = switch_core_session_strdup(oglobals.session, holding);


From anthm at freeswitch.org  Tue Mar  3 20:28:06 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 22:28:06 -0600
Subject: [Freeswitch-svn] [commit] r12404 - freeswitch/trunk/src
Message-ID: <E1LeiiE-0003i2-5b@svn.freeswitch.org>

Author: anthm
Date: Tue Mar  3 22:28:06 2009
New Revision: 12404

Log:
tweak on last one 

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Tue Mar  3 22:28:06 2009
@@ -1855,7 +1855,7 @@
 					continue;
 				}
 
-				switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
+				//switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
 
 				if (switch_channel_test_flag(originate_status[i].peer_channel, CF_TRANSFER) 
 					|| switch_channel_test_flag(originate_status[i].peer_channel, CF_REDIRECT) 


From mikej at freeswitch.org  Tue Mar  3 20:35:30 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 03 Mar 2009 22:35:30 -0600
Subject: [Freeswitch-svn] [commit] r12405 - freeswitch/trunk/src/include
Message-ID: <E1LeipO-00041z-HC@svn.freeswitch.org>

Author: mikej
Date: Tue Mar  3 22:35:30 2009
New Revision: 12405

Log:
dox

Modified:
   freeswitch/trunk/src/include/switch_types.h

Modified: freeswitch/trunk/src/include/switch_types.h
==============================================================================
--- freeswitch/trunk/src/include/switch_types.h	(original)
+++ freeswitch/trunk/src/include/switch_types.h	Tue Mar  3 22:35:30 2009
@@ -764,7 +764,7 @@
 CS_HIBERNATE - Channel is in a sleep state.
 CS_RESET 	 - Channel is in a reset state.
 CS_HANGUP    - Channel is flagged for hangup and ready to end.
-CS_HANGUP    - Channel is ready to collect call detail.
+CS_REPORTING - Channel is ready to collect call detail.
 CS_DONE      - Channel is ready to be destroyed and out of the state machine
 </pre>
  */


From mrene at freeswitch.org  Wed Mar  4 06:21:52 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 08:21:52 -0600
Subject: [Freeswitch-svn] [commit] r12406 -
	freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
Message-ID: <E1Leryq-0000zs-4T@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 08:21:51 2009
New Revision: 12406

Log:
Revert 12400

Modified:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c	Wed Mar  4 08:21:51 2009
@@ -73,13 +73,8 @@
 #include "sofia-sip/su_time.h"
 #include "sofia-sip/su_uniqueid.h"
 
-#ifdef SU_HAVE_WINSOCK
-#define PERTHREAD __declspec(thread)
-#else
-#define PERTHREAD
-#endif
 /* For random number generator */
-static PERTHREAD int initialized = 0;
+static int initialized = 0;
 
 static void init(void);
 static void init_node(void);


From brian at freeswitch.org  Wed Mar  4 07:26:39 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 09:26:39 -0600
Subject: [Freeswitch-svn] [commit] r12407 - freeswitch/trunk/libs/esl/src
Message-ID: <E1LeszX-0001aQ-5h@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 09:26:39 2009
New Revision: 12407

Log:
missed a spot

Modified:
   freeswitch/trunk/libs/esl/src/esl_oop.cpp

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Wed Mar  4 09:26:39 2009
@@ -98,7 +98,7 @@
 	assert(cmd_buf);
 
 	snprintf(cmd_buf, len, "bgapi %s %s", cmd, arg ? arg : "");
-	*(cmd_buf + len) = '\0';
+	*(cmd_buf + (len + 1)) = '\0';
 
 	if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) {
 		esl_event_t *event;


From brian at freeswitch.org  Wed Mar  4 08:02:02 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 10:02:02 -0600
Subject: [Freeswitch-svn] [commit] r12408 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LetXm-00022N-MA@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 10:02:02 2009
New Revision: 12408

Log:
add sip_route_uri var to set proxy route

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Wed Mar  4 10:02:02 2009
@@ -1296,7 +1296,7 @@
 			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";
@@ -1418,6 +1418,10 @@
 		route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL);
 	}
 
+	if ((val = switch_channel_get_variable(channel, "sip_route_uri"))) {
+		route_uri = switch_core_session_strdup(session, val);
+		route = NULL;
+	}
 
 	if (route_uri) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel));


From anthm at freeswitch.org  Wed Mar  4 10:19:30 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 12:19:30 -0600
Subject: [Freeswitch-svn] [commit] r12409 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1Levgo-0003Bv-6R@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 12:19:30 2009
New Revision: 12409

Log:
MODENDP-195

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Wed Mar  4 12:19:30 2009
@@ -1110,6 +1110,7 @@
 	const char *call_id = NULL;
 	char *route = NULL;
 	char *route_uri = NULL;
+	char *sendto = NULL;
 
 	rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);
 
@@ -1171,7 +1172,7 @@
 		const char *invite_contact_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_contact_params");
 		const char *invite_from_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_from_params");
 		const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri");
-
+		
 		if (switch_strlen_zero(tech_pvt->dest)) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error!\n");
 			return SWITCH_STATUS_FALSE;
@@ -1422,6 +1423,10 @@
 		route_uri = switch_core_session_strdup(session, val);
 		route = NULL;
 	}
+	
+	if ((val = switch_channel_get_variable(channel, "sip_network_destination"))) {
+		sendto = switch_core_session_strdup(session, val);
+	}
 
 	if (route_uri) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel));
@@ -1436,6 +1441,7 @@
 			   TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),
 			   TAG_IF(route_uri, NUTAG_PROXY(route_uri)),
 			   TAG_IF(route, SIPTAG_ROUTE_STR(route)),
+			   TAG_IF(!switch_strlen_zero(sendto), NTATAG_DEFAULT_PROXY(sendto)),
 			   SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip),
 			   SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
 			   SOATAG_REUSE_REJECTED(1),


From mrene at freeswitch.org  Wed Mar  4 10:54:43 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 12:54:43 -0600
Subject: [Freeswitch-svn] [commit] r12410 - in freeswitch/trunk/src: .
	include mod/endpoints/mod_sofia
Message-ID: <E1LewEt-0003db-L9@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 12:54:43 2009
New Revision: 12410

Log:
Move sofia logging to the core logging engine, add change sofia loglevel api and add sofia profile xxx siptrace on-off for TPORT_LOG

Modified:
   freeswitch/trunk/src/include/switch_log.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/switch_log.c

Modified: freeswitch/trunk/src/include/switch_log.h
==============================================================================
--- freeswitch/trunk/src/include/switch_log.h	(original)
+++ freeswitch/trunk/src/include/switch_log.h	Wed Mar  4 12:54:43 2009
@@ -93,12 +93,31 @@
   \param level the current log level
   \param fmt desired format
   \param ... variable args
-  \note there are channel macros to supply the first 4 parameters
+  \note there are channel macros to supply the first 4 parameters (SWITCH_CHANNEL_LOG, SWITCH_CHANNEL_LOG_CLEAN, ...)
+  \see switch_types.h
 */
 SWITCH_DECLARE(void) switch_log_printf(_In_ switch_text_channel_t channel, _In_z_ const char *file,
 									   _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);
+/*!								
+  \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 ap variable args
+  \note there are channel macros to supply the first 4 parameters (SWITCH_CHANNEL_LOG, SWITCH_CHANNEL_LOG_CLEAN, ...)
+  \see switch_types.h
+*/
+SWITCH_DECLARE(void) switch_log_vprintf(_In_ switch_text_channel_t channel, _In_z_ const char *file,
+									   _In_z_ const char *func, _In_ int line,
+									   _In_opt_z_ const char *userdata, _In_ switch_log_level_t level,
+										const char *fmt, va_list ap);
+
 #endif
 /*! 
   \brief Shut down  the logging engine

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Wed Mar  4 12:54:43 2009
@@ -2076,6 +2076,17 @@
 		}
 		goto done;
 	}
+	
+	if (!strcasecmp(argv[1], "siptrace")) {
+		if (argc > 2) {
+			int value = switch_true(argv[2]);
+			nua_set_params(profile->nua, TPTAG_LOG(value), TAG_END());
+			stream->write_function(stream, "%s sip debugging on %s", value ? "Enabled" : "Disabled", profile->name);
+		} else {
+			stream->write_function(stream, "Usage: sofia profile <name> siptrace <on/off>\n");
+		}
+		goto done;
+	}
 
 	stream->write_function(stream, "-ERR Unknown command!\n");
 
@@ -2232,7 +2243,8 @@
 		"sofia profile <profile_name> [[start|stop|restart|rescan] [reloadxml]|flush_inbound_reg [<call_id>] [reboot]|[register|unregister] [<gateway name>|all]|killgw <gateway name>|[stun-auto-disable|stun-enabled] [true|false]]\n"
 		"sofia status profile <name> [ reg <contact str> ] | [ pres <pres str> ]\n"
 		"sofia status gateway <name>\n"
-		"sofia loglevel [0-9]\n" "--------------------------------------------------------------------------------\n";
+		"sofia loglevel <all|default|tport|iptsec|nea|nta|nth_client|nth_server|nua|soa|sresolv|stun> [0-9]\n"
+		"--------------------------------------------------------------------------------\n";
 
 	if (session) {
 		return SWITCH_STATUS_FALSE;
@@ -2260,12 +2272,17 @@
 	} else if (!strcasecmp(argv[0], "xmlstatus")) {
 		func = cmd_xml_status;
 	} else if (!strcasecmp(argv[0], "loglevel")) {
-		if (argc > 1 && argv[1]) {
-			int level;
-			level = atoi(argv[1]);
-			if (level >= 0 && level <= 9) {
-				su_log_set_level(NULL, atoi(argv[1]));
-				stream->write_function(stream, "Sofia-sip log level set to [%d]", level);
+		if (argc > 2 && argv[2] && switch_is_number(argv[2])) {
+			int level = atoi(argv[2]);
+			if (sofia_set_loglevel(argv[1], level) == SWITCH_STATUS_SUCCESS) {
+				stream->write_function(stream, "Sofia log level for component [%s] has been set to [%d]", argv[1], level);
+			} else {
+				stream->write_function(stream, "%s", usage_string);
+			}
+		} else if (argc > 1 && argv[1]) {
+			int level = sofia_get_loglevel(argv[1]);
+			if (level >= 0) {
+				stream->write_function(stream, "Sofia-sip loglevel for [%s] is [%d]", argv[1], level);
 			} else {
 				stream->write_function(stream, "%s", usage_string);
 			}

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	Wed Mar  4 12:54:43 2009
@@ -104,6 +104,7 @@
 #include <sofia-sip/su_log.h>
 #include <sofia-sip/nea.h>
 #include <sofia-sip/msg_addr.h>
+#include <sofia-sip/tport_tag.h>
 #include "nua_stack.h"
 
 typedef enum {
@@ -804,3 +805,23 @@
 void sofia_sla_handle_sip_i_subscribe(nua_t *nua, const char *contact_str, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]);
 void sofia_sla_handle_sip_r_subscribe(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]);
 void sofia_sla_handle_sip_i_notify(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]);
+
+/* 
+ * Logging control functions
+ */
+
+/*!
+ * \brief Changes the loglevel of a sofia component
+ * \param name the sofia component on which to change the loglevel, or "all" to change them all
+ * \note Valid components are "all", "default" (sofia's default logger), "tport", "iptsec", "nea", "nta", "nth_client", "nth_server", "nua", "soa", "sresolv", "stun"
+ * \return SWITCH_STATUS_SUCCESS or SWITCH_STATUS_FALSE if the component isnt valid, or the level is out of range
+ */
+switch_status_t sofia_set_loglevel(const char *name, int level);
+
+/*!
+ * \brief Gets the loglevel of a sofia component
+ * \param name the sofia component on which to change the loglevel
+ * \note Valid components are "default" (sofia's default logger), "tport", "iptsec", "nea", "nta", "nth_client", "nth_server", "nua", "soa", "sresolv", "stun"
+ * \return the component's loglevel, or -1 if the component isn't valid
+ */
+int sofia_get_loglevel(const char *name);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Wed Mar  4 12:54:43 2009
@@ -50,6 +50,7 @@
 extern su_log_t sresolv_log[];
 extern su_log_t stun_log[];
 
+
 static void set_variable_sip_param(switch_channel_t *channel, char *header_type, sip_param_t const *params);
 
 static void sofia_info_send_sipfrag(switch_core_session_t *aleg, switch_core_session_t *bleg);
@@ -931,27 +932,81 @@
 
 static void logger(void *logarg, char const *fmt, va_list ap)
 {
-	char *data = NULL;
+	if (fmt && ap) {
+		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, fmt, ap);
+	} else if (fmt && !ap) {
+		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s", fmt);
+	}
+}
 
-	if (fmt) {
-#ifdef HAVE_VASPRINTF
-		int ret;
-		ret = vasprintf(&data, fmt, ap);
-		if ((ret == -1) || !data) {
-			return;
-		}
-#else
-		data = (char *) malloc(2048);
-		if (data) {
-			vsnprintf(data, 2048, fmt, ap);
-		} else {
-			return;
-		}
-#endif
+static switch_status_t sofia_get_logger(const char *name, su_log_t **out) 
+{
+	*out = (void*)0x1;
+	if (!strcasecmp(name, "tport")) {
+		*out = tport_log;
+	} else if (!strcasecmp(name, "iptsec")) {
+		*out = iptsec_log;
+	} else if (!strcasecmp(name, "nea")) {
+		*out = nea_log;
+	} else if (!strcasecmp(name, "nta")) {
+		*out = nta_log;
+	} else if (!strcasecmp(name, "nth_client")) {
+		*out = nth_client_log;
+	} else if (!strcasecmp(name, "nth_server")) {
+		*out = nth_server_log;
+	} else if (!strcasecmp(name, "nua")) {
+		*out = nua_log;
+	} else if (!strcasecmp(name, "sresolv")) {
+		*out = sresolv_log;
+	} else if (!strcasecmp(name, "stun")) {
+		*out = stun_log;
+	} else if (!strcasecmp(name, "default")){
+		*out = NULL;
+	}
+	
+	return (*out != (void*)0x1) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
+}
+
+switch_status_t sofia_set_loglevel(const char *name, int level)
+{
+	su_log_t *log = NULL;
+	switch_status_t status;
+	
+	if (level < 0 || level > 9) {
+		return SWITCH_STATUS_FALSE;
+	}
+	
+	if (!strcasecmp(name, "all")) {
+		su_log_set_level(NULL, level);
+		su_log_set_level(tport_log, level);
+		su_log_set_level(iptsec_log, level);
+		su_log_set_level(nea_log, level);
+		su_log_set_level(nta_log, level);
+		su_log_set_level(nth_client_log, level);
+		su_log_set_level(nth_server_log, level);
+		su_log_set_level(nua_log, level);
+		su_log_set_level(soa_log, level);
+		su_log_set_level(sresolv_log, level);
+		su_log_set_level(stun_log, level);
+		return SWITCH_STATUS_SUCCESS;
 	}
-	if (data) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, (char *) "%s", data);
-		free(data);
+	
+	if ((status = sofia_get_logger(name, &log)) == SWITCH_STATUS_SUCCESS) {
+		su_log_set_level(log, level);
+	}
+	
+	return status;
+}
+
+int sofia_get_loglevel(const char *name)
+{
+	su_log_t *log = NULL;
+	switch_status_t status;
+	
+	if ((status = sofia_get_logger(name, &log)) == SWITCH_STATUS_SUCCESS && log) { /* default logger is NULL */
+		return log->log_level;
+	} else {
+		return -1;
 	}
 }
 
@@ -1718,9 +1773,19 @@
 			su_deinit();
 			return SWITCH_STATUS_FALSE;
 		}
-
-		su_log_redirect(NULL, logger, NULL);
+		
+		/* Redirect loggers in sofia */
+		su_log_redirect(NULL /* default */, logger, NULL);
 		su_log_redirect(tport_log, logger, NULL);
+		su_log_redirect(iptsec_log, logger, NULL);
+		su_log_redirect(nea_log, logger, NULL);
+		su_log_redirect(nta_log, logger, NULL);
+		su_log_redirect(nth_client_log, logger, NULL);
+		su_log_redirect(nth_server_log, logger, NULL);
+		su_log_redirect(nua_log, logger, NULL);
+		su_log_redirect(soa_log, logger, NULL);
+		su_log_redirect(sresolv_log, logger, NULL);
+		su_log_redirect(stun_log, logger, NULL);
 	}
 
 	if (!switch_strlen_zero(profile_name) && (profile = sofia_glue_find_profile(profile_name))) {

Modified: freeswitch/trunk/src/switch_log.c
==============================================================================
--- freeswitch/trunk/src/switch_log.c	(original)
+++ freeswitch/trunk/src/switch_log.c	Wed Mar  4 12:54:43 2009
@@ -243,14 +243,23 @@
 	return NULL;
 }
 
-#define do_mods (LOG_QUEUE && THREAD_RUNNING)
 SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line,
 									   const char *userdata, switch_log_level_t level, const char *fmt, ...)
 {
+	va_list ap;
+	
+	va_start(ap, fmt);
+	switch_log_vprintf(channel, file, func, line, userdata, level, fmt, ap);
+	va_end(ap);	
+}
+
+#define do_mods (LOG_QUEUE && THREAD_RUNNING)
+SWITCH_DECLARE(void) switch_log_vprintf(switch_text_channel_t channel, const char *file, const char *func, int line,
+									   const char *userdata, switch_log_level_t level, const char *fmt, va_list ap)
+{
 	char *data = NULL;
 	char *new_fmt = NULL;
 	int ret = 0;
-	va_list ap;
 	FILE *handle;
 	const char *filep = (file ? switch_cut_path(file) : "");
 	const char *funcp = (func ? func : "");
@@ -265,8 +274,6 @@
 
 	switch_assert(level < SWITCH_LOG_INVALID);
 
-	va_start(ap, fmt);
-
 	handle = switch_core_data_channel(channel);
 
 	if (channel != SWITCH_CHANNEL_ID_LOG_CLEAN) {
@@ -285,7 +292,6 @@
 	}
 
 	ret = switch_vasprintf(&data, fmt, ap);
-	va_end(ap);
 
 	if (ret == -1) {
 		fprintf(stderr, "Memory Error\n");


From gmaruzz at freeswitch.org  Wed Mar  4 11:03:25 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 13:03:25 -0600
Subject: [Freeswitch-svn] [commit] r12411 -
	freeswitch/trunk/src/mod/endpoints/mod_skypiax
Message-ID: <E1LewNJ-0003iF-AJ@svn.freeswitch.org>

Author: gmaruzz
Date: Wed Mar  4 13:03:25 2009
New Revision: 12411

Log:
skypiax: do EARLY MEDIA when requested (mainly by skypeout calls)

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	Wed Mar  4 13:03:25 2009
@@ -1241,8 +1241,8 @@
     ERRORA("No session???\n", SKYPIAX_P_LOG);
   }
   if (channel) {
-    //switch_channel_mark_pre_answered(channel);
-    NOTICA("skype_call: REMOTE PARTY EARLY MEDIA, we will pass you the audio, just the code is not yet written :-)\n", SKYPIAX_P_LOG);
+    switch_channel_mark_pre_answered(channel);
+    NOTICA("skype_call: REMOTE PARTY EARLY MEDIA\n", SKYPIAX_P_LOG);
   } else {
     ERRORA("No channel???\n", SKYPIAX_P_LOG);
   }

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Wed Mar  4 13:03:25 2009
@@ -270,10 +270,19 @@
               remote_party_is_ringing(tech_pvt);
             }
           } else if (!strcasecmp(value, "EARLYMEDIA")) {
+            char msg_to_skype[1024];
             tech_pvt->skype_callflow = CALLFLOW_STATUS_EARLYMEDIA;
             tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
             NOTICA("Our remote party in skype_call %s is EARLYMEDIA\n",
                          SKYPIAX_P_LOG, id);
+              sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
+                      tech_pvt->tcp_cli_port);
+              skypiax_signaling_write(tech_pvt, msg_to_skype);
+              start_audio_threads(tech_pvt);
+              sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
+                      tech_pvt->tcp_srv_port);
+              skypiax_signaling_write(tech_pvt, msg_to_skype);
+
               remote_party_is_early_media(tech_pvt);
           } else if (!strcasecmp(value, "MISSED")) {
             DEBUGA_SKYPE("We missed skype_call %s\n", SKYPIAX_P_LOG, id);
@@ -344,10 +353,11 @@
 
             if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id)
                 || !strcasecmp(tech_pvt->skype_call_id, id)) {
-              tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
               strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-              tech_pvt->interface_state = SKYPIAX_STATE_UP;
               DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id);
+              if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA){
+              tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
+              tech_pvt->interface_state = SKYPIAX_STATE_UP;
               sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
                       tech_pvt->tcp_cli_port);
               skypiax_signaling_write(tech_pvt, msg_to_skype);
@@ -355,6 +365,7 @@
               sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
                       tech_pvt->tcp_srv_port);
               skypiax_signaling_write(tech_pvt, msg_to_skype);
+	      }
               tech_pvt->skype_callflow = SKYPIAX_STATE_UP;
               if (!strlen(tech_pvt->session_uuid_str)) {
                 DEBUGA_SKYPE("New Inbound Channel!\n", SKYPIAX_P_LOG);
@@ -445,6 +456,7 @@
       break;
     while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
            && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+	       || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
                || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
 
       unsigned int fdselect;
@@ -595,7 +607,7 @@
     if (!running)
       break;
     while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
-           && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+           && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA 
                || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
       unsigned int fdselect;
       int rt;


From mrene at freeswitch.org  Wed Mar  4 11:21:55 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 13:21:55 -0600
Subject: [Freeswitch-svn] [commit] r12412 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LewfD-00045K-Ah@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 13:21:55 2009
New Revision: 12412

Log:
MODENDP-145

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Wed Mar  4 13:21:55 2009
@@ -690,7 +690,6 @@
 	switch_memory_pool_t *pool;
 	sip_alias_node_t *node;
 	switch_event_t *s_event;
-	int tportlog = 0;
 	int use_100rel = !sofia_test_pflag(profile, PFLAG_DISABLE_100REL);
 	int use_timer = !sofia_test_pflag(profile, PFLAG_DISABLE_TIMER);
 	const char *supported = NULL;
@@ -713,10 +712,6 @@
 		goto end;
 	}
 
-	if (sofia_test_flag(profile, TFLAG_TPORT_LOG)) {
-		tportlog = 1;
-	}
-
 	supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, replaces", 
 									use_100rel ? "100rel, " : "",
 									use_timer ? "timer, " : ""
@@ -736,7 +731,7 @@
  							  TAG_IF(sofia_test_pflag(profile, PFLAG_DISABLE_NAPTR), NTATAG_USE_NAPTR(0)),
 							  NTATAG_DEFAULT_PROXY(profile->outbound_proxy),
 							  NTATAG_SERVER_RPORT(profile->rport_level), 
-							  TAG_IF(tportlog, TPTAG_LOG(1)), 
+							  TPTAG_LOG(sofia_test_flag(profile, TFLAG_TPORT_LOG)), 
 							  TAG_END());	/* Last tag should always finish the sequence */
 
 	if (!profile->nua) {
@@ -1434,6 +1429,13 @@
 					char *val = (char *) switch_xml_attr_soft(param, "value");
 					if (!strcasecmp(var, "debug")) {
 						profile->debug = atoi(val);
+					} else if (!strcasecmp(var, "sip-trace")) {
+						if (switch_true(val)) {
+							sofia_set_flag(profile, TFLAG_TPORT_LOG);
+						} else {
+							sofia_clear_flag(profile, TFLAG_TPORT_LOG);
+						}
+						nua_set_params(profile->nua, TPTAG_LOG(sofia_test_flag(profile, TFLAG_TPORT_LOG)), TAG_END());
 					} else if (!strcasecmp(var, "auto-rtp-bugs")) {
 						parse_rtp_bugs(profile, val);
 					} else if (!strcasecmp(var, "user-agent-string")) { 


From gmaruzz at freeswitch.org  Wed Mar  4 11:36:02 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 13:36:02 -0600
Subject: [Freeswitch-svn] [commit] r12413 -
	freeswitch/trunk/src/mod/endpoints/mod_skypiax
Message-ID: <E1Lewss-0004AO-3Z@svn.freeswitch.org>

Author: gmaruzz
Date: Wed Mar  4 13:36:02 2009
New Revision: 12413

Log:
skypiax: better timing on loading/starting module (thanks to Jeff Lenk)

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	Wed Mar  4 13:36:02 2009
@@ -942,9 +942,8 @@
 
         NOTICA("WAITING roughly 10/15 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d. NB: on XP will wait for much much more! (on Vista and Linux is OK)\n", SKYPIAX_P_LOG, interface_id);
         i = 0;
-        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 10000) {    // 400 x 1000 is 6sec on windows XP but only 0.4 seconds on Vista  FIXME
-          //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i);
-          switch_sleep(1000);
+        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 200) {    // 10 seconds? thanks Jeff Lenk
+          switch_sleep(50000);
           i++;
         }
         if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected) {
@@ -956,9 +955,8 @@
         }
 
         i = 0;
-        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 60000) {    // 4000 * 1000 is 60sec on windows XP but 4seconds on Vista  FIXME
-          //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i);
-          switch_sleep(1000);
+        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 1200) {    // 60 seconds? thanks Jeff Lenk
+          switch_sleep(50000);
           i++;
         }
         if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle) {


From anthm at freeswitch.org  Wed Mar  4 11:45:10 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 13:45:10 -0600
Subject: [Freeswitch-svn] [commit] r12414 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1Lex1i-0004EW-AI@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 13:45:10 2009
New Revision: 12414

Log:
MODENDP-194

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Wed Mar  4 13:45:10 2009
@@ -27,6 +27,7 @@
  * Ken Rice, Asteria Solutions Group, Inc <ken at asteriasgi.com>
  * Paul D. Tinsley <pdt at jackhammer.org>
  * Bret McDanel <trixter AT 0xdecafbad.com>
+ * Eliot Gable <egable AT.AT broadvox.com>
  *
  *
  * sofia_glue.c -- SOFIA SIP Endpoint (code to tie sofia to freeswitch)
@@ -1169,6 +1170,7 @@
 		const char *screen = "no";
 		const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params");
 		const char *invite_to_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_to_params");
+		const char *invite_to_uri = switch_channel_get_variable(tech_pvt->channel, "sip_invite_to_uri");
 		const char *invite_contact_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_contact_params");
 		const char *invite_from_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_from_params");
 		const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri");
@@ -1260,7 +1262,7 @@
 		url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params);
 		invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, invite_contact_params);
 		from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, invite_from_params);
-		to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params ? invite_to_params : invite_params);
+		to_str = sofia_overcome_sip_uri_weakness(session, invite_to_uri ? invite_to_uri : tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params ? invite_to_params : invite_params);
 
 
 		/*
@@ -1435,6 +1437,7 @@
 	nua_invite(tech_pvt->nh,
 			   NUTAG_AUTOANSWER(0),
 			   NUTAG_SESSION_TIMER(session_timeout),
+			   TAG_IF(!switch_strlen_zero(sendto), NTATAG_DEFAULT_PROXY(sendto)),
 			   TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_HEADER_STR(tech_pvt->rpid)),
 			   TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)),
 			   TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
@@ -3019,7 +3022,9 @@
 		"   server_user     VARCHAR(255),\n"
 		"   server_host     VARCHAR(255),\n" 
 		"   profile_name    VARCHAR(255),\n" 
-		"   hostname        VARCHAR(255)\n" 
+		"   hostname        VARCHAR(255),\n" 
+		"   network_ip      VARCHAR(255),\n" 
+		"   network_port    VARCHAR(6)\n" 
 		");\n";
 
 
@@ -3032,7 +3037,9 @@
 		"   expires         INTEGER,\n" 
 		"   user_agent      VARCHAR(255),\n" 
 		"   profile_name    VARCHAR(255),\n" 
-		"   hostname        VARCHAR(255)\n" 
+		"   hostname        VARCHAR(255),\n" 
+		"   network_ip      VARCHAR(255),\n" 
+		"   network_port    VARCHAR(6)\n" 
 		");\n";
 
 	char dialog_sql[] =
@@ -3104,6 +3111,8 @@
 			"create index sr_expires on sip_registrations (expires)",
 			"create index sr_hostname on sip_registrations (hostname)",
 			"create index sr_status on sip_registrations (status)",
+			"create index sr_network_ip on sip_registrations (network_ip)",
+			"create index sr_network_port on sip_registrations (network_port)",
 			"create index ss_call_id on sip_subscriptions (call_id)",
 			"create index ss_hostname on sip_subscriptions (hostname)",
 			"create index ss_sip_user on sip_subscriptions (sip_user)",
@@ -3136,7 +3145,8 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn);
 		
 		test_sql = switch_mprintf("delete from sip_registrations where (contact like '%%TCP%%' "
-								  "or status like '%%TCP%%' or status like '%%TLS%%') and hostname='%q'", 
+								  "or status like '%%TCP%%' or status like '%%TLS%%') and hostname='%q' "
+								  "and network_ip!='-1' and network_port!='-1'", 
 								  mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
@@ -3146,7 +3156,7 @@
 		free(test_sql);
 
 
-		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
+		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q' and network_ip!='-1' and network_port!='-1'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL);
@@ -3198,7 +3208,8 @@
 		}
 
 		test_sql = switch_mprintf("delete from sip_registrations where (contact like '%%TCP%%' "
-								  "or status like '%%TCP%%' or status like '%%TLS%%') and hostname='%q'", 
+								  "or status like '%%TCP%%' or status like '%%TLS%%') and hostname='%q' "
+								  "and network_ip!='-1' and network_port!='-1'",
 								  mod_sofia_globals.hostname);
 		
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql);
@@ -3244,6 +3255,8 @@
 		switch_core_db_exec(profile->master_db, "create index if not exists sr_expires on sip_registrations (expires)", NULL, NULL, NULL);
 		switch_core_db_exec(profile->master_db, "create index if not exists sr_hostname on sip_registrations (hostname)", NULL, NULL, NULL);
 		switch_core_db_exec(profile->master_db, "create index if not exists sr_status on sip_registrations (status)", NULL, NULL, NULL);
+		switch_core_db_exec(profile->master_db, "create index if not exists sr_network_ip on sip_registrations (network_ip)", NULL, NULL, NULL);
+		switch_core_db_exec(profile->master_db, "create index if not exists sr_network_port on sip_registrations (network_port)", NULL, NULL, NULL);
 
 		switch_core_db_exec(profile->master_db, "create index if not exists ss_call_id on sip_subscriptions (call_id)", NULL, NULL, NULL);
 		switch_core_db_exec(profile->master_db, "create index if not exists ss_hostname on sip_subscriptions (hostname)", NULL, NULL, NULL);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	Wed Mar  4 13:45:10 2009
@@ -29,6 +29,7 @@
  * Bret McDanel <trixter AT 0xdecafbad.com>
  * Marcel Barbulescu <marcelbarbulescu at gmail.com>
  * David Knell <>
+ * Eliot Gable <egable AT.AT broadvox.com>
  *
  *
  * sofia_ref.c -- SOFIA SIP Endpoint (registration code)
@@ -653,6 +654,7 @@
 	const char *rpid = "unknown";
 	const char *display = "\"user\"";
 	char network_ip[80];
+	char network_port_c[6];
 	char url_ip[80];
 	char *register_gateway = NULL;
 	int network_port;
@@ -669,6 +671,8 @@
 	get_addr(network_ip, sizeof(network_ip), my_addrinfo->ai_addr,my_addrinfo->ai_addrlen);
 	network_port = get_port(my_addrinfo->ai_addr);
 
+	snprintf(network_port_c, sizeof(network_port_c), "%d", network_port);
+
 	snprintf(url_ip, sizeof(url_ip), my_addrinfo->ai_addr->sa_family == AF_INET6 ? "[%s]" : "%s", network_ip);
 
 	expires = sip->sip_expires;
@@ -940,11 +944,11 @@
 		
 		switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET);
 		sql = switch_mprintf("insert into sip_registrations "
-							 "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name,hostname) "
-							 "values ('%q','%q', '%q','%q','%q','%q', '%q', %ld, '%q', '%q', '%q', '%q', '%q')", 
+							 "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port) "
+							 "values ('%q','%q', '%q','%q','%q','%q', '%q', %ld, '%q', '%q', '%q', '%q', '%q', '%q', '%q')", 
 							 call_id, to_user, reg_host, profile->presence_hosts ? profile->presence_hosts : reg_host, 
 							 contact_str, reg_desc, rpid, (long) switch_epoch_time_now(NULL) + (long) exptime * 2, 
-							 agent, from_user, guess_ip4, profile->name, mod_sofia_globals.hostname);
+							 agent, from_user, guess_ip4, profile->name, mod_sofia_globals.hostname, network_ip, network_port_c);
 							 
 		if (sql) {
 			sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
@@ -965,6 +969,8 @@
 			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime);
 			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-user", from_user);
 			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-host", from_host);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-ip", network_ip);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-port", network_port_c);
 			switch_event_fire(&s_event);
 		}
 


From mrene at freeswitch.org  Wed Mar  4 12:17:36 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:17:36 -0600
Subject: [Freeswitch-svn] [commit] r12415 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LexX6-0004hw-Ju@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 14:17:36 2009
New Revision: 12415

Log:
Link with su_log_default and avoid dealing with NULL ptrs

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Wed Mar  4 14:17:36 2009
@@ -49,7 +49,7 @@
 extern su_log_t soa_log[];
 extern su_log_t sresolv_log[];
 extern su_log_t stun_log[];
-
+extern su_log_t su_log_default[];
 
 static void set_variable_sip_param(switch_channel_t *channel, char *header_type, sip_param_t const *params);
 
@@ -934,45 +934,43 @@
 	}
 }
 
-static switch_status_t sofia_get_logger(const char *name, su_log_t **out) 
+static su_log_t *sofia_get_logger(const char *name) 
 {
-	*out = (void*)0x1;
 	if (!strcasecmp(name, "tport")) {
-		*out = tport_log;
+		return tport_log;
 	} else if (!strcasecmp(name, "iptsec")) {
-		*out = iptsec_log;
+		return iptsec_log;
 	} else if (!strcasecmp(name, "nea")) {
-		*out = nea_log;
+		return nea_log;
 	} else if (!strcasecmp(name, "nta")) {
-		*out = nta_log;
+		return nta_log;
 	} else if (!strcasecmp(name, "nth_client")) {
-		*out = nth_client_log;
+		return nth_client_log;
 	} else if (!strcasecmp(name, "nth_server")) {
-		*out = nth_server_log;
+		return nth_server_log;
 	} else if (!strcasecmp(name, "nua")) {
-		*out = nua_log;
+		return nua_log;
 	} else if (!strcasecmp(name, "sresolv")) {
-		*out = sresolv_log;
+		return sresolv_log;
 	} else if (!strcasecmp(name, "stun")) {
-		*out = stun_log;
-	} else if (!strcasecmp(name, "default")){
-		*out = NULL;
+		return stun_log;
+	} else if (!strcasecmp(name, "default")) {
+		return su_log_default;
+	} else {
+		return NULL;
 	}
-	
-	return (*out != (void*)0x1) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 }
 
 switch_status_t sofia_set_loglevel(const char *name, int level)
 {
 	su_log_t *log = NULL;
-	switch_status_t status;
 	
 	if (level < 0 || level > 9) {
 		return SWITCH_STATUS_FALSE;
 	}
-	
+		
 	if (!strcasecmp(name, "all")) {
-		su_log_set_level(NULL, level);
+		su_log_set_level(su_log_default, level);
 		su_log_set_level(tport_log, level);
 		su_log_set_level(iptsec_log, level);
 		su_log_set_level(nea_log, level);
@@ -986,19 +984,20 @@
 		return SWITCH_STATUS_SUCCESS;
 	}
 	
-	if ((status = sofia_get_logger(name, &log)) == SWITCH_STATUS_SUCCESS) {
-		su_log_set_level(log, level);
+	if (!(log = sofia_get_logger(name))) {
+		return SWITCH_STATUS_FALSE;
 	}
 	
-	return status;
+	su_log_set_level(log, level);
+		
+	return SWITCH_STATUS_SUCCESS;
 }
 
 int sofia_get_loglevel(const char *name)
 {
 	su_log_t *log = NULL;
-	switch_status_t status;
 	
-	if ((status = sofia_get_logger(name, &log)) == SWITCH_STATUS_SUCCESS && log) { /* default logger is NULL */
+	if ((log = sofia_get_logger(name))) {
 		return log->log_level;
 	} else {
 		return -1;
@@ -1777,7 +1776,7 @@
 		}
 		
 		/* Redirect loggers in sofia */
-		su_log_redirect(NULL /* default */, logger, NULL);
+		su_log_redirect(su_log_default, logger, NULL);
 		su_log_redirect(tport_log, logger, NULL);
 		su_log_redirect(iptsec_log, logger, NULL);
 		su_log_redirect(nea_log, logger, NULL);


From gmaruzz at freeswitch.org  Wed Mar  4 12:18:37 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:18:37 -0600
Subject: [Freeswitch-svn] [commit] r12416 - in
	freeswitch/trunk/src/mod/endpoints/mod_skypiax: . asterisk
Message-ID: <E1LexY5-0004jl-IO@svn.freeswitch.org>

Author: gmaruzz
Date: Wed Mar  4 14:18:37 2009
New Revision: 12416

Log:
skypiax:  indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c	Wed Mar  4 14:18:37 2009
@@ -144,7 +144,7 @@
   AST_CLI_DEFINE(skypiax_console_skype, "Sends a Skype command"),
   AST_CLI_DEFINE(skypiax_console_skypiax_dir_import, "imports entries from cellphone"),
   AST_CLI_DEFINE(skypiax_console_skypiax, "all things skypiax"),
-  #endif
+#endif
 };
 #else
 struct ast_cli_entry myclis[] = {
@@ -313,15 +313,15 @@
     return NULL;
   }
 
-char interface[256];
-int i;
-memset(interface, '\0', sizeof(interface));
-
-for (i=0; i<sizeof(interface); i++){
-	if(name[i] == '/')
-		break;
-	interface[i]=name[i];
-}
+  char interface[256];
+  int i;
+  memset(interface, '\0', sizeof(interface));
+
+  for (i = 0; i < sizeof(interface); i++) {
+    if (name[i] == '/')
+      break;
+    interface[i] = name[i];
+  }
   /* lock the interfaces' list */
   LOKKA(&skypiax_iflock);
   /* make a pointer to the first interface in the interfaces list */
@@ -1124,8 +1124,7 @@
             skypiax_store_boost(v->value, &skypiax_default.capture_boost))
         M_UINT("skypiax_dir_entry_extension_prefix",
                skypiax_default.skypiax_dir_entry_extension_prefix)
-        M_END(;
-        );
+        M_END(;);
     }
   }
 
@@ -1161,8 +1160,7 @@
       M_STR("skype_user", tmp->skype_user)
       M_UINT("skypiax_dir_entry_extension_prefix",
              tmp->skypiax_dir_entry_extension_prefix)
-      M_END(;
-      );
+      M_END(;);
   }
 
   if (debug_all) {
@@ -1861,7 +1859,9 @@
   switch_core_session_t *session = NULL;
   switch_channel_t *channel = NULL;
 
-  if ((session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
+  if ((session =
+       switch_core_session_request(skypiax_endpoint_interface,
+                                   SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
     switch_core_session_add_stream(session, NULL);
     channel = switch_core_session_get_channel(session);
     skypiax_tech_init(tech_pvt, session);
@@ -1889,6 +1889,7 @@
 #endif
   return 0;
 }
+
 int remote_party_is_ringing(private_t * p)
 {
   if (p->owner) {
@@ -1897,6 +1898,7 @@
 
   return 0;
 }
+
 int remote_party_is_early_media(private_t * p)
 {
   if (p->owner) {
@@ -1906,7 +1908,6 @@
   return 0;
 }
 
-
 int outbound_channel_answered(private_t * p)
 {
 

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	Wed Mar  4 14:18:37 2009
@@ -506,7 +506,9 @@
                                                     switch_memory_pool_t ** pool,
                                                     switch_originate_flag_t flags)
 {
-	if ((*new_session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
+  if ((*new_session =
+       switch_core_session_request(skypiax_endpoint_interface,
+                                   SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
     private_t *tech_pvt;
     switch_channel_t *channel;
     switch_caller_profile_t *caller_profile;
@@ -940,29 +942,43 @@
 
         skypiax_audio_init(&globals.SKYPIAX_INTERFACES[interface_id]);
 
-        NOTICA("WAITING roughly 10/15 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d. NB: on XP will wait for much much more! (on Vista and Linux is OK)\n", SKYPIAX_P_LOG, interface_id);
+        NOTICA
+          ("WAITING roughly 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d\n",
+           SKYPIAX_P_LOG, interface_id);
         i = 0;
-        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 200) {    // 10 seconds? thanks Jeff Lenk
+        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 200) {  // 10 seconds! thanks Jeff Lenk
           switch_sleep(50000);
           i++;
         }
         if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected) {
-          NOTICA("Found a running Skype client, connected to its SKYPE API for interface_id=%d, waiting roughly 60/90 seconds for CURRENTUSERHANDLE==%s. NB: on XP will wait for much much more! (on Vista and Linux is OK)\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user);
+          NOTICA
+            ("Found a running Skype client, connected to its SKYPE API for interface_id=%d, waiting 60 seconds for CURRENTUSERHANDLE==%s\n",
+             SKYPIAX_P_LOG, interface_id,
+             globals.SKYPIAX_INTERFACES[interface_id].skype_user);
         } else {
-          ERRORA("Failed to connect to a SKYPE API for interface_id=%d, no SKYPE client running, please (re)start Skype client. Skypiax exiting\n", SKYPIAX_P_LOG, interface_id);
+          ERRORA
+            ("Failed to connect to a SKYPE API for interface_id=%d, no SKYPE client running, please (re)start Skype client. Skypiax exiting\n",
+             SKYPIAX_P_LOG, interface_id);
           running = 0;
           return SWITCH_STATUS_FALSE;
         }
 
         i = 0;
-        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 1200) {    // 60 seconds? thanks Jeff Lenk
+        while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 1200) { // 60 seconds! thanks Jeff Lenk
           switch_sleep(50000);
           i++;
         }
         if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle) {
-          WARNINGA("Interface_id=%d is now STARTED, the Skype client to which we are connected gave us the correct CURRENTUSERHANDLE (%s)\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user);
+          WARNINGA
+            ("Interface_id=%d is now STARTED, the Skype client to which we are connected gave us the correct CURRENTUSERHANDLE (%s)\n",
+             SKYPIAX_P_LOG, interface_id,
+             globals.SKYPIAX_INTERFACES[interface_id].skype_user);
         } else {
-          ERRORA("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypiax exiting now\n", SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user, globals.SKYPIAX_INTERFACES[interface_id].skype_user);
+          ERRORA
+            ("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypiax exiting now\n",
+             SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user,
+             interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user,
+             globals.SKYPIAX_INTERFACES[interface_id].skype_user);
           running = 0;
           return SWITCH_STATUS_FALSE;
         }
@@ -1056,7 +1072,7 @@
         DEBUGA_SKYPE
           ("got FALSE here, thread probably was already dead. GetLastError returned: %d\n",
            SKYPIAX_P_LOG, GetLastError());
-            globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread=NULL;
+        globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
       }
 #else
       XEvent e;
@@ -1075,9 +1091,9 @@
       XSync(tech_pvt->SkypiaxHandles.disp, False);
 #endif
     }
-    while (x) {//FIXME 2 seconds?
+    while (x) {                 //FIXME 2 seconds?
       x--;
-      switch_yield(20000); 
+      switch_yield(20000);
     }
     if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
       switch_thread_join(&status,
@@ -1164,7 +1180,9 @@
   switch_core_session_t *session = NULL;
   switch_channel_t *channel = NULL;
 
-  if ((session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
+  if ((session =
+       switch_core_session_request(skypiax_endpoint_interface,
+                                   SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
     switch_core_session_add_stream(session, NULL);
     channel = switch_core_session_get_channel(session);
     skypiax_tech_init(tech_pvt, session);
@@ -1221,7 +1239,6 @@
   return 0;
 }
 
-
 int remote_party_is_early_media(private_t * tech_pvt)
 {
   switch_core_session_t *session = NULL;

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Wed Mar  4 14:18:37 2009
@@ -273,17 +273,17 @@
             char msg_to_skype[1024];
             tech_pvt->skype_callflow = CALLFLOW_STATUS_EARLYMEDIA;
             tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
-            NOTICA("Our remote party in skype_call %s is EARLYMEDIA\n",
-                         SKYPIAX_P_LOG, id);
-              sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
-                      tech_pvt->tcp_cli_port);
-              skypiax_signaling_write(tech_pvt, msg_to_skype);
-              start_audio_threads(tech_pvt);
-              sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
-                      tech_pvt->tcp_srv_port);
-              skypiax_signaling_write(tech_pvt, msg_to_skype);
+            NOTICA("Our remote party in skype_call %s is EARLYMEDIA\n", SKYPIAX_P_LOG,
+                   id);
+            sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
+                    tech_pvt->tcp_cli_port);
+            skypiax_signaling_write(tech_pvt, msg_to_skype);
+            start_audio_threads(tech_pvt);
+            sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
+                    tech_pvt->tcp_srv_port);
+            skypiax_signaling_write(tech_pvt, msg_to_skype);
 
-              remote_party_is_early_media(tech_pvt);
+            remote_party_is_early_media(tech_pvt);
           } else if (!strcasecmp(value, "MISSED")) {
             DEBUGA_SKYPE("We missed skype_call %s\n", SKYPIAX_P_LOG, id);
           } else if (!strcasecmp(value, "FINISHED")) {
@@ -355,17 +355,17 @@
                 || !strcasecmp(tech_pvt->skype_call_id, id)) {
               strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
               DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id);
-              if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA){
-              tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-              tech_pvt->interface_state = SKYPIAX_STATE_UP;
-              sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
-                      tech_pvt->tcp_cli_port);
-              skypiax_signaling_write(tech_pvt, msg_to_skype);
-              start_audio_threads(tech_pvt);
-              sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
-                      tech_pvt->tcp_srv_port);
-              skypiax_signaling_write(tech_pvt, msg_to_skype);
-	      }
+              if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) {
+                tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
+                tech_pvt->interface_state = SKYPIAX_STATE_UP;
+                sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
+                        tech_pvt->tcp_cli_port);
+                skypiax_signaling_write(tech_pvt, msg_to_skype);
+                start_audio_threads(tech_pvt);
+                sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
+                        tech_pvt->tcp_srv_port);
+                skypiax_signaling_write(tech_pvt, msg_to_skype);
+              }
               tech_pvt->skype_callflow = SKYPIAX_STATE_UP;
               if (!strlen(tech_pvt->session_uuid_str)) {
                 DEBUGA_SKYPE("New Inbound Channel!\n", SKYPIAX_P_LOG);
@@ -456,7 +456,7 @@
       break;
     while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
            && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-	       || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
+               || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
                || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
 
       unsigned int fdselect;
@@ -607,7 +607,8 @@
     if (!running)
       break;
     while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
-           && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA 
+           && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+               || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
                || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
       unsigned int fdselect;
       int rt;
@@ -921,8 +922,8 @@
   lReturnCode = 0;
   fIssueDefProc = 0;
   tech_pvt = (private_t *) GetWindowLong(hWindow, GWL_USERDATA);
-  if(!running)
-	  return lReturnCode;
+  if (!running)
+    return lReturnCode;
   switch (uiMessage) {
   case WM_CREATE:
     tech_pvt = (private_t *) ((LPCREATESTRUCT) ulParam)->lpCreateParams;
@@ -1141,7 +1142,7 @@
 
   xerror = err->error_code;
   ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror);
-  running=0;
+  running = 0;
   return 0;                     /*  ignore the error */
 }
 
@@ -1248,7 +1249,7 @@
   if (status != Success || format_ret != 32 || nitems_ret != 1) {
     SkypiaxHandles->skype_win = (Window) - 1;
     DEBUGA_SKYPE("Skype instance not found\n", SKYPIAX_P_LOG);
-    running =0;
+    running = 0;
     SkypiaxHandles->api_connected = 0;
     return 0;
   }


From mikej at freeswitch.org  Wed Mar  4 12:35:51 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:35:51 -0600
Subject: [Freeswitch-svn] [commit] r12417 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1Lexol-00057p-59@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:35:51 2009
New Revision: 12417

Log:
Wed Mar  4 12:22:20 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta: fix timer N3
  Ignore-this: 4018f3a32723692153389c2109b72296
  
  Try UDP instead of TCP if TCP server does not respond quick enough.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:35:51 2009
@@ -1 +1 @@
-Tue Mar  3 16:01:38 CST 2009
+Wed Mar  4 14:35:03 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Wed Mar  4 14:35:51 2009
@@ -7021,7 +7021,7 @@
 static void outgoing_send_via(nta_outgoing_t *orq, tport_t *tp);
 static void outgoing_send(nta_outgoing_t *orq, int retransmit);
 static void outgoing_try_tcp_instead(nta_outgoing_t *orq);
-static void outgoing_try_udp_instead(nta_outgoing_t *orq);
+static void outgoing_try_udp_instead(nta_outgoing_t *orq, int timeout);
 static void outgoing_tport_error(nta_agent_t *agent, nta_outgoing_t *orq,
 				 tport_t *tp, msg_t *msg, int error);
 static void outgoing_print_tport_error(nta_outgoing_t *orq,
@@ -8024,7 +8024,7 @@
     }
     else if (err == ECONNREFUSED && orq->orq_try_tcp_instead) {
       if (su_casematch(tpn->tpn_proto, "tcp") && msg_size(msg) <= 65535) {
-	outgoing_try_udp_instead(orq);
+	outgoing_try_udp_instead(orq, 0);
 	continue;
       }
     }
@@ -8138,7 +8138,7 @@
 }
 
 static void
-outgoing_try_udp_instead(nta_outgoing_t *orq)
+outgoing_try_udp_instead(nta_outgoing_t *orq, int timeout)
 {
   tport_t *tp;
   tp_name_t tpn[1];
@@ -8160,8 +8160,9 @@
     sip_fragment_clear(sip->sip_via->v_common);
     sip->sip_via->v_protocol = sip_transport_udp;
 
-    SU_DEBUG_5(("nta: %s (%u) TCP refused, trying UDP\n",
-		orq->orq_method_name, orq->orq_cseq->cs_seq));
+    SU_DEBUG_5(("nta: %s (%u) TCP %s, trying UDP\n",
+		orq->orq_method_name, orq->orq_cseq->cs_seq,
+		timeout ? "times out" : "refused"));
 
     orq->orq_tpn->tpn_proto = "udp";
     tport_decref(&orq->orq_tport);
@@ -8196,7 +8197,7 @@
     if (su_casematch(tpn->tpn_proto, "tcp") && msg_size(msg) <= 65535) {
       outgoing_print_tport_error(orq, 5, "retrying with UDP after ",
 				 tpn, msg, error);
-      outgoing_try_udp_instead(orq);
+      outgoing_try_udp_instead(orq, 0);
       outgoing_remove(orq);	/* Reset state - this is no resend! */
       outgoing_send(orq, 0);	/* Send */
       return;
@@ -8601,8 +8602,11 @@
 	 * but no connection is established within SIP T4
 	 */
 	SU_DEBUG_5(("nta: timer %s fired, %s %s (%u)\n", "N3",
-		    "try UDP instead", orq->orq_method_name, orq->orq_cseq->cs_seq));
-	outgoing_try_udp_instead(orq);
+		    "try UDP instead for",
+		    orq->orq_method_name, orq->orq_cseq->cs_seq));
+	outgoing_try_udp_instead(orq, 1);
+	outgoing_remove(orq);	/* Reset state - this is no resend! */
+	outgoing_send(orq, 0);	/* Send */
       }
       continue;
     }


From mikej at freeswitch.org  Wed Mar  4 12:37:00 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:37:00 -0600
Subject: [Freeswitch-svn] [commit] r12418 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
Message-ID: <E1Lexps-00059T-N6@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:37:00 2009
New Revision: 12418

Log:
Wed Mar  4 12:28:12 CST 2009  Pekka Pessi <first.last at nokia.com>
  * run_test_nta: run tests without named if named refuses to start



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:37:00 2009
@@ -1 +1 @@
-Wed Mar  4 14:35:03 CST 2009
+Wed Mar  4 14:36:40 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta	Wed Mar  4 14:37:00 2009
@@ -205,7 +205,7 @@
     exit $exit
 else
     echo "$0: cannot start named (check apparmor/selinux)"
-    exit 77
+    exec ipv6=$ipv6 $VALGRIND ./test_nta "$@"
 fi
 
 else # not having BIND and portbind


From mikej at freeswitch.org  Wed Mar  4 12:37:55 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:37:55 -0600
Subject: [Freeswitch-svn] [commit] r12419 - in
	freeswitch/trunk/libs/sofia-sip: . s2check
Message-ID: <E1Lexql-0005Ax-UT@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:37:55 2009
New Revision: 12419

Log:
Wed Mar  4 12:31:05 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2_dns_domain(): more flexible selection of transports by URI parameters


Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:37:55 2009
@@ -1 +1 @@
-Wed Mar  4 14:36:40 CST 2009
+Wed Mar  4 14:37:34 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c	Wed Mar  4 14:37:55 2009
@@ -97,14 +97,16 @@
 }
 
 /* Set filter function */
-void s2_dns_set_filter(int (*filter)(void *data, size_t len, void *userdata),
+void
+s2_dns_set_filter(int (*filter)(void *data, size_t len, void *userdata),
 		       void *userdata)
 {
   s2dns.filter = filter;
   s2dns.userdata = userdata;
 }
 
-void s2_dns_teardown(void)
+void
+s2_dns_teardown(void)
 {
   struct s2_dns_response *r, *next;
   su_root_deregister(s2dns.root, s2dns.reg), s2dns.reg = -1;
@@ -442,7 +444,7 @@
   }
 }
 
-/** Set up DNS domain */
+/** Set up records for SIP server */
 void s2_dns_domain(char const *domain, int use_naptr,
 		   /* char *prefix, int priority, url_t const *uri, */
 		   ...)
@@ -471,7 +473,9 @@
       char *services = NULL;
 
       priority = va_arg(va, int);
-      uri = va_arg(va, url_t *); assert(uri);
+      uri = va_arg(va, url_t *);
+      if (uri == NULL)
+	continue;
 
       if (uri->url_type == url_sips) {
 	services = "SIPS+D2T";
@@ -499,7 +503,9 @@
 
     for (;(prefix = va_arg(va, char *));) {
       priority = va_arg(va, int);
-      uri = va_arg(va, url_t *); assert(uri);
+      uri = va_arg(va, url_t *);
+      if (uri == NULL)
+	continue;
 
       make_server(server, prefix, domain);
 
@@ -518,7 +524,9 @@
   va_copy(va, va0);
   for (;(prefix = va_arg(va, char *));) {
     priority = va_arg(va, int);
-    uri = va_arg(va, url_t *); assert(uri);
+    uri = va_arg(va, url_t *);
+    if (uri == NULL)
+      continue;
 
     make_server(server, prefix, domain);
 
@@ -539,7 +547,8 @@
   va_copy(va, va0);
   for (;(prefix = va_arg(va, char *));) {
     (void)va_arg(va, int);
-    (void)va_arg(va, url_t *);
+    if (va_arg(va, url_t *) == NULL)
+      continue;
 
     memset(m, 0, sizeof m);
     make_server(server, prefix, domain);


From mikej at freeswitch.org  Wed Mar  4 12:39:24 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:39:24 -0600
Subject: [Freeswitch-svn] [commit] r12420 - in
	freeswitch/trunk/libs/sofia-sip: . s2check
Message-ID: <E1LexsC-0005Cb-Em@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:39:24 2009
New Revision: 12420

Log:
Wed Mar  4 12:29:06 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2sip: removed nua dependency
  Ignore-this: d32f68be34d4628129aff2afad3c99f1
  
  Fixed CK_FORK=no case.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c
   freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:39:24 2009
@@ -1 +1 @@
-Wed Mar  4 14:37:34 CST 2009
+Wed Mar  4 14:38:54 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c	Wed Mar  4 14:39:24 2009
@@ -44,6 +44,7 @@
 
 #include <sofia-sip/sip_header.h>
 #include <sofia-sip/sip_status.h>
+#include <sofia-sip/sip_tag.h>
 #include <sofia-sip/msg_addr.h>
 #include <sofia-sip/su_log.h>
 #include <sofia-sip/su_tagarg.h>
@@ -269,8 +270,8 @@
 
 struct message *
 s2_sip_respond_to(struct message *m, struct dialog *d,
-	      int status, char const *phrase,
-	      tag_type_t tag, tag_value_t value, ...)
+		  int status, char const *phrase,
+		  tag_type_t tag, tag_value_t value, ...)
 {
   ta_list ta;
   msg_t *reply;
@@ -395,9 +396,9 @@
  */
 int
 s2_sip_request_to(struct dialog *d,
-	      sip_method_t method, char const *name,
-	      tport_t *tport,
-	      tag_type_t tag, tag_value_t value, ...)
+		  sip_method_t method, char const *name,
+		  tport_t *tport,
+		  tag_type_t tag, tag_value_t value, ...)
 {
   ta_list ta;
   tagi_t const *tags;
@@ -811,5 +812,7 @@
   if (s2sip) {
     tport_destroy(s2sip->master), s2sip->master = NULL;
     su_root_destroy(s2sip->root), s2sip->root = NULL;
+    su_home_unref(s2sip->home);
+    s2sip = NULL;
   }
 }

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h	Wed Mar  4 14:39:24 2009
@@ -27,7 +27,6 @@
 #include <sofia-sip/su_wait.h>
 #include <sofia-sip/sip.h>
 #include <sofia-sip/tport.h>
-#include <sofia-sip/nua.h>
 
 #include "s2util.h"
 


From mikej at freeswitch.org  Wed Mar  4 12:40:07 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:40:07 -0600
Subject: [Freeswitch-svn] [commit] r12421 - in
	freeswitch/trunk/libs/sofia-sip: . s2check
Message-ID: <E1Lexst-0005Eu-1a@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:40:06 2009
New Revision: 12421

Log:
Wed Mar  4 12:31:26 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2base: removed s2_setup_logs()
  Ignore-this: ea4848902b3be9c966b4f7e114f2a5b6



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/s2base.c
   freeswitch/trunk/libs/sofia-sip/s2check/s2base.h

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:40:06 2009
@@ -1 +1 @@
-Wed Mar  4 14:38:54 CST 2009
+Wed Mar  4 14:39:41 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c	Wed Mar  4 14:40:06 2009
@@ -135,26 +135,6 @@
     printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title);
 }
 
-SOFIAPUBVAR su_log_t nua_log[];
-SOFIAPUBVAR su_log_t soa_log[];
-SOFIAPUBVAR su_log_t nea_log[];
-SOFIAPUBVAR su_log_t nta_log[];
-SOFIAPUBVAR su_log_t tport_log[];
-SOFIAPUBVAR su_log_t su_log_default[];
-
-void
-s2_setup_logs(int level)
-{
-  assert(s2base);
-
-  su_log_soft_set_level(nua_log, level);
-  su_log_soft_set_level(soa_log, level);
-  su_log_soft_set_level(su_log_default, level);
-  su_log_soft_set_level(nea_log, level);
-  su_log_soft_set_level(nta_log, level);
-  su_log_soft_set_level(tport_log, level);
-}
-
 void s2_step(void)
 {
   su_root_step(s2base->root, 10);

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2base.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h	Wed Mar  4 14:40:06 2009
@@ -40,8 +40,6 @@
 void s2_suite(char const *label);
 void s2_setup(char const *label);
 
-void s2_setup_logs(int level);
-
 void s2_step(void);
 
 void s2_case(char const *tag,


From mikej at freeswitch.org  Wed Mar  4 12:41:38 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:41:38 -0600
Subject: [Freeswitch-svn] [commit] r12422 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
Message-ID: <E1LexuM-0005GV-8u@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:41:38 2009
New Revision: 12422

Log:
Wed Mar  4 12:37:47 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nua: moved contents of test_s2.[hc] to check_nua.[hc]
  Ignore-this: f53929b29092e2d62e661fc40397492e



Removed:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h
Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:41:38 2009
@@ -1 +1 @@
-Wed Mar  4 14:39:41 CST 2009
+Wed Mar  4 14:40:17 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am	Wed Mar  4 14:41:38 2009
@@ -49,8 +49,7 @@
 
 check_nua_SOURCES = 	check_nua.c check_nua.h \
 			check_session.c check_register.c \
-			check_etsi.c check_simple.c \
-			test_s2.h test_s2.c
+			check_etsi.c check_simple.c
 
 check_nua_LDADD = 	$(nua_libs) ${top_builddir}/s2check/libs2.a \
 			@CHECK_LIBS@

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c	Wed Mar  4 14:41:38 2009
@@ -34,9 +34,9 @@
 
 #include "config.h"
 
-#include "check_nua.h"
+#undef NDEBUG
 
-#include "test_s2.h"
+#include "check_nua.h"
 
 #include <sofia-sip/sip_status.h>
 #include <sofia-sip/sip_header.h>

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c	Wed Mar  4 14:41:38 2009
@@ -22,7 +22,7 @@
  *
  */
 
-/**@CFILE check2_sofia.c
+/**@CFILE check_nua.c
  *
  * @brief Check-driven tester for Sofia SIP User Agent library
  *
@@ -33,16 +33,26 @@
 
 #include "config.h"
 
-#include "test_s2.h"
+#undef NDEBUG
+
 #include "check_nua.h"
+#include "s2dns.h"
+
+#include <sofia-sip/sip_header.h>
+#include <sofia-sip/sip_status.h>
+#include <sofia-sip/msg_addr.h>
+#include <sofia-sip/su_log.h>
+#include <sofia-sip/su_tagarg.h>
+#include <sofia-sip/su_alloc.h>
+#include <sofia-sip/su_string.h>
+#include <sofia-sip/sresolv.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-#if HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif
+#include <assert.h>
+#include <limits.h>
+#include <time.h>
 
 static void usage(int exitcode)
 {
@@ -111,3 +121,384 @@
 
   exit(failed ? EXIT_FAILURE : EXIT_SUCCESS);
 }
+
+/* ---------------------------------------------------------------------- */
+
+/* -- Globals -------------------------------------------------------------- */
+
+struct s2nua *s2;
+
+int s2_nua_thread = 0;
+
+unsigned s2_default_registration_duration = 3600;
+
+char const s2_auth_digest_str[] =
+  "Digest realm=\"s2test\", "
+  "nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", "
+  "qop=\"auth\", "
+  "algorithm=\"MD5\"";
+
+char const s2_auth_credentials[] = "Digest:\"s2test\":abc:abc";
+
+char const s2_auth2_digest_str[] =
+  "Digest realm=\"s2test2\", "
+  "nonce=\"fb0c093dcd98b7102dd2f0e8b11d0f600b\", "
+  "qop=\"auth\", "
+  "algorithm=\"MD5\"";
+
+char const s2_auth2_credentials[] = "Digest:\"s2test2\":abc:abc";
+
+char const s2_auth3_digest_str[] =
+  "Digest realm=\"s2test3\", "
+  "nonce=\"e8b11d0f600bfb0c093dcd98b7102dd2f0\", "
+  "qop=\"auth-int\", "
+  "algorithm=\"MD5-sess\"";
+
+char const s2_auth3_credentials[] = "Digest:\"s2test3\":abc:abc";
+
+/* -- NUA events -------------------------------------------------------- */
+
+struct event *s2_remove_event(struct event *e)
+{
+  if ((*e->prev = e->next))
+    e->next->prev = e->prev;
+
+  e->prev = NULL, e->next = NULL;
+
+  return e;
+}
+
+void s2_free_event(struct event *e)
+{
+  if (e) {
+    if (e->prev) {
+      if ((*e->prev = e->next))
+	e->next->prev = e->prev;
+    }
+    nua_destroy_event(e->event);
+    nua_handle_unref(e->nh);
+    free(e);
+  }
+}
+
+void s2_flush_events(void)
+{
+  while (s2->events) {
+    s2_free_event(s2->events);
+  }
+}
+
+struct event *s2_next_event(void)
+{
+  for (;;) {
+    if (s2->events)
+      return s2_remove_event(s2->events);
+
+    su_root_step(s2base->root, 100);
+  }
+}
+
+struct event *s2_wait_for_event(nua_event_t event, int status)
+{
+  struct event *e;
+
+  for (;;) {
+    for (e = s2->events; e; e = e->next) {
+      if (event != nua_i_none && event != e->data->e_event)
+	continue;
+      if (status && e->data->e_status != status)
+	continue;
+      return s2_remove_event(e);
+    }
+
+    su_root_step(s2base->root, 100);
+  }
+}
+
+int s2_check_event(nua_event_t event, int status)
+{
+  struct event *e = s2_wait_for_event(event, status);
+  s2_free_event(e);
+  return e != NULL;
+}
+
+int s2_check_callstate(enum nua_callstate state)
+{
+  int retval = 0;
+  tagi_t const *tagi;
+  struct event *e;
+
+  e = s2_wait_for_event(nua_i_state, 0);
+  if (e) {
+    tagi = tl_find(e->data->e_tags, nutag_callstate);
+    if (tagi) {
+      retval = (tag_value_t)state == tagi->t_value;
+    }
+  }
+  s2_free_event(e);
+  return retval;
+}
+
+int s2_check_substate(struct event *e, enum nua_substate state)
+{
+  int retval = 0;
+  tagi_t const *tagi;
+
+  tagi = tl_find(e->data->e_tags, nutag_substate);
+  if (tagi) {
+    retval = (tag_value_t)state == tagi->t_value;
+  }
+
+  return retval;
+}
+
+static void
+s2_nua_callback(nua_event_t event,
+		int status, char const *phrase,
+		nua_t *nua, nua_magic_t *_t,
+		nua_handle_t *nh, nua_hmagic_t *hmagic,
+		sip_t const *sip,
+		tagi_t tags[])
+{
+  struct event *e, **prev;
+
+  if (event == nua_i_active || event == nua_i_terminated)
+    return;
+
+  e = calloc(1, sizeof *e);
+  nua_save_event(nua, e->event);
+  e->nh = nua_handle_ref(nh);
+  e->data = nua_event_data(e->event);
+
+  for (prev = &s2->events; *prev; prev = &(*prev)->next)
+    ;
+
+  *prev = e, e->prev = prev;
+}
+
+
+/* ====================================================================== */
+
+SOFIAPUBVAR su_log_t nua_log[];
+SOFIAPUBVAR su_log_t soa_log[];
+SOFIAPUBVAR su_log_t nea_log[];
+SOFIAPUBVAR su_log_t nta_log[];
+SOFIAPUBVAR su_log_t tport_log[];
+SOFIAPUBVAR su_log_t su_log_default[];
+
+void
+s2_setup_logs(int level)
+{
+  su_log_soft_set_level(nua_log, level);
+  su_log_soft_set_level(soa_log, level);
+  su_log_soft_set_level(su_log_default, level);
+  su_log_soft_set_level(nea_log, level);
+  su_log_soft_set_level(nta_log, level);
+  su_log_soft_set_level(tport_log, level);
+}
+
+nua_t *s2_nua_setup(char const *label,
+		    tag_type_t tag, tag_value_t value, ...)
+{
+  ta_list ta;
+
+  s2_setup(label);
+
+  s2 = su_home_new(sizeof *s2);
+
+  s2_dns_setup(s2base->root);
+
+  s2_setup_logs(0);
+  s2_sip_setup("example.org", NULL, TAG_END());
+  assert(s2sip->contact);
+
+  s2_dns_domain("example.org", 1,
+		"s2", 1, s2sip->udp.contact->m_url,
+		"s2", 1, s2sip->tcp.contact->m_url,
+		NULL);
+
+  /* enable/disable multithreading */
+  su_root_threading(s2base->root, s2_nua_thread);
+
+  ta_start(ta, tag, value);
+  s2->nua =
+    nua_create(s2base->root,
+	       s2_nua_callback,
+	       s2,
+	       SIPTAG_FROM_STR("Alice <sip:alice at example.org>"),
+	       /* NUTAG_PROXY((url_string_t *)s2sip->contact->m_url), */
+	       /* Use internal DNS server */
+	       NUTAG_PROXY("sip:example.org"),
+	       /* Force sresolv to use localhost and s2dns as DNS server */
+#if HAVE_WIN32
+	       SRESTAG_RESOLV_CONF("NUL"),
+#else
+	       SRESTAG_RESOLV_CONF("/dev/null"),
+#endif
+	       ta_tags(ta));
+  ta_end(ta);
+
+  return s2->nua;
+}
+
+void
+s2_nua_fast_forward(unsigned long seconds,
+		    su_root_t *steproot)
+{
+  s2_fast_forward(seconds, NULL);
+
+  if (s2_nua_thread)
+    /* Wake up nua thread */
+    nua_handle_by_call_id(s2->nua, NULL);
+
+  if (steproot)
+    su_root_step(steproot, 0);
+}
+
+void s2_nua_teardown(void)
+{
+  if (s2) {
+    struct s2nua *zap = s2;
+    nua_destroy(s2->nua), s2->nua = NULL;
+    s2 = NULL;
+    su_home_unref(zap->home);
+  }
+
+  s2_dns_teardown();
+  s2_sip_teardown();
+  s2_teardown();
+
+}
+
+/* ====================================================================== */
+
+/** Register NUA user.
+ *
+ * <pre>
+ *  A                  B
+ *  |-----REGISTER---->|
+ *  |<-----200 OK------|
+ *  |                  |
+ * </pre>
+ */
+void s2_register_setup(void)
+{
+  nua_handle_t *nh;
+  struct message *m;
+
+  assert(s2 && s2->nua);
+  assert(!s2->registration->nh);
+
+  nh = nua_handle(s2->nua, NULL, TAG_END());
+
+  nua_register(nh, TAG_END());
+
+  m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
+  assert(m);
+
+  s2_save_register(m);
+
+  s2_sip_respond_to(m, NULL,
+		SIP_200_OK,
+		SIPTAG_CONTACT(s2->registration->contact),
+		TAG_END());
+  s2_sip_free_message(m);
+
+  assert(s2->registration->contact != NULL);
+  s2_check_event(nua_r_register, 200);
+
+  s2->registration->nh = nh;
+}
+
+/** Un-register NUA user.
+ *
+ * <pre>
+ *  A                  B
+ *  |-----REGISTER---->|
+ *  |<-----200 OK------|
+ *  |                  |
+ * </pre>
+ */
+void s2_register_teardown(void)
+{
+  if (s2 && s2->registration->nh) {
+    nua_handle_t *nh = s2->registration->nh;
+    struct message *m;
+
+    nua_unregister(nh, TAG_END());
+
+    m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); assert(m);
+    s2_save_register(m);
+    s2_sip_respond_to(m, NULL,
+		  SIP_200_OK,
+		  SIPTAG_CONTACT(s2->registration->contact),
+		  TAG_END());
+    assert(s2->registration->contact == NULL);
+
+    s2_sip_free_message(m);
+
+    s2_check_event(nua_r_unregister, 200);
+
+    nua_handle_destroy(nh);
+    s2->registration->nh = NULL;
+  }
+}
+
+int
+s2_save_register(struct message *rm)
+{
+  sip_contact_t *contact, *m, **m_prev;
+  sip_expires_t const *ex;
+  sip_date_t const *date;
+  sip_time_t now = rm->when.tv_sec, expires;
+
+  msg_header_free_all(s2->home, (msg_header_t *)s2->registration->aor);
+  msg_header_free_all(s2->home, (msg_header_t *)s2->registration->contact);
+  tport_unref(s2->registration->tport);
+
+  s2->registration->aor = NULL;
+  s2->registration->contact = NULL;
+  s2->registration->tport = NULL;
+
+  if (rm == NULL)
+    return 0;
+
+  assert(rm && rm->sip && rm->sip->sip_request);
+  assert(rm->sip->sip_request->rq_method == sip_method_register);
+
+  ex = rm->sip->sip_expires;
+  date = rm->sip->sip_date;
+
+  contact = sip_contact_dup(s2->home, rm->sip->sip_contact);
+
+  for (m_prev = &contact; *m_prev;) {
+    m = *m_prev;
+
+    expires = sip_contact_expires(m, ex, date,
+				  s2_default_registration_duration,
+				  now);
+    if (expires) {
+      char *p = su_sprintf(s2->home, "expires=%lu", (unsigned long)expires);
+      msg_header_add_param(s2->home, m->m_common, p);
+      m_prev = &m->m_next;
+    }
+    else {
+      *m_prev = m->m_next;
+      m->m_next = NULL;
+      msg_header_free(s2->home, (msg_header_t *)m);
+    }
+  }
+
+  if (contact == NULL)
+    return 0;
+
+  s2->registration->aor = sip_to_dup(s2->home, rm->sip->sip_to);
+  s2->registration->contact = contact;
+  s2->registration->tport = tport_ref(rm->tport);
+
+  s2sip->sut.aor = s2->registration->aor;
+  s2sip->sut.contact = s2->registration->contact;
+  s2sip->sut.tport = s2->registration->tport;
+
+  return 0;
+}

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h	Wed Mar  4 14:41:38 2009
@@ -1,5 +1,104 @@
+/*
+ * This file is part of the Sofia-SIP package
+ *
+ * Copyright (C) 2008 Nokia Corporation.
+ *
+ * Contact: Pekka Pessi <pekka.pessi at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
 #ifndef CHECK_NUA_H
 
+#include <sofia-sip/su_wait.h>
+#include <sofia-sip/sip.h>
+#include <sofia-sip/tport.h>
+#include <sofia-sip/nua.h>
+#include <sofia-sip/su_string.h>
+
+#include "s2base.h"
+#include "s2util.h"
+#include "s2sip.h"
+
+struct s2nua
+{
+  su_home_t home[1];
+
+  nua_t *nua;
+
+  int shutdown;
+
+  struct event {
+    struct event *next, **prev;
+    nua_saved_event_t event[1];
+    nua_handle_t *nh;
+    nua_event_data_t const *data;
+    su_time_t when;
+  } *events;
+
+  struct {
+    nua_handle_t *nh;
+    sip_to_t *aor;
+    sip_contact_t *contact;
+    tport_t *tport;
+  } registration[1];
+};
+
+extern unsigned s2_default_registration_duration;
+extern char const s2_auth_digest_str[];
+extern char const s2_auth_credentials[];
+
+extern char const s2_auth2_digest_str[];
+extern char const s2_auth2_credentials[];
+
+extern char const s2_auth3_digest_str[];
+extern char const s2_auth3_credentials[];
+
+extern int s2_nua_thread;
+
+extern struct s2nua *s2;
+
+void s2_setup_logs(int level);
+
+struct event *s2_remove_event(struct event *);
+void s2_free_event(struct event *);
+void s2_flush_events(void);
+
+struct event *s2_next_event(void);
+struct event *s2_wait_for_event(nua_event_t event, int status);
+int s2_check_event(nua_event_t event, int status);
+int s2_check_callstate(enum nua_callstate state);
+int s2_check_substate(struct event *e, enum nua_substate state);
+
+#define SIP_METHOD_UNKNOWN sip_method_unknown, NULL
+
+void s2_flush_all(void);
+
+nua_t *s2_nua_setup(char const *label, tag_type_t tag, tag_value_t value, ...);
+
+void s2_nua_teardown(void);
+
+void s2_nua_fast_forward(unsigned long seconds,
+			 su_root_t *steproot);
+
+int s2_save_register(struct message *m);
+
+void s2_register_setup(void);
+void s2_register_teardown(void);
+
 #include <s2check.h>
 
 void check_session_cases(Suite *suite, int threading);

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c	Wed Mar  4 14:41:38 2009
@@ -33,9 +33,9 @@
 
 #include "config.h"
 
-#include "check_nua.h"
+#undef NDEBUG
 
-#include "test_s2.h"
+#include "check_nua.h"
 
 #include <sofia-sip/sip_status.h>
 #include <sofia-sip/sip_header.h>

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Wed Mar  4 14:41:38 2009
@@ -33,9 +33,9 @@
 
 #include "config.h"
 
-#include "check_nua.h"
+#undef NDEBUG
 
-#include "test_s2.h"
+#include "check_nua.h"
 
 #include <sofia-sip/sip_status.h>
 #include <sofia-sip/sip_header.h>
@@ -1131,7 +1131,11 @@
   s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
   s2_sip_free_message(cancel);
 
-  s2_register_teardown();
+  /* emulate network gone bad below
+     zap registration handle here
+     so that s2_register_teardown() does not hang
+  */
+  s2->registration->nh = NULL;
 
   nua_set_params(s2->nua, NUTAG_SHUTDOWN_EVENTS(1), TAG_END());
   fail_unless(s2_check_event(nua_r_set_params, 200));

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c	Wed Mar  4 14:41:38 2009
@@ -33,9 +33,9 @@
 
 #include "config.h"
 
-#include "check_nua.h"
+#undef NDEBUG
 
-#include "test_s2.h"
+#include "check_nua.h"
 
 #include <sofia-sip/sip_status.h>
 #include <sofia-sip/sip_header.h>


From mikej at freeswitch.org  Wed Mar  4 12:42:54 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 14:42:54 -0600
Subject: [Freeswitch-svn] [commit] r12423 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua-glib/su-glib m4
Message-ID: <E1Lexva-0005IH-2C@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 14:42:53 2009
New Revision: 12423

Log:
Wed Mar  4 13:12:17 CST 2009  Pekka Pessi <first.last at nokia.com>
  * configure: SOFIA_GLIB_CFLAGS added
  Ignore-this: f70baad5a9f61b6fcbe44ec1aa4c2c22
  
  GLib behaves badly with -Wall -Werror.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am
   freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:42:53 2009
@@ -1 +1 @@
-Wed Mar  4 14:40:17 CST 2009
+Wed Mar  4 14:42:12 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am	Wed Mar  4 14:42:53 2009
@@ -12,7 +12,8 @@
 S_BASE = $(top_srcdir)/libsofia-sip-ua
 B_BASE = $(top_builddir)/libsofia-sip-ua
 
-INCLUDES =		-I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS)
+INCLUDES =		-I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \
+			$(SOFIA_GLIB_CFLAGS)
 
 # ----------------------------------------------------------------------
 # Build targets

Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4	(original)
+++ freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4	Wed Mar  4 14:42:53 2009
@@ -122,6 +122,7 @@
 AC_SUBST([CWFLAG], [$ac_cv_cwflag])
 
 AC_ARG_VAR([SOFIA_CFLAGS], [CFLAGS not used during configure])
+AC_ARG_VAR([SOFIA_GLIB_CFLAGS], [Extra CFLAGS for libsofia-sip-ua-glib])
 
 SAC_COVERAGE
 ])


From anthm at freeswitch.org  Wed Mar  4 13:22:41 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 15:22:41 -0600
Subject: [Freeswitch-svn] [commit] r12424 -
	freeswitch/trunk/src/mod/applications/mod_dptools
Message-ID: <E1LeyY5-0005qO-6C@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 15:22:41 2009
New Revision: 12424

Log:
make yes no on and off all work in privacy app

Modified:
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	Wed Mar  4 15:22:41 2009
@@ -968,17 +968,18 @@
 	} else {
 		switch_set_flag(caller_profile, SWITCH_CPF_SCREEN);
 
-		if (!strcasecmp(data, "no")) {
-			switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME);
-			switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER);
-		} else if (!strcasecmp(data, "yes")) {
-			switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);
-		} else if (!strcasecmp(data, "full")) {
+
+		if (!strcasecmp(data, "full")) {
 			switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);
 		} else if (!strcasecmp(data, "name")) {
 			switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME);
 		} else if (!strcasecmp(data, "number")) {
 			switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER);
+		} else if (switch_true(data)) {
+			switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);
+		} else if (switch_false(data)) {
+			switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME);
+			switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER);
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n");
 		}


From mrene at freeswitch.org  Wed Mar  4 14:22:30 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 16:22:30 -0600
Subject: [Freeswitch-svn] [commit] r12425 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LezTy-0006hc-IT@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 16:22:30 2009
New Revision: 12425

Log:
Missed one doc line

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Wed Mar  4 16:22:30 2009
@@ -2240,7 +2240,7 @@
 	const char *usage_string = "USAGE:\n"
 		"--------------------------------------------------------------------------------\n"
 		"sofia help\n"
-		"sofia profile <profile_name> [[start|stop|restart|rescan] [reloadxml]|flush_inbound_reg [<call_id>] [reboot]|[register|unregister] [<gateway name>|all]|killgw <gateway name>|[stun-auto-disable|stun-enabled] [true|false]]\n"
+		"sofia profile <profile_name> [[start|stop|restart|rescan] [reloadxml]|flush_inbound_reg [<call_id>] [reboot]|[register|unregister] [<gateway name>|all]|killgw <gateway name>|[stun-auto-disable|stun-enabled] [true|false]]|siptrace [on|off]\n"
 		"sofia status profile <name> [ reg <contact str> ] | [ pres <pres str> ]\n"
 		"sofia status gateway <name>\n"
 		"sofia loglevel <all|default|tport|iptsec|nea|nta|nth_client|nth_server|nua|soa|sresolv|stun> [0-9]\n"


From anthm at freeswitch.org  Wed Mar  4 14:39:47 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 16:39:47 -0600
Subject: [Freeswitch-svn] [commit] r12426 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1Lezkh-0006nD-VV@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 16:39:47 2009
New Revision: 12426

Log:
FSCORE-310

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	Wed Mar  4 16:39:47 2009
@@ -57,10 +57,14 @@
 	sofia_profile_t *profile = NULL;
 	char *ffrom = NULL;
 	nua_handle_t *msg_nh;
-	char *contact;
+	char *contact = NULL;
 	char *dup = NULL;
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	const char *ct = "text/html";
+	char *clean_to = NULL;
+	char *route = NULL;
+	char *route_uri = NULL;
+	char *ptr = NULL;
 
 	if (!to) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To: header.\n");
@@ -135,19 +139,55 @@
 		switch_safe_free(fp);
 	}
 
-	status = SWITCH_STATUS_SUCCESS;
 	contact = sofia_glue_get_url_from_contact(buf, 1);
+
+	if (contact && (ptr = strstr(contact, ";fs_path=")) && (route = strdup(ptr + 9))) {
+		char *p;
+		for (p = route; p && *p ; p++) {
+			if (*p == '>' || *p == ';') {
+				*p = '\0';
+				break;
+			}
+		}
+		switch_url_decode(route);
+		route_uri = strdup(route);
+		if ((p = strchr(route_uri, ','))) {
+			while ((p > route_uri) && *(p-1) == ' ') {
+				p--;
+			}
+			if (*p) {
+				*p = '\0';
+			}
+		}
+		*ptr++ = '>';	
+		*ptr++ = '\0';	
+	}
+
+	clean_to = strdup(buf);
+	if ((ptr = strstr(clean_to, ";fs_path="))) {
+		*ptr++ = '>';	
+		*ptr++ = '\0';	
+	}
+
+	/* sofia_glue is running sofia_overcome_sip_uri_weakness we do not, not sure if it matters */
+
+	status = SWITCH_STATUS_SUCCESS;
 	/* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */
-	msg_nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(from), NUTAG_URL(contact), SIPTAG_TO_STR(buf),	
-						SIPTAG_CONTACT_STR(profile->url), TAG_END());
+	msg_nh = nua_handle(profile->nua, NULL, TAG_IF(route, NUTAG_PROXY(route_uri)), TAG_IF(route, SIPTAG_ROUTE_STR(route)),
+						SIPTAG_FROM_STR(from), NUTAG_URL(contact),
+						SIPTAG_TO_STR(clean_to), SIPTAG_CONTACT_STR(profile->url),
+						TAG_END());
 
-	switch_safe_free(contact);
 	nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(body), TAG_END());
 
  end:
 
+	switch_safe_free(contact);
+	switch_safe_free(route);
+	switch_safe_free(route_uri);
 	switch_safe_free(ffrom);
 	switch_safe_free(dup);
+	switch_safe_free(clean_to);
 
 	if (profile) {
 		switch_thread_rwlock_unlock(profile->rwlock);


From anthm at freeswitch.org  Wed Mar  4 15:03:25 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 17:03:25 -0600
Subject: [Freeswitch-svn] [commit] r12427 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1Lf07Z-0007Cb-AB@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 17:03:25 2009
New Revision: 12427

Log:
add configurable outgoing cid types

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Wed Mar  4 17:03:25 2009
@@ -2579,6 +2579,7 @@
 		switch_ivr_transfer_variable(session, nsession, "sip_video_fmtp");
 		switch_ivr_transfer_variable(session, nsession, "sip-force-contact");
 		switch_ivr_transfer_variable(session, nsession, "sip_sticky_contact");
+		switch_ivr_transfer_variable(session, nsession, "sip_cid_type");
 
 		if (switch_core_session_compare(session, nsession)) {
 			/* It's another sofia channel! so lets cache what they use as a pt for telephone event so 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	Wed Mar  4 17:03:25 2009
@@ -105,6 +105,7 @@
 #include <sofia-sip/nea.h>
 #include <sofia-sip/msg_addr.h>
 #include <sofia-sip/tport_tag.h>
+#include <sofia-sip/sip_extra.h>
 #include "nua_stack.h"
 
 typedef enum {
@@ -371,6 +372,12 @@
 	MEDIA_OPT_BYPASS_AFTER_ATT_XFER = (1 << 1)
 } sofia_media_options_t;
 
+typedef enum {
+	CID_TYPE_RPID,
+	CID_TYPE_PID,
+	CID_TYPE_NONE
+} sofia_cid_type_t;
+
 struct sofia_profile {
 	int debug;
 	char *name;
@@ -403,6 +410,7 @@
 	char *record_template;
 	char *presence_hosts;
 	char *challenge_realm;
+	sofia_cid_type_t cid_type;
 	sofia_dtmf_t dtmf_type;
 	int auto_restart;
 	int sip_port;
@@ -493,6 +501,9 @@
 	char *contact_url;
 	char *from_str;
 	char *rpid;
+	char *asserted_id;
+	char *preferred_id;
+	char *privacy;
 	char *gateway_from_str;
 	char *rm_encoding;
 	char *iananame;
@@ -825,3 +836,4 @@
  * \return the component's loglevel, or -1 if the component isn't valid
  */
 int sofia_get_loglevel(const char *name);
+sofia_cid_type_t sofia_cid_name2type(const char *name);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Wed Mar  4 17:03:25 2009
@@ -1453,6 +1453,8 @@
 						if (switch_true(val)) {
 							profile->rport_level = 2;
 						}
+					} else if (!strcasecmp(var, "caller-id-type")) {
+						profile->cid_type = sofia_cid_name2type(val);
 					} else if (!strcasecmp(var, "record-template")) {
 						profile->record_template = switch_core_strdup(profile->pool, val);;
 					} else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media"))) {
@@ -1920,6 +1922,8 @@
 						profile->dbname = switch_core_strdup(profile->pool, val);
 					} else if (!strcasecmp(var, "presence-hosts")) {
 						profile->presence_hosts = switch_core_strdup(profile->pool, val);
+					} else if (!strcasecmp(var, "caller-id-type")) {
+						profile->cid_type = sofia_cid_name2type(val);
 					} else if (!strcasecmp(var, "record-template")) {
 						profile->record_template = switch_core_strdup(profile->pool, val);
 					} else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media")) && switch_true(val)) {
@@ -4195,6 +4199,7 @@
 		if (!switch_strlen_zero(rpid->rpid_display)) {
 			displayname = rpid->rpid_display;
 		}
+		switch_channel_set_variable(channel, "sip_cid_type", "rpid");
 	}
 
 	if ((passerted = sip_p_asserted_identity(sip))) {
@@ -4204,6 +4209,7 @@
 		if (!switch_strlen_zero(passerted->paid_display)) {
 			displayname = passerted->paid_display;
 		}
+		switch_channel_set_variable(channel, "sip_cid_type", "pid");
 	}
 
 	if ((ppreferred = sip_p_preferred_identity(sip))) {
@@ -4213,6 +4219,7 @@
 		if (!switch_strlen_zero(ppreferred->ppid_display)) {
 			displayname = ppreferred->ppid_display;
 		}
+		switch_channel_set_variable(channel, "sip_cid_type", "pid");
 	}
 
 	if (from_user) {

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Wed Mar  4 17:03:25 2009
@@ -36,6 +36,7 @@
 #include "mod_sofia.h"
 #include <switch_stun.h>
 
+
 void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *t38_options)
 {
 	char buf[2048];
@@ -1112,6 +1113,7 @@
 	char *route = NULL;
 	char *route_uri = NULL;
 	char *sendto = NULL;
+	sofia_cid_type_t cid_type = tech_pvt->profile->cid_type;
 
 	rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);
 
@@ -1300,23 +1302,54 @@
 			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";
+		if ((val = switch_channel_get_variable(channel, "sip_cid_type"))) {
+			cid_type = sofia_cid_name2type(val);
+		}
+		switch (cid_type) {
+		case CID_TYPE_PID:
+			if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) {
+				tech_pvt->asserted_id = switch_core_session_sprintf(tech_pvt->session, "\"%s\"<sip:%s@%s>",
+																	tech_pvt->caller_profile->caller_id_name,
+																	tech_pvt->caller_profile->caller_id_number, 
+																	rpid_domain);
+			} else {
+				tech_pvt->preferred_id = switch_core_session_sprintf(tech_pvt->session, "\"%s\"<sip:%s@%s>",
+																	 tech_pvt->caller_profile->caller_id_name,
+																	 tech_pvt->caller_profile->caller_id_number, 
+																	 rpid_domain);
+			}
+			
 			if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) {
-				priv = "full";
+				tech_pvt->privacy = "id";
+			} else {
+				tech_pvt->privacy = "none";
 			}
-		} else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) {
-			priv = "full";
-		}
 
-		if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) {
-			screen = "yes";
+			break;
+		case CID_TYPE_RPID:
+			{
+				if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) {
+					priv = "name";
+					if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) {
+						priv = "full";
+					}
+				} else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) {
+					priv = "full";
+				}
+				
+				if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) {
+					screen = "yes";
+				}
+				
+				tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "\"%s\"<sip:%s@%s>;party=calling;screen=%s;privacy=%s",
+															 tech_pvt->caller_profile->caller_id_name,
+															 tech_pvt->caller_profile->caller_id_number, rpid_domain, screen, priv);
+			}
+			break;
+		default:
+			break;
 		}
 
-		tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: \"%s\"<sip:%s@%s>;party=calling;screen=%s;privacy=%s",
-													 tech_pvt->caller_profile->caller_id_name,
-													 tech_pvt->caller_profile->caller_id_number, rpid_domain, screen, priv);
 
 		switch_safe_free(d_url);
 
@@ -1438,7 +1471,10 @@
 			   NUTAG_AUTOANSWER(0),
 			   NUTAG_SESSION_TIMER(session_timeout),
 			   TAG_IF(!switch_strlen_zero(sendto), NTATAG_DEFAULT_PROXY(sendto)),
-			   TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_HEADER_STR(tech_pvt->rpid)),
+			   TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_REMOTE_PARTY_ID_STR(tech_pvt->rpid)),
+			   TAG_IF(!switch_strlen_zero(tech_pvt->preferred_id), SIPTAG_P_PREFERRED_IDENTITY_STR(tech_pvt->preferred_id)),
+			   TAG_IF(!switch_strlen_zero(tech_pvt->asserted_id), SIPTAG_P_ASSERTED_IDENTITY_STR(tech_pvt->asserted_id)),
+			   TAG_IF(!switch_strlen_zero(tech_pvt->privacy), SIPTAG_PRIVACY_STR(tech_pvt->preferred_id)),
 			   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)),
@@ -3557,6 +3593,20 @@
 	return uri;
 }
 
+sofia_cid_type_t sofia_cid_name2type(const char *name)
+{
+	if (!strcasecmp(name, "rpid")) {
+		return CID_TYPE_RPID;
+	}
+
+	if (!strcasecmp(name, "pid")) {
+		return CID_TYPE_PID;
+	}
+
+	return CID_TYPE_NONE;
+	
+}
+
 
 /* For Emacs:
  * Local Variables:


From anthm at freeswitch.org  Wed Mar  4 15:15:13 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 17:15:13 -0600
Subject: [Freeswitch-svn] [commit] r12428 - freeswitch/trunk/src
Message-ID: <E1Lf0Iz-0007HL-M3@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 17:15:13 2009
New Revision: 12428

Log:
FSCORE-320

Modified:
   freeswitch/trunk/src/switch_core_media_bug.c

Modified: freeswitch/trunk/src/switch_core_media_bug.c
==============================================================================
--- freeswitch/trunk/src/switch_core_media_bug.c	(original)
+++ freeswitch/trunk/src/switch_core_media_bug.c	Wed Mar  4 17:15:13 2009
@@ -122,7 +122,7 @@
 		return SWITCH_STATUS_FALSE;
 	}
 	
-	if (!(bug->raw_read_buffer && bug->raw_write_buffer)) {
+	if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel));
 	}
 	
@@ -136,13 +136,15 @@
 	}
 	switch_mutex_unlock(bug->read_mutex);
 	
-	switch_mutex_lock(bug->write_mutex);
-	datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes);
-	if (datalen < bytes) {
-		memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen);
-		datalen = bytes;
+	if (switch_test_flag(bug, SMBF_WRITE_STREAM)) {
+		switch_mutex_lock(bug->write_mutex);
+		datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes);
+		if (datalen < bytes) {
+			memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen);
+			datalen = bytes;
+		}
+		switch_mutex_unlock(bug->write_mutex);
 	}
-	switch_mutex_unlock(bug->write_mutex);
 
 	tp = bug->tmp;
 	dp = (int16_t *) bug->data;


From anthm at freeswitch.org  Wed Mar  4 17:15:17 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 19:15:17 -0600
Subject: [Freeswitch-svn] [commit] r12429 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf2BB-0008Mo-VA@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 19:15:17 2009
New Revision: 12429

Log:
FSCORE-319

Modified:
   freeswitch/trunk/src/include/switch_core.h
   freeswitch/trunk/src/switch_core_media_bug.c
   freeswitch/trunk/src/switch_ivr_async.c

Modified: freeswitch/trunk/src/include/switch_core.h
==============================================================================
--- freeswitch/trunk/src/include/switch_core.h	(original)
+++ freeswitch/trunk/src/include/switch_core.h	Wed Mar  4 19:15:17 2009
@@ -196,6 +196,8 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(_In_ switch_core_session_t *session, _Inout_ switch_media_bug_t **bug);
 
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback);
+
 /*!
   \brief Close and destroy a media bug
   \param bug bug to remove

Modified: freeswitch/trunk/src/switch_core_media_bug.c
==============================================================================
--- freeswitch/trunk/src/switch_core_media_bug.c	(original)
+++ freeswitch/trunk/src/switch_core_media_bug.c	Wed Mar  4 19:15:17 2009
@@ -370,15 +370,7 @@
 	if (session->bugs) {
 		switch_thread_rwlock_wrlock(session->bug_rwlock);
 		for (bp = session->bugs; bp; bp = bp->next) {
-			if (bp->thread_id && bp->thread_id != switch_thread_self()) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n");
-				continue;
-			}
-
-			if (!bp->ready) {
-				continue;
-			}
-			if (bp == *bug) {
+			if ((!bp->thread_id || bp->thread_id == switch_thread_self()) && bp->ready && bp == *bug) {
 				if (last) {
 					last->next = bp->next;
 				} else {
@@ -386,6 +378,7 @@
 				}
 				break;
 			}
+
 			last = bp;
 		}
 		switch_thread_rwlock_unlock(session->bug_rwlock);
@@ -402,6 +395,44 @@
 	return status;
 }
 
+
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback)
+{
+	switch_media_bug_t *cur = NULL, *bp = NULL, *last = NULL;
+	int total = 0;
+
+	if (session->bugs) {
+		switch_thread_rwlock_wrlock(session->bug_rwlock);
+		
+		bp = session->bugs;
+		while (bp) {
+			cur = bp;
+			bp = bp->next;
+
+			if ((!cur->thread_id || cur->thread_id == switch_thread_self()) && cur->ready && cur->callback == callback) {
+				if (last) {
+					last->next = cur->next;
+				} else {
+					session->bugs = cur->next;
+				}
+				if (switch_core_media_bug_close(&cur) == SWITCH_STATUS_SUCCESS) {
+					total++;
+				}
+			} else {
+				last = cur;
+			}
+		}
+		switch_thread_rwlock_unlock(session->bug_rwlock);
+	}
+	
+	if (!session->bugs && session->bug_codec.implementation) {
+		switch_core_codec_destroy(&session->bug_codec);
+		memset(&session->bug_codec, 0, sizeof(session->bug_codec));
+	}
+
+	return total ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Wed Mar  4 19:15:17 2009
@@ -424,23 +424,31 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
+struct record_helper {
+	char *file;
+	switch_file_handle_t *fh;
+};
+
 static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
 {
-	switch_file_handle_t *fh = (switch_file_handle_t *) user_data;
+	switch_core_session_t *session = switch_core_media_bug_get_session(bug);
+	switch_channel_t *channel = switch_core_session_get_channel(session);
+	struct record_helper *rh = (struct record_helper *) user_data;
 
 	switch (type) {
 	case SWITCH_ABC_TYPE_INIT:
 		break;
 	case SWITCH_ABC_TYPE_CLOSE:
-		if (fh) {
-			switch_core_file_close(fh);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file);
+		switch_channel_set_private(channel, rh->file, NULL);
+		
+		if (rh->fh) {
+			switch_core_file_close(rh->fh);
 		}
 		break;
 	case SWITCH_ABC_TYPE_READ_PING:
-		if (fh) {
+		if (rh->fh) {
 			switch_size_t len;
-			switch_core_session_t *session = switch_core_media_bug_get_session(bug);
-			switch_channel_t *channel = switch_core_session_get_channel(session);
 			uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
 			switch_frame_t frame = { 0 };
 			
@@ -455,7 +463,7 @@
 
 				if (doit) {
 					len = (switch_size_t) frame.datalen / 2;
-					switch_core_file_write(fh, data, &len);
+					switch_core_file_write(rh->fh, data, &len);
 				}
 			}
 		}
@@ -473,8 +481,9 @@
 	switch_media_bug_t *bug;
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 
-	if ((bug = switch_channel_get_private(channel, file))) {
-		switch_channel_set_private(channel, file, NULL);
+	if (!strcasecmp(file, "all")) {
+		return switch_core_media_bug_remove_callback(session, record_callback);
+	} else if ((bug = switch_channel_get_private(channel, file))) {
 		switch_core_media_bug_remove(session, &bug);
 		return SWITCH_STATUS_SUCCESS;
 	}
@@ -838,6 +847,8 @@
 	switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_PING;
 	uint8_t channels;
 	switch_codec_implementation_t read_impl = {0};
+	struct record_helper *rh = NULL;
+
     switch_core_session_get_read_impl(session, &read_impl);
 
 	if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) {
@@ -925,7 +936,11 @@
 		to = switch_epoch_time_now(NULL) + limit;
 	}
 
-	if ((status = switch_core_media_bug_add(session, record_callback, fh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) {
+	rh = switch_core_session_alloc(session, sizeof(*rh));
+	rh->fh = fh;
+	rh->file = switch_core_session_strdup(session, file);
+
+	if ((status = switch_core_media_bug_add(session, record_callback, rh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file);
 		switch_core_file_close(fh);
 		return status;


From mrene at freeswitch.org  Wed Mar  4 18:46:00 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 20:46:00 -0600
Subject: [Freeswitch-svn] [commit] r12430 - freeswitch/trunk/src
Message-ID: <E1Lf3ay-00010V-NJ@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 20:46:00 2009
New Revision: 12430

Log:
Don't crash in the odd event you have no modules loaded

Modified:
   freeswitch/trunk/src/switch_loadable_module.c

Modified: freeswitch/trunk/src/switch_loadable_module.c
==============================================================================
--- freeswitch/trunk/src/switch_loadable_module.c	(original)
+++ freeswitch/trunk/src/switch_loadable_module.c	Wed Mar  4 20:46:00 2009
@@ -1266,6 +1266,10 @@
 	switch_hash_index_t *hi;
 	void *val;
 	switch_loadable_module_t *module;
+	
+	if (!loadable_modules.module_hash) {
+		return;
+	}
 
 	for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) {
 		switch_hash_this(hi, NULL, NULL, &val);


From anthm at freeswitch.org  Wed Mar  4 19:08:15 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 21:08:15 -0600
Subject: [Freeswitch-svn] [commit] r12431 - freeswitch/trunk/src
Message-ID: <E1Lf3wV-0001Ox-87@svn.freeswitch.org>

Author: anthm
Date: Wed Mar  4 21:08:15 2009
New Revision: 12431

Log:
MODLANG-100

Modified:
   freeswitch/trunk/src/switch_ivr_play_say.c

Modified: freeswitch/trunk/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_play_say.c	(original)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	Wed Mar  4 21:08:15 2009
@@ -1446,7 +1446,7 @@
 	switch_input_args_t args = { 0 };
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	char terminator;
-	size_t len;
+	size_t len = 0;
 
 	switch_assert(session);
 
@@ -1510,6 +1510,10 @@
 	
  end:
 
+	if (max_digits == 1 && len == 1 && valid_terminators && strchr(valid_terminators, *digit_buffer)) {
+		*digit_buffer = '\0';
+	}
+
 	if (var_name && !switch_strlen_zero(digit_buffer)) {
 		switch_channel_set_variable(channel, var_name, digit_buffer);
 	}


From mrene at freeswitch.org  Wed Mar  4 19:09:31 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 21:09:31 -0600
Subject: [Freeswitch-svn] [commit] r12432 - in freeswitch/trunk: . src
	src/include
Message-ID: <E1Lf3xj-0001Qt-Px@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 21:09:31 2009
New Revision: 12432

Log:
Generic config parser

Added:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c
Modified:
   freeswitch/trunk/Makefile.am

Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am	(original)
+++ freeswitch/trunk/Makefile.am	Wed Mar  4 21:09:31 2009
@@ -91,6 +91,7 @@
 src/switch_stun.c\
 src/switch_log.c\
 src/switch_xml.c\
+src/switch_xml_config.c\
 src/switch_config.c\
 src/switch_time.c\
 libs/stfu/stfu.c\
@@ -132,6 +133,7 @@
 src/include/switch_stun.h\
 src/include/switch_log.h\
 src/include/switch_xml.h\
+src/include/switch_xml_config.h\
 src/include/switch_cpp.h\
 libs/libteletone/src/libteletone_detect.h\
 libs/libteletone/src/libteletone_generate.h\

Added: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 21:09:31 2009
@@ -0,0 +1,85 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm at freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm at freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Rene <mathieu.rene at gmail.com>
+ *
+ *
+ * switch_xml_config.h - Generic configuration parser
+ *
+ */
+
+#ifndef SWITCH_XML_CONFIG_H
+#define SWITCH_XML_CONFIG_H
+
+/*! \brief Type of value to parse */
+typedef enum {
+	SWITCH_CONFIG_INT,		/*< (ptr=int* default=int data=NULL) Integer */
+	SWITCH_CONFIG_STRING, 	/*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */
+	SWITCH_CONFIG_YESNO, 	/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
+	SWITCH_CONFIG_CUSTOM, 	/*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer  */
+	SWITCH_CONFIG_ENUM, 	/*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */
+	SWITCH_CONFIG_FLAG,		/*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */
+	SWITCH_CONFIG_FLAGARRAY,/*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */
+	
+	/* No more past that line */
+	SWITCH_CONFIG_LAST
+} switch_xml_config_type_t;
+
+typedef struct {
+	char *key;				/*< The item's key or NULL if this is the last one in the list */
+	int value;				/*< The item's value */
+} switch_xml_config_enum_item_t;
+
+typedef struct {
+	switch_memory_pool_t *pool; /*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/
+	int length;					/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
+} switch_xml_config_string_options_t;
+
+/*!
+ * \brief A configuration instruction read by switch_xml_config_parse 
+*/
+typedef struct {
+	char *key;					/*< The key of the element, or NULL to indicate the end of the list */
+	switch_xml_config_type_t type; 	/*< The type of variable */
+	switch_bool_t reloadable; 	/*< True if the var can be changed on reload */
+	void *ptr;					/*< Ptr to the var to be changed */
+	void *defaultvalue; 		/*< Default value */
+	void *data; 				/*< Custom data (depending on the type) */
+} switch_xml_config_item_t;
+
+typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data);
+
+#define SWITCH_CONFIG_END { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL }
+
+/*! 
+ * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t 
+ * \param xml The first element of the list to parse
+ * \param reload true to skip all non-reloadable options
+ * \param options instrutions on how to parse the elements
+ * \see switch_xml_config_item_t
+ */
+switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options);
+
+#endif /* !defined(SWITCH_XML_CONFIG_H) */
\ No newline at end of file

Added: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 21:09:31 2009
@@ -0,0 +1,221 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm at freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Mathieu Rene <mathieu.rene at gmail.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Rene <mathieu.rene at gmail.com>
+ *
+ *
+ * switch_xml_config.c - Generic configuration parser
+ *
+ */
+
+#include <stdio.h>
+#include <switch.h>
+
+switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options)
+{
+	switch_xml_config_item_t *item;
+	switch_xml_t node;
+	switch_event_t *event;
+	switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS);
+	switch_assert(event);
+	int file_count = 0, 
+
+	for (node = xml; node; node = node->next) {
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, switch_xml_attr_soft(node, "name"); switch_xml_attr_soft(node, "value"));
+	}
+	
+	for (item = options; item->key; item++) {
+		const char *value = switch_event_get_header(event, item->key);
+		
+		if (reload && !item->reloadable) {
+			continue;
+		}
+		
+		switch(item->type) {
+			case SWITCH_CONFIG_INT:
+				{
+					int *dest = (int*)item->ptr;
+					if (value) {
+						if (switch_is_number(value)) {
+							*dest = atoi(value);
+						} else {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", 
+								value, item->key);
+							*dest = (int)item->defaultvalue;
+						}
+					} else {
+						*dest = (int)item->defaultvalue;
+					}
+				}
+				break;
+			case SWITCH_CONFIG_STRING:
+				{
+					switch_xml_config_string_options_t *options = (switch_xml_config_string_options_t*)item->data;
+					if (options->length > 0) {
+						/* We have a preallocated buffer */
+						char *dest = (char*)item->ptr;
+						strncpy(dest, value, options->length);
+					} else {
+						char **dest = (char**)item->ptr;
+						if (options->pool) {
+							*dest = switch_core_strdup(options->pool, value);
+						} else {
+							switch_safe_free(*dest); /* Free the destination if its not NULL */
+							*dest = strdup(value);
+						}
+					}
+				}
+				break;
+			case SWITCH_CONFIG_YESNO:
+				{
+					switch_bool_t *dest = (switch_bool_t*)item->ptr;
+					if (value) {
+						*dest = !!switch_true(value);
+					} else {
+						*dest = (switch_bool_t)item->defaultvalue;
+					}
+				}
+				break;
+			case SWITCH_CONFIG_CUSTOM: 
+				{
+					switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->data;
+					callback(item);
+				}
+				break;
+			case SWITCH_CONFIG_ENUM:
+				{
+					switch_xml_config_enum_item_t *options = (switch_xml_config_enum_item_t*)item->data;
+					int *dest = (int*)item->ptr;
+					
+					if (value) {
+						for (;options->key; options++) {
+							if (!strcasecmp(value, options->key)) {
+								*dest = options->value;
+								break;
+							}
+						}
+					
+						if (!options->key) { /* if (!found) */
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", 
+								value, item->key);
+						}
+					} else {
+						*dest = (int)item->defaultvalue;
+					}
+				}
+				break;
+			case SWITCH_CONFIG_FLAG:
+				{
+					int32_t *dest = (int32_t*)item->ptr;
+					int index = (int)item->data;
+					if (value) {
+						if (switch_true(value)) {
+							*dest |= (1 << index);
+						} else {
+							*dest &= ~(1 << index);
+						}
+					} else {
+						if ((switch_bool_t)item->defaultvalue) {
+							*dest |= (1 << index);
+						} else {
+							*dest &= ~(1 << index);
+						}
+					}
+				}
+				break;
+			case SWITCH_CONFIG_FLAGARRAY:
+				{
+					int8_t *dest = (int8_t*)item->ptr;
+					int index = (int)item->data;
+					if (value) {
+						dest[index] = !!switch_true(value);						
+					} else {
+						dest[index] = (int8_t)((int32_t)item->defaultvalue);
+					}
+				}
+				break;
+			case SWITCH_CONFIG_LAST:
+				break;
+		}
+	}
+	
+	switch_event_destroy(&event);
+	
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
+#if 0
+typedef enum {
+	MYENUM_TEST1 = 1,
+	MYENUM_TEST2 = 2,
+	MYENUM_TEST3 = 3
+} myenum_t;
+
+static struct {
+	char *stringalloc;
+	char string[50];
+	myenum_t enumm;
+	int yesno;
+	
+} globals;
+
+
+void switch_xml_config_test()
+{
+	char *cf = "test.conf";
+	switch_xml_t cfg, xml, settings;
+	switch_xml_config_string_options_t config_opt_stringalloc = { NULL, 0 }; /* No pool, use strdup */
+	switch_xml_config_string_options_t config_opt_buffer = { NULL, 50 }; 	/* No pool, use current var as buffer */
+	switch_xml_config_enum_item_t enumm_options[] = { 
+		{ "test1", MYENUM_TEST1 },
+		{ "test2", MYENUM_TEST2 },
+		{ "test3", MYENUM_TEST3 },
+		{ NULL, 0 } 
+	};
+	
+	switch_xml_config_item_t instructions[] = {
+			{ "db_host", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.stringalloc, "blah", &config_opt_stringalloc },
+			{ "db_user", SWITCH_CONFIG_STRING, SWITCH_TRUE, globals.string, 	  "dflt", &config_opt_buffer },
+			{ "test",	 SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm,  (void*)MYENUM_TEST1, enumm_options },
+			SWITCH_CONFIG_END
+	};
+
+	if (!(xml = switch_xml_open_cfg("blaster.conf", &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open %s\n", cf);
+		return;
+	}
+
+	if ((settings = switch_xml_child(cfg, "settings"))) {
+		if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) {
+			printf("YAY!\n");
+		}
+	}
+	
+	if (cfg) {
+		switch_xml_free(cfg);
+	}
+}
+#endif


From brian at freeswitch.org  Wed Mar  4 19:12:28 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 21:12:28 -0600
Subject: [Freeswitch-svn] [commit] r12433 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf40a-0001Te-Bx@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 21:12:28 2009
New Revision: 12433

Log:
 me being all OCD

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 21:12:28 2009
@@ -82,4 +82,15 @@
  */
 switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options);
 
-#endif /* !defined(SWITCH_XML_CONFIG_H) */
\ No newline at end of file
+#endif /* !defined(SWITCH_XML_CONFIG_H) */
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 21:12:28 2009
@@ -219,3 +219,14 @@
 	}
 }
 #endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */


From mrene at freeswitch.org  Wed Mar  4 19:24:29 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 21:24:29 -0600
Subject: [Freeswitch-svn] [commit] r12434 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf4CD-0001YD-TW@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 21:24:29 2009
New Revision: 12434

Log:
Immediate Post-Commit Omission Finding Syndrome

Modified:
   freeswitch/trunk/src/include/switch.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch.h
==============================================================================
--- freeswitch/trunk/src/include/switch.h	(original)
+++ freeswitch/trunk/src/include/switch.h	Wed Mar  4 21:24:29 2009
@@ -115,6 +115,7 @@
 #include "switch_rtp.h"
 #include "switch_log.h"
 #include "switch_xml.h"
+#include "switch_xml_config.h"
 #include "switch_core_event_hook.h"
 #include "switch_scheduler.h"
 #include "switch_config.h"

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 21:24:29 2009
@@ -30,7 +30,6 @@
  *
  */
 
-#include <stdio.h>
 #include <switch.h>
 
 switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options)


From mrene at freeswitch.org  Wed Mar  4 19:30:48 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 21:30:48 -0600
Subject: [Freeswitch-svn] [commit] r12435 - freeswitch/trunk/src
Message-ID: <E1Lf4IK-0001s6-AO@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 21:30:48 2009
New Revision: 12435

Log:
oops

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 21:30:48 2009
@@ -39,10 +39,11 @@
 	switch_event_t *event;
 	switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS);
 	switch_assert(event);
-	int file_count = 0, 
+	int file_count = 0, matched_count = 0;
 
 	for (node = xml; node; node = node->next) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, switch_xml_attr_soft(node, "name"); switch_xml_attr_soft(node, "value"));
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, switch_xml_attr_soft(node, "name"), switch_xml_attr_soft(node, "value"));
+		file_count++;
 	}
 	
 	for (item = options; item->key; item++) {
@@ -98,10 +99,13 @@
 				}
 				break;
 			case SWITCH_CONFIG_CUSTOM: 
+#if 0
 				{
+					
 					switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->data;
 					callback(item);
 				}
+#endif
 				break;
 			case SWITCH_CONFIG_ENUM:
 				{
@@ -160,6 +164,10 @@
 		}
 	}
 	
+	if (file_count > matched_count) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Config file had %d params but only %d were valid\n", file_count, matched_count);
+	}
+	
 	switch_event_destroy(&event);
 	
 	return SWITCH_STATUS_SUCCESS;


From brian at freeswitch.org  Wed Mar  4 20:04:41 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:04:41 -0600
Subject: [Freeswitch-svn] [commit] r12436 - freeswitch/trunk/src
Message-ID: <E1Lf4p7-00022j-Ct@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 22:04:41 2009
New Revision: 12436

Log:
 wanna talk about OCD

Modified:
   freeswitch/trunk/src/switch_xml.c

Modified: freeswitch/trunk/src/switch_xml.c
==============================================================================
--- freeswitch/trunk/src/switch_xml.c	(original)
+++ freeswitch/trunk/src/switch_xml.c	Wed Mar  4 22:04:41 2009
@@ -73,27 +73,27 @@
 } glob_t;
 
 /* Believed to have been introduced in 1003.2-1992 */
-#define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
-#define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
-#define	GLOB_ERR	0x0004	/* Return on error. */
-#define	GLOB_MARK	0x0008	/* Append / to matching directories. */
+#define	GLOB_APPEND		0x0001	/* Append to output from previous call. */
+#define	GLOB_DOOFFS		0x0002	/* Use gl_offs. */
+#define	GLOB_ERR		0x0004	/* Return on error. */
+#define	GLOB_MARK		0x0008	/* Append / to matching directories. */
 #define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
-#define	GLOB_NOSORT	0x0020	/* Don't sort. */
+#define	GLOB_NOSORT		0x0020	/* Don't sort. */
 
 /* Error values returned by glob(3) */
 #define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
 #define	GLOB_ABORTED	(-2)	/* Unignored error. */
 #define	GLOB_NOMATCH	(-3)	/* No match and GLOB_NOCHECK was not set. */
-#define	GLOB_NOSYS	(-4)	/* Obsolete: source comptability only. */
+#define	GLOB_NOSYS		(-4)	/* Obsolete: source comptability only. */
 
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
 #define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
-#define	GLOB_LIMIT	0x1000	/* limit number of returned paths */
+#define	GLOB_QUOTE		0x0400	/* Quote special chars with \. */
+#define	GLOB_LIMIT		0x1000	/* limit number of returned paths */
 
 int	glob(const char *, int, int (*)(const char *, int), glob_t *);
-void	globfree(glob_t *);
+void globfree(glob_t *);
 
 #endif
 #undef HAVE_MMAP
@@ -104,29 +104,29 @@
 #endif
 #endif
 
-#define SWITCH_XML_WS   "\t\r\n "	// whitespace
-#define SWITCH_XML_ERRL 128		// maximum error string length
+#define SWITCH_XML_WS   "\t\r\n "	/* whitespace */
+#define SWITCH_XML_ERRL 128			/* maximum error string length */
 
 static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel);
 
 typedef struct switch_xml_root *switch_xml_root_t;
-struct switch_xml_root {		// additional data for the root tag
-	struct switch_xml xml;		// is a super-struct built on top of switch_xml struct
-	switch_xml_t cur;			// current xml tree insertion point
-	char *m;					// original xml string
-	switch_size_t len;			// length of allocated memory for mmap
+struct switch_xml_root {		/* additional data for the root tag */
+	struct switch_xml xml;		/* is a super-struct built on top of switch_xml struct */
+	switch_xml_t cur;			/* current xml tree insertion point */
+	char *m;					/* original xml string */
+	switch_size_t len;			/* length of allocated memory for mmap */
 	uint8_t dynamic;
-	char *u;					// UTF-8 conversion of string if original was UTF-16
-	char *s;					// start of work area
-	char *e;					// end of work area
-	char **ent;					// general entities (ampersand sequences)
-	char ***attr;				// default attributes
-	char ***pi;					// processing instructions
-	short standalone;			// non-zero if <?xml standalone="yes"?>
-	char err[SWITCH_XML_ERRL];	// error string
+	char *u;					/* UTF-8 conversion of string if original was UTF-16 */
+	char *s;					/* start of work area */
+	char *e;					/* end of work area */
+	char **ent;					/* general entities (ampersand sequences) */
+	char ***attr;				/* default attributes */
+	char ***pi;					/* processing instructions */
+	short standalone;			/* non-zero if <?xml standalone="yes"?> */
+	char err[SWITCH_XML_ERRL];	/* error string */
 };
 
-char *SWITCH_XML_NIL[] = { NULL };	// empty, null terminated array of strings
+char *SWITCH_XML_NIL[] = { NULL };	/* empty, null terminated array of strings */
 
 struct switch_xml_binding {
 	switch_xml_search_function_t function;
@@ -147,7 +147,7 @@
 
 struct xml_section_t {
 	const char *name;
-	//switch_xml_section_t section;
+	/* switch_xml_section_t section; */
 	uint32_t section;
 };
 
@@ -164,7 +164,7 @@
 {
 	size_t x;
 	char buf[1024] = "";
-	//switch_xml_section_t sections = SWITCH_XML_SECTION_RESULT;
+	/*switch_xml_section_t sections = SWITCH_XML_SECTION_RESULT; */
 	uint32_t sections = SWITCH_XML_SECTION_RESULT;
 	
 	if (str) {
@@ -251,8 +251,9 @@
 	return binding->user_data;
 }
 
-
-SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function_ret(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data, switch_xml_binding_t **ret_binding)
+SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function_ret(switch_xml_search_function_t function,
+																	switch_xml_section_t sections, void *user_data,
+																	switch_xml_binding_t **ret_binding)
 {
 	switch_xml_binding_t *binding = NULL, *ptr = NULL;
 	assert(function != NULL);
@@ -357,7 +358,7 @@
 	return p;
 }
 
-// returns the first child tag with the given name or NULL if not found
+/* returns the first child tag with the given name or NULL if not found */
 SWITCH_DECLARE(switch_xml_t) switch_xml_child(switch_xml_t xml, const char *name)
 {
 	xml = (xml) ? xml->child : NULL;
@@ -366,8 +367,7 @@
 	return xml;
 }
 
-// returns the Nth tag with the same name in the same subsection or NULL if not
-// found
+/* returns the Nth tag with the same name in the same subsection or NULL if not found */
 switch_xml_t switch_xml_idx(switch_xml_t xml, int idx)
 {
 	for (; xml && idx; idx--)
@@ -375,7 +375,7 @@
 	return xml;
 }
 
-// returns the value of the requested tag attribute or "" if not found
+/* returns the value of the requested tag attribute or "" if not found */
 SWITCH_DECLARE(const char *) switch_xml_attr_soft(switch_xml_t xml, const char *attr)
 {
 	const char *ret = switch_xml_attr(xml, attr);
@@ -383,7 +383,7 @@
 	return ret ? ret : "";
 }
 
-// returns the value of the requested tag attribute or NULL if not found
+/* returns the value of the requested tag attribute or NULL if not found */
 SWITCH_DECLARE(const char *) switch_xml_attr(switch_xml_t xml, const char *attr)
 {
 	int i = 0, j = 1;
@@ -394,19 +394,19 @@
 	while (xml->attr[i] && strcmp(attr, xml->attr[i]))
 		i += 2;
 	if (xml->attr[i])
-		return xml->attr[i + 1];	// found attribute
+		return xml->attr[i + 1];	/* found attribute */
 
 	while (root->xml.parent)
-		root = (switch_xml_root_t) root->xml.parent;	// root tag
+		root = (switch_xml_root_t) root->xml.parent;	/* root tag */
 	for (i = 0; root->attr[i] && strcmp(xml->name, root->attr[i][0]); i++);
 	if (!root->attr[i])
-		return NULL;			// no matching default attributes
+		return NULL;			/* no matching default attributes */
 	while (root->attr[i][j] && strcmp(attr, root->attr[i][j]))
 		j += 3;
-	return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL;	// found default
+	return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL;	/* found default */
 }
 
-// same as switch_xml_get but takes an already initialized va_list
+/* same as switch_xml_get but takes an already initialized va_list */
 static switch_xml_t switch_xml_vget(switch_xml_t xml, va_list ap)
 {
 	char *name = va_arg(ap, char *);
@@ -419,12 +419,12 @@
 	return (idx < 0) ? xml : switch_xml_vget(switch_xml_idx(xml, idx), ap);
 }
 
-// Traverses the xml tree to retrieve a specific subtag. Takes a variable
-// length list of tag names and indexes. The argument list must be terminated
-// by either an index of -1 or an empty string tag name. Example: 
-// title = switch_xml_get(library, "shelf", 0, "book", 2, "title", -1);
-// This retrieves the title of the 3rd book on the 1st shelf of library.
-// Returns NULL if not found.
+/* Traverses the xml tree to retrieve a specific subtag. Takes a variable
+   length list of tag names and indexes. The argument list must be terminated
+   by either an index of -1 or an empty string tag name. Example: 
+   title = switch_xml_get(library, "shelf", 0, "book", 2, "title", -1);
+   This retrieves the title of the 3rd book on the 1st shelf of library.
+   Returns NULL if not found. */
 SWITCH_DECLARE(switch_xml_t) switch_xml_get(switch_xml_t xml,...)
 {
 	va_list ap;
@@ -436,8 +436,7 @@
 	return r;
 }
 
-// returns a null terminated array of processing instructions for the given
-// target
+/* returns a null terminated array of processing instructions for the given target */
 SWITCH_DECLARE(const char **) switch_xml_pi(switch_xml_t xml, const char *target)
 {
 	switch_xml_root_t root = (switch_xml_root_t) xml;
@@ -446,13 +445,13 @@
 	if (!root)
 		return (const char **) SWITCH_XML_NIL;
 	while (root->xml.parent)
-		root = (switch_xml_root_t) root->xml.parent;	// root tag
+		root = (switch_xml_root_t) root->xml.parent;	/* root tag */
 	while (root->pi[i] && strcmp(target, root->pi[i][0]))
-		i++;					// find target
+		i++;					/* find target */
 	return (const char **) ((root->pi[i]) ? root->pi[i] + 1 : SWITCH_XML_NIL);
 }
 
-// set an error string and return root
+/* set an error string and return root */
 static switch_xml_t switch_xml_err(switch_xml_root_t root, char *s, const char *err, ...)
 {
 	va_list ap;
@@ -471,18 +470,18 @@
 	return &root->xml;
 }
 
-// Recursively decodes entity and character references and normalizes new lines
-// ent is a null terminated array of alternating entity names and values. set t
-// to '&' for general entity decoding, '%' for parameter entity decoding, 'c'
-// for cdata sections, ' ' for attribute normalization, or '*' for non-cdata
-// attribute normalization. Returns s, or if the decoded string is longer than
-// s, returns a malloced string that must be freed.
+/* Recursively decodes entity and character references and normalizes new lines
+   ent is a null terminated array of alternating entity names and values. set t
+   to '&' for general entity decoding, '%' for parameter entity decoding, 'c'
+   for cdata sections, ' ' for attribute normalization, or '*' for non-cdata
+   attribute normalization. Returns s, or if the decoded string is longer than
+   s, returns a malloced string that must be freed. */
 static char *switch_xml_decode(char *s, char **ent, char t)
 {
 	char *e, *r = s, *m = s;
 	long b, c, d, l;
 
-	for (; *s; s++) {			// normalize line endings
+	for (; *s; s++) {	/* normalize line endings */
 		while (*s == '\r') {
 			*(s++) = '\n';
 			if (*s == '\n')
@@ -496,34 +495,34 @@
 
 		if (!*s)
 			break;
-		else if (t != 'c' && !strncmp(s, "&#", 2)) {	// character reference
+		else if (t != 'c' && !strncmp(s, "&#", 2)) {	/* character reference */
 			if (s[2] == 'x')
-				c = strtol(s + 3, &e, 16);	// base 16
+				c = strtol(s + 3, &e, 16);	/* base 16 */
 			else
-				c = strtol(s + 2, &e, 10);	// base 10
+				c = strtol(s + 2, &e, 10);	/* base 10 */
 			if (!c || *e != ';') {
 				s++;
 				continue;
-			}					// not a character ref
+			}					/* not a character ref */
 
 			if (c < 0x80)
-				*(s++) = (char) c;	// US-ASCII subset
-			else {				// multi-byte UTF-8 sequence
+				*(s++) = (char) c;	/* US-ASCII subset */
+			else {					/* multi-byte UTF-8 sequence */
 				for (b = 0, d = c; d; d /= 2)
-					b++;		// number of bits in c
-				b = (b - 2) / 5;	// number of bytes in payload
-				*(s++) = (char) ((0xFF << (7 - b)) | (c >> (6 * b)));	// head
+					b++;			/* number of bits in c */
+				b = (b - 2) / 5;	/* number of bytes in payload */
+				*(s++) = (char) ((0xFF << (7 - b)) | (c >> (6 * b)));	/* head */
 				while (b)
-					*(s++) = (char) (0x80 | ((c >> (6 * --b)) & 0x3F));	// payload
+					*(s++) = (char) (0x80 | ((c >> (6 * --b)) & 0x3F));	/* payload */
 			}
 
 			memmove(s, strchr(s, ';') + 1, strlen(strchr(s, ';')));
-		} else if ((*s == '&' && (t == '&' || t == ' ' || t == '*')) || (*s == '%' && t == '%')) {	// entity reference
-			for (b = 0; ent[b] && strncmp(s + 1, ent[b], strlen(ent[b])); b += 2);	// find entity in entity list
+		} else if ((*s == '&' && (t == '&' || t == ' ' || t == '*')) || (*s == '%' && t == '%')) {	/* entity reference */
+			for (b = 0; ent[b] && strncmp(s + 1, ent[b], strlen(ent[b])); b += 2);	/* find entity in entity list */
 
-			if (ent[b++]) {		// found a match
+			if (ent[b++]) {		/* found a match */
 				if ((c = (long) strlen(ent[b])) - 1 > (e = strchr(s, ';')) - s) {
-					l = (d = (long) (s - r)) + c + (long) strlen(e);	// new length
+					l = (d = (long) (s - r)) + c + (long) strlen(e);	/* new length */
 					if (l) {
 						if (r == m) {
 							char *tmp = (char *)malloc(l);
@@ -543,20 +542,20 @@
 							}
 						}
 					}
-					e = strchr((s = r + d), ';');	// fix up pointers
+					e = strchr((s = r + d), ';');	/* fix up pointers */
 				}
 
-				memmove(s + c, e + 1, strlen(e));	// shift rest of string
-				strncpy(s, ent[b], c);	// copy in replacement text
+				memmove(s + c, e + 1, strlen(e));	/* shift rest of string */
+				strncpy(s, ent[b], c);	/* copy in replacement text */
 			} else
-				s++;			// not a known entity
+				s++;			/* not a known entity */
 		} else if ((t == ' ' || t == '*') && isspace((int) (*s)))
 			*(s++) = ' ';
 		else
-			s++;				// no decoding needed
+			s++;				/* no decoding needed */
 	}
 
-	if (t == '*') {				// normalize spaces for non-cdata attributes
+	if (t == '*') {				/* normalize spaces for non-cdata attributes */
 		for (s = r; *s; s++) {
 			if ((l = (long) strspn(s, " ")))
 				memmove(s, s + l, strlen(s + l) + 1);
@@ -564,12 +563,12 @@
 				s++;
 		}
 		if (--s >= r && *s == ' ')
-			*s = '\0';			// trim any trailing space
+			*s = '\0';			/* trim any trailing space */
 	}
 	return r;
 }
 
-// called when parser finds start of new tag
+/* called when parser finds start of new tag */
 static void switch_xml_open_tag(switch_xml_root_t root, char *name, char **attr)
 {
 	switch_xml_t xml = root->cur;
@@ -577,13 +576,13 @@
 	if (xml->name)
 		xml = switch_xml_add_child(xml, name, strlen(xml->txt));
 	else
-		xml->name = name;		// first open tag
+		xml->name = name;		/* first open tag */
 
 	xml->attr = attr;
-	root->cur = xml;			// update tag insertion point
+	root->cur = xml;			/* update tag insertion point */
 }
 
-// called when parser finds character content between open and closing tag
+/* called when parser finds character content between open and closing tag */
 static void switch_xml_char_content(switch_xml_root_t root, char *s, switch_size_t len, char t)
 {
 	switch_xml_t xml = root->cur;
@@ -591,15 +590,15 @@
 	switch_size_t l;
 
 	if (!xml || !xml->name || !len)
-		return;					// sanity check
+		return;					/* sanity check */
 
-	s[len] = '\0';				// null terminate text (calling functions anticipate this)
+	s[len] = '\0';				/* null terminate text (calling functions anticipate this) */
 	len = strlen(s = switch_xml_decode(s, root->ent, t)) + 1;
 
 	if (!*(xml->txt))
-		xml->txt = s;			// initial character content
-	else {						// allocate our own memory and make a copy
-		if ((xml->flags & SWITCH_XML_TXTM)) { // allocate some space
+		xml->txt = s;			/* initial character content */
+	else {						/* allocate our own memory and make a copy */
+		if ((xml->flags & SWITCH_XML_TXTM)) { /* allocate some space */
 			char *tmp = (char *)realloc(xml->txt, (l = strlen(xml->txt)) + len);
 			if (tmp) {
 				xml->txt = tmp;
@@ -614,16 +613,16 @@
 				return;
 			}
 		}
-		strcpy(xml->txt + l, s);	// add new char content
+		strcpy(xml->txt + l, s);	/* add new char content */
 		if (s != m)
-			free(s);			// free s if it was malloced by switch_xml_decode()
+			free(s);			/* free s if it was malloced by switch_xml_decode() */
 	}
 
 	if (xml->txt != m)
 		switch_xml_set_flag(xml, SWITCH_XML_TXTM);
 }
 
-// called when parser finds closing tag
+/* called when parser finds closing tag */
 static switch_xml_t switch_xml_close_tag(switch_xml_root_t root, char *name, char *s)
 {
 	if (!root->cur || !root->cur->name || strcmp(name, root->cur->name))
@@ -633,26 +632,26 @@
 	return NULL;
 }
 
-// checks for circular entity references, returns non-zero if no circular
-// references are found, zero otherwise
+/* checks for circular entity references, returns non-zero if no circular
+   references are found, zero otherwise */
 static int switch_xml_ent_ok(char *name, char *s, char **ent)
 {
 	int i;
 
 	for (;; s++) {
 		while (*s && *s != '&')
-			s++;				// find next entity reference
+			s++;				/* find next entity reference */
 		if (!*s)
 			return 1;
 		if (!strncmp(s + 1, name, strlen(name)))
-			return 0;			// circular ref.
+			return 0;			/* circular ref. */
 		for (i = 0; ent[i] && strncmp(ent[i], s + 1, strlen(ent[i])); i += 2);
 		if (ent[i] && !switch_xml_ent_ok(name, ent[i + 1], ent))
 			return 0;
 	}
 }
 
-// called when the parser finds a processing instruction
+/* called when the parser finds a processing instruction */
 static void switch_xml_proc_inst(switch_xml_root_t root, char *s, switch_size_t len)
 {
 	int i = 0, j = 1;
@@ -660,15 +659,15 @@
 	char **sstmp;
 	char *stmp;
 
-	s[len] = '\0';				// null terminate instruction
+	s[len] = '\0';				/* null terminate instruction */
 	if (*(s += strcspn(s, SWITCH_XML_WS))) {
-		*s = '\0';				// null terminate target
-		s += strspn(s + 1, SWITCH_XML_WS) + 1;	// skip whitespace after target
+		*s = '\0';				/* null terminate target */
+		s += strspn(s + 1, SWITCH_XML_WS) + 1;	/* skip whitespace after target */
 	}
 
 	if (!root) return;
 
-	if (!strcmp(target, "xml")) {	// <?xml ... ?>
+	if (!strcmp(target, "xml")) {	/* <?xml ... ?> */
 		if ((s = strstr(s, "standalone")) && !strncmp(s + strspn(s + 10, SWITCH_XML_WS "='\"") + 10, "yes", 3))
 			root->standalone = 1;
 		return;
@@ -677,12 +676,12 @@
 	if (!root->pi[0]) {
 		root->pi = (char ***)malloc(sizeof(char **));
 		if (!root->pi) return;
-		*(root->pi) = NULL;	//first pi
+		*(root->pi) = NULL;	/* first pi */
 	}
 
 	while (root->pi[i] && strcmp(target, root->pi[i][0]))
-		i++;					// find target
-	if (!root->pi[i]) {			// new target
+		i++;					/* find target */
+	if (!root->pi[i]) {			/* new target */
 		char ***ssstmp = (char ***)realloc(root->pi, sizeof(char **) * (i + 2));
 		if (!ssstmp) return;
 		root->pi = ssstmp; 
@@ -690,12 +689,12 @@
 		root->pi[i] = (char **)malloc(sizeof(char *) * 3);
 		if (!root->pi[i]) return;
 		root->pi[i][0] = target;
-		root->pi[i][1] = (char *) (root->pi[i + 1] = NULL);	// terminate pi list
-		root->pi[i][2] = strdup("");	// empty document position list
+		root->pi[i][1] = (char *) (root->pi[i + 1] = NULL);	/* terminate pi list */
+		root->pi[i][2] = strdup("");	/* empty document position list */
 	}
 
 	while (root->pi[i][j])
-		j++;					// find end of instruction list for this target
+		j++;					/* find end of instruction list for this target */
 	sstmp = (char **)realloc(root->pi[i], sizeof(char *) * (j + 3));
 	if (!sstmp) return;
 	root->pi[i] = sstmp;
@@ -703,11 +702,11 @@
 	if (!stmp) return;
 	root->pi[i][j + 2] = stmp; 
 	strcpy(root->pi[i][j + 2] + j - 1, (root->xml.name) ? ">" : "<");
-	root->pi[i][j + 1] = NULL;	// null terminate pi list for this target
-	root->pi[i][j] = s;			// set instruction
+	root->pi[i][j + 1] = NULL;	/* null terminate pi list for this target */
+	root->pi[i][j] = s;			/* set instruction */
 }
 
-// called when the parser finds an internal doctype subset
+/* called when the parser finds an internal doctype subset */
 static short switch_xml_internal_dtd(switch_xml_root_t root, char *s, switch_size_t len)
 {
 	char q, *c, *t, *n = NULL, *v, **ent, **pe;
@@ -718,23 +717,23 @@
 	
 	for (s[len] = '\0'; s;) {
 		while (*s && *s != '<' && *s != '%')
-			s++;				// find next declaration
+			s++;				/* find next declaration */
 
 		if (!*s)
 			break;
-		else if (!strncmp(s, "<!ENTITY", 8)) {	// parse entity definitions
-			c = s += strspn(s + 8, SWITCH_XML_WS) + 8;	// skip white space separator
-			n = s + strspn(s, SWITCH_XML_WS "%");	// find name
-			*(s = n + strcspn(n, SWITCH_XML_WS)) = ';';	// append ; to name
+		else if (!strncmp(s, "<!ENTITY", 8)) {			/* parse entity definitions */
+			c = s += strspn(s + 8, SWITCH_XML_WS) + 8;	/* skip white space separator */
+			n = s + strspn(s, SWITCH_XML_WS "%");		/* find name */
+			*(s = n + strcspn(n, SWITCH_XML_WS)) = ';';	/* append ; to name */
 
-			v = s + strspn(s + 1, SWITCH_XML_WS) + 1;	// find value
-			if ((q = *(v++)) != '"' && q != '\'') {	// skip externals
+			v = s + strspn(s + 1, SWITCH_XML_WS) + 1;	/* find value */
+			if ((q = *(v++)) != '"' && q != '\'') {		/* skip externals */
 				s = strchr(s, '>');
 				continue;
 			}
 
 			for (i = 0, ent = (*c == '%') ? pe : root->ent; ent[i]; i++);
-			sstmp = (char **)realloc(ent, (i + 3) * sizeof(char *));	// space for next ent
+			sstmp = (char **)realloc(ent, (i + 3) * sizeof(char *));	/* space for next ent */
 			if (!sstmp) {
 				switch_xml_err(root, v, "Allocation Error!");
 				break;
@@ -745,20 +744,20 @@
 			else
 				root->ent = ent;
 
-			*(++s) = '\0';		// null terminate name
+			*(++s) = '\0';		/* null terminate name */
 			if ((s = strchr(v, q)))
-				*(s++) = '\0';	// null terminate value
-			ent[i + 1] = switch_xml_decode(v, pe, '%');	// set value
-			ent[i + 2] = NULL;	// null terminate entity list
-			if (!switch_xml_ent_ok(n, ent[i + 1], ent)) {	// circular reference
+				*(s++) = '\0';	/* null terminate value */
+			ent[i + 1] = switch_xml_decode(v, pe, '%');	/* set value */
+			ent[i + 2] = NULL;	/* null terminate entity list */
+			if (!switch_xml_ent_ok(n, ent[i + 1], ent)) {	/* circular reference */
 				if (ent[i + 1] != v)
 					free(ent[i + 1]);
 				switch_xml_err(root, v, "circular entity declaration &%s", n);
 				break;
 			} else
-				ent[i] = n;		// set entity name
-		} else if (!strncmp(s, "<!ATTLIST", 9)) {	// parse default attributes
-			t = s + strspn(s + 9, SWITCH_XML_WS) + 9;	// skip whitespace separator
+				ent[i] = n;		/* set entity name */
+		} else if (!strncmp(s, "<!ATTLIST", 9)) {	/* parse default attributes */
+			t = s + strspn(s + 9, SWITCH_XML_WS) + 9;	/* skip whitespace separator */
 			if (!*t) {
 				switch_xml_err(root, t, "unclosed <!ATTLIST");
 				break;
@@ -766,19 +765,19 @@
 			if (*(s = t + strcspn(t, SWITCH_XML_WS ">")) == '>')
 				continue;
 			else
-				*s = '\0';		// null terminate tag name
+				*s = '\0';		/* null terminate tag name */
 			for (i = 0; root->attr[i] && strcmp(n, root->attr[i][0]); i++);
 
 			while (*(n = ++s + strspn(s, SWITCH_XML_WS)) && *n != '>') {
 				if (*(s = n + strcspn(n, SWITCH_XML_WS)))
-					*s = '\0';	// attr name
+					*s = '\0';	/* attr name */
 				else {
 					switch_xml_err(root, t, "malformed <!ATTLIST");
 					break;
 				}
 
-				s += strspn(s + 1, SWITCH_XML_WS) + 1;	// find next token
-				c = (strncmp(s, "CDATA", 5)) ? (char *)"*" : (char *)" ";	// is it cdata?
+				s += strspn(s + 1, SWITCH_XML_WS) + 1;	/* find next token */
+				c = (strncmp(s, "CDATA", 5)) ? (char *)"*" : (char *)" ";	/* is it cdata? */
 				if (!strncmp(s, "NOTATION", 8))
 					s += strspn(s + 8, SWITCH_XML_WS) + 8;
 				s = (*s == '(') ? strchr(s, ')') : s + strcspn(s, SWITCH_XML_WS);
@@ -787,15 +786,15 @@
 					break;
 				}
 
-				s += strspn(s, SWITCH_XML_WS ")");	// skip white space separator
+				s += strspn(s, SWITCH_XML_WS ")");	/* skip white space separator */
 				if (!strncmp(s, "#FIXED", 6))
 					s += strspn(s + 6, SWITCH_XML_WS) + 6;
-				if (*s == '#') {	// no default value
+				if (*s == '#') {	/* no default value */
 					s += strcspn(s, SWITCH_XML_WS ">") - 1;
 					if (*c == ' ')
-						continue;	// cdata is default, nothing to do
+						continue;	/* cdata is default, nothing to do */
 					v = NULL;
-				} else if ((*s == '"' || *s == '\'') &&	// default value
+				} else if ((*s == '"' || *s == '\'') &&	/* default value */
 						   (s = strchr(v = s + 1, *s)))
 					*s = '\0';
 				else {
@@ -803,15 +802,15 @@
 					break;
 				}
 
-				if (!root->attr[i]) {	// new tag name
+				if (!root->attr[i]) {	/* new tag name */
 					root->attr = (!i) ? (char ***)malloc(2 * sizeof(char **))
 						: (char ***)realloc(root->attr, (i + 2) * sizeof(char **));
 					root->attr[i] = (char **)malloc(2 * sizeof(char *));
-					root->attr[i][0] = t;	// set tag name
+					root->attr[i][0] = t;	/* set tag name */
 					root->attr[i][1] = (char *) (root->attr[i + 1] = NULL);
 				}
 
-				for (j = 1; root->attr[i][j]; j += 3);	// find end of list
+				for (j = 1; root->attr[i][j]; j += 3);	/* find end of list */
 				sstmp = (char **)realloc(root->attr[i], (j + 4) * sizeof(char *));
 
 				if (!sstmp) {
@@ -820,19 +819,18 @@
 				}
 
 				root->attr[i] = sstmp;
-				root->attr[i][j + 3] = NULL;	// null terminate list
-				root->attr[i][j + 2] = c;	// is it cdata?
-				root->attr[i][j + 1] = (v) ? switch_xml_decode(v, root->ent, *c)
-					: NULL;
-				root->attr[i][j] = n;	// attribute name 
+				root->attr[i][j + 3] = NULL;	/* null terminate list */
+				root->attr[i][j + 2] = c;		/* is it cdata? */
+				root->attr[i][j + 1] = (v) ? switch_xml_decode(v, root->ent, *c) : NULL;
+				root->attr[i][j] = n;			/* attribute name  */
 			}
 		} else if (!strncmp(s, "<!--", 4))
-			s = strstr(s + 4, "-->");	// comments
-		else if (!strncmp(s, "<?", 2)) {	// processing instructions
+			s = strstr(s + 4, "-->");			/* comments */
+		else if (!strncmp(s, "<?", 2)) {		/* processing instructions */
 			if ((s = strstr(c = s + 2, "?>")))
 				switch_xml_proc_inst(root, c, s++ - c);
 		} else if (*s == '<')
-			s = strchr(s, '>');	// skip other declarations
+			s = strchr(s, '>');					/* skip other declarations */
 		else if (*(s++) == '%' && !root->standalone)
 			break;
 	}
@@ -841,8 +839,8 @@
 	return !*root->err;
 }
 
-// Converts a UTF-16 string to UTF-8. Returns a new string that must be freed
-// or NULL if no conversion was needed.
+/* Converts a UTF-16 string to UTF-8. Returns a new string that must be freed
+   or NULL if no conversion was needed. */
 static char *switch_xml_str2utf8(char **s, switch_size_t *len)
 {
 	char *u;
@@ -851,13 +849,13 @@
 	int b, be = (**s == '\xFE') ? 1 : (**s == '\xFF') ? 0 : -1;
 
 	if (be == -1)
-		return NULL;			// not UTF-16
+		return NULL;			/* not UTF-16 */
 
 	u = (char *)malloc(max);
 	for (sl = 2; sl < *len - 1; sl += 2) {
-		c = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF)	//UTF-16BE
-			: (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF);	//UTF-16LE
-		if (c >= 0xD800 && c <= 0xDFFF && (sl += 2) < *len - 1) {	// high-half
+		c = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF)	/* UTF-16BE */
+			: (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF);		/* UTF-16LE */
+		if (c >= 0xD800 && c <= 0xDFFF && (sl += 2) < *len - 1) {	/* high-half */
 			d = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF)
 				: (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF);
 			c = (((c & 0x3FF) << 10) | (d & 0x3FF)) + 0x10000;
@@ -870,30 +868,30 @@
 			u = tmp;
 		}
 		if (c < 0x80)
-			u[l++] = (char) c;	// US-ASCII subset
-		else {					// multi-byte UTF-8 sequence
+			u[l++] = (char) c;	/* US-ASCII subset */
+		else {					/* multi-byte UTF-8 sequence */
 			for (b = 0, d = c; d; d /= 2)
-				b++;			// bits in c
-			b = (b - 2) / 5;	// bytes in payload
-			u[l++] = (char) ((0xFF << (7 - b)) | (c >> (6 * b)));	// head
+				b++;			/* bits in c */
+			b = (b - 2) / 5;	/* bytes in payload */
+			u[l++] = (char) ((0xFF << (7 - b)) | (c >> (6 * b)));	/* head */
 			while (b)
-				u[l++] = (char) (0x80 | ((c >> (6 * --b)) & 0x3F));	// payload
+				u[l++] = (char) (0x80 | ((c >> (6 * --b)) & 0x3F));	/* payload */
 		}
 	}
 	return *s = (char *)realloc(u, *len = l);
 }
 
-// frees a tag attribute list
+/* frees a tag attribute list */
 static void switch_xml_free_attr(char **attr)
 {
 	int i = 0;
 	char *m;
 
 	if (!attr || attr == SWITCH_XML_NIL)
-		return;					// nothing to free
+		return;					/* nothing to free */
 	while (attr[i])
-		i += 2;					// find end of attribute list
-	m = attr[i + 1];			// list of which names and values are malloced
+		i += 2;					/* find end of attribute list */
+	m = attr[i + 1];			/* list of which names and values are malloced */
 	for (i = 0; m[i]; i++) {
 		if (m[i] & SWITCH_XML_NAMEM)
 			free(attr[i * 2]);
@@ -904,24 +902,24 @@
 	free(attr);
 }
 
-// parse the given xml string and return an switch_xml structure
+/* parse the given xml string and return an switch_xml structure */
 SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str(char *s, switch_size_t len)
 {
 	switch_xml_root_t root = (switch_xml_root_t) switch_xml_new(NULL);
-	char q, e, *d, **attr, **a = NULL;	// initialize a to avoid compile warning
+	char q, e, *d, **attr, **a = NULL;	/* initialize a to avoid compile warning */
 	int l, i, j;
 
 	root->m = s;
 	if (!len)
 		return switch_xml_err(root, s, "root tag missing");
-	root->u = switch_xml_str2utf8(&s, &len);	// convert utf-16 to utf-8
-	root->e = (root->s = s) + len;	// record start and end of work area
+	root->u = switch_xml_str2utf8(&s, &len);	/* convert utf-16 to utf-8 */
+	root->e = (root->s = s) + len;	/* record start and end of work area */
 
-	e = s[len - 1];				// save end char
-	s[len - 1] = '\0';			// turn end char into null terminator
+	e = s[len - 1];				/* save end char */
+	s[len - 1] = '\0';			/* turn end char into null terminator */
 
 	while (*s && *s != '<')
-		s++;					// find first tag
+		s++;					/* find first tag */
 	if (!*s)
 		return switch_xml_err(root, s, "root tag missing");
 
@@ -929,37 +927,37 @@
 		attr = (char **) SWITCH_XML_NIL;
 		d = ++s;
 
-		if (isalpha((int) (*s)) || *s == '_' || *s == ':' || (int8_t) *s < '\0') {	// new tag
+		if (isalpha((int) (*s)) || *s == '_' || *s == ':' || (int8_t) *s < '\0') {	/* new tag */
 			if (!root->cur)
 				return switch_xml_err(root, d, "markup outside of root element");
 
 			s += strcspn(s, SWITCH_XML_WS "/>");
 			while (isspace((int) (*s)))
-				*(s++) = '\0';	// null terminate tag name
+			*(s++) = '\0';	/* null terminate tag name */
 
-			if (*s && *s != '/' && *s != '>')	// find tag in default attr list
+			if (*s && *s != '/' && *s != '>')	/* find tag in default attr list */
 				for (i = 0; (a = root->attr[i]) && strcmp(a[0], d); i++);
 
-			for (l = 0; *s && *s != '/' && *s != '>'; l += 2) {	// new attrib
+			for (l = 0; *s && *s != '/' && *s != '>'; l += 2) {	/* new attrib */
 				attr = (l) ? (char **)realloc(attr, (l + 4) * sizeof(char *))
-					: (char **)malloc(4 * sizeof(char *));	// allocate space
+					: (char **)malloc(4 * sizeof(char *));	/* allocate space */
 				attr[l + 3] = (l) ? (char *)realloc(attr[l + 1], (l / 2) + 2)
-					: (char *)malloc(2);	// mem for list of maloced vals
-				strcpy(attr[l + 3] + (l / 2), " ");	// value is not malloced
-				attr[l + 2] = NULL;	// null terminate list
-				attr[l + 1] = (char *)"";	// temporary attribute value
-				attr[l] = s;	// set attribute name
+					: (char *)malloc(2);					/* mem for list of maloced vals */
+				strcpy(attr[l + 3] + (l / 2), " ");			/* value is not malloced */
+				attr[l + 2] = NULL;							/* null terminate list */
+				attr[l + 1] = (char *)"";					/* temporary attribute value */
+				attr[l] = s;								/* set attribute name */
 
 				s += strcspn(s, SWITCH_XML_WS "=/>");
 				if (*s == '=' || isspace((int) (*s))) {
-					*(s++) = '\0';	// null terminate tag attribute name
+					*(s++) = '\0';	/* null terminate tag attribute name */
 					q = *(s += strspn(s, SWITCH_XML_WS "="));
-					if (q == '"' || q == '\'') {	// attribute value
+					if (q == '"' || q == '\'') {	/* attribute value */
 						attr[l + 1] = ++s;
 						while (*s && *s != q)
 							s++;
 						if (*s)
-							*(s++) = '\0';	// null terminate attribute val
+							*(s++) = '\0';	/* null terminate attribute val */
 						else {
 							switch_xml_free_attr(attr);
 							return switch_xml_err(root, d, "missing %c", q);
@@ -968,14 +966,14 @@
 						for (j = 1; a && a[j] && strcmp(a[j], attr[l]); j += 3);
 						attr[l + 1] = switch_xml_decode(attr[l + 1], root->ent, (a && a[j]) ? *a[j + 2] : ' ');
 						if (attr[l + 1] < d || attr[l + 1] > s)
-							attr[l + 3][l / 2] = SWITCH_XML_TXTM;	// value malloced
+							attr[l + 3][l / 2] = SWITCH_XML_TXTM;	/* value malloced */
 					}
 				}
 				while (isspace((int) (*s)))
 					s++;
 			}
 
-			if (*s == '/') {	// self closing tag
+			if (*s == '/') {	/* self closing tag */
 				*(s++) = '\0';
 				if ((*s && *s != '>') || (!*s && e != '>')) {
 					if (l)
@@ -984,8 +982,8 @@
 				}
 				switch_xml_open_tag(root, d, attr);
 				switch_xml_close_tag(root, d, s);
-			} else if ((q = *s) == '>' || (!*s && e == '>')) {	// open tag
-				*s = '\0';		// temporarily null terminate tag name
+			} else if ((q = *s) == '>' || (!*s && e == '>')) {	/* open tag */
+				*s = '\0';		/* temporarily null terminate tag name */
 				switch_xml_open_tag(root, d, attr);
 				*s = q;
 			} else {
@@ -993,24 +991,24 @@
 					switch_xml_free_attr(attr);
 				return switch_xml_err(root, d, "missing >");
 			}
-		} else if (*s == '/') {	// close tag
+		} else if (*s == '/') {	/* close tag */
 			s += strcspn(d = s + 1, SWITCH_XML_WS ">") + 1;
 			if (!(q = *s) && e != '>')
 				return switch_xml_err(root, d, "missing >");
-			*s = '\0';			// temporarily null terminate tag name
+			*s = '\0';			/* temporarily null terminate tag name */
 			if (switch_xml_close_tag(root, d, s))
 				return &root->xml;
 			if (isspace((int) (*s = q)))
 				s += strspn(s, SWITCH_XML_WS);
-		} else if (!strncmp(s, "!--", 3)) {	// xml comment
+		} else if (!strncmp(s, "!--", 3)) {	/* xml comment */
 			if (!(s = strstr(s + 3, "--")) || (*(s += 2) != '>' && *s) || (!*s && e != '>'))
 				return switch_xml_err(root, d, "unclosed <!--");
-		} else if (!strncmp(s, "![CDATA[", 8)) {	// cdata
+		} else if (!strncmp(s, "![CDATA[", 8)) {	/* cdata */
 			if ((s = strstr(s, "]]>")))
 				switch_xml_char_content(root, d + 8, (s += 2) - d - 10, 'c');
 			else
 				return switch_xml_err(root, d, "unclosed <![CDATA[");
-		} else if (!strncmp(s, "!DOCTYPE", 8)) {	// dtd
+		} else if (!strncmp(s, "!DOCTYPE", 8)) {	/* dtd */
 			for (l = 0; *s && ((!l && *s != '>') || (l && (*s != ']' || *(s + strspn(s + 1, SWITCH_XML_WS) + 1) != '>'))); l = (*s == '[') ? 1 : l)
 				s += strcspn(s + 1, "[]>") + 1;
 			if (!*s && e != '>')
@@ -1018,7 +1016,7 @@
 			d = (l) ? strchr(d, '[') + 1 : d;
 			if (l && !switch_xml_internal_dtd(root, d, s++ - d))
 				return &root->xml;
-		} else if (*s == '?') {	// <?...?> processing instructions
+		} else if (*s == '?') {	/* <?...?> processing instructions */
 			do {
 				s = strchr(s, '?');
 			} while (s && *(++s) && *s != '>');
@@ -1033,7 +1031,7 @@
 			break;
 		*s = '\0';
 		d = ++s;
-		if (*s && *s != '<') {	// tag character content
+		if (*s && *s != '<') {	/* tag character content */
 			while (*s && *s != '<')
 				s++;
 			if (*s)
@@ -1052,9 +1050,9 @@
 		return switch_xml_err(root, d, "unclosed tag <%s>", root->cur->name);
 }
 
-// Wrapper for switch_xml_parse_str() that accepts a file stream. Reads the entire
-// stream into memory and then parses it. For xml files, use switch_xml_parse_file()
-// or switch_xml_parse_fd()
+/* Wrapper for switch_xml_parse_str() that accepts a file stream. Reads the entire
+   stream into memory and then parses it. For xml files, use switch_xml_parse_file()
+   or switch_xml_parse_fd() */
 SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fp(FILE * fp)
 {
 	switch_xml_root_t root;
@@ -1078,13 +1076,13 @@
 	if (!s)
 		return NULL;
 	root = (switch_xml_root_t) switch_xml_parse_str(s, len);
-	root->dynamic = 1;			// so we know to free s in switch_xml_free()
+	root->dynamic = 1;			/* so we know to free s in switch_xml_free() */
 	return &root->xml;
 }
 
-// A wrapper for switch_xml_parse_str() that accepts a file descriptor. First
-// attempts to mem map the file. Failing that, reads the file into memory.
-// Returns NULL on failure.
+/* A wrapper for switch_xml_parse_str() that accepts a file descriptor. First
+   attempts to mem map the file. Failing that, reads the file into memory.
+   Returns NULL on failure. */
 SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fd(int fd)
 {
 	switch_xml_root_t root;
@@ -1099,19 +1097,19 @@
 #ifdef HAVE_MMAP
 	l = (st.st_size + sysconf(_SC_PAGESIZE) - 1) & ~(sysconf(_SC_PAGESIZE) - 1);
 	if ((m = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0)) != MAP_FAILED) {
-		madvise(m, l, MADV_SEQUENTIAL);	// optimize for sequential access
+		madvise(m, l, MADV_SEQUENTIAL);	/* optimize for sequential access */
 		root = (switch_xml_root_t) switch_xml_parse_str(m, st.st_size);
-		madvise(m, root->len = l, MADV_NORMAL);	// put it back to normal
-	} else {					// mmap failed, read file into memory
-#endif // HAVE_MMAP
+		madvise(m, root->len = l, MADV_NORMAL);	/* put it back to normal */
+	} else {					/* mmap failed, read file into memory */
+#endif /* HAVE_MMAP */
 		m = malloc(st.st_size);
 		if (!m) return NULL;
 		l = read(fd, m, st.st_size);
 		root = (switch_xml_root_t) switch_xml_parse_str((char *)m, l);
-		root->dynamic = 1;		// so we know to free s in switch_xml_free()
+		root->dynamic = 1;		/* so we know to free s in switch_xml_free() */
 #ifdef HAVE_MMAP
 	}
-#endif // HAVE_MMAP
+#endif /* HAVE_MMAP */
 	return &root->xml;
 }
 
@@ -1200,7 +1198,6 @@
 	
 }
 
-
 static int preprocess_glob(const char *cwd, const char *pattern, int write_fd, int rlevel)
 {
 	char *full_path = NULL;
@@ -1578,7 +1575,8 @@
 	return SWITCH_STATUS_FALSE;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name, switch_event_t *params, switch_xml_t *root, switch_xml_t *domain)
+SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name, switch_event_t *params,
+														 switch_xml_t *root, switch_xml_t *domain)
 {
 	switch_event_t *my_params = NULL;
 	switch_status_t status;
@@ -1648,7 +1646,8 @@
 	return status;
 }
 
-static switch_status_t find_user_in_tag(switch_xml_t tag, const char *ip, const char *user_name, const char *key, switch_event_t *params, switch_xml_t *user)
+static switch_status_t find_user_in_tag(switch_xml_t tag, const char *ip, const char *user_name,
+										const char *key, switch_event_t *params, switch_xml_t *user)
 {
 	const char *type = "!pointer";
 	const char *val;
@@ -1683,7 +1682,10 @@
 	
 }
 
-SWITCH_DECLARE(switch_status_t) switch_xml_locate_user_in_domain(const char *user_name, switch_xml_t domain, switch_xml_t *user, switch_xml_t *ingroup)
+SWITCH_DECLARE(switch_status_t) switch_xml_locate_user_in_domain(const char *user_name,
+																 switch_xml_t domain,
+																 switch_xml_t *user,
+																 switch_xml_t *ingroup)
 {
 	switch_xml_t group = NULL, groups = NULL, users = NULL;
 	switch_status_t status = SWITCH_STATUS_FALSE;
@@ -1773,7 +1775,6 @@
 		status = find_user_in_tag(*domain, ip, user_name, key, params, user);
 	}
 	
-
  end:
 
 	if (my_params) {
@@ -1795,7 +1796,6 @@
 	return MAIN_XML_ROOT;
 }
 
-
 struct destroy_xml {
 	switch_xml_t xml;
 	switch_memory_pool_t *pool;
@@ -1821,7 +1821,7 @@
 
 	switch_threadattr_create(&thd_attr, pool);
     switch_threadattr_detach_set(thd_attr, 1);
-	// TBD figure out how much space we need by looking at the xml_t when stacksize == 0
+	/* TBD figure out how much space we need by looking at the xml_t when stacksize == 0 */
     switch_threadattr_stacksize_set(thd_attr, stacksize);
 
 	dx = switch_core_alloc(pool, sizeof(*dx));
@@ -1829,7 +1829,6 @@
 	dx->xml = xml;
 
 	switch_thread_create(&thread, thd_attr, destroy_thread, dx, pool);
-
 }
 
 static char not_so_threadsafe_error_buffer[256] = "";
@@ -1868,7 +1867,7 @@
 			MAIN_XML_ROOT = new_main;
 			switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT);
 			switch_xml_free(old_root);
-			//switch_xml_free_in_thread(old_root);
+			/* switch_xml_free_in_thread(old_root); */
 		}
 	} else {
 		*err = "Cannot Open log directory or XML Root!";
@@ -1950,8 +1949,8 @@
 
 }
 
-// Encodes ampersand sequences appending the results to *dst, reallocating *dst
-// if length exceeds max. a is non-zero for attribute encoding. Returns *dst
+/* Encodes ampersand sequences appending the results to *dst, reallocating *dst
+   if length exceeds max. a is non-zero for attribute encoding. Returns *dst */
 static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst, switch_size_t *dlen, switch_size_t *max, short a)
 {
 	const char *e = NULL;
@@ -2014,9 +2013,9 @@
 }
 
 #define XML_INDENT "  "
-// Recursively converts each tag to xml appending it to *s. Reallocates *s if
-// its length exceeds max. start is the location of the previous tag in the
-// parent tag's character content. Returns *s.
+/* Recursively converts each tag to xml appending it to *s. Reallocates *s if
+   its length exceeds max. start is the location of the previous tag in the
+   parent tag's character content. Returns *s. */
 static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max, switch_size_t start, char ***attr, uint32_t * count)
 {
 	int i, j;
@@ -2024,27 +2023,27 @@
 	switch_size_t off = 0;
 	uint32_t lcount = 0;
 
-	// parent character content up to this tag
+	/* parent character content up to this tag */
 	*s = switch_xml_ampencode(txt + start, xml->off - start, s, len, max, 0);
 
-	while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) + 1 > *max) {	// reallocate s
+	while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) + 1 > *max) {	/* reallocate s */
 		char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE);
 		if (!tmp) return *s;
 		*s = tmp;
 	}
 
 	if (*(*s + (*len) - 1) == '>') {
-		*len += sprintf(*s + *len, "\n");	// indent
+		*len += sprintf(*s + *len, "\n");	/* indent */
 	}
 	for (lcount = 0; lcount < *count; lcount++) {
-		*len += sprintf(*s + *len, "%s", XML_INDENT);	// indent
+		*len += sprintf(*s + *len, "%s", XML_INDENT);	/* indent */
 	}
 
-	*len += sprintf(*s + *len, "<%s", xml->name);	// open tag
-	for (i = 0; xml->attr[i]; i += 2) {	// tag attributes
+	*len += sprintf(*s + *len, "<%s", xml->name);	/* open tag */
+	for (i = 0; xml->attr[i]; i += 2) {	/* tag attributes */
 		if (switch_xml_attr(xml, xml->attr[i]) != xml->attr[i + 1])
 			continue;
-		while (*len + strlen(xml->attr[i]) + 7 + (strlen(XML_INDENT) * (*count)) > *max) {	// reallocate s
+		while (*len + strlen(xml->attr[i]) + 7 + (strlen(XML_INDENT) * (*count)) > *max) {	/* reallocate s */
 			char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE);
 			if (!tmp) return *s;
 			*s = tmp;
@@ -2056,10 +2055,10 @@
 	}
 
 	for (i = 0; attr[i] && strcmp(attr[i][0], xml->name); i++);
-	for (j = 1; attr[i] && attr[i][j]; j += 3) {	// default attributes
+	for (j = 1; attr[i] && attr[i][j]; j += 3) {	/* default attributes */
 		if (!attr[i][j + 1] || switch_xml_attr(xml, attr[i][j]) != attr[i][j + 1])
-			continue;			// skip duplicates and non-values
-		while (*len + strlen(attr[i][j]) + 8 + (strlen(XML_INDENT) * (*count)) > *max) {	// reallocate s
+			continue;			/* skip duplicates and non-values */
+		while (*len + strlen(attr[i][j]) + 8 + (strlen(XML_INDENT) * (*count)) > *max) {	/* reallocate s */
 			char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE);
 			if (!tmp) return *s;
 			*s = tmp;
@@ -2077,10 +2076,10 @@
 		*s = switch_xml_toxml_r(xml->child, s, len, max, 0, attr, count);
 
 	} else {
-		*s = switch_xml_ampencode(xml->txt, 0, s, len, max, 0);	//data
+		*s = switch_xml_ampencode(xml->txt, 0, s, len, max, 0);	/* data */
 	}
 
-	while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) > *max) {	// reallocate s
+	while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) > *max) {	/* reallocate s */
 			char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE);
 			if (!tmp) return *s;
 			*s = tmp;
@@ -2089,14 +2088,14 @@
 	if (xml->child || xml->txt) {
 		if (*(*s + (*len) - 1) == '\n') {
 			for (lcount = 0; lcount < *count; lcount++) {
-				*len += sprintf(*s + *len, "%s", XML_INDENT);	// indent
+				*len += sprintf(*s + *len, "%s", XML_INDENT);	/* indent */
 			}
 		}
-		*len += sprintf(*s + (*len), "</%s>\n", xml->name);	// close tag
+		*len += sprintf(*s + (*len), "</%s>\n", xml->name);	/* close tag */
 	}
 
 	while (txt[off] && off < xml->off)
-		off++;					// make sure off is within bounds
+		off++;					/* make sure off is within bounds */
 
 	if (xml->ordered) {
 		return switch_xml_toxml_r(xml->ordered, s, len, max, off, attr, count);
@@ -2118,8 +2117,8 @@
 	return r;
 }
 
-// converts an switch_xml structure back to xml, returning a string of xml date that
-// must be freed
+/* converts an switch_xml structure back to xml, returning a string of xml date that
+   must be freed */
 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)
 {
 	switch_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL;
@@ -2145,14 +2144,14 @@
 	}
 
 	while (root->xml.parent) {
-		root = (switch_xml_root_t) root->xml.parent;	// root tag
+		root = (switch_xml_root_t) root->xml.parent;	/* root tag */
 	}
 
-	for (i = 0; !p && root->pi[i]; i++) {	// pre-root processing instructions
+	for (i = 0; !p && root->pi[i]; i++) {	/* pre-root processing instructions */
 		for (k = 2; root->pi[i][k - 1]; k++);
 		for (j = 1; (n = root->pi[i][j]); j++) {
 			if (root->pi[i][k][j - 1] == '>') {
-				continue;		// not pre-root
+				continue;		/* not pre-root */
 			}
 			while (len + strlen(t = root->pi[i][0]) + strlen(n) + 7 > max) {
 				if (!(r = (char *)realloc(s, max += SWITCH_XML_BUFSIZE))) {
@@ -2169,11 +2168,11 @@
 	xml->parent = p;
 	xml->ordered = o;
 
-	for (i = 0; !p && root->pi[i]; i++) {	// post-root processing instructions
+	for (i = 0; !p && root->pi[i]; i++) {	/* post-root processing instructions */
 		for (k = 2; root->pi[i][k - 1]; k++);
 		for (j = 1; (n = root->pi[i][j]); j++) {
 			if (root->pi[i][k][j - 1] == '<') {
-				continue;		// not post-root
+				continue;		/* not post-root */
 			}
 			while (len + strlen(t = root->pi[i][0]) + strlen(n) + 7 > max) {
 				if (!(r = (char *)realloc(s, max += SWITCH_XML_BUFSIZE))) {
@@ -2192,7 +2191,7 @@
 	return r;
 }
 
-// free the memory allocated for the switch_xml structure
+/* free the memory allocated for the switch_xml structure */
 SWITCH_DECLARE(void) switch_xml_free(switch_xml_t xml)
 {
 	switch_xml_root_t root = (switch_xml_root_t) xml;
@@ -2221,20 +2220,20 @@
 	switch_xml_free(xml->child);
 	switch_xml_free(xml->ordered);
 
-	if (!xml->parent) {			// free root tag allocations
-		for (i = 10; root->ent[i]; i += 2)	// 0 - 9 are default entities (<>&"')
+	if (!xml->parent) {			/* free root tag allocations */
+		for (i = 10; root->ent[i]; i += 2)	/* 0 - 9 are default entities (<>&"') */
 			if ((s = root->ent[i + 1]) < root->s || s > root->e)
 				free(s);
-		free(root->ent);		// free list of general entities
+		free(root->ent);		/* free list of general entities */
 
 		for (i = 0; (a = root->attr[i]); i++) {
-			for (j = 1; a[j++]; j += 2)	// free malloced attribute values
+			for (j = 1; a[j++]; j += 2)	/* free malloced attribute values */
 				if (a[j] && (a[j] < root->s || a[j] > root->e))
 					free(a[j]);
 			free(a);
 		}
 		if (root->attr[0])
-			free(root->attr);	// free default attribute list
+			free(root->attr);	/* free default attribute list */
 
 		for (i = 0; root->pi[i]; i++) {
 			for (j = 1; root->pi[i][j]; j++);
@@ -2242,35 +2241,35 @@
 			free(root->pi[i]);
 		}
 		if (root->pi[0])
-			free(root->pi);		// free processing instructions
+			free(root->pi);		/* free processing instructions */
 
 		if (root->dynamic == 1)
-			free(root->m);		// malloced xml data
+			free(root->m);		/* malloced xml data */
 #ifdef HAVE_MMAP
 		else if (root->len)
-			munmap(root->m, root->len);	// mem mapped xml data
-#endif // HAVE_MMAP
+			munmap(root->m, root->len);	/* mem mapped xml data */
+#endif /* HAVE_MMAP */
 		if (root->u)
-			free(root->u);		// utf8 conversion
+			free(root->u);		/* utf8 conversion */
 	}
 
-	switch_xml_free_attr(xml->attr);	// tag attributes
+	switch_xml_free_attr(xml->attr);	/* tag attributes */
 	if ((xml->flags & SWITCH_XML_TXTM))
-		free(xml->txt);			// character content
+		free(xml->txt);			/* character content */
 	if ((xml->flags & SWITCH_XML_NAMEM))
-		free(xml->name);		// tag name
+		free(xml->name);		/* tag name */
 	free(xml);
 }
 
-// return parser error message or empty string if none
+/* return parser error message or empty string if none */
 SWITCH_DECLARE(const char *) switch_xml_error(switch_xml_t xml)
 {
 	while (xml && xml->parent)
-		xml = xml->parent;		// find root tag
+		xml = xml->parent;		/* find root tag */
 	return (xml) ? ((switch_xml_root_t) xml)->err : "";
 }
 
-// returns a new empty switch_xml structure with the given root tag name
+/* returns a new empty switch_xml structure with the given root tag name */
 SWITCH_DECLARE(switch_xml_t) switch_xml_new(const char *name)
 {
 	static const char *ent[] = { "lt;", "&#60;", "gt;", "&#62;", "quot;", "&#34;",
@@ -2286,7 +2285,7 @@
 	return &root->xml;
 }
 
-// inserts an existing tag into an switch_xml structure
+/* inserts an existing tag into an switch_xml structure */
 SWITCH_DECLARE(switch_xml_t) switch_xml_insert(switch_xml_t xml, switch_xml_t dest, switch_size_t off)
 {
 	switch_xml_t cur, prev, head;
@@ -2295,39 +2294,39 @@
 	xml->off = off;
 	xml->parent = dest;
 
-	if ((head = dest->child)) {	// already have sub tags
-		if (head->off <= off) {	// not first subtag
+	if ((head = dest->child)) {	/* already have sub tags */
+		if (head->off <= off) {	/* not first subtag */
 			for (cur = head; cur->ordered && cur->ordered->off <= off; cur = cur->ordered);
 			xml->ordered = cur->ordered;
 			cur->ordered = xml;
-		} else {				// first subtag
+		} else {				/* first subtag */
 			xml->ordered = head;
 			dest->child = xml;
 		}
 
-		for (cur = head, prev = NULL; cur && strcmp(cur->name, xml->name); prev = cur, cur = cur->sibling);	// find tag type
-		if (cur && cur->off <= off) {	// not first of type
+		for (cur = head, prev = NULL; cur && strcmp(cur->name, xml->name); prev = cur, cur = cur->sibling);	/* find tag type */
+		if (cur && cur->off <= off) {	/* not first of type */
 			while (cur->next && cur->next->off <= off)
 				cur = cur->next;
 			xml->next = cur->next;
 			cur->next = xml;
-		} else {				// first tag of this type
+		} else {				/* first tag of this type */
 			if (prev && cur)
-				prev->sibling = cur->sibling;	// remove old first
-			xml->next = cur;	// old first tag is now next
-			for (cur = head, prev = NULL; cur && cur->off <= off; prev = cur, cur = cur->sibling);	// new sibling insert point
+				prev->sibling = cur->sibling;	/* remove old first */
+			xml->next = cur;	/* old first tag is now next */
+			for (cur = head, prev = NULL; cur && cur->off <= off; prev = cur, cur = cur->sibling);	/* new sibling insert point */
 			xml->sibling = cur;
 			if (prev)
 				prev->sibling = xml;
 		}
 	} else
-		dest->child = xml;		// only sub tag
+		dest->child = xml;		/* only sub tag */
 
 	return xml;
 }
 
-// Adds a child tag. off is the offset of the child tag relative to the start
-// of the parent tag's character content. Returns the child tag
+/* Adds a child tag. off is the offset of the child tag relative to the start
+   of the parent tag's character content. Returns the child tag */
 SWITCH_DECLARE(switch_xml_t) switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off)
 {
 	switch_xml_t child;
@@ -2344,20 +2343,20 @@
 	return switch_xml_insert(child, xml, off);
 }
 
-// sets the character content for the given tag and returns the tag
+/* sets the character content for the given tag and returns the tag */
 SWITCH_DECLARE(switch_xml_t) switch_xml_set_txt(switch_xml_t xml, const char *txt)
 {
 	if (!xml)
 		return NULL;
 	if (xml->flags & SWITCH_XML_TXTM)
-		free(xml->txt);			// existing txt was malloced
+		free(xml->txt);			/* existing txt was malloced */
 	xml->flags &= ~SWITCH_XML_TXTM;
 	xml->txt = (char *) txt;
 	return xml;
 }
 
-// Sets the given tag attribute or adds a new attribute if not found. A value
-// of NULL will remove the specified attribute.  Returns the tag given
+/* Sets the given tag attribute or adds a new attribute if not found. A value
+   of NULL will remove the specified attribute.  Returns the tag given */
 SWITCH_DECLARE(switch_xml_t) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value)
 {
 	int l = 0, c;
@@ -2366,39 +2365,39 @@
 		return NULL;
 	while (xml->attr[l] && strcmp(xml->attr[l], name))
 		l += 2;
-	if (!xml->attr[l]) {		// not found, add as new attribute
+	if (!xml->attr[l]) {		/* not found, add as new attribute */
 		if (!value)
-			return xml;			// nothing to do
-		if (xml->attr == SWITCH_XML_NIL) {	// first attribute
+			return xml;			/* nothing to do */
+		if (xml->attr == SWITCH_XML_NIL) {	/* first attribute */
 			xml->attr = (char **)malloc(4 * sizeof(char *));
 			if (!xml->attr) return NULL;
-			xml->attr[1] = strdup("");	// empty list of malloced names/vals
+			xml->attr[1] = strdup("");	/* empty list of malloced names/vals */
 		} else {
 			char **tmp = (char **)realloc(xml->attr, (l + 4) * sizeof(char *));
 			if (!tmp) return xml;
 			xml->attr = tmp;
 		}
 
-		xml->attr[l] = (char *) name;	// set attribute name
-		xml->attr[l + 2] = NULL;	// null terminate attribute list
+		xml->attr[l] = (char *) name;	/* set attribute name */
+		xml->attr[l + 2] = NULL;	/* null terminate attribute list */
 		xml->attr[l + 3] = (char *)realloc(xml->attr[l + 1], (c = (int) strlen(xml->attr[l + 1])) + 2);
-		strcpy(xml->attr[l + 3] + c, " ");	// set name/value as not malloced
+		strcpy(xml->attr[l + 3] + c, " ");	/* set name/value as not malloced */
 		if (xml->flags & SWITCH_XML_DUP)
 			xml->attr[l + 3][c] = SWITCH_XML_NAMEM;
 	} else if (xml->flags & SWITCH_XML_DUP)
-		free((char *) name);	// name was strduped
+		free((char *) name);	/* name was strduped */
 
-	for (c = l; xml->attr[c]; c += 2);	// find end of attribute list
+	for (c = l; xml->attr[c]; c += 2);	/* find end of attribute list */
 	if (xml->attr[c + 1][l / 2] & SWITCH_XML_TXTM)
-		free(xml->attr[l + 1]);	//old val
+		free(xml->attr[l + 1]);	/* old val */
 	if (xml->flags & SWITCH_XML_DUP)
 		xml->attr[c + 1][l / 2] |= SWITCH_XML_TXTM;
 	else
 		xml->attr[c + 1][l / 2] &= ~SWITCH_XML_TXTM;
 
 	if (value)
-		xml->attr[l + 1] = (char *) value;	// set attribute value
-	else {						// remove attribute
+		xml->attr[l + 1] = (char *) value;	/* set attribute value */
+	else {						/* remove attribute */
 		char **tmp;
 		if (xml->attr[c + 1][l / 2] & SWITCH_XML_NAMEM)
 			free(xml->attr[l]);
@@ -2406,14 +2405,14 @@
 		tmp =(char **)realloc(xml->attr, (c + 2) * sizeof(char *));
 		if (!tmp) return xml;
 		xml->attr = tmp;
-		memmove(xml->attr[c + 1] + (l / 2), xml->attr[c + 1] + (l / 2) + 1, (c / 2) - (l / 2));	// fix list of which name/vals are malloced
+		memmove(xml->attr[c + 1] + (l / 2), xml->attr[c + 1] + (l / 2) + 1, (c / 2) - (l / 2));	/* fix list of which name/vals are malloced */
 	}
-	xml->flags &= ~SWITCH_XML_DUP;	// clear strdup() flag
+	xml->flags &= ~SWITCH_XML_DUP;	/* clear strdup() flag */
 
 	return xml;
 }
 
-// sets a flag for the given tag and returns the tag
+/* sets a flag for the given tag and returns the tag */
 SWITCH_DECLARE(switch_xml_t) switch_xml_set_flag(switch_xml_t xml, switch_xml_flag_t flag)
 {
 	if (xml)
@@ -2421,42 +2420,42 @@
 	return xml;
 }
 
-// removes a tag along with its subtags without freeing its memory
+/* removes a tag along with its subtags without freeing its memory */
 SWITCH_DECLARE(switch_xml_t) switch_xml_cut(switch_xml_t xml)
 {
 	switch_xml_t cur;
 
 	if (!xml)
-		return NULL;			// nothing to do
+		return NULL;			/* nothing to do */
 	if (xml->next)
-		xml->next->sibling = xml->sibling;	// patch sibling list
+		xml->next->sibling = xml->sibling;	/* patch sibling list */
 
-	if (xml->parent) {			// not root tag
-		cur = xml->parent->child;	// find head of subtag list
+	if (xml->parent) {			/* not root tag */
+		cur = xml->parent->child;	/* find head of subtag list */
 		if (cur == xml)
-			xml->parent->child = xml->ordered;	// first subtag
-		else {					// not first subtag
+			xml->parent->child = xml->ordered;	/* first subtag */
+		else {					/* not first subtag */
 			while (cur->ordered != xml)
 				cur = cur->ordered;
-			cur->ordered = cur->ordered->ordered;	// patch ordered list
+			cur->ordered = cur->ordered->ordered;	/* patch ordered list */
 
-			cur = xml->parent->child;	// go back to head of subtag list
-			if (strcmp(cur->name, xml->name)) {	// not in first sibling list
+			cur = xml->parent->child;	/* go back to head of subtag list */
+			if (strcmp(cur->name, xml->name)) {	/* not in first sibling list */
 				while (strcmp(cur->sibling->name, xml->name))
 					cur = cur->sibling;
-				if (cur->sibling == xml) {	// first of a sibling list
+				if (cur->sibling == xml) {	/* first of a sibling list */
 					cur->sibling = (xml->next) ? xml->next : cur->sibling->sibling;
 				} else
-					cur = cur->sibling;	// not first of a sibling list
+					cur = cur->sibling;	/* not first of a sibling list */
 			}
 
 			while (cur->next && cur->next != xml)
 				cur = cur->next;
 			if (cur->next)
-				cur->next = cur->next->next;	// patch next list
+				cur->next = cur->next->next;	/* patch next list */
 		}
 	}
-	xml->ordered = xml->sibling = xml->next = NULL;	// prevent switch_xml_free() from clobbering ordered list
+	xml->ordered = xml->sibling = xml->next = NULL;	/* prevent switch_xml_free() from clobbering ordered list */
 	return xml;
 }
 


From brian at freeswitch.org  Wed Mar  4 20:06:46 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:06:46 -0600
Subject: [Freeswitch-svn] [commit] r12437 - freeswitch/trunk/src
Message-ID: <E1Lf4r8-00024w-Cw@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 22:06:46 2009
New Revision: 12437

Log:
this one was my fault

Modified:
   freeswitch/trunk/src/switch_ivr_menu.c

Modified: freeswitch/trunk/src/switch_ivr_menu.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_menu.c	(original)
+++ freeswitch/trunk/src/switch_ivr_menu.c	Wed Mar  4 22:06:46 2009
@@ -394,7 +394,7 @@
 		switch_goto_status(SWITCH_STATUS_FALSE, end);
 	}
 
-	if(!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) {
+	if (!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) {
 		switch_channel_set_variable(channel, "tts_engine", menu->tts_engine);
 		switch_channel_set_variable(channel, "tts_voice", menu->tts_voice);
 	}
@@ -442,7 +442,7 @@
 				char substituted[1024];
 				char *use_arg = ap->arg;
 
-				if(!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) {
+				if (!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) {
 					switch_channel_set_variable(channel, "tts_engine", menu->tts_engine);
 					switch_channel_set_variable(channel, "tts_voice", menu->tts_voice);
 				}


From brian at freeswitch.org  Wed Mar  4 20:07:51 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:07:51 -0600
Subject: [Freeswitch-svn] [commit] r12438 -
	freeswitch/trunk/src/mod/applications/mod_conference
Message-ID: <E1Lf4sB-00026Y-2h@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 22:07:50 2009
New Revision: 12438

Log:
More OCD.. again this one was me

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Wed Mar  4 22:07:50 2009
@@ -3694,7 +3694,7 @@
 			conference_add_member(new_conference, member);
 
 			if (conference->rate != new_conference->rate) {
-				if(setup_media(member, new_conference)) {
+				if (setup_media(member, new_conference)) {
 					switch_clear_flag_locked(member, MFLAG_RUNNING);
 				} else {
 					switch_channel_set_flag(channel, CF_SERVICE);


From brian at freeswitch.org  Wed Mar  4 20:08:31 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:08:31 -0600
Subject: [Freeswitch-svn] [commit] r12439 -
	freeswitch/trunk/src/mod/applications/mod_lcr
Message-ID: <E1Lf4sp-000284-Ul@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 22:08:31 2009
New Revision: 12439

Log:
damn OCD

Modified:
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	Wed Mar  4 22:08:31 2009
@@ -326,14 +326,14 @@
 	switch_channel_t *channel;
 	
 	/* first replace %s with digits to maintain backward compat */
-	if(cb_struct->profile->custom_sql_has_percent == SWITCH_TRUE) {
+	if (cb_struct->profile->custom_sql_has_percent == SWITCH_TRUE) {
 		tmpSQL = switch_string_replace(custom_sql, "%q", digits);
 		newSQL = tmpSQL;
 	}
 	
 	/* expand the vars */
-	if(cb_struct->profile->custom_sql_has_vars == SWITCH_TRUE) {
-		if(cb_struct->session) {
+	if (cb_struct->profile->custom_sql_has_vars == SWITCH_TRUE) {
+		if (cb_struct->session) {
 			channel = switch_core_session_get_channel(cb_struct->session);
 			switch_assert(channel);
 			/*
@@ -349,11 +349,11 @@
 		}
 	}
 	
-	if(tmpSQL != newSQL) {
+	if (tmpSQL != newSQL) {
 		switch_safe_free(tmpSQL);
 	}
 	
-	if(newSQL == NULL) {
+	if (newSQL == NULL) {
 		return (char *) custom_sql;
 	} else {
 		return newSQL;
@@ -519,8 +519,8 @@
 	digits_expanded = expand_digits(cb_struct->pool, digits_copy);
 	
 	/* set some channel vars if we have a session */
-	if(cb_struct->session) {
-		if((channel = switch_core_session_get_channel(cb_struct->session))) {
+	if (cb_struct->session) {
+		if ((channel = switch_core_session_get_channel(cb_struct->session))) {
 			switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE);
 			id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
 			switch_channel_set_variable_var_check(channel, "lcr_query_profile", id_str, SWITCH_FALSE);
@@ -555,11 +555,11 @@
 
 		/* format the custom_sql */
 		safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy);
-		if(!safe_sql) {
+		if (!safe_sql) {
 			return SWITCH_STATUS_GENERR;
 		}
 		sql_stream.write_function(&sql_stream, safe_sql);
-		if(safe_sql != profile->custom_sql) {
+		if (safe_sql != profile->custom_sql) {
 			/* channel_expand_variables returned the same string to us, no need to free */
 			switch_safe_free(safe_sql);
 		}
@@ -727,10 +727,10 @@
 				}
 				
 				if (!switch_strlen_zero(custom_sql)) {
-					if(switch_string_var_check_const(custom_sql)) {
+					if (switch_string_var_check_const(custom_sql)) {
 						profile->custom_sql_has_vars = SWITCH_TRUE;
 					}
-					if(strstr(custom_sql, "%")) {
+					if (strstr(custom_sql, "%")) {
 						profile->custom_sql_has_percent = SWITCH_TRUE;
 					}
 					profile->custom_sql = switch_core_strdup(globals.pool, (char *)custom_sql);


From mrene at freeswitch.org  Wed Mar  4 20:22:10 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:22:10 -0600
Subject: [Freeswitch-svn] [commit] r12440 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf562-0002Tz-12@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 22:22:09 2009
New Revision: 12440

Log:
update

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 22:22:09 2009
@@ -17,7 +17,7 @@
  * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
  *
  * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm at freeswitch.org>
+ * Mathieu Rene <mathieu.rene at gmail.com>
  * Portions created by the Initial Developer are Copyright (C)
  * the Initial Developer. All Rights Reserved.
  *
@@ -35,21 +35,21 @@
 
 /*! \brief Type of value to parse */
 typedef enum {
-	SWITCH_CONFIG_INT,		/*< (ptr=int* default=int data=NULL) Integer */
-	SWITCH_CONFIG_STRING, 	/*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */
-	SWITCH_CONFIG_YESNO, 	/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
-	SWITCH_CONFIG_CUSTOM, 	/*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer  */
-	SWITCH_CONFIG_ENUM, 	/*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */
-	SWITCH_CONFIG_FLAG,		/*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */
-	SWITCH_CONFIG_FLAGARRAY,/*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */
+	SWITCH_CONFIG_INT,			/*< (ptr=int* default=int data=NULL) Integer */
+	SWITCH_CONFIG_STRING, 		/*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */
+	SWITCH_CONFIG_YESNO, 		/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
+	SWITCH_CONFIG_CUSTOM, 		/*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer  */
+	SWITCH_CONFIG_ENUM, 		/*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */
+	SWITCH_CONFIG_FLAG,			/*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */
+	SWITCH_CONFIG_FLAGARRAY,	/*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */
 	
 	/* No more past that line */
 	SWITCH_CONFIG_LAST
 } switch_xml_config_type_t;
 
 typedef struct {
-	char *key;				/*< The item's key or NULL if this is the last one in the list */
-	int value;				/*< The item's value */
+	char *key;					/*< The item's key or NULL if this is the last one in the list */
+	switch_size_t value;		/*< The item's value */
 } switch_xml_config_enum_item_t;
 
 typedef struct {
@@ -57,21 +57,28 @@
 	int length;					/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
 } switch_xml_config_string_options_t;
 
+struct switch_xml_config_item;
+typedef struct switch_xml_config_item switch_xml_config_item_t;
+
+typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data);
+
 /*!
  * \brief A configuration instruction read by switch_xml_config_parse 
 */
-typedef struct {
-	char *key;					/*< The key of the element, or NULL to indicate the end of the list */
+struct switch_xml_config_item {
+	char *key;						/*< The key of the element, or NULL to indicate the end of the list */
 	switch_xml_config_type_t type; 	/*< The type of variable */
-	switch_bool_t reloadable; 	/*< True if the var can be changed on reload */
-	void *ptr;					/*< Ptr to the var to be changed */
-	void *defaultvalue; 		/*< Default value */
-	void *data; 				/*< Custom data (depending on the type) */
-} switch_xml_config_item_t;
+	switch_bool_t reloadable; 		/*< True if the var can be changed on reload */
+	void *ptr;						/*< Ptr to the var to be changed */
+	void *defaultvalue; 			/*< Default value */
+	void *data; 					/*< Custom data (depending on the type) */
+	switch_xml_config_callback_t function;	/*< Callback (for type CUSTOM) */
+} ;
 
-typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data);
 
-#define SWITCH_CONFIG_END { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL }
+#define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL }
+#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, NULL, _data }
+#define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL }
 
 /*! 
  * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 22:22:09 2009
@@ -30,16 +30,20 @@
  *
  */
 
+//#define SWITCH_XML_CONFIG_TEST
+
 #include <switch.h>
 
-switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options)
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options)
 {
 	switch_xml_config_item_t *item;
 	switch_xml_t node;
 	switch_event_t *event;
+	int file_count = 0, matched_count = 0;
+	
 	switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS);
 	switch_assert(event);
-	int file_count = 0, matched_count = 0;
+
 
 	for (node = xml; node; node = node->next) {
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, switch_xml_attr_soft(node, "name"), switch_xml_attr_soft(node, "value"));
@@ -63,27 +67,39 @@
 						} else {
 							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", 
 								value, item->key);
-							*dest = (int)item->defaultvalue;
+							*dest = (int)(intptr_t)item->defaultvalue;
 						}
 					} else {
-						*dest = (int)item->defaultvalue;
+						*dest = (int)(intptr_t)item->defaultvalue;
 					}
 				}
 				break;
 			case SWITCH_CONFIG_STRING:
 				{
-					switch_xml_config_string_options_t *options = (switch_xml_config_string_options_t*)item->data;
-					if (options->length > 0) {
+					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
+					if (string_options->length > 0) {
 						/* We have a preallocated buffer */
 						char *dest = (char*)item->ptr;
-						strncpy(dest, value, options->length);
+						if (value) {
+							switch_copy_string(dest, value, string_options->length);
+						} else if (options->defaultvalue){
+							switch_copy_string(dest, value, string_options->length);
+						}
 					} else {
 						char **dest = (char**)item->ptr;
-						if (options->pool) {
-							*dest = switch_core_strdup(options->pool, value);
+						if (string_options->pool) {
+							if (value) {
+								*dest = switch_core_strdup(string_options->pool, value);
+							} else if (item->defaultvalue) {
+								*dest = switch_core_strdup(string_options->pool, (char*)item->defaultvalue);
+							}
 						} else {
 							switch_safe_free(*dest); /* Free the destination if its not NULL */
-							*dest = strdup(value);
+							if (value) {
+								*dest = strdup(value);
+							} else if(item->defaultvalue) {
+								*dest = strdup((char*)item->defaultvalue);
+							}
 						}
 					}
 				}
@@ -94,18 +110,15 @@
 					if (value) {
 						*dest = !!switch_true(value);
 					} else {
-						*dest = (switch_bool_t)item->defaultvalue;
+						*dest = (switch_bool_t)(intptr_t)item->defaultvalue;
 					}
 				}
 				break;
 			case SWITCH_CONFIG_CUSTOM: 
-#if 0
-				{
-					
-					switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->data;
+				{	
+					switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function;
 					callback(item);
 				}
-#endif
 				break;
 			case SWITCH_CONFIG_ENUM:
 				{
@@ -125,7 +138,7 @@
 								value, item->key);
 						}
 					} else {
-						*dest = (int)item->defaultvalue;
+						*dest = (int)(intptr_t)item->defaultvalue;
 					}
 				}
 				break;
@@ -140,7 +153,7 @@
 							*dest &= ~(1 << index);
 						}
 					} else {
-						if ((switch_bool_t)item->defaultvalue) {
+						if ((switch_bool_t)(intptr_t)item->defaultvalue) {
 							*dest |= (1 << index);
 						} else {
 							*dest &= ~(1 << index);
@@ -155,7 +168,7 @@
 					if (value) {
 						dest[index] = !!switch_true(value);						
 					} else {
-						dest[index] = (int8_t)((int32_t)item->defaultvalue);
+						dest[index] = (int8_t)((intptr_t)item->defaultvalue);
 					}
 				}
 				break;
@@ -174,7 +187,7 @@
 }
 
 
-#if 0
+#if SWITCH_XML_CONFIG_TEST
 typedef enum {
 	MYENUM_TEST1 = 1,
 	MYENUM_TEST2 = 2,
@@ -190,7 +203,7 @@
 } globals;
 
 
-void switch_xml_config_test()
+SWITCH_DECLARE(void) switch_xml_config_test()
 {
 	char *cf = "test.conf";
 	switch_xml_t cfg, xml, settings;
@@ -204,10 +217,10 @@
 	};
 	
 	switch_xml_config_item_t instructions[] = {
-			{ "db_host", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.stringalloc, "blah", &config_opt_stringalloc },
-			{ "db_user", SWITCH_CONFIG_STRING, SWITCH_TRUE, globals.string, 	  "dflt", &config_opt_buffer },
-			{ "test",	 SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm,  (void*)MYENUM_TEST1, enumm_options },
-			SWITCH_CONFIG_END
+			SWITCH_CONFIG_ITEM("db_host", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.stringalloc, "blah", &config_opt_stringalloc),
+			SWITCH_CONFIG_ITEM("db_user", SWITCH_CONFIG_STRING, SWITCH_TRUE, globals.string, "dflt", &config_opt_buffer ),
+			SWITCH_CONFIG_ITEM("test", SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm,  (void*)MYENUM_TEST1, enumm_options ),
+			SWITCH_CONFIG_ITEM_END()
 	};
 
 	if (!(xml = switch_xml_open_cfg("blaster.conf", &cfg, NULL))) {


From mrene at freeswitch.org  Wed Mar  4 20:23:54 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:23:54 -0600
Subject: [Freeswitch-svn] [commit] r12441 - freeswitch/trunk/src
Message-ID: <E1Lf57i-0002Vk-MJ@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 22:23:54 2009
New Revision: 12441

Log:
update

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 22:23:54 2009
@@ -34,7 +34,7 @@
 
 #include <switch.h>
 
-SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options)
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
 {
 	switch_xml_config_item_t *item;
 	switch_xml_t node;
@@ -50,7 +50,7 @@
 		file_count++;
 	}
 	
-	for (item = options; item->key; item++) {
+	for (item = instructions; item->key; item++) {
 		const char *value = switch_event_get_header(event, item->key);
 		
 		if (reload && !item->reloadable) {
@@ -77,7 +77,7 @@
 			case SWITCH_CONFIG_STRING:
 				{
 					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
-					if (string_options->length > 0) {
+					if (options->length > 0) {
 						/* We have a preallocated buffer */
 						char *dest = (char*)item->ptr;
 						if (value) {
@@ -122,18 +122,18 @@
 				break;
 			case SWITCH_CONFIG_ENUM:
 				{
-					switch_xml_config_enum_item_t *options = (switch_xml_config_enum_item_t*)item->data;
+					switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data;
 					int *dest = (int*)item->ptr;
 					
 					if (value) {
-						for (;options->key; options++) {
-							if (!strcasecmp(value, options->key)) {
-								*dest = options->value;
+						for (;enum_options->key; enum_options++) {
+							if (!strcasecmp(value, enum_options->key)) {
+								*dest = enum_options->value;
 								break;
 							}
 						}
 					
-						if (!options->key) { /* if (!found) */
+						if (!enum_options->key) { /* if (!found) */
 							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", 
 								value, item->key);
 						}


From mrene at freeswitch.org  Wed Mar  4 20:30:15 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:30:15 -0600
Subject: [Freeswitch-svn] [commit] r12442 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf5Dr-0002a7-NO@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 22:30:15 2009
New Revision: 12442

Log:
update

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 22:30:15 2009
@@ -87,7 +87,7 @@
  * \param options instrutions on how to parse the elements
  * \see switch_xml_config_item_t
  */
-switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options);
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions);
 
 #endif /* !defined(SWITCH_XML_CONFIG_H) */
 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 22:30:15 2009
@@ -77,13 +77,13 @@
 			case SWITCH_CONFIG_STRING:
 				{
 					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
-					if (options->length > 0) {
+					if (string_options->length > 0) {
 						/* We have a preallocated buffer */
 						char *dest = (char*)item->ptr;
 						if (value) {
 							switch_copy_string(dest, value, string_options->length);
-						} else if (options->defaultvalue){
-							switch_copy_string(dest, value, string_options->length);
+						} else if (item->defaultvalue){
+							switch_copy_string(dest, item->defaultvalue, string_options->length);
 						}
 					} else {
 						char **dest = (char**)item->ptr;
@@ -145,7 +145,7 @@
 			case SWITCH_CONFIG_FLAG:
 				{
 					int32_t *dest = (int32_t*)item->ptr;
-					int index = (int)item->data;
+					int index = (int)(intptr_t)item->data;
 					if (value) {
 						if (switch_true(value)) {
 							*dest |= (1 << index);
@@ -164,7 +164,7 @@
 			case SWITCH_CONFIG_FLAGARRAY:
 				{
 					int8_t *dest = (int8_t*)item->ptr;
-					int index = (int)item->data;
+					int index = (int)(intptr_t)item->data;
 					if (value) {
 						dest[index] = !!switch_true(value);						
 					} else {


From brian at freeswitch.org  Wed Mar  4 20:39:35 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:39:35 -0600
Subject: [Freeswitch-svn] [commit] r12443 - freeswitch/trunk/src/include
Message-ID: <E1Lf5Mt-0002dn-Ox@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 22:39:35 2009
New Revision: 12443

Log:
 more tweaks to doxygen and cleanups

Modified:
   freeswitch/trunk/src/include/switch_core.h
   freeswitch/trunk/src/include/switch_resample.h

Modified: freeswitch/trunk/src/include/switch_core.h
==============================================================================
--- freeswitch/trunk/src/include/switch_core.h	(original)
+++ freeswitch/trunk/src/include/switch_core.h	Wed Mar  4 22:39:35 2009
@@ -144,7 +144,16 @@
 														  _In_opt_ void *user_data,
 														  _In_ time_t stop_time, _In_ switch_media_bug_flag_t flags, _Out_ switch_media_bug_t **new_bug);
 
+/*!
+  \brief Pause a media bug on the session
+  \param session the session to pause the bug on sets CF_PAUSE_BUGS flag
+*/
 SWITCH_DECLARE(void) switch_core_media_bug_pause(switch_core_session_t *session);
+
+/*!
+  \brief Resume a media bug on the session
+  \param session the session to resume the bug on, clears CF_PAUSE_BUGS flag
+*/
 SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session);
 
 /*!
@@ -179,6 +188,12 @@
 */
 SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(_In_ switch_media_bug_t *bug);
 
+/*!
+  \brief Test for the existance of a flag on an media bug
+  \param bug the object to test
+  \param flag the or'd list of flags to test
+  \return true value if the object has the flags defined
+*/
 SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(_In_ switch_media_bug_t *bug, _In_ uint32_t flag);
 
 /*!
@@ -196,6 +211,12 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(_In_ switch_core_session_t *session, _Inout_ switch_media_bug_t **bug);
 
+/*!
+  \brief Remove media bug callback
+  \param bug bug to remove
+  \param callback callback to remove
+  \return SWITCH_STATUS_SUCCESS if the operation was a success
+*/
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback);
 
 /*!
@@ -219,7 +240,16 @@
 */
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame);
 
+/*!
+  \brief Flush the read and write buffers for the bug
+  \param bug the bug to flush the read and write buffers on
+*/
 SWITCH_DECLARE(void) switch_core_media_bug_flush(_In_ switch_media_bug_t *bug);
+
+/*!
+  \brief Flush the read/write buffers for all media bugs on the session
+  \param session the session to flush the read/write buffers for all media bugs on the session
+*/
 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(_In_ switch_core_session_t *session);
 
 ///\}

Modified: freeswitch/trunk/src/include/switch_resample.h
==============================================================================
--- freeswitch/trunk/src/include/switch_resample.h	(original)
+++ freeswitch/trunk/src/include/switch_resample.h	Wed Mar  4 22:39:35 2009
@@ -38,7 +38,7 @@
 	way comes along some day. =D
 	
 */
-#define switch_normalize_volume(x) if(x > 4) x = 4; if (x < -4) x = -4;
+#define switch_normalize_volume(x) if (x > 4) x = 4; if (x < -4) x = -4;
 
 #ifndef SWITCH_RESAMPLE_H
 #define SWITCH_RESAMPLE_H


From mikej at freeswitch.org  Wed Mar  4 20:48:38 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:48:38 -0600
Subject: [Freeswitch-svn] [commit] r12444 - freeswitch/trunk/w32/Library
Message-ID: <E1Lf5Ve-0002zp-Ig@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 22:48:38 2009
New Revision: 12444

Log:
add new switch_xml_config.[ch] files to project

Modified:
   freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj
   freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj

Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj
==============================================================================
--- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj	(original)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj	Wed Mar  4 22:48:38 2009
@@ -804,6 +804,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\switch_xml_config.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -946,6 +950,10 @@
 				RelativePath="..\..\src\include\switch_xml.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\include\switch_xml_config.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj
==============================================================================
--- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj	(original)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj	Wed Mar  4 22:48:38 2009
@@ -504,6 +504,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\switch_xml_config.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -555,11 +559,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\include\private\switch_core.h"
+				RelativePath="..\..\src\include\switch_core.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\include\switch_core.h"
+				RelativePath="..\..\src\include\private\switch_core.h"
 				>
 			</File>
 			<File
@@ -650,6 +654,10 @@
 				RelativePath="..\..\src\include\switch_xml.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\include\switch_xml_config.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"


From mikej at freeswitch.org  Wed Mar  4 20:49:19 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 22:49:19 -0600
Subject: [Freeswitch-svn] [commit] r12445 - freeswitch/trunk/src
Message-ID: <E1Lf5WJ-00031Y-3F@svn.freeswitch.org>

Author: mikej
Date: Wed Mar  4 22:49:19 2009
New Revision: 12445

Log:
actually return from error condition

Modified:
   freeswitch/trunk/src/switch_core_media_bug.c

Modified: freeswitch/trunk/src/switch_core_media_bug.c
==============================================================================
--- freeswitch/trunk/src/switch_core_media_bug.c	(original)
+++ freeswitch/trunk/src/switch_core_media_bug.c	Wed Mar  4 22:49:19 2009
@@ -124,6 +124,7 @@
 	
 	if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel));
+		return SWITCH_STATUS_FALSE;
 	}
 	
 	frame->datalen = 0;
@@ -137,6 +138,7 @@
 	switch_mutex_unlock(bug->read_mutex);
 	
 	if (switch_test_flag(bug, SMBF_WRITE_STREAM)) {
+		switch_assert(bug->raw_write_buffer);
 		switch_mutex_lock(bug->write_mutex);
 		datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes);
 		if (datalen < bytes) {


From brian at freeswitch.org  Wed Mar  4 21:03:52 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:03:52 -0600
Subject: [Freeswitch-svn] [commit] r12446 - freeswitch/trunk/src
Message-ID: <E1Lf5kO-00037S-F5@svn.freeswitch.org>

Author: brian
Date: Wed Mar  4 23:03:52 2009
New Revision: 12446

Log:
spaces help readability

Modified:
   freeswitch/trunk/src/switch_core_media_bug.c

Modified: freeswitch/trunk/src/switch_core_media_bug.c
==============================================================================
--- freeswitch/trunk/src/switch_core_media_bug.c	(original)
+++ freeswitch/trunk/src/switch_core_media_bug.c	Wed Mar  4 23:03:52 2009
@@ -123,7 +123,7 @@
 	}
 	
 	if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel));
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Buffer Error\n", switch_channel_get_name(bug->session->channel));
 		return SWITCH_STATUS_FALSE;
 	}
 	


From mrene at freeswitch.org  Wed Mar  4 21:32:50 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:32:50 -0600
Subject: [Freeswitch-svn] [commit] r12447 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf6CQ-0003fp-EZ@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:32:50 2009
New Revision: 12447

Log:
update

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 23:32:50 2009
@@ -60,7 +60,7 @@
 struct switch_xml_config_item;
 typedef struct switch_xml_config_item switch_xml_config_item_t;
 
-typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data);
+typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_bool_t changed);
 
 /*!
  * \brief A configuration instruction read by switch_xml_config_parse 
@@ -72,7 +72,8 @@
 	void *ptr;						/*< Ptr to the var to be changed */
 	void *defaultvalue; 			/*< Default value */
 	void *data; 					/*< Custom data (depending on the type) */
-	switch_xml_config_callback_t function;	/*< Callback (for type CUSTOM) */
+	switch_xml_config_callback_t function;	/*< Callback to be called after the var is parsed */
+	void *functiondata;				/*< Custom data passed to the callback */
 } ;
 
 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 23:32:50 2009
@@ -52,6 +52,8 @@
 	
 	for (item = instructions; item->key; item++) {
 		const char *value = switch_event_get_header(event, item->key);
+		switch_bool_t changed = SWITCH_FALSE;
+		switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function;
 		
 		if (reload && !item->reloadable) {
 			continue;
@@ -61,45 +63,53 @@
 			case SWITCH_CONFIG_INT:
 				{
 					int *dest = (int*)item->ptr;
+					int intval;
 					if (value) {
 						if (switch_is_number(value)) {
-							*dest = atoi(value);
+							intval = atoi(value);
 						} else {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", 
-								value, item->key);
-							*dest = (int)(intptr_t)item->defaultvalue;
+							intval = (int)(intptr_t)item->defaultvalue;
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s] setting default [%d]\n", 
+								value, item->key, intval);
 						}
 					} else {
-						*dest = (int)(intptr_t)item->defaultvalue;
+						intval = (int)(intptr_t)item->defaultvalue;
+					}
+					
+					if (*dest != intval) {
+						*dest = intval;
+						changed = SWITCH_TRUE;
 					}
 				}
 				break;
 			case SWITCH_CONFIG_STRING:
 				{
 					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
+					const char *newstring = NULL;
 					if (string_options->length > 0) {
 						/* We have a preallocated buffer */
 						char *dest = (char*)item->ptr;
 						if (value) {
-							switch_copy_string(dest, value, string_options->length);
-						} else if (item->defaultvalue){
-							switch_copy_string(dest, item->defaultvalue, string_options->length);
+							newstring = value;
+						} else if (item->defaultvalue) {
+							newstring = item->defaultvalue;
+						}
+						
+						if (newstring && strncasecmp(dest, newstring, string_options->length)) {
+							switch_copy_string(dest, newstring, string_options->length);
 						}
 					} else {
 						char **dest = (char**)item->ptr;
-						if (string_options->pool) {
-							if (value) {
-								*dest = switch_core_strdup(string_options->pool, value);
-							} else if (item->defaultvalue) {
-								*dest = switch_core_strdup(string_options->pool, (char*)item->defaultvalue);
-							}
-						} else {
-							switch_safe_free(*dest); /* Free the destination if its not NULL */
-							if (value) {
-								*dest = strdup(value);
-							} else if(item->defaultvalue) {
-								*dest = strdup((char*)item->defaultvalue);
+						const char *newstring = value ? value : (char*)item->defaultvalue;
+						
+						if (newstring && strcasecmp(*dest, newstring)) {
+							if (string_options->pool) {
+								*dest = switch_core_strdup(string_options->pool, newstring);
+							} else {
+								switch_safe_free(*dest);
+								*dest = strdup(newstring);
 							}
+							changed = SWITCH_TRUE;								
 						}
 					}
 				}
@@ -107,38 +117,41 @@
 			case SWITCH_CONFIG_YESNO:
 				{
 					switch_bool_t *dest = (switch_bool_t*)item->ptr;
-					if (value) {
-						*dest = !!switch_true(value);
-					} else {
-						*dest = (switch_bool_t)(intptr_t)item->defaultvalue;
+					switch_bool_t newval = value ?  !!switch_true(value) : (switch_bool_t)(intptr_t)item->defaultvalue;
+					
+					if (*dest != newval) {
+						*dest = newval;
+						changed = SWITCH_TRUE;
 					}
 				}
 				break;
 			case SWITCH_CONFIG_CUSTOM: 
-				{	
-					switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function;
-					callback(item);
-				}
 				break;
 			case SWITCH_CONFIG_ENUM:
 				{
 					switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data;
 					int *dest = (int*)item->ptr;
+					int newval;
 					
 					if (value) {
 						for (;enum_options->key; enum_options++) {
 							if (!strcasecmp(value, enum_options->key)) {
-								*dest = enum_options->value;
+								newval = enum_options->value;
 								break;
 							}
 						}
-					
-						if (!enum_options->key) { /* if (!found) */
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", 
-								value, item->key);
-						}
 					} else {
-						*dest = (int)(intptr_t)item->defaultvalue;
+						newval = (int)(intptr_t)item->defaultvalue; 
+					}
+					
+					if (!enum_options->key) { /* if (!found) */
+						newval = (int)(intptr_t)item->defaultvalue;
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n",  value, item->key);
+					}
+					
+					if (*dest != newval) {
+						changed = SWITCH_TRUE;
+						*dest = newval;
 					}
 				}
 				break;
@@ -146,14 +159,18 @@
 				{
 					int32_t *dest = (int32_t*)item->ptr;
 					int index = (int)(intptr_t)item->data;
+					int8_t currentval = !!(*dest & index);
+					int8_t newval = 0;
+					
 					if (value) {
-						if (switch_true(value)) {
-							*dest |= (1 << index);
-						} else {
-							*dest &= ~(1 << index);
-						}
+						newval = switch_true(value);
 					} else {
-						if ((switch_bool_t)(intptr_t)item->defaultvalue) {
+						newval = (switch_bool_t)(intptr_t)item->defaultvalue;
+					}
+					
+					if (newval != currentval) {
+						changed = SWITCH_TRUE;
+						if (newval) {
 							*dest |= (1 << index);
 						} else {
 							*dest &= ~(1 << index);
@@ -165,15 +182,21 @@
 				{
 					int8_t *dest = (int8_t*)item->ptr;
 					int index = (int)(intptr_t)item->data;
-					if (value) {
-						dest[index] = !!switch_true(value);						
-					} else {
-						dest[index] = (int8_t)((intptr_t)item->defaultvalue);
+					int newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue);
+					if (dest[index] != newval) {
+						changed = SWITCH_TRUE;
+						dest[index] = newval;
 					}
 				}
 				break;
 			case SWITCH_CONFIG_LAST:
 				break;
+			default:
+				break;
+		}
+		
+		if (callback) {
+			callback(item, changed);
 		}
 	}
 	


From mrene at freeswitch.org  Wed Mar  4 21:34:26 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:34:26 -0600
Subject: [Freeswitch-svn] [commit] r12448 - freeswitch/trunk/src/include
Message-ID: <E1Lf6Dy-0008KA-QV@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:34:26 2009
New Revision: 12448

Log:
update macros

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 23:34:26 2009
@@ -77,9 +77,9 @@
 } ;
 
 
-#define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL }
-#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, NULL, _data }
-#define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL }
+#define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL }
+#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, NULL, _data, _functiondata }
+#define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
 
 /*! 
  * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t 


From mrene at freeswitch.org  Wed Mar  4 21:41:40 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:41:40 -0600
Subject: [Freeswitch-svn] [commit] r12449 - freeswitch/trunk/src
Message-ID: <E1Lf6Ky-0005GC-Jg@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:41:40 2009
New Revision: 12449

Log:
oops

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 23:41:40 2009
@@ -181,8 +181,8 @@
 			case SWITCH_CONFIG_FLAGARRAY:
 				{
 					int8_t *dest = (int8_t*)item->ptr;
-					int index = (int)(intptr_t)item->data;
-					int newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue);
+					int8_t index = (int)(intptr_t)item->data;
+					int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue);
 					if (dest[index] != newval) {
 						changed = SWITCH_TRUE;
 						dest[index] = newval;


From mrene at freeswitch.org  Wed Mar  4 21:45:42 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:45:42 -0600
Subject: [Freeswitch-svn] [commit] r12450 - freeswitch/trunk/src
Message-ID: <E1Lf6Os-0005Ii-73@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:45:42 2009
New Revision: 12450

Log:
tweak

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 23:45:42 2009
@@ -181,7 +181,7 @@
 			case SWITCH_CONFIG_FLAGARRAY:
 				{
 					int8_t *dest = (int8_t*)item->ptr;
-					int8_t index = (int)(intptr_t)item->data;
+					int8_t index = (int8_t)(intptr_t)item->data;
 					int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue);
 					if (dest[index] != newval) {
 						changed = SWITCH_TRUE;


From mrene at freeswitch.org  Wed Mar  4 21:47:43 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:47:43 -0600
Subject: [Freeswitch-svn] [commit] r12451 - freeswitch/trunk/src
Message-ID: <E1Lf6Qp-0005b3-Bg@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:47:43 2009
New Revision: 12451

Log:
final tweak?

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 23:47:43 2009
@@ -85,8 +85,9 @@
 			case SWITCH_CONFIG_STRING:
 				{
 					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
-					const char *newstring = NULL;
+
 					if (string_options->length > 0) {
+						const char *newstring = NULL;
 						/* We have a preallocated buffer */
 						char *dest = (char*)item->ptr;
 						if (value) {


From mrene at freeswitch.org  Wed Mar  4 21:50:11 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:50:11 -0600
Subject: [Freeswitch-svn] [commit] r12452 - freeswitch/trunk/src
Message-ID: <E1Lf6TD-0005dR-JU@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:50:11 2009
New Revision: 12452

Log:
Shut up MikeJ's code analyzer

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Wed Mar  4 23:50:11 2009
@@ -132,7 +132,7 @@
 				{
 					switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data;
 					int *dest = (int*)item->ptr;
-					int newval;
+					int newval = 0;
 					
 					if (value) {
 						for (;enum_options->key; enum_options++) {


From mrene at freeswitch.org  Wed Mar  4 21:58:12 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:58:12 -0600
Subject: [Freeswitch-svn] [commit] r12453 - freeswitch/trunk/src/include
Message-ID: <E1Lf6ay-00035b-DY@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:58:12 2009
New Revision: 12453

Log:
its getting late

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 23:58:12 2009
@@ -78,7 +78,7 @@
 
 
 #define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL }
-#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, NULL, _data, _functiondata }
+#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata }
 #define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
 
 /*! 


From mrene at freeswitch.org  Wed Mar  4 21:59:54 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 04 Mar 2009 23:59:54 -0600
Subject: [Freeswitch-svn] [commit] r12454 - freeswitch/trunk/src/include
Message-ID: <E1Lf6cc-00037J-Bz@svn.freeswitch.org>

Author: mrene
Date: Wed Mar  4 23:59:54 2009
New Revision: 12454

Log:
 

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Mar  4 23:59:54 2009
@@ -49,12 +49,12 @@
 
 typedef struct {
 	char *key;					/*< The item's key or NULL if this is the last one in the list */
-	switch_size_t value;		/*< The item's value */
+	int value;		/*< The item's value */
 } switch_xml_config_enum_item_t;
 
 typedef struct {
 	switch_memory_pool_t *pool; /*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/
-	int length;					/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
+	switch_size_t length;					/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
 } switch_xml_config_string_options_t;
 
 struct switch_xml_config_item;


From mrene at freeswitch.org  Wed Mar  4 22:00:36 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 00:00:36 -0600
Subject: [Freeswitch-svn] [commit] r12455 - freeswitch/trunk/src
Message-ID: <E1Lf6dI-00039e-9F@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 00:00:36 2009
New Revision: 12455

Log:
I like casts

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 00:00:36 2009
@@ -160,7 +160,7 @@
 				{
 					int32_t *dest = (int32_t*)item->ptr;
 					int index = (int)(intptr_t)item->data;
-					int8_t currentval = !!(*dest & index);
+					int8_t currentval = (int8_t)!!(*dest & index);
 					int8_t newval = 0;
 					
 					if (value) {


From mrene at freeswitch.org  Wed Mar  4 22:08:45 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 00:08:45 -0600
Subject: [Freeswitch-svn] [commit] r12456 - freeswitch/trunk/src/include
Message-ID: <E1Lf6lB-0000sR-Kk@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 00:08:45 2009
New Revision: 12456

Log:
OCD - going to bed

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 00:08:45 2009
@@ -35,26 +35,26 @@
 
 /*! \brief Type of value to parse */
 typedef enum {
-	SWITCH_CONFIG_INT,			/*< (ptr=int* default=int data=NULL) Integer */
-	SWITCH_CONFIG_STRING, 		/*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */
-	SWITCH_CONFIG_YESNO, 		/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
-	SWITCH_CONFIG_CUSTOM, 		/*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer  */
-	SWITCH_CONFIG_ENUM, 		/*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */
-	SWITCH_CONFIG_FLAG,			/*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */
-	SWITCH_CONFIG_FLAGARRAY,	/*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */
+	SWITCH_CONFIG_INT,				/*< (ptr=int* default=int data=NULL) Integer */
+	SWITCH_CONFIG_STRING, 			/*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */
+	SWITCH_CONFIG_YESNO, 			/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
+	SWITCH_CONFIG_CUSTOM, 			/*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer  */
+	SWITCH_CONFIG_ENUM, 			/*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */
+	SWITCH_CONFIG_FLAG,				/*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */
+	SWITCH_CONFIG_FLAGARRAY,		/*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */
 	
 	/* No more past that line */
 	SWITCH_CONFIG_LAST
 } switch_xml_config_type_t;
 
-typedef struct {
-	char *key;					/*< The item's key or NULL if this is the last one in the list */
-	int value;		/*< The item's value */
+typedef struct {                	
+	char *key;						/*< The item's key or NULL if this is the last one in the list */
+	int value;						/*< The item's value */
 } switch_xml_config_enum_item_t;
 
 typedef struct {
-	switch_memory_pool_t *pool; /*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/
-	switch_size_t length;					/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
+	switch_memory_pool_t *pool; 	/*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/
+	switch_size_t length;			/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
 } switch_xml_config_string_options_t;
 
 struct switch_xml_config_item;
@@ -66,14 +66,14 @@
  * \brief A configuration instruction read by switch_xml_config_parse 
 */
 struct switch_xml_config_item {
-	char *key;						/*< The key of the element, or NULL to indicate the end of the list */
-	switch_xml_config_type_t type; 	/*< The type of variable */
-	switch_bool_t reloadable; 		/*< True if the var can be changed on reload */
-	void *ptr;						/*< Ptr to the var to be changed */
-	void *defaultvalue; 			/*< Default value */
-	void *data; 					/*< Custom data (depending on the type) */
+	char *key;					   			/*< The key of the element, or NULL to indicate the end of the list */
+	switch_xml_config_type_t type; 			/*< The type of variable */
+	switch_bool_t reloadable; 	   			/*< True if the var can be changed on reload */
+	void *ptr;					   			/*< Ptr to the var to be changed */
+	void *defaultvalue; 		   			/*< Default value */
+	void *data; 				   			/*< Custom data (depending on the type) */
 	switch_xml_config_callback_t function;	/*< Callback to be called after the var is parsed */
-	void *functiondata;				/*< Custom data passed to the callback */
+	void *functiondata;						/*< Custom data passed to the callback */
 } ;
 
 
@@ -85,7 +85,7 @@
  * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t 
  * \param xml The first element of the list to parse
  * \param reload true to skip all non-reloadable options
- * \param options instrutions on how to parse the elements
+ * \param instructions instrutions on how to parse the elements
  * \see switch_xml_config_item_t
  */
 SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions);


From mrene at freeswitch.org  Wed Mar  4 22:38:52 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 00:38:52 -0600
Subject: [Freeswitch-svn] [commit] r12457 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lf7EK-0001Nk-RC@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 00:38:52 2009
New Revision: 12457

Log:
last one

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 00:38:52 2009
@@ -77,9 +77,9 @@
 } ;
 
 
-#define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL }
-#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata }
-#define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
+#define SWITCH_CONFIG_ITEM(_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL }
+#define SWITCH_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata }
+#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
 
 /*! 
  * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 00:38:52 2009
@@ -30,7 +30,7 @@
  *
  */
 
-//#define SWITCH_XML_CONFIG_TEST
+#define SWITCH_XML_CONFIG_TEST
 
 #include <switch.h>
 
@@ -211,7 +211,7 @@
 }
 
 
-#if SWITCH_XML_CONFIG_TEST
+#ifdef SWITCH_XML_CONFIG_TEST
 typedef enum {
 	MYENUM_TEST1 = 1,
 	MYENUM_TEST2 = 2,
@@ -243,7 +243,7 @@
 	switch_xml_config_item_t instructions[] = {
 			SWITCH_CONFIG_ITEM("db_host", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.stringalloc, "blah", &config_opt_stringalloc),
 			SWITCH_CONFIG_ITEM("db_user", SWITCH_CONFIG_STRING, SWITCH_TRUE, globals.string, "dflt", &config_opt_buffer ),
-			SWITCH_CONFIG_ITEM("test", SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm,  (void*)MYENUM_TEST1, enumm_options ),
+			SWITCH_CONFIG_ITEM("test", SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm,  (void*)MYENUM_TEST1, enumm_options),
 			SWITCH_CONFIG_ITEM_END()
 	};
 


From mrene at freeswitch.org  Wed Mar  4 22:39:43 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 00:39:43 -0600
Subject: [Freeswitch-svn] [commit] r12458 - freeswitch/trunk/src/include
Message-ID: <E1Lf7F9-0001PO-VM@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 00:39:43 2009
New Revision: 12458

Log:
grrr

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 00:39:43 2009
@@ -78,7 +78,7 @@
 
 
 #define SWITCH_CONFIG_ITEM(_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL }
-#define SWITCH_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata }
+#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata }
 #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
 
 /*! 


From mrene at freeswitch.org  Thu Mar  5 07:03:29 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 09:03:29 -0600
Subject: [Freeswitch-svn] [commit] r12459 - in freeswitch/trunk/src: .
	include mod/applications/mod_skel
Message-ID: <E1LfF6f-0001zv-Mf@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 09:03:29 2009
New Revision: 12459

Log:
Integer (min,max) and string (regex) validation options added, mod_skel is my new playground

Added:
   freeswitch/trunk/src/mod/applications/mod_skel/Makefile
Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 09:03:29 2009
@@ -37,7 +37,7 @@
 typedef enum {
 	SWITCH_CONFIG_INT,				/*< (ptr=int* default=int data=NULL) Integer */
 	SWITCH_CONFIG_STRING, 			/*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */
-	SWITCH_CONFIG_YESNO, 			/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
+	SWITCH_CONFIG_BOOL, 			/*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */
 	SWITCH_CONFIG_CUSTOM, 			/*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer  */
 	SWITCH_CONFIG_ENUM, 			/*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */
 	SWITCH_CONFIG_FLAG,				/*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */
@@ -55,8 +55,16 @@
 typedef struct {
 	switch_memory_pool_t *pool; 	/*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/
 	switch_size_t length;			/*< Length of the char array, or 0 if memory has to be allocated dynamically*/
+	char *validation_regex;			/*< Enforce validation using this regular expression */
 } switch_xml_config_string_options_t;
 
+typedef struct {
+	switch_bool_t enforce_min;
+	int min;
+	switch_bool_t enforce_max;	
+	int max;
+} switch_xml_config_int_options_t;
+
 struct switch_xml_config_item;
 typedef struct switch_xml_config_item switch_xml_config_item_t;
 
@@ -73,12 +81,11 @@
 	void *defaultvalue; 		   			/*< Default value */
 	void *data; 				   			/*< Custom data (depending on the type) */
 	switch_xml_config_callback_t function;	/*< Callback to be called after the var is parsed */
-	void *functiondata;						/*< Custom data passed to the callback */
 } ;
 
 
-#define SWITCH_CONFIG_ITEM(_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL }
-#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata }
+#define SWITCH_CONFIG_ITEM(_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL }
+#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _functiondata, _data }
 #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
 
 /*! 

Added: freeswitch/trunk/src/mod/applications/mod_skel/Makefile
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/applications/mod_skel/Makefile	Thu Mar  5 09:03:29 2009
@@ -0,0 +1,2 @@
+BASE=../../../..
+include $(BASE)/build/modmake.rules
\ No newline at end of file

Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	Thu Mar  5 09:03:29 2009
@@ -33,22 +33,105 @@
 #include <switch.h>
 
 /* Prototypes */
-//SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown);
-//SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown);
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime);
 SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load);
 
 /* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) 
  * Defines a switch_loadable_module_function_table_t and a static const char[] modname
  */
-SWITCH_MODULE_DEFINITION(mod_skel, mod_skel_load, NULL, NULL);
+SWITCH_MODULE_DEFINITION(mod_skel, mod_skel_load, mod_skel_shutdown, NULL);
+
+typedef enum {
+	CODEC_NEGOTIATION_GREEDY = 1,
+	CODEC_NEGOTIATION_GENEROUS = 2,
+	CODEC_NEGOTIATION_EVIL = 3
+} codec_negotiation_t;
+
+static struct {
+	char *codec_negotiation_str;
+	codec_negotiation_t codec_negotiation;
+	switch_bool_t sip_trace;
+	int integer;
+} globals;
+
+static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_bool_t changed) 
+{
+	switch_bool_t value = *(switch_bool_t*)data->ptr;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In siptrace callback: value %s changed %s\n",
+		value ? "true" : "false", changed ? "true" : "false");
+	
+	/*
+	if (changed) {
+		nua_set_params(((sofia_profile_t*)data->functiondata)->nua, TPTAG_LOG(value), TAG_END());
+	} 
+	*/
+	
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t do_config(switch_bool_t reload)
+{
+	switch_xml_t cfg, xml, settings;
+	switch_xml_config_string_options_t config_opt_codec_negotiation = { NULL, 0, "greedy|generous|evil" };
+														 /* enforce_min, min, enforce_max, max */
+	switch_xml_config_int_options_t config_opt_integer = { SWITCH_TRUE, 0, SWITCH_TRUE, 10 };
+	switch_xml_config_enum_item_t config_opt_codec_negotiation_enum[] = { 
+		{ "greedy", CODEC_NEGOTIATION_GREEDY },
+		{ "generous", CODEC_NEGOTIATION_GENEROUS },
+		{ "evil", CODEC_NEGOTIATION_EVIL },
+		{ NULL, 0 } 
+	};
+	
+	switch_xml_config_item_t instructions[] = {
+							/* parameter name        type                 reloadable   pointer                         default value     options structure */
+		SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation),
+		SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation,  (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum),
+		SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace,  (void*)SWITCH_FALSE,  config_callback_siptrace, NULL ),
+		SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer),
+		SWITCH_CONFIG_ITEM_END()
+	};
+
+	memset(&globals, 0, sizeof(globals));
+
+	if (!(xml = switch_xml_open_cfg("skel.conf", &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open skel.conf\n");
+		return SWITCH_STATUS_FALSE;
+	}
+
+	if ((settings = switch_xml_child(cfg, "settings"))) {
+		if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"Config parsed ok!\n");
+			return SWITCH_STATUS_SUCCESS;
+		}
+	}
+	
+	if (cfg) {
+		switch_xml_free(cfg);
+	}
+	
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_STANDARD_API(skel_function)
+{
+	stream->write_function(stream, "+OK Reloading\n");
+	do_config(SWITCH_TRUE);
+	return SWITCH_STATUS_SUCCESS;
+}
 
 /* Macro expands to: switch_status_t mod_skel_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
 SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load)
 {
+	switch_api_interface_t *api_interface;
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n");
+	
+	do_config(SWITCH_FALSE);
+	
+	SWITCH_ADD_API(api_interface, "skel", "Skel API", skel_function, "syntax");
 
 	/* indicate that the module should continue to be loaded */
 	return SWITCH_STATUS_SUCCESS;
@@ -56,12 +139,12 @@
 
 /*
   Called when the system shuts down
-  Macro expands to: switch_status_t mod_skel_shutdown()
+  Macro expands to: switch_status_t mod_skel_shutdown() */
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown)
 {
 	return SWITCH_STATUS_SUCCESS;
 }
-*/
+
 
 /*
   If it exists, this is called in it's own thread when the module-load completes
@@ -85,5 +168,5 @@
  * c-basic-offset:4
  * End:
  * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4
  */

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 09:03:29 2009
@@ -30,8 +30,6 @@
  *
  */
 
-#define SWITCH_XML_CONFIG_TEST
-
 #include <switch.h>
 
 SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
@@ -62,6 +60,7 @@
 		switch(item->type) {
 			case SWITCH_CONFIG_INT:
 				{
+					switch_xml_config_int_options_t *int_options = (switch_xml_config_int_options_t*)item->data;
 					int *dest = (int*)item->ptr;
 					int intval;
 					if (value) {
@@ -69,9 +68,26 @@
 							intval = atoi(value);
 						} else {
 							intval = (int)(intptr_t)item->defaultvalue;
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s] setting default [%d]\n", 
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%d]\n", 
 								value, item->key, intval);
 						}
+						
+						if (int_options) {
+							/* Enforce validation options */
+							if ((int_options->enforce_min && !(intval > int_options->min)) ||
+								(int_options->enforce_max && !(intval < int_options->max))) {
+									/* Validation failed, set default */
+									intval = (int)(intptr_t)item->defaultvalue;
+									/* Then complain */
+									if (int_options->enforce_min && int_options->enforce_max) {
+										switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], should be between [%d] and [%d], setting default [%d]\n", 
+											value, item->key, int_options->min, int_options->max, intval);
+ 									} else {
+										switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], should be %s [%d], setting default [%d]\n", 
+											value, item->key, int_options->enforce_min ? "at least" : "at max", int_options->enforce_min ? int_options->min : int_options->max, intval);
+									}
+								}
+						}
 					} else {
 						intval = (int)(intptr_t)item->defaultvalue;
 					}
@@ -85,40 +101,74 @@
 			case SWITCH_CONFIG_STRING:
 				{
 					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
-
-					if (string_options->length > 0) {
-						const char *newstring = NULL;
-						/* We have a preallocated buffer */
-						char *dest = (char*)item->ptr;
-						if (value) {
-							newstring = value;
-						} else if (item->defaultvalue) {
-							newstring = item->defaultvalue;
-						}
-						
-						if (newstring && strncasecmp(dest, newstring, string_options->length)) {
-							switch_copy_string(dest, newstring, string_options->length);
+					const char *newstring = NULL;
+					
+					if (!string_options) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n",
+										  item->key);
+						continue;
+					}
+					
+					/* Perform validation */
+					if (value) {
+						if (!switch_strlen_zero(string_options->validation_regex)) {
+							if (switch_regex_match(value, string_options->validation_regex) == SWITCH_STATUS_SUCCESS) {
+								newstring = value; /* Regex match, accept value*/
+							} else {
+								newstring = (char*)item->defaultvalue;  /* Regex failed */
+								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", 
+									value, item->key, newstring);
+							}
+						} else {
+							newstring = value; /* No validation */
 						}
 					} else {
-						char **dest = (char**)item->ptr;
-						const char *newstring = value ? value : (char*)item->defaultvalue;
+						newstring = (char*)item->defaultvalue;
+					}
+
+					
+					if (newstring) {
+						if (string_options->length > 0) {
+							/* We have a preallocated buffer */
+							char *dest = (char*)item->ptr;
 						
-						if (newstring && strcasecmp(*dest, newstring)) {
-							if (string_options->pool) {
-								*dest = switch_core_strdup(string_options->pool, newstring);
-							} else {
-								switch_safe_free(*dest);
-								*dest = strdup(newstring);
+							if (strncasecmp(dest, newstring, string_options->length)) {
+								switch_copy_string(dest, newstring, string_options->length);
+								changed = SWITCH_TRUE;
+							}
+						} else {
+							char **dest = (char**)item->ptr;
+						
+							if (strcasecmp(*dest, newstring)) {
+								if (string_options->pool) {
+									*dest = switch_core_strdup(string_options->pool, newstring);
+								} else {
+									switch_safe_free(*dest);
+									*dest = strdup(newstring);
+								}
+								changed = SWITCH_TRUE;								
 							}
-							changed = SWITCH_TRUE;								
 						}
 					}
 				}
 				break;
-			case SWITCH_CONFIG_YESNO:
+			case SWITCH_CONFIG_BOOL:
 				{
 					switch_bool_t *dest = (switch_bool_t*)item->ptr;
-					switch_bool_t newval = value ?  !!switch_true(value) : (switch_bool_t)(intptr_t)item->defaultvalue;
+					switch_bool_t newval = SWITCH_FALSE;
+					
+					if (value && switch_true(value)) {
+						newval = SWITCH_TRUE;
+					} else if (value && switch_false(value)) {
+						newval = SWITCH_FALSE;
+					} else if (value) {
+						/* Value isnt true or false */
+						newval = (switch_bool_t)(intptr_t)item->defaultvalue;
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n",  
+										value, item->key, newval ? "true" : "false");
+					} else {
+						newval = (switch_bool_t)(intptr_t)item->defaultvalue;
+					}
 					
 					if (*dest != newval) {
 						*dest = newval;
@@ -231,8 +281,8 @@
 {
 	char *cf = "test.conf";
 	switch_xml_t cfg, xml, settings;
-	switch_xml_config_string_options_t config_opt_stringalloc = { NULL, 0 }; /* No pool, use strdup */
-	switch_xml_config_string_options_t config_opt_buffer = { NULL, 50 }; 	/* No pool, use current var as buffer */
+	switch_xml_config_string_options_t config_opt_stringalloc = { NULL, 0, NULL }; /* No pool, use strdup, no regex */
+	switch_xml_config_string_options_t config_opt_buffer = { NULL, 50, NULL }; 	/* No pool, use current var as buffer, no regex */
 	switch_xml_config_enum_item_t enumm_options[] = { 
 		{ "test1", MYENUM_TEST1 },
 		{ "test2", MYENUM_TEST2 },


From anthm at freeswitch.org  Thu Mar  5 07:17:12 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 09:17:12 -0600
Subject: [Freeswitch-svn] [commit] r12460 - in freeswitch/trunk/libs/esl:
	perl src
Message-ID: <E1LfFJw-000255-VF@svn.freeswitch.org>

Author: anthm
Date: Thu Mar  5 09:17:12 2009
New Revision: 12460

Log:
string buffer too small

Modified:
   freeswitch/trunk/libs/esl/perl/single_command.pl
   freeswitch/trunk/libs/esl/src/esl_oop.cpp

Modified: freeswitch/trunk/libs/esl/perl/single_command.pl
==============================================================================
--- freeswitch/trunk/libs/esl/perl/single_command.pl	(original)
+++ freeswitch/trunk/libs/esl/perl/single_command.pl	Thu Mar  5 09:17:12 2009
@@ -4,5 +4,5 @@
 my $args = join(" ", @ARGV);
 
 my $con = new ESL::ESLconnection("localhost", "8021", "ClueCon");
-my $e = $con->api($command, $args);
+my $e = $con->bgapi($command, $args);
 print $e->getBody();

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Thu Mar  5 09:17:12 2009
@@ -92,7 +92,7 @@
 		return NULL;
 	}
 
-	len = strlen(cmd) + (arg ? strlen(arg) : 0) + 5;
+	len = strlen(cmd) + (arg ? strlen(arg) : 0) + 8;
 
 	cmd_buf = (char *) malloc(len);
 	assert(cmd_buf);


From anthm at freeswitch.org  Thu Mar  5 07:18:54 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 09:18:54 -0600
Subject: [Freeswitch-svn] [commit] r12461 - freeswitch/trunk/libs/esl/perl
Message-ID: <E1LfFLa-00026h-8s@svn.freeswitch.org>

Author: anthm
Date: Thu Mar  5 09:18:54 2009
New Revision: 12461

Log:
revert

Modified:
   freeswitch/trunk/libs/esl/perl/single_command.pl

Modified: freeswitch/trunk/libs/esl/perl/single_command.pl
==============================================================================
--- freeswitch/trunk/libs/esl/perl/single_command.pl	(original)
+++ freeswitch/trunk/libs/esl/perl/single_command.pl	Thu Mar  5 09:18:54 2009
@@ -4,5 +4,5 @@
 my $args = join(" ", @ARGV);
 
 my $con = new ESL::ESLconnection("localhost", "8021", "ClueCon");
-my $e = $con->bgapi($command, $args);
+my $e = $con->api($command, $args);
 print $e->getBody();


From mikej at freeswitch.org  Thu Mar  5 08:14:36 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 10:14:36 -0600
Subject: [Freeswitch-svn] [commit] r12462 - freeswitch/trunk
Message-ID: <E1LfGDU-0002dY-0k@svn.freeswitch.org>

Author: mikej
Date: Thu Mar  5 10:14:35 2009
New Revision: 12462

Log:
silence some useless sun cc warnings

Modified:
   freeswitch/trunk/configure.in

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Thu Mar  5 10:14:35 2009
@@ -131,6 +131,9 @@
 if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC)
     APR_ADDTO(SWITCH_AM_CFLAGS, -DPIC)
+    APR_ADDTO(SWITCH_AM_CFLAGS, -erroff=E_END_OF_LOOP_CODE_NOT_REACHED)
+    APR_ADDTO(SWITCH_AM_CFLAGS, -errtags=yes)
+    APR_ADDTO(SWITCH_AM_CXXFLAGS, -errtags=yes)
     APR_ADDTO(SWITCH_AM_CXXFLAGS, -KPIC)
     APR_ADDTO(SWITCH_AM_CXXFLAGS, -DPIC)
     APR_ADDTO(SWITCH_AM_CXXFLAGS, "-features=extensions")


From mrene at freeswitch.org  Thu Mar  5 08:16:20 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 10:16:20 -0600
Subject: [Freeswitch-svn] [commit] r12463 - in freeswitch/trunk/src: .
	include
Message-ID: <E1LfGFA-0002wM-4c@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 10:16:20 2009
New Revision: 12463

Log:
refactor

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 10:16:20 2009
@@ -97,6 +97,23 @@
  */
 SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions);
 
+/*! 
+ * \brief Parses all of an event's elements, following a ruleset defined by an array of switch_xml_config_item_t 
+ * \param event The event structure containing the key and values to parse
+ * \param reload true to skip all non-reloadable options
+ * \param instructions instrutions on how to parse the elements
+ * \see switch_xml_config_item_t
+ */
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions);
+
+/*!
+ * \brief Parses a list of xml elements into an event  
+ * \param xml First element of the xml list to parse
+ * \param keyname Name of the key attribute
+ * \param keyvalue Name of the value attribute 
+ * \param event [out] event (if *event is NOT NULL, the headers will be appended to the existing event)
+ */
+SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event);
 #endif /* !defined(SWITCH_XML_CONFIG_H) */
 
 /* For Emacs:

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 10:16:20 2009
@@ -32,22 +32,48 @@
 
 #include <switch.h>
 
-SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
+SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event)
 {
-	switch_xml_config_item_t *item;
 	switch_xml_t node;
-	switch_event_t *event;
-	int file_count = 0, matched_count = 0;
+	switch_size_t count = 0;
 	
-	switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS);
-	switch_assert(event);
-
+	if (!*event) {
+		switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS);
+		switch_assert(event);
+	}
 
 	for (node = xml; node; node = node->next) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, switch_xml_attr_soft(node, "name"), switch_xml_attr_soft(node, "value"));
-		file_count++;
+		const char *key = switch_xml_attr_soft(node, keyname);
+		const char *value = switch_xml_attr_soft(node, valuename);
+		if (key && value) {
+			switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, key, value);
+			count++;
+		}
 	}
 	
+	return count;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
+{
+	switch_event_t *event;
+	switch_status_t result;
+	int count = switch_event_import_xml(xml, "name", "value", &event);
+	
+	result = switch_xml_config_parse_event(event, count, reload, instructions);
+	
+	if (event) {
+		switch_event_destroy(&event);
+	}
+	
+	return result;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions)
+{
+	switch_xml_config_item_t *item;
+	int file_count = 0, matched_count = 0;
+	
 	for (item = instructions; item->key; item++) {
 		const char *value = switch_event_get_header(event, item->key);
 		switch_bool_t changed = SWITCH_FALSE;
@@ -252,67 +278,26 @@
 	}
 	
 	if (file_count > matched_count) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Config file had %d params but only %d were valid\n", file_count, matched_count);
-	}
-	
-	switch_event_destroy(&event);
-	
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-#ifdef SWITCH_XML_CONFIG_TEST
-typedef enum {
-	MYENUM_TEST1 = 1,
-	MYENUM_TEST2 = 2,
-	MYENUM_TEST3 = 3
-} myenum_t;
-
-static struct {
-	char *stringalloc;
-	char string[50];
-	myenum_t enumm;
-	int yesno;
-	
-} globals;
-
-
-SWITCH_DECLARE(void) switch_xml_config_test()
-{
-	char *cf = "test.conf";
-	switch_xml_t cfg, xml, settings;
-	switch_xml_config_string_options_t config_opt_stringalloc = { NULL, 0, NULL }; /* No pool, use strdup, no regex */
-	switch_xml_config_string_options_t config_opt_buffer = { NULL, 50, NULL }; 	/* No pool, use current var as buffer, no regex */
-	switch_xml_config_enum_item_t enumm_options[] = { 
-		{ "test1", MYENUM_TEST1 },
-		{ "test2", MYENUM_TEST2 },
-		{ "test3", MYENUM_TEST3 },
-		{ NULL, 0 } 
-	};
-	
-	switch_xml_config_item_t instructions[] = {
-			SWITCH_CONFIG_ITEM("db_host", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.stringalloc, "blah", &config_opt_stringalloc),
-			SWITCH_CONFIG_ITEM("db_user", SWITCH_CONFIG_STRING, SWITCH_TRUE, globals.string, "dflt", &config_opt_buffer ),
-			SWITCH_CONFIG_ITEM("test", SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm,  (void*)MYENUM_TEST1, enumm_options),
-			SWITCH_CONFIG_ITEM_END()
-	};
-
-	if (!(xml = switch_xml_open_cfg("blaster.conf", &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open %s\n", cf);
-		return;
-	}
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) {
-			printf("YAY!\n");
+		/* User made a mistake, find it */
+		switch_event_header_t *header;
+		for (header = event->headers; header; header = header->next) {
+			switch_bool_t found = SWITCH_FALSE;
+			for (item = instructions; item->key; item++) {
+				if (strcasecmp(header->name, item->key)) {
+					found = SWITCH_TRUE;
+					break;
+				}
+			}
+			
+			if (!found) {
+				/* Tell the user */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name);
+			}
 		}
 	}
 	
-	if (cfg) {
-		switch_xml_free(cfg);
-	}
+	return SWITCH_STATUS_SUCCESS;
 }
-#endif
 
 /* For Emacs:
  * Local Variables:


From mikej at freeswitch.org  Thu Mar  5 08:38:31 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 10:38:31 -0600
Subject: [Freeswitch-svn] [commit] r12464 - in freeswitch/trunk: .
	src/mod/applications/mod_skel
Message-ID: <E1LfGad-00033V-2J@svn.freeswitch.org>

Author: mikej
Date: Thu Mar  5 10:38:30 2009
New Revision: 12464

Log:
testing switch_xml_config on windows

Added:
   freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.2008.vcproj
Modified:
   freeswitch/trunk/Freeswitch.2008.sln
   freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c

Modified: freeswitch/trunk/Freeswitch.2008.sln
==============================================================================
--- freeswitch/trunk/Freeswitch.2008.sln	(original)
+++ freeswitch/trunk/Freeswitch.2008.sln	Thu Mar  5 10:38:30 2009
@@ -987,6 +987,11 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2008.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2008.vcproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}"
+	ProjectSection(ProjectDependencies) = postProject
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -2384,6 +2389,13 @@
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.Build.0 = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.Build.0 = All|Win32
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|Win32.ActiveCfg = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64.ActiveCfg = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64.Build.0 = Release|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2419,6 +2431,7 @@
 		{329FD5B0-EF28-4606-86D0-F6EA21CF8E36} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{7877EFC8-4807-484B-B573-D7B7FD058FAA} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
+		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}
 		{A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}
 		{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}

Added: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.2008.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.2008.vcproj	Thu Mar  5 10:38:30 2009
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="mod_skel"
+	ProjectGUID="{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}"
+	RootNamespace="mod_skel"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath=".\mod_skel.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	Thu Mar  5 10:38:30 2009
@@ -70,27 +70,28 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
+static switch_xml_config_string_options_t config_opt_codec_negotiation = { NULL, 0, "greedy|generous|evil" };
+/* enforce_min, min, enforce_max, max */
+static switch_xml_config_int_options_t config_opt_integer = { SWITCH_TRUE, 0, SWITCH_TRUE, 10 };
+static switch_xml_config_enum_item_t config_opt_codec_negotiation_enum[] = { 
+	{ "greedy", CODEC_NEGOTIATION_GREEDY },
+	{ "generous", CODEC_NEGOTIATION_GENEROUS },
+	{ "evil", CODEC_NEGOTIATION_EVIL },
+	{ NULL, 0 } 
+};
+
+static switch_xml_config_item_t instructions[] = {
+	/* parameter name        type                 reloadable   pointer                         default value     options structure */
+	SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation),
+	SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation,  (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum),
+	SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace,  (void*)SWITCH_FALSE,  config_callback_siptrace, NULL ),
+	SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer),
+	SWITCH_CONFIG_ITEM_END()
+};
+
 static switch_status_t do_config(switch_bool_t reload)
 {
 	switch_xml_t cfg, xml, settings;
-	switch_xml_config_string_options_t config_opt_codec_negotiation = { NULL, 0, "greedy|generous|evil" };
-														 /* enforce_min, min, enforce_max, max */
-	switch_xml_config_int_options_t config_opt_integer = { SWITCH_TRUE, 0, SWITCH_TRUE, 10 };
-	switch_xml_config_enum_item_t config_opt_codec_negotiation_enum[] = { 
-		{ "greedy", CODEC_NEGOTIATION_GREEDY },
-		{ "generous", CODEC_NEGOTIATION_GENEROUS },
-		{ "evil", CODEC_NEGOTIATION_EVIL },
-		{ NULL, 0 } 
-	};
-	
-	switch_xml_config_item_t instructions[] = {
-							/* parameter name        type                 reloadable   pointer                         default value     options structure */
-		SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation),
-		SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation,  (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum),
-		SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace,  (void*)SWITCH_FALSE,  config_callback_siptrace, NULL ),
-		SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer),
-		SWITCH_CONFIG_ITEM_END()
-	};
 
 	memset(&globals, 0, sizeof(globals));
 


From mikej at freeswitch.org  Thu Mar  5 08:44:28 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 10:44:28 -0600
Subject: [Freeswitch-svn] [commit] r12465 - freeswitch/trunk/src
Message-ID: <E1LfGgO-00036h-IW@svn.freeswitch.org>

Author: mikej
Date: Thu Mar  5 10:44:28 2009
New Revision: 12465

Log:
fix assert when calling speech_open without a pool

Modified:
   freeswitch/trunk/src/switch_core_speech.c

Modified: freeswitch/trunk/src/switch_core_speech.c
==============================================================================
--- freeswitch/trunk/src/switch_core_speech.c	(original)
+++ freeswitch/trunk/src/switch_core_speech.c	Thu Mar  5 10:44:28 2009
@@ -78,7 +78,7 @@
 	}
 
 	sh->rate = rate;
-	sh->name = switch_core_strdup(pool, module_name);
+	sh->name = switch_core_strdup(sh->memory_pool, module_name);
 	sh->samples = switch_samples_per_packet(rate, interval);
 	sh->samplerate = rate;
 	sh->native_rate = rate;


From anthm at freeswitch.org  Thu Mar  5 08:53:31 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 10:53:31 -0600
Subject: [Freeswitch-svn] [commit] r12466 - in freeswitch/trunk/src: .
	mod/applications/mod_conference
Message-ID: <E1LfGp9-0003AW-Ji@svn.freeswitch.org>

Author: anthm
Date: Thu Mar  5 10:53:31 2009
New Revision: 12466

Log:
MODAPP-226

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/switch_ivr.c

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Thu Mar  5 10:53:31 2009
@@ -1563,7 +1563,7 @@
 
 	while (switch_test_flag(member, MFLAG_RUNNING) && switch_channel_ready(channel)) {
 
-		if (switch_channel_test_flag(channel, CF_SERVICE)) {
+		if (switch_channel_test_app_flag(channel, CF_APP_TAGGED)) {
 			switch_yield(100000);
 			continue;
 		}
@@ -1878,7 +1878,7 @@
 	}
 
 	if (restarting) {
-		switch_channel_clear_flag(channel, CF_SERVICE);
+		switch_channel_clear_app_flag(channel, CF_APP_TAGGED);
 	}
 
 	/* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed,      */
@@ -2094,9 +2094,9 @@
 
 
 		if (switch_core_session_private_event_count(member->session)) {
-			switch_channel_set_flag(channel, CF_SERVICE);
+			switch_channel_set_app_flag(channel, CF_APP_TAGGED);
 			switch_ivr_parse_all_events(member->session);
-			switch_channel_clear_flag(channel, CF_SERVICE);
+			switch_channel_clear_app_flag(channel, CF_APP_TAGGED);
 			switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
 			switch_core_session_set_read_codec(member->session, &member->read_codec);
 		}
@@ -3697,7 +3697,7 @@
 				if (setup_media(member, new_conference)) {
 					switch_clear_flag_locked(member, MFLAG_RUNNING);
 				} else {
-					switch_channel_set_flag(channel, CF_SERVICE);
+					switch_channel_set_app_flag(channel, CF_APP_TAGGED);
 					switch_set_flag_locked(member, MFLAG_RESTART);
 				}
 			}

Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c	(original)
+++ freeswitch/trunk/src/switch_ivr.c	Thu Mar  5 10:53:31 2009
@@ -975,9 +975,10 @@
 			switch_ivr_parse_all_events(session);
 		}
 
-
+		
 		if (eff_timeout) {
 			digit_elapsed = (uint32_t) ((switch_micro_time_now() - digit_started) / 1000);
+
 			if (digit_elapsed >= eff_timeout) {
 				status = SWITCH_STATUS_TIMEOUT;
 				break;
@@ -987,7 +988,7 @@
 		if (switch_channel_has_dtmf(channel)) {
 			switch_dtmf_t dtmf = { 0 };
 			switch_size_t y;
-
+			
 			if (eff_timeout) {
 				eff_timeout = digit_timeout;
 				digit_started = switch_micro_time_now();
@@ -1006,6 +1007,7 @@
 
 				buf[x++] = dtmf.digit;
 				buf[x] = '\0';
+				
 				if (x >= buflen || x >= maxdigits) {
 					return SWITCH_STATUS_SUCCESS;
 				}


From mrene at freeswitch.org  Thu Mar  5 08:57:26 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 10:57:26 -0600
Subject: [Freeswitch-svn] [commit] r12467 - in freeswitch/trunk/src: .
	include mod/applications/mod_skel
Message-ID: <E1LfGsw-0003Tk-5j@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 10:57:26 2009
New Revision: 12467

Log:
Lets make the parser free its stuff on shutdown, and let the callbacks do something if required

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 10:57:26 2009
@@ -68,7 +68,13 @@
 struct switch_xml_config_item;
 typedef struct switch_xml_config_item switch_xml_config_item_t;
 
-typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_bool_t changed);
+typedef enum {
+	CONFIG_LOAD,
+	CONFIG_RELOAD,
+	CONFIG_SHUTDOWN
+} switch_config_callback_type_t;
+
+typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed);
 
 /*!
  * \brief A configuration instruction read by switch_xml_config_parse 
@@ -114,6 +120,13 @@
  * \param event [out] event (if *event is NOT NULL, the headers will be appended to the existing event)
  */
 SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event);
+
+
+/*!
+ * \brief Free any memory allocated by the configuration
+ * \param instructions instrutions on how to parse the elements
+ */
+SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions);
 #endif /* !defined(SWITCH_XML_CONFIG_H) */
 
 /* For Emacs:

Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	Thu Mar  5 10:57:26 2009
@@ -55,14 +55,15 @@
 	int integer;
 } globals;
 
-static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_bool_t changed) 
+static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) 
 {
 	switch_bool_t value = *(switch_bool_t*)data->ptr;
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In siptrace callback: value %s changed %s\n",
 		value ? "true" : "false", changed ? "true" : "false");
 	
+	
 	/*
-	if (changed) {
+	if ((callback_type == CONFIG_LOG || callback_type == CONFIG_RELOAD) && changed) {
 		nua_set_params(((sofia_profile_t*)data->functiondata)->nua, TPTAG_LOG(value), TAG_END());
 	} 
 	*/
@@ -143,6 +144,8 @@
   Macro expands to: switch_status_t mod_skel_shutdown() */
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown)
 {
+	/* Cleanup dynamically allocated config settings */
+	switch_xml_config_cleanup(instructions);
 	return SWITCH_STATUS_SUCCESS;
 }
 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 10:57:26 2009
@@ -273,7 +273,7 @@
 		}
 		
 		if (callback) {
-			callback(item, changed);
+			callback(item, (reload ? CONFIG_RELOAD : CONFIG_LOAD), changed);
 		}
 	}
 	
@@ -299,6 +299,36 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
+
+SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions)
+{
+	switch_xml_config_item_t *item;
+	
+	for (item = instructions; item->key; item++) {
+		switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function;
+		
+		switch (item->type) {
+			case SWITCH_CONFIG_STRING:
+				{
+					char **ptr = (char**)item->ptr;
+					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
+					/* if (using_strdup) */
+					if (string_options && !string_options->pool && !string_options->length) {
+						switch_safe_free(*ptr);
+					}
+				}
+				break;
+			default:
+				break;
+		}
+		
+		if (callback) {
+			callback(item, CONFIG_SHUTDOWN, SWITCH_FALSE);
+		}
+		
+	}
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c


From mrene at freeswitch.org  Thu Mar  5 11:48:15 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 13:48:15 -0600
Subject: [Freeswitch-svn] [commit] r12468 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1LfJYF-0004mm-JG@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 13:48:15 2009
New Revision: 12468

Log:
Sofia logger goes to LOG_CONSOLE

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Thu Mar  5 13:48:15 2009
@@ -928,9 +928,9 @@
 static void logger(void *logarg, char const *fmt, va_list ap)
 {
 	if (fmt && ap) {
-		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, fmt, ap);
+		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, fmt, ap);
 	} else if (fmt && !ap) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s", fmt);
+		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", fmt);
 	}
 }
 


From mrene at freeswitch.org  Thu Mar  5 12:18:27 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 14:18:27 -0600
Subject: [Freeswitch-svn] [commit] r12469 - in freeswitch/trunk/src: .
	include mod/applications/mod_skel
Message-ID: <E1LfK1T-0005Cy-MO@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 14:18:27 2009
New Revision: 12469

Log:
replace reloadable bool by a flags structure and add required flag

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 14:18:27 2009
@@ -58,6 +58,8 @@
 	char *validation_regex;			/*< Enforce validation using this regular expression */
 } switch_xml_config_string_options_t;
 
+extern switch_xml_config_string_options_t switch_config_string_strdup; 	/*< String options structure for strdup, no validation */
+
 typedef struct {
 	switch_bool_t enforce_min;
 	int min;
@@ -74,6 +76,11 @@
 	CONFIG_SHUTDOWN
 } switch_config_callback_type_t;
 
+typedef enum {
+	CONFIG_RELOADABLE = (1 << 0),
+	CONFIG_REQUIRED = (1 << 1)
+} switch_config_flags_t;
+
 typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed);
 
 /*!
@@ -82,16 +89,16 @@
 struct switch_xml_config_item {
 	char *key;					   			/*< The key of the element, or NULL to indicate the end of the list */
 	switch_xml_config_type_t type; 			/*< The type of variable */
-	switch_bool_t reloadable; 	   			/*< True if the var can be changed on reload */
+	switch_config_flags_t flags; 	   		/*< True if the var can be changed on reload */
 	void *ptr;					   			/*< Ptr to the var to be changed */
 	void *defaultvalue; 		   			/*< Default value */
 	void *data; 				   			/*< Custom data (depending on the type) */
 	switch_xml_config_callback_t function;	/*< Callback to be called after the var is parsed */
-} ;
-
+};
 
-#define SWITCH_CONFIG_ITEM(_key, _type, _reloadable, _ptr, _defaultvalue, _data)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL }
-#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _reloadable, _ptr, _defaultvalue, _functiondata, _data }
+#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data)	{ _key, _type, _flags, _ptr, _defaultvalue, _data, NULL }
+#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue)	{ _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL }
+#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data }
 #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
 
 /*! 

Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c	Thu Mar  5 14:18:27 2009
@@ -83,10 +83,10 @@
 
 static switch_xml_config_item_t instructions[] = {
 	/* parameter name        type                 reloadable   pointer                         default value     options structure */
-	SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation),
-	SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation,  (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum),
-	SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace,  (void*)SWITCH_FALSE,  config_callback_siptrace, NULL ),
-	SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer),
+	SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation),
+	SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE, &globals.codec_negotiation,  (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum),
+	SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace,  (void*)SWITCH_FALSE,  config_callback_siptrace, NULL ),
+	SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE | CONFIG_REQUIRED, &globals.integer, (void*)100, &config_opt_integer),
 	SWITCH_CONFIG_ITEM_END()
 };
 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 14:18:27 2009
@@ -32,6 +32,8 @@
 
 #include <switch.h>
 
+switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL };
+
 SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event)
 {
 	switch_xml_t node;
@@ -79,10 +81,15 @@
 		switch_bool_t changed = SWITCH_FALSE;
 		switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function;
 		
-		if (reload && !item->reloadable) {
+		if (reload && !switch_test_flag(item, CONFIG_RELOADABLE)) {
 			continue;
 		}
 		
+		if (!value && switch_test_flag(item, CONFIG_REQUIRED)) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Required parameter [%s] is missing\n", item->key);
+			return SWITCH_STATUS_FALSE;
+		}
+		
 		switch(item->type) {
 			case SWITCH_CONFIG_INT:
 				{


From mrene at freeswitch.org  Thu Mar  5 12:51:24 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 14:51:24 -0600
Subject: [Freeswitch-svn] [commit] r12470 - in freeswitch/trunk/src: .
	include
Message-ID: <E1LfKXM-0005eR-4D@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 14:51:23 2009
New Revision: 12470

Log:
fix gcc visibility

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Mar  5 14:51:23 2009
@@ -58,7 +58,7 @@
 	char *validation_regex;			/*< Enforce validation using this regular expression */
 } switch_xml_config_string_options_t;
 
-extern switch_xml_config_string_options_t switch_config_string_strdup; 	/*< String options structure for strdup, no validation */
+SWITCH_DECLARE_DATA extern switch_xml_config_string_options_t switch_config_string_strdup; 	/*< String options structure for strdup, no validation */
 
 typedef struct {
 	switch_bool_t enforce_min;

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 14:51:23 2009
@@ -32,7 +32,7 @@
 
 #include <switch.h>
 
-switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL };
+SWITCH_DECLARE_DATA switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL };
 
 SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event)
 {


From mrene at freeswitch.org  Thu Mar  5 13:09:46 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 15:09:46 -0600
Subject: [Freeswitch-svn] [commit] r12471 - freeswitch/trunk/src
Message-ID: <E1LfKp8-0005l0-Oo@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 15:09:46 2009
New Revision: 12471

Log:
oops[]

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 15:09:46 2009
@@ -41,7 +41,7 @@
 	
 	if (!*event) {
 		switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS);
-		switch_assert(event);
+		switch_assert(*event);
 	}
 
 	for (node = xml; node; node = node->next) {
@@ -58,7 +58,7 @@
 
 SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
 {
-	switch_event_t *event;
+	switch_event_t *event = NULL;
 	switch_status_t result;
 	int count = switch_event_import_xml(xml, "name", "value", &event);
 	
@@ -165,14 +165,14 @@
 							/* We have a preallocated buffer */
 							char *dest = (char*)item->ptr;
 						
-							if (strncasecmp(dest, newstring, string_options->length)) {
+							if (!dest || strncasecmp(dest, newstring, string_options->length)) {
 								switch_copy_string(dest, newstring, string_options->length);
 								changed = SWITCH_TRUE;
 							}
 						} else {
 							char **dest = (char**)item->ptr;
 						
-							if (strcasecmp(*dest, newstring)) {
+							if (!*dest || strcasecmp(*dest, newstring)) {
 								if (string_options->pool) {
 									*dest = switch_core_strdup(string_options->pool, newstring);
 								} else {


From brian at freeswitch.org  Thu Mar  5 13:34:13 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 15:34:13 -0600
Subject: [Freeswitch-svn] [commit] r12472 - freeswitch/trunk/src
Message-ID: <E1LfLCn-0006BP-I6@svn.freeswitch.org>

Author: brian
Date: Thu Mar  5 15:34:13 2009
New Revision: 12472

Log:
 add sessions since start up to heartbeat event

Modified:
   freeswitch/trunk/src/switch_core.c

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Thu Mar  5 15:34:13 2009
@@ -75,6 +75,7 @@
 
 		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Count", "%u", switch_core_session_count());
 		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Per-Sec", "%u", runtime.sps);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Since-Startup", "%" SWITCH_SIZE_T_FMT, switch_core_session_id() - 1);
 		switch_event_fire(&event);
 	}
 }


From mrene at freeswitch.org  Thu Mar  5 13:38:32 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 15:38:32 -0600
Subject: [Freeswitch-svn] [commit] r12473 -
	freeswitch/trunk/src/mod/loggers/mod_console
Message-ID: <E1LfLGy-0006E0-UP@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 15:38:32 2009
New Revision: 12473

Log:
Add docs and complete to mod_console

Modified:
   freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c

Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c
==============================================================================
--- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c	(original)
+++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c	Thu Mar  5 15:38:32 2009
@@ -328,8 +328,9 @@
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 
-	SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, "");
-
+	SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, "loglevel [level]|colorize [on|off]");
+	switch_console_set_complete("add console loglevel");
+	switch_console_set_complete("add console colorize");
 
 	/* setup my logger function */
 	switch_log_bind_logger(switch_console_logger, SWITCH_LOG_DEBUG, SWITCH_TRUE);


From mrene at freeswitch.org  Thu Mar  5 13:39:21 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 15:39:21 -0600
Subject: [Freeswitch-svn] [commit] r12474 - freeswitch/trunk/src
Message-ID: <E1LfLHl-0006Fo-En@svn.freeswitch.org>

Author: mrene
Date: Thu Mar  5 15:39:21 2009
New Revision: 12474

Log:
generic parses fixes

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Mar  5 15:39:21 2009
@@ -40,7 +40,8 @@
 	switch_size_t count = 0;
 	
 	if (!*event) {
-		switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS);
+		/* SWITCH_EVENT_CLONE will not insert any generic event headers */
+		switch_event_create(event, SWITCH_EVENT_CLONE);
 		switch_assert(*event);
 	}
 
@@ -74,13 +75,17 @@
 SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions)
 {
 	switch_xml_config_item_t *item;
-	int file_count = 0, matched_count = 0;
+	int matched_count = 0;
 	
 	for (item = instructions; item->key; item++) {
 		const char *value = switch_event_get_header(event, item->key);
 		switch_bool_t changed = SWITCH_FALSE;
 		switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function;
 		
+		if (value) {
+			matched_count++;
+		}
+		
 		if (reload && !switch_test_flag(item, CONFIG_RELOADABLE)) {
 			continue;
 		}
@@ -283,14 +288,14 @@
 			callback(item, (reload ? CONFIG_RELOAD : CONFIG_LOAD), changed);
 		}
 	}
-	
-	if (file_count > matched_count) {
+
+	if (count != matched_count) {
 		/* User made a mistake, find it */
 		switch_event_header_t *header;
 		for (header = event->headers; header; header = header->next) {
 			switch_bool_t found = SWITCH_FALSE;
 			for (item = instructions; item->key; item++) {
-				if (strcasecmp(header->name, item->key)) {
+				if (!strcasecmp(header->name, item->key)) {
 					found = SWITCH_TRUE;
 					break;
 				}
@@ -298,7 +303,7 @@
 			
 			if (!found) {
 				/* Tell the user */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name);
 			}
 		}
 	}


From andrew at freeswitch.org  Thu Mar  5 13:54:16 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 15:54:16 -0600
Subject: [Freeswitch-svn] [commit] r12475 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: <E1LfLWC-0006Lc-45@svn.freeswitch.org>

Author: andrew
Date: Thu Mar  5 15:54:16 2009
New Revision: 12475

Log:
Rework how spawned outbound pids communicate their pid back to the outbound call process, try to improve some memory management


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c	Thu Mar  5 15:54:16 2009
@@ -131,7 +131,6 @@
 	ei_x_buff buf;
 	ei_x_new(&buf);
 	ei_x_encode_list_header(&buf, 1);
-	ei_init_ref(ec, ref);
 	ei_x_encode_ref(&buf, ref);
 	ei_x_encode_empty_list(&buf);
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c	Thu Mar  5 15:54:16 2009
@@ -700,7 +700,8 @@
 static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf)
 {
 	erlang_ref ref;
-	erlang_pid *pid2, *pid = switch_core_alloc(listener->pool, sizeof(erlang_pid));
+	erlang_pid *pid;/* = switch_core_alloc(listener->pool, sizeof(erlang_pid));*/
+	void *p;
 	char hash[100];
 	int arity;
 
@@ -711,6 +712,14 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
+	if (!(pid = malloc(sizeof(erlang_pid)))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n");
+		ei_x_encode_tuple_header(rbuf, 2);
+		ei_x_encode_atom(rbuf, "error");
+		ei_x_encode_atom(rbuf, "badmem");
+		return SWITCH_STATUS_SUCCESS;
+	}
+
 	if (ei_decode_pid(buf->buff, &buf->index, pid)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid pid in a reference/pid tuple\n");
 		return SWITCH_STATUS_FALSE;
@@ -720,19 +729,36 @@
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hashed ref to %s\n", hash);
 	
-	if ((pid2 = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) {
-		if (pid2 == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found unfilled slot for %s\n", hash);
+	if ((p = switch_core_hash_find(listener->spawn_pid_hash, hash))) {
+		if (p == &globals.TIMEOUT) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handler for %s timed out\n", hash);
+			switch_core_hash_delete(listener->spawn_pid_hash, hash);
+			ei_x_encode_tuple_header(rbuf, 2);
+			ei_x_encode_atom(rbuf, "error");
+			ei_x_encode_atom(rbuf, "timeout");
+		} else if (p == &globals.WAITING) {
+			/* update the key to point at a pid */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found waiting slot for %s\n", hash);
+			switch_core_hash_delete(listener->spawn_pid_hash, hash);
+			switch_core_hash_insert(listener->spawn_pid_hash, hash, pid);
+			return SWITCH_STATUS_FALSE; /*no reply */
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", hash);
+			ei_x_encode_tuple_header(rbuf, 2);
+			ei_x_encode_atom(rbuf, "error");
+			ei_x_encode_atom(rbuf, "duplicate_response");
 		}
 	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No slot for %s\n", hash);
-		switch_core_hash_insert(listener->spawn_pid_hash, hash, pid);
+		/* nothin in the hash */
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Empty slot for %s\n", hash);
+		ei_x_encode_tuple_header(rbuf, 2);
+		ei_x_encode_atom(rbuf, "error");
+		ei_x_encode_atom(rbuf, "invalid_ref");
 	}
 
-	/* no reply */
-	return SWITCH_STATUS_FALSE;
+	free(pid); /* don't need it */
+
+	return SWITCH_STATUS_SUCCESS;
 }
 
 
@@ -758,8 +784,7 @@
 				break;
 			case ERL_REFERENCE_EXT :
 			case ERL_NEW_REFERENCE_EXT :
-				handle_ref_tuple(listener, msg, buf, rbuf);
-				return 0;
+				ret = handle_ref_tuple(listener, msg, buf, rbuf);
 			default :
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type);
 				/* some other kind of erlang term */

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Thu Mar  5 15:54:16 2009
@@ -413,7 +413,12 @@
 	if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */
 		return NULL;
 
-	char *xmlstr = switch_core_alloc(ptr->listener->pool, size + 1);
+	char *xmlstr;
+	
+	if (!(xmlstr = malloc(size + 1))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n");
+		return NULL;
+	}
 
 	ei_decode_string_or_binary(rep->buff, &rep->index, size, xmlstr);
 
@@ -431,7 +436,7 @@
 
 	/*switch_safe_free(rep->buff);*/
 	/*switch_safe_free(rep);*/
-	/*switch_safe_free(xmlstr);*/
+	free(xmlstr);
 
 	return xml;
 }
@@ -811,7 +816,6 @@
 	switch_mutex_unlock(globals.listener_mutex);
 
 	switch_core_hash_init(&listener->fetch_reply_hash, listener->pool);
-	switch_core_hash_init(&listener->spawn_pid_hash, listener->pool);
 
 	switch_assert(listener != NULL);
 
@@ -1071,6 +1075,7 @@
 		else {
 			char hash[100];
 			int i = 0;
+			void *p = NULL;
 			session_element->session = session;
 			erlang_pid *pid;
 			erlang_ref ref;
@@ -1081,12 +1086,16 @@
 			/* attach the session to the listener */
 			add_session_elem_to_listener(listener,session_element);
 
+			ei_init_ref(listener->ec, &ref);
+			ei_hash_ref(&ref, hash);
+			/* insert the waiting marker */
+			switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.WAITING);
+
 			if (!strcmp(function, "!")) {
 				/* send a message to request a pid */
 				ei_x_buff rbuf;
 				ei_x_new_with_version(&rbuf);
 
-				ei_init_ref(listener->ec, &ref);
 				ei_x_encode_tuple_header(&rbuf, 3);
 				ei_x_encode_atom(&rbuf, "new_pid");
 				ei_x_encode_ref(&rbuf, &ref);
@@ -1107,23 +1116,27 @@
 				*/
 			}
 
-			ei_hash_ref(&ref, hash);
-
-			while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) {
+			/* loop until either we timeout or we get a value that's not the waiting marker */
+			while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) {
 				if (i > 50) { /* half a second timeout */
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n");
 					switch_core_session_rwunlock(session);
 					remove_session_elem_from_listener(listener,session_element);
+					switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */
 					return NULL;
 				}
 				i++;
 				switch_yield(10000); /* 10ms */
 			}
 
+			switch_core_hash_delete(listener->spawn_pid_hash, hash);
+
+			pid = (erlang_pid *) p;
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n");
 
 			session_element->process.type = ERLANG_PID;
 			memcpy(&session_element->process.pid, pid, sizeof(erlang_pid));
+			free(pid); /* malloced in handle_ref_tuple */
 			switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
 			switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT);
 			switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID);
@@ -1222,6 +1235,7 @@
 		}
 
 		if (module && function) {
+			switch_core_hash_init(&listener->spawn_pid_hash, listener->pool);
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating new spawned session for listener\n");
 			session_element=attach_call_to_spawned_process(listener, module, function, session);
 		} else {

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	Thu Mar  5 15:54:16 2009
@@ -136,6 +136,8 @@
 	unsigned int reference0;
 	unsigned int reference1;
 	unsigned int reference2;
+	char TIMEOUT; /* marker for a timed out request */
+	char WAITING; /* marker for a request waiting for a response */
 	switch_mutex_t *ref_mutex;
 };
 typedef struct globals_struct globals_t;


From brian at freeswitch.org  Thu Mar  5 16:40:34 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 18:40:34 -0600
Subject: [Freeswitch-svn] [commit] r12476 -
	freeswitch/trunk/src/mod/asr_tts/mod_flite
Message-ID: <E1LfO78-0007xH-CR@svn.freeswitch.org>

Author: brian
Date: Thu Mar  5 18:40:34 2009
New Revision: 12476

Log:
 fix a few issues new tarball is up please remove it from libs and redownload

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile

Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile	Thu Mar  5 18:40:34 2009
@@ -5,7 +5,7 @@
 	$(FLITE_LIBDIR)/libflite_cmu_us_kal.a \
 	$(FLITE_LIBDIR)/libflite_cmu_us_rms.a \
 	$(FLITE_LIBDIR)/libflite_cmu_us_slt.a \
-	$(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm -lasound
+	$(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm
 
 LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include
 LOCAL_LIBADD=$(FLITE_A)
@@ -17,7 +17,7 @@
 	$(GETLIB) $(FLITE)-latest.tar.gz
 
 $(FLITE_DIR)/Makefile: $(FLITE_DIR)
-	cd $(FLITE_DIR) && CFLAGS="-fPIC" ./configure
+	cd $(FLITE_DIR) && ./configure --without-audio --with-pic --disable-shared
 	$(TOUCH_TARGET)
 
 $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile


From mikej at freeswitch.org  Thu Mar  5 16:44:49 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 18:44:49 -0600
Subject: [Freeswitch-svn] [commit] r12477 - freeswitch/trunk/libs/win32/flite
Message-ID: <E1LfOBF-0007zC-Ca@svn.freeswitch.org>

Author: mikej
Date: Thu Mar  5 18:44:49 2009
New Revision: 12477

Log:
updated windows projects for flite (FSBUILD-128/FSBUILD-133)

Modified:
   freeswitch/trunk/libs/win32/flite/flite.2008.vcproj

Modified: freeswitch/trunk/libs/win32/flite/flite.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/flite/flite.2008.vcproj	(original)
+++ freeswitch/trunk/libs/win32/flite/flite.2008.vcproj	Thu Mar  5 18:44:49 2009
@@ -44,12 +44,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
-				PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				WarningLevel="0"
+				WarningLevel="4"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4100;4057;4706"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -80,12 +81,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -101,18 +101,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
-				PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				WarningLevel="0"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100;4057;4706"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -143,11 +144,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -163,18 +165,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
-				PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="0"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100;4057;4706"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -233,12 +236,13 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
-				PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="0"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100;4057;4706"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -282,6 +286,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\audio\au_none.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\src\audio\au_streaming.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\src\audio\au_wince.c"
 				>
 			</File>
@@ -314,6 +326,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_postlex.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb.c"
 				>
 				<FileConfiguration
@@ -325,7 +341,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -333,7 +349,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -374,26 +390,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_diphone.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_lpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_res.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_residx.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_diphone.c"
 				>
 			</File>
@@ -422,6 +418,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_cg.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_clunits.c"
 				>
 			</File>
@@ -446,6 +446,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\synth\cst_ffeatures.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\src\utils\cst_file_stdio.c"
 				>
 			</File>
@@ -470,6 +474,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlpg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlsa.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\src\utils\cst_mmap_win32.c"
 				>
 			</File>
@@ -498,10 +510,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_sigprFP.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\flite-1.3.99\src\utils\cst_socket.c"
 				>
 			</File>
@@ -558,6 +566,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_vc.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\src\stats\cst_viterbi.c"
 				>
 			</File>
@@ -646,10 +658,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_postlex.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_text.c"
 				>
 			</File>
@@ -688,6 +696,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\include\cst_cg.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\include\cst_clunits.h"
 				>
 			</File>
@@ -736,6 +748,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlpg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlsa.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\include\cst_phoneset.h"
 				>
 			</File>
@@ -804,6 +824,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\flite-1.3.99\src\cg\cst_vc.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\flite-1.3.99\include\cst_viterbi.h"
 				>
 			</File>
@@ -864,11 +888,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h"
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\voxdefs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\voxdefs.h"
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h"
 				>
 			</File>
 		</Filter>
@@ -878,6 +902,150 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
+		<Filter
+			Name="sltvoice"
+			>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_params.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\voxdefs.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="awbvoice"
+			>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_params.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\voxdefs.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="rmsvoice"
+			>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_params.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\voxdefs.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>


From anthm at freeswitch.org  Thu Mar  5 18:06:33 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 20:06:33 -0600
Subject: [Freeswitch-svn] [commit] r12478 - in freeswitch/trunk:
	libs/iksemel/build libs/iksemel/src src/mod/endpoints/mod_dingaling
Message-ID: <E1LfPSL-0000rM-3F@svn.freeswitch.org>

Author: anthm
Date: Thu Mar  5 20:06:32 2009
New Revision: 12478

Log:
LIBDING-11 use svn update; make iks-reconf; make current

Modified:
   freeswitch/trunk/libs/iksemel/build/libgnutls.m4
   freeswitch/trunk/libs/iksemel/src/stream.c
   freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c

Modified: freeswitch/trunk/libs/iksemel/build/libgnutls.m4
==============================================================================
--- freeswitch/trunk/libs/iksemel/build/libgnutls.m4	(original)
+++ freeswitch/trunk/libs/iksemel/build/libgnutls.m4	Thu Mar  5 20:06:32 2009
@@ -31,7 +31,7 @@
     no_libgnutls=yes
   else
     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+    LIBGNUTLS_LIBS="`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` -lpthread"
     libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
 
 

Modified: freeswitch/trunk/libs/iksemel/src/stream.c
==============================================================================
--- freeswitch/trunk/libs/iksemel/src/stream.c	(original)
+++ freeswitch/trunk/libs/iksemel/src/stream.c	Thu Mar  5 20:06:32 2009
@@ -4,6 +4,14 @@
 ** modify it under the terms of GNU Lesser General Public License.
 */
 
+#include "config.h"
+#ifdef HAVE_GNUTLS
+#define _XOPEN_SOURCE 500
+#define _GNU_SOURCE
+#include <pthread.h>
+#endif
+
+
 #include "common.h"
 #include "iksemel.h"
 
@@ -37,14 +45,17 @@
 };
 
 #ifdef HAVE_GNUTLS
+static pthread_mutex_t tls_send_mutex;
+static pthread_mutex_t tls_recv_mutex;
 
 static size_t
 tls_push (iksparser *prs, const char *buffer, size_t len)
 {
 	struct stream_data *data = iks_user_data (prs);
 	int ret;
-
+	pthread_mutex_lock(&tls_send_mutex);
 	ret = data->trans->send (data->sock, buffer, len);
+	pthread_mutex_unlock(&tls_send_mutex);
 	if (ret) return (size_t) -1;
 	return len;
 }
@@ -54,8 +65,9 @@
 {
 	struct stream_data *data = iks_user_data (prs);
 	int ret;
-
+	pthread_mutex_lock(&tls_recv_mutex);
 	ret = data->trans->recv (data->sock, buffer, len, -1);
+	pthread_mutex_unlock(&tls_recv_mutex);
 	if (ret == -1) return (size_t) -1;
 	return ret;
 }
@@ -584,6 +596,43 @@
 	return 0;
 #endif
 }
+#ifdef HAVE_GNUTLS
+
+
+int
+iks_init(void)
+{
+	int ok = 0;
+	pthread_mutexattr_t attr;
+
+	if (pthread_mutexattr_init(&attr))
+		return -1;
+	
+	if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE))
+		ok = -1;
+	
+	if (ok == 0 && pthread_mutex_init(&tls_send_mutex, &attr))
+		ok = -1;
+
+	if (ok == 0 && pthread_mutex_init(&tls_recv_mutex, &attr)) {
+		pthread_mutex_destroy(&tls_send_mutex);
+		ok = -1;
+	}
+	
+
+	pthread_mutexattr_destroy(&attr);
+
+	return ok;
+
+}
+#else
+int
+iks_init(void)
+{
+	return 0;
+}
+#endif
+
 
 int
 iks_start_tls (iksparser *prs)

Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c	Thu Mar  5 20:06:32 2009
@@ -2495,9 +2495,10 @@
 					}
 					from = ffrom;
 				}
-
-
-				switch_core_chat_send(proto, MDL_CHAT_PROTO, from, to, subject, switch_str_nil(msg), NULL, hint);
+				
+				if (strcasecmp(proto, MDL_CHAT_PROTO)) { /* yes no ! on purpose */
+					switch_core_chat_send(proto, MDL_CHAT_PROTO, from, to, subject, switch_str_nil(msg), NULL, hint);
+				}
 
 				switch_safe_free(pproto);
 				switch_safe_free(ffrom);


From anthm at freeswitch.org  Thu Mar  5 19:54:38 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 05 Mar 2009 21:54:38 -0600
Subject: [Freeswitch-svn] [commit] r12479 - in freeswitch/trunk/src: .
	mod/applications/mod_dptools mod/dialplans/mod_dialplan_xml
Message-ID: <E1LfR8w-0001u2-HJ@svn.freeswitch.org>

Author: anthm
Date: Thu Mar  5 21:54:38 2009
New Revision: 12479

Log:
refactor dialplan logging lines and consolidate some logic for bypass_media mode when the a leg has audio in advance

Modified:
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
   freeswitch/trunk/src/switch_core_session.c
   freeswitch/trunk/src/switch_core_state_machine.c
   freeswitch/trunk/src/switch_ivr_bridge.c

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	Thu Mar  5 21:54:38 2009
@@ -1961,7 +1961,6 @@
 	switch_core_session_t *peer_session = NULL;
 	unsigned int timelimit = 60;
 	const char *var, *continue_on_fail = NULL, *failure_causes = NULL;
-	uint8_t no_media_bridge = 0;
 	switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
 
 	if (switch_strlen_zero(data)) {
@@ -1989,8 +1988,10 @@
 				switch_ivr_media(switch_core_session_get_uuid(session), SMF_REBRIDGE);
 				switch_channel_set_flag(caller_channel, CF_PROXY_MODE);
 			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are up.\n");
-				no_media_bridge = 1;
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are answered.\n");
+				switch_channel_set_variable(caller_channel, "bypass_media_after_bridge", "true");
+				switch_channel_set_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE, NULL);
+				switch_channel_clear_flag(caller_channel, CF_PROXY_MODE);
 			}
 		}
 	}
@@ -2032,60 +2033,35 @@
 		}
 		return;
 	} else {
-		if (no_media_bridge) {
-			switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
-			switch_frame_t *read_frame;
-			/* SIP won't let us redir media until the call has been answered #$^#%& so we will proxy any early media until they do */
-			while (switch_channel_ready(caller_channel) && switch_channel_ready(peer_channel)
-				   && !switch_channel_test_flag(peer_channel, CF_ANSWERED)) {
-				switch_status_t status = switch_core_session_read_frame(peer_session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
-				uint8_t bad = 1;
-
-				if (SWITCH_READ_ACCEPTABLE(status)
-					&& switch_core_session_write_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0) == SWITCH_STATUS_SUCCESS) {
-					bad = 0;
-				}
-				if (bad) {
-					switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-					switch_channel_hangup(peer_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-					goto end;
-				}
-			}
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting media to proxy mode.\n");
-			switch_ivr_nomedia(switch_core_session_get_uuid(session), SMF_FORCE);
-			switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE);
+		
+		if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
 			switch_ivr_signal_bridge(session, peer_session);
 		} else {
-			if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
-				switch_ivr_signal_bridge(session, peer_session);
+			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 {
-				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);
+				a_key = NULL;
+				b_key = NULL;
 			}
+
+			switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, a_key);
 		}
-	  end:
+		
 		if (peer_session) {
 			switch_core_session_rwunlock(peer_session);
 		}

Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
==============================================================================
--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c	(original)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c	Thu Mar  5 21:54:38 2009
@@ -97,6 +97,8 @@
 				do_break_i = BREAK_ALWAYS;
 			} else if (!strcasecmp(do_break_a, "never")) {
 				do_break_i = BREAK_NEVER;
+			} else {
+				do_break_a = NULL;
 			}
 		}
 
@@ -114,14 +116,23 @@
 			if (!field_data) {
 				field_data = "";
 			}
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Regex: [%s] %s(%s) =~ /%s/\n", exten_name, field, field_data, expression);
-			if (!(proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Regex mismatch\n");
-
+			
+			if ((proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
+				switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, 
+								  "Dialplan: %s Regex (PASS) [%s] %s(%s) =~ /%s/ break=%s\n", 
+								  switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false");
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, 
+								  "Dialplan: %s Regex (FAIL) [%s] %s(%s) =~ /%s/ break=%s\n", 
+								  switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false");
 				for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) {
 					char *application = (char *) switch_xml_attr_soft(xaction, "application");
 					char *data = (char *) switch_xml_attr_soft(xaction, "data");
-
+					
+					switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, 
+									  "Dialplan: %s ANTI-Action %s(%s)\n", 
+									  switch_channel_get_name(channel), application, data);
+					
 					if (!*extension) {
 						if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
 							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
@@ -141,6 +152,10 @@
 				}
 			}
 			assert(re != NULL);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, 
+							  "Dialplan: %s Absolute Condition [%s]\n", 
+							  switch_channel_get_name(channel), exten_name);
 		}
 
 		for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) {
@@ -178,6 +193,10 @@
 				}
 			}
 
+			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, 
+							  "Dialplan: %s Action %s(%s)\n", 
+							  switch_channel_get_name(channel), application, app_data);
+
 			switch_caller_extension_add_application(session, *extension, application, app_data);
 			switch_safe_free(substituted);
 		}
@@ -275,7 +294,16 @@
 
 	while (xexten) {
 		int proceed = 0;
-		char *cont = (char *) switch_xml_attr_soft(xexten, "continue");
+		const char *cont = switch_xml_attr(xexten, "continue");
+		const char *exten_name = switch_xml_attr(xexten, "name");
+
+		if (!exten_name) {
+			exten_name = "UNKNOWN";
+		}
+
+		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, 
+						  "Dialplan: %s parsing [%s->%s] continue=%s\n", 
+						  switch_channel_get_name(channel), caller_profile->context, exten_name, cont ? cont : "false");
 
 		proceed = parse_exten(session, caller_profile, xexten, &extension);
 

Modified: freeswitch/trunk/src/switch_core_session.c
==============================================================================
--- freeswitch/trunk/src/switch_core_session.c	(original)
+++ freeswitch/trunk/src/switch_core_session.c	Thu Mar  5 21:54:38 2009
@@ -1299,10 +1299,13 @@
 
 	app = application_interface->interface_name;
 	
-	if (arg && (expanded = switch_channel_expand_variables(session->channel, arg)) != arg) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Expanded String %s(%s)\n", switch_channel_get_name(session->channel), app, expanded);
+	if (arg) {
+		expanded = switch_channel_expand_variables(session->channel, arg);
 	}
 
+	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "EXECUTE %s %s(%s)\n", 
+					  switch_channel_get_name(session->channel), app, switch_str_nil(expanded));
+
 	if ((var = switch_channel_get_variable(session->channel, "verbose_presence")) && switch_true(var)) {
 		char *myarg = NULL;
 		if (expanded) {
@@ -1318,10 +1321,6 @@
 		}
 	}
 
-	if (!arg) {
-		arg = "";
-	}
-
 	if (!(var = switch_channel_get_variable(session->channel, SWITCH_DISABLE_APP_LOG_VARIABLE)) || (!(switch_true(var)))) {
 		log = switch_core_session_alloc(session, sizeof(*log));
 

Modified: freeswitch/trunk/src/switch_core_state_machine.c
==============================================================================
--- freeswitch/trunk/src/switch_core_state_machine.c	(original)
+++ freeswitch/trunk/src/switch_core_state_machine.c	Thu Mar  5 21:54:38 2009
@@ -156,9 +156,6 @@
 
 		extension->current_application = extension->current_application->next;
 
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Execute %s(%s)\n", switch_channel_get_name(session->channel),
-						  current_application->application_name, switch_str_nil(current_application->application_data));
-
 		if (switch_core_session_execute_application(session,
 													current_application->application_name,
 													current_application->application_data) != SWITCH_STATUS_SUCCESS) {

Modified: freeswitch/trunk/src/switch_ivr_bridge.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_bridge.c	(original)
+++ freeswitch/trunk/src/switch_ivr_bridge.c	Thu Mar  5 21:54:38 2009
@@ -250,7 +250,8 @@
 		}
 #endif
 
-		if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge) {
+		if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge && switch_channel_test_flag(chan_a, CF_ANSWERED) && 
+			switch_channel_test_flag(chan_b, CF_ANSWERED)) {
 			switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
 			bypass_media_after_bridge = 0;
 		}


From anthm at freeswitch.org  Fri Mar  6 06:12:32 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 08:12:32 -0600
Subject: [Freeswitch-svn] [commit] r12480 - in freeswitch/trunk/src: .
	mod/applications/mod_commands mod/languages/mod_spidermonkey
Message-ID: <E1Lfamu-0005CT-E5@svn.freeswitch.org>

Author: anthm
Date: Fri Mar  6 08:12:32 2009
New Revision: 12480

Log:
MODAPP-228

Modified:
   freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
   freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
   freeswitch/trunk/src/switch_ivr_play_say.c

Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	Fri Mar  6 08:12:32 2009
@@ -777,7 +777,7 @@
 
 	if ((proceed = switch_regex_perform(argv[0], argv[1], &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
 		if (argc > 2) {
-			len = strlen(argv[0]) * 3;
+			len = (strlen(argv[0]) + strlen(argv[2]) + 10) * proceed;
 			substituted = malloc(len);
 			switch_assert(substituted);
 			memset(substituted, 0, len);

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	Fri Mar  6 08:12:32 2009
@@ -403,7 +403,7 @@
 	if (argc > 0) {
 		uint32_t len;
 		subst_string = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10);
+		len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10) * pcre_obj->proceed;
 		substituted = malloc(len);
 		switch_assert(substituted != NULL);
 		switch_perform_substitution(pcre_obj->re, pcre_obj->proceed, subst_string, pcre_obj->string, substituted, len, pcre_obj->ovector);

Modified: freeswitch/trunk/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_play_say.c	(original)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	Fri Mar  6 08:12:32 2009
@@ -247,7 +247,7 @@
 					char *func = (char *) switch_xml_attr_soft(action, "function");
 
 					if (strchr(pattern, '(') && strchr(adata, '$')) {
-						len = (uint32_t) (strlen(data) + strlen(adata) + 10);
+						len = (uint32_t) (strlen(data) + strlen(adata) + 10) * proceed;
 						if (!(substituted = malloc(len))) {
 							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
 							switch_regex_safe_free(re);


From mikej at freeswitch.org  Fri Mar  6 09:40:04 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 11:40:04 -0600
Subject: [Freeswitch-svn] [commit] r12482 - freeswitch/trunk/libs/win32
Message-ID: <E1Lfe1k-0007L2-TT@svn.freeswitch.org>

Author: mikej
Date: Fri Mar  6 11:40:04 2009
New Revision: 12482

Log:
build: download flite from right tarball location (FSBUILD-135)

Modified:
   freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj

Modified: freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj	(original)
+++ freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj	Fri Mar  6 11:40:04 2009
@@ -76,17 +76,17 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading Flite."
-					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
+					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
 					Outputs="$(ProjectDir)..\flite-1.3.99"
-        />
-      </FileConfiguration>
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading Flite."
-					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
+					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
 					Outputs="$(ProjectDir)..\flite-1.3.99"
 				/>
 			</FileConfiguration>


From brian at freeswitch.org  Fri Mar  6 09:44:27 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 11:44:27 -0600
Subject: [Freeswitch-svn] [commit] r12483 -
	freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
Message-ID: <E1Lfe5z-0007NE-Pe@svn.freeswitch.org>

Author: brian
Date: Fri Mar  6 11:44:27 2009
New Revision: 12483

Log:
MODASRTTS-13 part 1

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c	Fri Mar  6 11:44:27 2009
@@ -134,15 +134,20 @@
 		model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model16k);
 	}
 
-	dic = switch_mprintf("%s%sdefault.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar);
+	dic = switch_mprintf("%s%sdefault.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR);
 
 	if (switch_file_exists(dic, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open dictionary %s.\n", dic); 
 		goto end;
 	}
 
+	if (switch_file_exists(model, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open speech model %s.\n", model); 
+		goto end;
+	}
+
 	if (switch_file_exists(jsgf, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open language model %s.\n", model); 
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open grammar file %s.\n", jsgf); 
 		goto end;
 	}
 


From anthm at freeswitch.org  Fri Mar  6 09:45:32 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 11:45:32 -0600
Subject: [Freeswitch-svn] [commit] r12484 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: <E1Lfe72-0007PH-Hk@svn.freeswitch.org>

Author: anthm
Date: Fri Mar  6 11:45:32 2009
New Revision: 12484

Log:
FSCORE-263

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Fri Mar  6 11:45:32 2009
@@ -932,11 +932,19 @@
 {
 	private_object_t *tech_pvt;
 	char message[128] = "";
+	sofia_dtmf_t dtmf_type;
 
 	tech_pvt = (private_object_t *) switch_core_session_get_private(session);
 	switch_assert(tech_pvt != NULL);
 
-	switch (tech_pvt->dtmf_type) {
+	dtmf_type = tech_pvt->dtmf_type;
+
+	/* We only can send INFO when we have no media */
+	if (!tech_pvt->rtp_session || !switch_channel_media_ready(tech_pvt->channel) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE)) {
+		dtmf_type = DTMF_INFO;
+	}
+
+	switch (dtmf_type) {
 	case DTMF_2833:
 		return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf);
 
@@ -947,6 +955,7 @@
 		switch_mutex_unlock(tech_pvt->sofia_mutex);
 		break;
 	default:
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unhandled DTMF type!\n");
 		break;
 	}
 


From brian at freeswitch.org  Fri Mar  6 09:46:45 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 11:46:45 -0600
Subject: [Freeswitch-svn] [commit] r12485 - in freeswitch/trunk: libs
	libs/esl libs/iksemel libs/ilbc libs/ilbc/config
	libs/ilbc/doc libs/ilbc/localtests libs/ilbc/src
	libs/ilbc/tests libs/libg722_1 libs/libg722_1/doc
	libs/libg722_1/src libs/libg722_1/test-data
	libs/libg722_1/test-data/itu libs/libg722_1/test-data/local
	libs/libg722_1/tests libs/sofia-sip libs/sofia-sip/s2check
	libs/speex libs/speex/win32/VS2003/libspeexdsp
	libs/speex/win32/VS2003/tests libs/speex/win32/VS2005/libspeexdsp
	libs/speex/win32/VS2005/tests libs/speex/win32/VS2008
	libs/speex/win32/VS2008/libspeex libs/speex/win32/VS2008/libspeexdsp
	libs/speex/win32/VS2008/speexdec libs/speex/win32/VS2008/speexenc
	libs/speex/win32/VS2008/tests scripts
	src/mod/codecs/mod_dahdi_codec src/mod/endpoints
	src/mod/endpoints/mod_sofia
Message-ID: <E1Lfe8D-0007Qn-Oy@svn.freeswitch.org>

Author: brian
Date: Fri Mar  6 11:46:45 2009
New Revision: 12485

Log:
ignore

Modified:
   freeswitch/trunk/libs/   (props changed)
   freeswitch/trunk/libs/esl/   (props changed)
   freeswitch/trunk/libs/iksemel/   (props changed)
   freeswitch/trunk/libs/ilbc/   (props changed)
   freeswitch/trunk/libs/ilbc/config/   (props changed)
   freeswitch/trunk/libs/ilbc/doc/   (props changed)
   freeswitch/trunk/libs/ilbc/localtests/   (props changed)
   freeswitch/trunk/libs/ilbc/src/   (props changed)
   freeswitch/trunk/libs/ilbc/tests/   (props changed)
   freeswitch/trunk/libs/libg722_1/   (props changed)
   freeswitch/trunk/libs/libg722_1/doc/   (props changed)
   freeswitch/trunk/libs/libg722_1/src/   (props changed)
   freeswitch/trunk/libs/libg722_1/test-data/   (props changed)
   freeswitch/trunk/libs/libg722_1/test-data/itu/   (props changed)
   freeswitch/trunk/libs/libg722_1/test-data/local/   (props changed)
   freeswitch/trunk/libs/libg722_1/tests/   (props changed)
   freeswitch/trunk/libs/sofia-sip/   (props changed)
   freeswitch/trunk/libs/sofia-sip/s2check/   (props changed)
   freeswitch/trunk/libs/speex/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2003/libspeexdsp/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2003/tests/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2005/libspeexdsp/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2005/tests/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/libspeex/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/libspeexdsp/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/speexdec/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/speexenc/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/tests/   (props changed)
   freeswitch/trunk/scripts/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/   (props changed)
   freeswitch/trunk/src/mod/endpoints/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_sofia/   (props changed)


From brian at freeswitch.org  Fri Mar  6 09:48:15 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 11:48:15 -0600
Subject: [Freeswitch-svn] [commit] r12486 -
	freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig
Message-ID: <E1Lfe9f-0007jB-2N@svn.freeswitch.org>

Author: brian
Date: Fri Mar  6 11:48:14 2009
New Revision: 12486

Log:
add missing java files

Added:
   freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_CoreSession.java
   freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_SWITCH_DECLARE_CLASS.java

Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_CoreSession.java
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_CoreSession.java	Fri Mar  6 11:48:14 2009
@@ -0,0 +1,26 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.freeswitch.swig;
+
+public class SWIGTYPE_p_CoreSession {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_CoreSession(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_CoreSession() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_CoreSession obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+

Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_SWITCH_DECLARE_CLASS.java
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_SWITCH_DECLARE_CLASS.java	Fri Mar  6 11:48:14 2009
@@ -0,0 +1,26 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.freeswitch.swig;
+
+public class SWIGTYPE_p_SWITCH_DECLARE_CLASS {
+  private long swigCPtr;
+
+  protected SWIGTYPE_p_SWITCH_DECLARE_CLASS(long cPtr, boolean futureUse) {
+    swigCPtr = cPtr;
+  }
+
+  protected SWIGTYPE_p_SWITCH_DECLARE_CLASS() {
+    swigCPtr = 0;
+  }
+
+  protected static long getCPtr(SWIGTYPE_p_SWITCH_DECLARE_CLASS obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+}
+


From mikej at freeswitch.org  Fri Mar  6 11:19:56 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 13:19:56 -0600
Subject: [Freeswitch-svn] [commit] r12487 - freeswitch/trunk/libs/speex
Message-ID: <E1LffaO-0008Pj-Q0@svn.freeswitch.org>

Author: mikej
Date: Fri Mar  6 13:19:56 2009
New Revision: 12487

Log:
fix automake 1.7 build

Modified:
   freeswitch/trunk/libs/speex/Makefile.am

Modified: freeswitch/trunk/libs/speex/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/speex/Makefile.am	(original)
+++ freeswitch/trunk/libs/speex/Makefile.am	Fri Mar  6 13:19:56 2009
@@ -2,7 +2,7 @@
 
 # To disable automatic dependency tracking if using other tools than
 # gcc and gmake, add the option 'no-dependencies'
-AUTOMAKE_OPTIONS = 1.8
+AUTOMAKE_OPTIONS = 1.7
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = speex.m4


From anthm at freeswitch.org  Fri Mar  6 11:24:10 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 13:24:10 -0600
Subject: [Freeswitch-svn] [commit] r12488 - in freeswitch/trunk/libs/esl:
	lua perl php python ruby src src/include
Message-ID: <E1LffeU-0000La-Mi@svn.freeswitch.org>

Author: anthm
Date: Fri Mar  6 13:24:10 2009
New Revision: 12488

Log:
change api to return event on filter command

Modified:
   freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
   freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
   freeswitch/trunk/libs/esl/perl/server2.pl
   freeswitch/trunk/libs/esl/php/ESL.php
   freeswitch/trunk/libs/esl/php/esl_wrap.cpp
   freeswitch/trunk/libs/esl/python/esl_wrap.cpp
   freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
   freeswitch/trunk/libs/esl/src/esl_oop.cpp
   freeswitch/trunk/libs/esl/src/include/esl_oop.h

Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	Fri Mar  6 13:24:10 2009
@@ -2537,7 +2537,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  int result;
+  ESLevent *result = 0 ;
   
   SWIG_check_num_args("filter",3,3)
   if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("filter",1,"ESLconnection *");
@@ -2550,9 +2550,9 @@
   
   arg2 = (char *)lua_tostring(L, 2);
   arg3 = (char *)lua_tostring(L, 3);
-  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
+  result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
   SWIG_arg=0;
-  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
+  SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++; 
   return SWIG_arg;
   
   if(0) SWIG_fail;

Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	Fri Mar  6 13:24:10 2009
@@ -3092,7 +3092,7 @@
     ESLconnection *arg1 = (ESLconnection *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
-    int result;
+    ESLevent *result = 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res2 ;
@@ -3122,8 +3122,8 @@
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'");
     }
     arg3 = reinterpret_cast< char * >(buf3);
-    result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
+    result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     if (alloc3 == SWIG_NEWOBJ) delete[] buf3;

Modified: freeswitch/trunk/libs/esl/perl/server2.pl
==============================================================================
--- freeswitch/trunk/libs/esl/perl/server2.pl	(original)
+++ freeswitch/trunk/libs/esl/perl/server2.pl	Fri Mar  6 13:24:10 2009
@@ -26,7 +26,17 @@
 
   printf "Connected call %s, from %s\n", $uuid, $info->getHeader("caller-caller-id-number");
 
-  $con->sendRecv("myevents");
+  $e = $con->filter("unique-id", $uuid);
+  if ($e) {
+    print $e->serialize();
+  } else {
+    printf("WTF?\n");
+  }
+    
+  $con->events("plain", "all");
+
+
+  #$con->sendRecv("myevents");
   $con->execute("answer");
   $con->execute("playback", "/ram/swimp.raw");
   

Modified: freeswitch/trunk/libs/esl/php/ESL.php
==============================================================================
--- freeswitch/trunk/libs/esl/php/ESL.php	(original)
+++ freeswitch/trunk/libs/esl/php/ESL.php	Fri Mar  6 13:24:10 2009
@@ -170,7 +170,8 @@
 	}
 
 	function filter($header,$value) {
-		return ESLconnection_filter($this->_cPtr,$header,$value);
+		$r=ESLconnection_filter($this->_cPtr,$header,$value);
+		return is_resource($r) ? new ESLevent($r) : $r;
 	}
 
 	function events($etype,$value) {

Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp	Fri Mar  6 13:24:10 2009
@@ -2120,7 +2120,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  int result;
+  ESLevent *result = 0 ;
   zval **args[3];
   
   SWIG_ResetError();
@@ -2146,9 +2146,9 @@
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
   
-  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
+  result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
   {
-    ZVAL_LONG(return_value,result);
+    SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
   }
   return;
 fail:

Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp	Fri Mar  6 13:24:10 2009
@@ -3956,7 +3956,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  int result;
+  ESLevent *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3985,8 +3985,8 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'");
   }
   arg3 = reinterpret_cast< char * >(buf3);
-  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
+  result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   return resultobj;

Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	Fri Mar  6 13:24:10 2009
@@ -3087,7 +3087,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  int result;
+  ESLevent *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3116,8 +3116,8 @@
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","filter", 3, argv[1] ));
   }
   arg3 = reinterpret_cast< char * >(buf3);
-  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
-  vresult = SWIG_From_int(static_cast< int >(result));
+  result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   return vresult;

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Fri Mar  6 13:24:10 2009
@@ -189,9 +189,18 @@
 	return NULL;
 }
 
-int ESLconnection::filter(const char *header, const char *value)
+ESLevent *ESLconnection::filter(const char *header, const char *value)
 {
-	return esl_filter(&handle, header, value);
+	esl_status_t status = esl_filter(&handle, header, value);
+
+	if (status == ESL_SUCCESS && handle.last_sr_event) {
+		esl_event_t *event;
+		esl_event_dup(&event, handle.last_sr_event);
+		return new ESLevent(event, 1);
+	}
+
+	return NULL;
+
 }
 
 int ESLconnection::events(const char *etype, const char *value)

Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h
==============================================================================
--- freeswitch/trunk/libs/esl/src/include/esl_oop.h	(original)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h	Fri Mar  6 13:24:10 2009
@@ -86,7 +86,7 @@
 	int sendEvent(ESLevent *send_me);
 	ESLevent *recvEvent();
 	ESLevent *recvEventTimed(int ms);
-	int filter(const char *header, const char *value);
+	ESLevent *filter(const char *header, const char *value);
 	int events(const char *etype, const char *value);
 	int execute(const char *app, const char *arg = NULL, const char *uuid = NULL);
 	int setBlockingExecute(const char *val);


From anthm at freeswitch.org  Fri Mar  6 11:25:20 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 13:25:20 -0600
Subject: [Freeswitch-svn] [commit] r12489 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_socket
Message-ID: <E1Lfffc-0000OF-1k@svn.freeswitch.org>

Author: anthm
Date: Fri Mar  6 13:25:19 2009
New Revision: 12489

Log:
fix broken filter command in event socket

Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c	Fri Mar  6 13:25:19 2009
@@ -254,7 +254,7 @@
 
 			send = 0;
 			switch_mutex_lock(l->filter_mutex);
-			for (hp = l->filters->headers; hp;  hp = hp->next) {
+			for (hp = l->filters->headers; hp; hp = hp->next) {
 				if ((hval = switch_event_get_header(event, hp->name))) {
 					const char *comp_to = hp->value;
 					int pos = 1, cmp = 0;
@@ -611,7 +611,8 @@
 
 		switch_mutex_lock(listener->filter_mutex);		
 		if (!listener->filters) {
-			switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+			switch_event_create(&listener->filters, SWITCH_EVENT_CLONE);
+			listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA;
 		}
 
 		if (!strcasecmp(action, "delete")) {
@@ -622,7 +623,8 @@
 
 			if (!strcasecmp(header_val, "all")) {
 				switch_event_destroy(&listener->filters);
-				switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+				switch_event_create(&listener->filters, SWITCH_EVENT_CLONE);
+				listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA;
 			} else {
 				switch_event_del_header(listener->filters, header_val);
 			}
@@ -1406,13 +1408,15 @@
 
 		switch_mutex_lock(listener->filter_mutex);		
 		if (!listener->filters) {
-			switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+			switch_event_create(&listener->filters, SWITCH_EVENT_CLONE);
+			listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA;
 		}
 		
 		if (!strcasecmp(header_name, "delete")) {
 			if (!strcasecmp(header_val, "all")) {
 				switch_event_destroy(&listener->filters);
-				switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+				switch_event_create(&listener->filters, SWITCH_EVENT_CLONE);
+				listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA;
 			} else {
 				switch_event_del_header(listener->filters, header_val);
 			}


From mikej at freeswitch.org  Fri Mar  6 11:27:14 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 13:27:14 -0600
Subject: [Freeswitch-svn] [commit] r12490 - in freeswitch/trunk:
	src/mod/applications/mod_commands
	src/mod/applications/mod_conference src/mod/applications/mod_dptools
	src/mod/applications/mod_easyroute
	src/mod/applications/mod_enum src/mod/applications/mod_esf
	src/mod/applications/mod_expr src/mod/applications/mod_fax
	src/mod/applications/mod_fifo src/mod/applications/mod_fsv
	src/mod/applications/mod_lcr src/mod/applications/mod_limit
	src/mod/applications/mod_rss src/mod/applications/mod_snom
	src/mod/applications/mod_vmd src/mod/applications/mod_voicemail
	src/mod/asr_tts/mod_cepstral src/mod/asr_tts/mod_flite
	src/mod/asr_tts/mod_pocketsphinx src/mod/codecs/mod_amr
	src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729
	src/mod/codecs/mod_h26x src/mod/codecs/mod_ilbc
	src/mod/codecs/mod_siren src/mod/codecs/mod_speex
	src/mod/codecs/mod_voipcodecs
	src/mod/dialplans/mod_dialplan_asterisk
	src/mod/dialplans/mod_dialplan_directory
	src/mod/dialplans/mod_dialplan_xml
	src/mod/directories/mod_ldap src/mod/endpoints/mod_dingaling
	src/mod/endpoints/mod_iax src/mod/endpoints/mod_loopback
	src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia
	src/mod/event_handlers/mod_cdr_csv
	src/mod/event_handlers/mod_event_multicast
	src/mod/event_handlers/mod_event_socket
	src/mod/event_handlers/mod_zeroconf src/mod/formats/mod_local_stream
	src/mod/formats/mod_native_file src/mod/formats/mod_shout
	src/mod/formats/mod_sndfile src/mod/formats/mod_tone_stream
	src/mod/languages/mod_lua src/mod/languages/mod_managed
	src/mod/languages/mod_spidermonkey
	src/mod/languages/mod_spidermonkey_core_db
	src/mod/languages/mod_spidermonkey_curl
	src/mod/languages/mod_spidermonkey_odbc
	src/mod/languages/mod_spidermonkey_socket
	src/mod/languages/mod_spidermonkey_teletone
	src/mod/loggers/mod_console src/mod/loggers/mod_logfile
	src/mod/say/mod_say_de src/mod/say/mod_say_en
	src/mod/say/mod_say_es src/mod/say/mod_say_fr
	src/mod/say/mod_say_it src/mod/say/mod_say_nl
	src/mod/say/mod_say_zh src/mod/xml_int/mod_xml_cdr
	src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc w32
Message-ID: <E1LffhS-0000pX-As@svn.freeswitch.org>

Author: mikej
Date: Fri Mar  6 13:27:14 2009
New Revision: 12490

Log:
build: build path cleanups (FSBUILD-130)

Modified:
   freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj
   freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj
   freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj
   freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj
   freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj
   freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj
   freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj
   freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj
   freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj
   freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj
   freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj
   freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj
   freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj
   freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj
   freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj
   freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj
   freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj
   freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj
   freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj
   freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj
   freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj
   freeswitch/trunk/w32/modules.vsprops

Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="0"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="0"

Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="0"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="0"

Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -211,8 +209,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -211,8 +209,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -218,8 +216,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -87,8 +87,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -223,8 +221,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -21,8 +21,6 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="1"
@@ -96,8 +94,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="1"
@@ -173,8 +169,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="1"
@@ -253,8 +247,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="1"

Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -345,8 +345,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug Passthrough|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -476,8 +474,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release Passthrough|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -347,8 +347,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug Passthrough|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -478,8 +476,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release Passthrough|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -349,8 +349,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug Passthrough|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -480,8 +478,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release Passthrough|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -212,8 +210,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -212,8 +210,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -359,8 +359,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug MS-LDAP|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -497,8 +495,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release MS-LDAP|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -217,8 +215,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -87,8 +87,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -223,8 +221,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -211,8 +209,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -88,8 +88,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -226,8 +224,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -87,8 +87,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -224,8 +222,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"
@@ -213,8 +211,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -212,8 +210,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -211,8 +209,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj	(original)
+++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj	Fri Mar  6 13:27:14 2009
@@ -20,8 +20,6 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -93,8 +91,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -168,8 +164,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"
@@ -244,8 +238,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -217,8 +215,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -86,8 +86,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -220,8 +218,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj	Fri Mar  6 13:27:14 2009
@@ -103,8 +103,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_CLR|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -267,8 +265,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release_CLR|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="1"

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -86,8 +86,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"
@@ -220,8 +218,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"
@@ -218,8 +216,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"
@@ -218,8 +216,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"
@@ -223,8 +221,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="1"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="1"

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"
@@ -221,8 +219,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -88,8 +88,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -221,8 +219,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -82,8 +82,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
 			CharacterSet="2"
@@ -209,8 +207,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -83,8 +83,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"
@@ -213,8 +211,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -84,8 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"
@@ -215,8 +213,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj	Fri Mar  6 13:27:14 2009
@@ -85,8 +85,6 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"
@@ -218,8 +216,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
 			CharacterSet="2"

Modified: freeswitch/trunk/w32/modules.vsprops
==============================================================================
--- freeswitch/trunk/w32/modules.vsprops	(original)
+++ freeswitch/trunk/w32/modules.vsprops	Fri Mar  6 13:27:14 2009
@@ -3,8 +3,8 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="modules"
-	OutputDirectory="$(ConfigurationName)"
-	IntermediateDirectory="$(ConfigurationName)"
+	OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+	IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 	InheritedPropertySheets=".\winlibs.vsprops"
 	>
 	<Tool
@@ -17,7 +17,7 @@
 		Name="VCLinkerTool"
 		OutputFile=""
 		GenerateDebugInformation="true"
-		ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
+		ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
 		ImportLibrary="$(OutDir)/$(InputName).lib"
 	/>
 </VisualStudioPropertySheet>


From anthm at freeswitch.org  Fri Mar  6 12:16:48 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 14:16:48 -0600
Subject: [Freeswitch-svn] [commit] r12491 - in
	freeswitch/trunk/src/mod/applications: mod_commands mod_dptools
Message-ID: <E1LfgTQ-0001OK-TC@svn.freeswitch.org>

Author: anthm
Date: Fri Mar  6 14:16:48 2009
New Revision: 12491

Log:
add heartbeat apps

Modified:
   freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c

Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	Fri Mar  6 14:16:48 2009
@@ -2743,7 +2743,7 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
-#define HEARTBEAT_SYNTAX "<uuid> [sched] <on|off|<seconds>>"
+#define HEARTBEAT_SYNTAX "<uuid> [sched] [0|<seconds>]"
 SWITCH_STANDARD_API(uuid_session_heartbeat_function)
 {
 	char *mycmd = NULL, *argv[3] = { 0 };

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	Fri Mar  6 14:16:48 2009
@@ -111,6 +111,42 @@
 	}
 }
 
+
+#define SCHED_HEARTBEAT_SYNTAX "[0|<seconds>]"
+SWITCH_STANDARD_APP(sched_heartbeat_function)
+{
+	int seconds = 0;
+
+	if (data) {
+		seconds = atoi(data);
+		if (seconds >= 0) {
+			switch_core_session_sched_heartbeat(session, seconds);
+			return;
+		}
+	}
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SCHED_HEARTBEAT_SYNTAX);
+
+}
+
+
+#define HEARTBEAT_SYNTAX "[0|<seconds>]"
+SWITCH_STANDARD_APP(heartbeat_function)
+{
+	int seconds = 0;
+
+	if (data) {
+		seconds = atoi(data);
+		if (seconds >= 0) {
+			switch_core_session_enable_heartbeat(session, seconds);
+			return;
+		}
+	}
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", HEARTBEAT_SYNTAX);
+
+}
+
 #define EXE_SYNTAX "<extension> <dialplan> <context>"
 SWITCH_STANDARD_APP(exe_function)
 {
@@ -2605,6 +2641,10 @@
 	SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function,
 				   "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA);
 	SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA);
+	SWITCH_ADD_APP(app_interface, "sched_heartbeat", "Enable Scheduled Heartbeat", "Enable Scheduled Heartbeat", 
+				   sched_heartbeat_function, SCHED_HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA);
+	SWITCH_ADD_APP(app_interface, "enable_heartbeat", "Enable Media Heartbeat", "Enable Media Heartbeat", 
+				   heartbeat_function, HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA);
 	SWITCH_ADD_APP(app_interface, "mkdir", "Create a directory", "Create a directory", mkdir_function, MKDIR_SYNTAX, SAF_SUPPORT_NOMEDIA);
 	SWITCH_ADD_APP(app_interface, "soft_hold", "Put a bridged channel on hold", "Put a bridged channel on hold", soft_hold_function, SOFT_HOLD_SYNTAX,
 				   SAF_NONE);


From mikej at freeswitch.org  Fri Mar  6 14:28:32 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 16:28:32 -0600
Subject: [Freeswitch-svn] [commit] r12492 - freeswitch/trunk/w32/Library
Message-ID: <E1LfiWu-0002Vx-9U@svn.freeswitch.org>

Author: mikej
Date: Fri Mar  6 16:28:32 2009
New Revision: 12492

Log:
build: fix rebuild every time on msvc 2008 non team editions (FSBUILD-132)

Modified:
   freeswitch/trunk/w32/Library/   (props changed)
   freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj

Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj
==============================================================================
--- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj	(original)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj	Fri Mar  6 16:28:32 2009
@@ -30,7 +30,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine=""
+				CommandLine="echo Testing for Code Analysis support&#x0D;&#x0A;echo ; &gt; &quot;$(OutDir)\TestAnalysis.c&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(OutDir)\TestAnalysis.c&quot;  | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -60,7 +60,7 @@
 				WarnAsError="true"
 				DebugInformationFormat="3"
 				ForcedIncludeFiles=""
-				EnablePREfast="true"
+				EnablePREfast="$(EnablePREfast)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -79,7 +79,7 @@
 				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;"
 				AddModuleNamesToAssembly=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(SolutionDir)$(OutDir)/FreeSwitch.pdb"
+				ProgramDatabaseFile="$(OutDir)/FreeSwitch.pdb"
 				SubSystem="2"
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
@@ -122,7 +122,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine=""
+				CommandLine="echo Testing for Code Analysis support&#x0D;&#x0A;echo ; &gt; &quot;$(OutDir)\TestAnalysis.c&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(OutDir)\TestAnalysis.c&quot;  | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -153,7 +153,7 @@
 				WarnAsError="false"
 				DebugInformationFormat="3"
 				ForcedIncludeFiles=""
-				EnablePREfast="true"
+				EnablePREfast="$(EnablePREfast)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -172,7 +172,7 @@
 				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;"
 				AddModuleNamesToAssembly=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(SolutionDir)$(OutDir)/FreeSwitch.pdb"
+				ProgramDatabaseFile="$(OutDir)/FreeSwitch.pdb"
 				SubSystem="2"
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
@@ -215,7 +215,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine=""
+				CommandLine="echo Testing for Code Analysis support&#x0D;&#x0A;echo ; &gt; &quot;$(OutDir)\TestAnalysis.c&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(OutDir)\TestAnalysis.c&quot;  | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -242,6 +242,7 @@
 				WarningLevel="4"
 				WarnAsError="true"
 				DebugInformationFormat="3"
+				EnablePREfast="$(EnablePREfast)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -302,7 +303,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine=""
+				CommandLine="echo Testing for Code Analysis support&#x0D;&#x0A;echo ; &gt; &quot;$(OutDir)\TestAnalysis.c&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(OutDir)\TestAnalysis.c&quot;  | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -330,6 +331,7 @@
 				WarningLevel="4"
 				WarnAsError="false"
 				DebugInformationFormat="3"
+				EnablePREfast="$(EnablePREfast)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -763,46 +765,6 @@
 			<File
 				RelativePath="..\..\src\switch_xml.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\switch_xml_config.c"


From mrene at freeswitch.org  Fri Mar  6 18:11:16 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 20:11:16 -0600
Subject: [Freeswitch-svn] [commit] r12493 - in freeswitch/trunk/src: .
	include
Message-ID: <E1Lfm0S-0004Zx-G6@svn.freeswitch.org>

Author: mrene
Date: Fri Mar  6 20:11:16 2009
New Revision: 12493

Log:
Enhance generic configuration parser

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Fri Mar  6 20:11:16 2009
@@ -94,12 +94,35 @@
 	void *defaultvalue; 		   			/*< Default value */
 	void *data; 				   			/*< Custom data (depending on the type) */
 	switch_xml_config_callback_t function;	/*< Callback to be called after the var is parsed */
+	char *syntax;							/*< Optional syntax documentation for this setting */
+	char *helptext;							/*< Optional documentation text for this setting */
 };
 
-#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data)	{ _key, _type, _flags, _ptr, _defaultvalue, _data, NULL }
-#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue)	{ _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL }
-#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata)	{ _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data }
-#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL }
+#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext)	{ _key, _type, _flags, _ptr, _defaultvalue, _data, NULL, _syntax, _helptext }
+#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL, _helptext}
+#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata, _syntax, _helptext)	{ _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data, _helptext}
+#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL, NULL, NULL }
+
+/*! 
+ * \brief Gets the int representation of an enum
+ * \param enum_options the switch_xml_config_enum_item_t array for this enum
+ * \param value string value to search 
+ */
+SWITCH_DECLARE(switch_status_t) switch_xml_config_enum_str2int(switch_xml_config_enum_item_t *enum_options, const char *value, int *out);
+
+/*! 
+ * \brief Gets the string representation of an enum
+ * \param enum_options the switch_xml_config_enum_item_t array for this enum
+ * \param value int value to search 
+ */
+SWITCH_DECLARE(const char*) switch_xml_config_enum_int2str(switch_xml_config_enum_item_t *enum_options, int value);
+
+/*!
+ * \brief Prints out an item's documentation on the console 
+ * \param level loglevel to use
+ * \param item item which the doc should be printed
+ */
+SWITCH_DECLARE(void) switch_xml_config_item_print_doc(int level, switch_xml_config_item_t *item);
 
 /*! 
  * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t 
@@ -108,7 +131,15 @@
  * \param instructions instrutions on how to parse the elements
  * \see switch_xml_config_item_t
  */
-SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions);
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, switch_bool_t reload, switch_xml_config_item_t *instructions);
+
+/*!
+ * \brief Parses a module's settings
+ * \param reload true to skip all non-reloadable options
+ * \param file the configuration file to look for
+ * \param instructions the instructions 
+ */
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_module_settings(const char *file, switch_bool_t reload, switch_xml_config_item_t *instructions);
 
 /*! 
  * \brief Parses all of an event's elements, following a ruleset defined by an array of switch_xml_config_item_t 
@@ -117,7 +148,7 @@
  * \param instructions instrutions on how to parse the elements
  * \see switch_xml_config_item_t
  */
-SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions);
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, switch_bool_t reload, switch_xml_config_item_t *instructions);
 
 /*!
  * \brief Parses a list of xml elements into an event  
@@ -128,12 +159,12 @@
  */
 SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event);
 
-
 /*!
  * \brief Free any memory allocated by the configuration
  * \param instructions instrutions on how to parse the elements
  */
 SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions);
+
 #endif /* !defined(SWITCH_XML_CONFIG_H) */
 
 /* For Emacs:

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Fri Mar  6 20:11:16 2009
@@ -34,6 +34,17 @@
 
 SWITCH_DECLARE_DATA switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL };
 
+static switch_xml_config_enum_item_t switch_config_types_enum[] = {
+	{"int", 	SWITCH_CONFIG_INT		},
+	{"string", 	SWITCH_CONFIG_STRING	},
+	{"bool", 	SWITCH_CONFIG_BOOL		},
+	{"custom", 	SWITCH_CONFIG_CUSTOM	},
+	{"enum", 	SWITCH_CONFIG_ENUM		},
+	{"flag", 	SWITCH_CONFIG_FLAG		},
+	{"flagarray",SWITCH_CONFIG_FLAGARRAY},
+	{ NULL, 0 }
+};
+
 SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event)
 {
 	switch_xml_t node;
@@ -57,7 +68,35 @@
 	return count;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_module_settings(const char *file, switch_bool_t reload, switch_xml_config_item_t *instructions)
+{
+	switch_xml_t cfg, xml, settings;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	
+	if (!(xml = switch_xml_open_cfg(file, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open %s\n", file);
+		return SWITCH_STATUS_FALSE;
+	}
+
+	if ((settings = switch_xml_child(cfg, "settings"))) {
+		status = switch_xml_config_parse(switch_xml_child(settings, "param"), reload, instructions);
+	}
+	
+	switch_xml_free(xml);
+	
+	return status;
+}
+
+SWITCH_DECLARE(void) switch_xml_config_item_print_doc(int level, switch_xml_config_item_t *item)
+{
+	if (item->syntax && item->helptext) {
+		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, level, "Item name: [%s]\nType: %s (%s)\nSyntax: %s\nHelp: %s\n\n",
+		 	item->key, switch_xml_config_enum_int2str(switch_config_types_enum, item->type), 
+			switch_test_flag(item, CONFIG_REQUIRED) ? "required" : "optional", item->syntax, item->helptext);
+	}
+}
+
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, switch_bool_t reload, switch_xml_config_item_t *instructions)
 {
 	switch_event_t *event = NULL;
 	switch_status_t result;
@@ -72,7 +111,29 @@
 	return result;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions)
+SWITCH_DECLARE(switch_status_t) switch_xml_config_enum_str2int(switch_xml_config_enum_item_t *enum_options, const char *value, int *out)
+{
+	for (;enum_options->key; enum_options++) {
+		if (!strcasecmp(value, enum_options->key)) {
+			*out = enum_options->value;
+			return SWITCH_STATUS_SUCCESS;
+		}
+	}
+	
+	return SWITCH_STATUS_FALSE;
+}
+
+SWITCH_DECLARE(const char*) switch_xml_config_enum_int2str(switch_xml_config_enum_item_t *enum_options, int value)
+{
+	for (;enum_options->key; enum_options++) {
+		if (value == enum_options->value) {
+			return enum_options->key;
+		}
+	}
+	return NULL;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, switch_bool_t reload, switch_xml_config_item_t *instructions)
 {
 	switch_xml_config_item_t *item;
 	int matched_count = 0;
@@ -142,9 +203,9 @@
 					const char *newstring = NULL;
 					
 					if (!string_options) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n",
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n",
 										  item->key);
-						continue;
+						return SWITCH_STATUS_FALSE;
 					}
 					
 					/* Perform validation */
@@ -155,7 +216,8 @@
 							} else {
 								newstring = (char*)item->defaultvalue;  /* Regex failed */
 								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", 
-									value, item->key, newstring);
+									value, item->key, newstring ? newstring : "(null)");
+								switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);
 							}
 						} else {
 							newstring = value; /* No validation */
@@ -204,6 +266,7 @@
 						newval = (switch_bool_t)(intptr_t)item->defaultvalue;
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n",  
 										value, item->key, newval ? "true" : "false");
+						switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);
 					} else {
 						newval = (switch_bool_t)(intptr_t)item->defaultvalue;
 					}
@@ -221,21 +284,18 @@
 					switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data;
 					int *dest = (int*)item->ptr;
 					int newval = 0;
+					switch_status_t lookup_result;
 					
 					if (value) {
-						for (;enum_options->key; enum_options++) {
-							if (!strcasecmp(value, enum_options->key)) {
-								newval = enum_options->value;
-								break;
-							}
-						}
+						lookup_result = switch_xml_config_enum_str2int(enum_options, value, &newval);
 					} else {
 						newval = (int)(intptr_t)item->defaultvalue; 
 					}
 					
-					if (!enum_options->key) { /* if (!found) */
+					if (value != SWITCH_STATUS_SUCCESS) {
 						newval = (int)(intptr_t)item->defaultvalue;
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n",  value, item->key);
+						switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);
 					}
 					
 					if (*dest != newval) {


From mrene at freeswitch.org  Fri Mar  6 18:13:32 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 20:13:32 -0600
Subject: [Freeswitch-svn] [commit] r12494 -
	freeswitch/trunk/src/mod/applications/mod_limit
Message-ID: <E1Lfm2e-0004bk-PW@svn.freeswitch.org>

Author: mrene
Date: Fri Mar  6 20:13:32 2009
New Revision: 12494

Log:
Implement new config parser in mod_limit

Modified:
   freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c

Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	Fri Mar  6 20:13:32 2009
@@ -166,45 +166,42 @@
 	return ret;
 }
 
+static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "\\w+:\\w+:\\w+" };
+
+static switch_xml_config_item_t config_settings[] = {
+	SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn,  
+		"dsn:username:password", "If set, the ODBC DSN used by the limit and db applications"),
+	SWITCH_CONFIG_ITEM_END()
+};
+
 static switch_status_t do_config()
 {
-	char *cf = "limit.conf";
-	switch_xml_t cfg, xml, settings, param;
 	switch_core_db_t *db;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	char *odbc_user = NULL;
 	char *odbc_pass = NULL;
 	char *sql = NULL;
+	
+	limit_config_dsn.pool = globals.pool;
 
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
+	if (switch_xml_config_parse_module_settings("limit.conf", SWITCH_FALSE, config_settings) != SWITCH_STATUS_SUCCESS) {
 		return SWITCH_STATUS_TERM;
 	}
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-			char *var = NULL;
-			char *val = NULL;
-
-			var = (char *) switch_xml_attr_soft(param, "name");
-			val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) {
+	
+	if (globals.odbc_dsn) {
 #ifdef SWITCH_HAVE_ODBC
-				globals.odbc_dsn = switch_core_strdup(globals.pool, val);
-				if ((odbc_user = strchr(globals.odbc_dsn, ':'))) {
-					*odbc_user++ = '\0';
-					if ((odbc_pass = strchr(odbc_user, ':'))) {
-						*odbc_pass++ = '\0';
-					}
-				}
-#else
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n");
-#endif
+		if ((odbc_user = strchr(globals.odbc_dsn, ':'))) {
+			*odbc_user++ = '\0';
+			if ((odbc_pass = strchr(odbc_user, ':'))) {
+				*odbc_pass++ = '\0';
 			}
 		}
+#else
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n");
+#endif
 	}
 
+
 	if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) {
 		globals.dbname = "call_limit";
 	}
@@ -291,8 +288,6 @@
 	limit_execute_sql(sql, globals.mutex);
 	switch_safe_free(sql);
 
-	switch_xml_free(xml);
-
 	return status;
 }
 


From anthm at freeswitch.org  Fri Mar  6 18:20:29 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 20:20:29 -0600
Subject: [Freeswitch-svn] [commit] r12495 - freeswitch/trunk/src
Message-ID: <E1Lfm9N-0004fX-KA@svn.freeswitch.org>

Author: anthm
Date: Fri Mar  6 20:20:29 2009
New Revision: 12495

Log:
performance tuning

Modified:
   freeswitch/trunk/src/switch.c
   freeswitch/trunk/src/switch_core.c

Modified: freeswitch/trunk/src/switch.c
==============================================================================
--- freeswitch/trunk/src/switch.c	(original)
+++ freeswitch/trunk/src/switch.c	Fri Mar  6 20:20:29 2009
@@ -37,6 +37,12 @@
 #define _XOPEN_SOURCE 600
 #endif
 
+#ifndef WIN32
+#ifdef HAVE_SETRLIMIT
+#include <sys/resource.h>
+#endif
+#endif
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -274,6 +280,10 @@
 	switch_status_t destroy_status;
 	switch_file_t *fd;
 	switch_memory_pool_t *pool = NULL;
+#ifdef HAVE_SETRLIMIT
+	struct rlimit rlp;
+	int waste = 0;
+#endif
 
 	if (argv[0] && strstr(argv[0], "freeswitchd")) {
 		nc++;
@@ -291,6 +301,7 @@
 #endif
 		"\t-help                  -- this message\n"
 #ifdef HAVE_SETRLIMIT
+		"\t-waste                 -- allow memory waste\n"
 		"\t-core                  -- dump cores\n"
 #endif
 		"\t-hp                    -- enable high priority settings\n"
@@ -374,6 +385,7 @@
 					exit(0);
 				}
 			}
+
 			if (argv[x] && !strcmp(argv[x], "-uninstall")) {
 				x++;
 				if (argv[x] && strlen(argv[x])) {
@@ -429,13 +441,17 @@
 #endif
 #ifdef HAVE_SETRLIMIT
 		if (argv[x] && !strcmp(argv[x], "-core")) {
-			struct rlimit rlp;
 			memset(&rlp, 0, sizeof(rlp));
 			rlp.rlim_cur = RLIM_INFINITY;
 			rlp.rlim_max = RLIM_INFINITY;
 			setrlimit(RLIMIT_CORE, &rlp);
 			known_opt++;
 		}
+
+		if (argv[x] && !strcmp(argv[x], "-waste")) {
+			waste++;
+			known_opt++;
+		}
 #endif
 
 		if (argv[x] && !strcmp(argv[x], "-hp")) {
@@ -600,12 +616,32 @@
 #endif
 	}
 
+#ifdef HAVE_SETRLIMIT
+	if (!waste) {
+		memset(&rlp, 0, sizeof(rlp));
+		getrlimit(RLIMIT_STACK, &rlp);
+		if (rlp.rlim_max > SWITCH_THREAD_STACKSIZE) {
+			memset(&rlp, 0, sizeof(rlp));
+			rlp.rlim_cur = SWITCH_THREAD_STACKSIZE;
+			rlp.rlim_max = SWITCH_THREAD_STACKSIZE;
+			setrlimit(RLIMIT_STACK, &rlp);
+			fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance....\n", 
+					SWITCH_THREAD_STACKSIZE / 1024, SWITCH_THREAD_STACKSIZE / 1024, argv[0]);
+			return (int)execv(argv[0], argv);
+		}
+	}
+#endif
+
+
+
+
 	if (high_prio) {
 		set_high_priority();
 	}
 
 	switch_core_setrlimits();
 
+
 #ifndef WIN32
 	if (runas_user || runas_group) {
 		if (change_user_group(runas_user, runas_group) < 0) {

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Fri Mar  6 20:20:29 2009
@@ -792,7 +792,7 @@
 #ifndef __FreeBSD__
 	memset(&rlp, 0, sizeof(rlp));
 	rlp.rlim_cur = SWITCH_THREAD_STACKSIZE;
-	rlp.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE;
+	rlp.rlim_max = SWITCH_THREAD_STACKSIZE;
 	setrlimit(RLIMIT_STACK, &rlp);
 #endif
 
@@ -808,6 +808,8 @@
 	setrlimit(RLIMIT_CPU, &rlp);
 	setrlimit(RLIMIT_DATA, &rlp);
 	setrlimit(RLIMIT_FSIZE, &rlp);
+	setrlimit(RLIMIT_NPROC, &rlp);
+	setrlimit(RLIMIT_RTPRIO, &rlp);
 #if !defined(__OpenBSD__) && !defined(__NetBSD__)
 	setrlimit(RLIMIT_AS, &rlp);
 #endif
@@ -1632,6 +1634,15 @@
 	switch_threadattr_detach_set(thd_attr, 1);
 	switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool);
 
+
+#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__)
+	rlim.rlim_cur = SWITCH_THREAD_STACKSIZE;
+	rlim.rlim_max = SWITCH_THREAD_STACKSIZE;
+	if (setrlimit(RLIMIT_STACK, &rlim) < 0) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n");
+	}
+#endif
+
 	if (wait) {
 		switch_thread_cond_wait(sth->cond, sth->mutex);
 		ret = sth->ret;


From mrene at freeswitch.org  Fri Mar  6 18:55:52 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 20:55:52 -0600
Subject: [Freeswitch-svn] [commit] r12496 -
	freeswitch/trunk/src/mod/applications/mod_limit
Message-ID: <E1Lfmhc-00056k-54@svn.freeswitch.org>

Author: mrene
Date: Fri Mar  6 20:55:52 2009
New Revision: 12496

Log:
update regex

Modified:
   freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c

Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	Fri Mar  6 20:55:52 2009
@@ -166,7 +166,7 @@
 	return ret;
 }
 
-static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "\\w+:\\w+:\\w+" };
+static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "(.+?):(.+?):(.+)" };
 
 static switch_xml_config_item_t config_settings[] = {
 	SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn,  


From mrene at freeswitch.org  Fri Mar  6 20:56:08 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 06 Mar 2009 22:56:08 -0600
Subject: [Freeswitch-svn] [commit] r12497 -
	freeswitch/trunk/src/mod/applications/mod_limit
Message-ID: <E1Lfoa0-0006Fz-3Z@svn.freeswitch.org>

Author: mrene
Date: Fri Mar  6 22:56:07 2009
New Revision: 12497

Log:
Add events and a shutdown function to mod_limit

Modified:
   freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c

Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c	Fri Mar  6 22:56:07 2009
@@ -37,8 +37,11 @@
 #include <switch_odbc.h>
 #endif
 
+#define LIMIT_EVENT_USAGE "limit::usage"
+
 SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load);
-SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, NULL, NULL);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown);
+SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, mod_limit_shutdown, NULL);
 
 static struct {
 	switch_memory_pool_t *pool;
@@ -291,6 +294,21 @@
 	return status;
 }
 
+static void limit_fire_event(const char *realm, const char *key, uint32_t usage, uint32_t rate, uint32_t max, uint32_t ratemax)
+{
+	switch_event_t *event;
+	
+	if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, LIMIT_EVENT_USAGE) == SWITCH_STATUS_SUCCESS) {
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "realm", realm);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", key);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "usage", "%d", usage);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rate", "%d", rate);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "max", "%d", max);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ratemax", "%d", ratemax);
+		switch_event_fire(&event);
+	}
+}
+
 static switch_status_t db_state_handler(switch_core_session_t *session)
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
@@ -792,7 +810,8 @@
 	limit_execute_sql(sql, NULL);
 	switch_safe_free(sql);
 	
-	switch_channel_set_variable(channel, "limit_usage", switch_core_session_sprintf(session, "%d", ++got));
+	switch_channel_set_variable_printf(channel, "limit_usage", "%d", ++got);
+	limit_fire_event(realm, id, got, 0, max, 0);
 
   done:
 	switch_mutex_unlock(globals.mutex);
@@ -954,7 +973,6 @@
 	if (increment) {
 		item->total_usage++;
 		
-
 		switch_core_hash_insert(pvt->hash, hashkey, item);
 		
 		if (max == -1) {
@@ -964,6 +982,8 @@
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval);
 		}
+		
+		limit_fire_event(realm, id, item->total_usage, item->rate_usage, max, max >=0 ? (uint32_t)max : 0);
 	}
 	
 	/* Save current usage & rate into channel variables so it can be used later in the dialplan, or added to CDR records */
@@ -1036,6 +1056,13 @@
 	gethostname(globals.hostname, sizeof(globals.hostname));
 	globals.pool = pool;
 
+
+	if (switch_event_reserve_subclass(LIMIT_EVENT_USAGE) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldnt register event subclass \"%s\"", 
+			LIMIT_EVENT_USAGE);
+		return SWITCH_STATUS_FALSE;
+	}
+	
 	if ((status = do_config() != SWITCH_STATUS_SUCCESS)) {
 		return status;
 	}
@@ -1048,6 +1075,8 @@
 
 	/* 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, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_SUPPORT_NOMEDIA);
 	SWITCH_ADD_APP(app_interface, "limit_hash", "Limit (hash)", LIMITHASH_DESC, limit_hash_function, LIMITHASH_USAGE, SAF_SUPPORT_NOMEDIA);
@@ -1074,6 +1103,23 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown) 
+{
+	switch_event_free_subclass(LIMIT_EVENT_USAGE);
+	
+	switch_xml_config_cleanup(config_settings);
+	
+	switch_mutex_destroy(globals.mutex);
+	switch_mutex_destroy(globals.limit_hash_mutex);
+	switch_mutex_destroy(globals.db_hash_mutex);
+
+	switch_core_hash_destroy(&globals.limit_hash);
+	switch_core_hash_destroy(&globals.db_hash);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c


From mikej at freeswitch.org  Fri Mar  6 22:45:14 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 00:45:14 -0600
Subject: [Freeswitch-svn] [commit] r12498 - freeswitch/trunk/src
Message-ID: <E1LfqHa-0007Qi-6M@svn.freeswitch.org>

Author: mikej
Date: Sat Mar  7 00:45:14 2009
New Revision: 12498

Log:
tweak

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Sat Mar  7 00:45:14 2009
@@ -284,7 +284,7 @@
 					switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data;
 					int *dest = (int*)item->ptr;
 					int newval = 0;
-					switch_status_t lookup_result;
+					switch_status_t lookup_result = SWITCH_STATUS_SUCCESS;
 					
 					if (value) {
 						lookup_result = switch_xml_config_enum_str2int(enum_options, value, &newval);
@@ -292,7 +292,7 @@
 						newval = (int)(intptr_t)item->defaultvalue; 
 					}
 					
-					if (value != SWITCH_STATUS_SUCCESS) {
+					if (lookup_result != SWITCH_STATUS_SUCCESS) {
 						newval = (int)(intptr_t)item->defaultvalue;
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n",  value, item->key);
 						switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);


From mrene at freeswitch.org  Fri Mar  6 22:50:10 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 00:50:10 -0600
Subject: [Freeswitch-svn] [commit] r12499 - freeswitch/trunk/src
Message-ID: <E1LfqMM-0007jv-7m@svn.freeswitch.org>

Author: mrene
Date: Sat Mar  7 00:50:10 2009
New Revision: 12499

Log:
avoid (null) confusion

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Sat Mar  7 00:50:10 2009
@@ -215,8 +215,12 @@
 								newstring = value; /* Regex match, accept value*/
 							} else {
 								newstring = (char*)item->defaultvalue;  /* Regex failed */
-								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", 
-									value, item->key, newstring ? newstring : "(null)");
+								if (newstring) {
+									switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", 
+										value, item->key, newstring);
+								} else {
+									switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key);
+								}
 								switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);
 							}
 						} else {


From mikej at freeswitch.org  Sat Mar  7 00:45:21 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 02:45:21 -0600
Subject: [Freeswitch-svn] [commit] r12500 - in freeswitch/trunk: . libs/esl
	libs/esl/src libs/ilbc libs/libdingaling
	libs/speex/win32/VS2008/libspeex libs/voipcodecs
	libs/win32/apr-util libs/win32/curl libs/win32/flite
	libs/win32/howl libs/win32/iksemel libs/win32/js
	libs/win32/libg722_1 libs/win32/libmp3lame libs/win32/libogg
	libs/win32/libshout libs/win32/libsndfile libs/win32/mpg123
	libs/win32/pocketsphinx libs/win32/pthread libs/win32/sofia
	libs/win32/sphinxbase libs/win32/udns libs/xmlrpc-c/Windows
	libs/xmlrpc-c/lib src/mod/applications/mod_commands
	src/mod/applications/mod_conference src/mod/applications/mod_dptools
	src/mod/applications/mod_easyroute
	src/mod/applications/mod_enum src/mod/applications/mod_esf
	src/mod/applications/mod_expr src/mod/applications/mod_fax
	src/mod/applications/mod_fifo src/mod/applications/mod_fsv
	src/mod/applications/mod_lcr src/mod/applications/mod_limit
	src/mod/applications/mod_rss src/mod/applications/mod_snom
	src/mod/applications/mod_vmd src/mod/applications/mod_voicemail
	src/mod/asr_tts/mod_pocketsphinx src/mod/codecs/mod_amr
	src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729
	src/mod/codecs/mod_h26x src/mod/codecs/mod_ilbc
	src/mod/codecs/mod_siren src/mod/codecs/mod_speex
	src/mod/codecs/mod_voipcodecs
	src/mod/dialplans/mod_dialplan_asterisk
	src/mod/dialplans/mod_dialplan_directory
	src/mod/dialplans/mod_dialplan_xml
	src/mod/directories/mod_ldap src/mod/endpoints/mod_dingaling
	src/mod/endpoints/mod_iax src/mod/endpoints/mod_loopback
	src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia
	src/mod/event_handlers/mod_cdr_csv
	src/mod/event_handlers/mod_event_multicast
	src/mod/event_handlers/mod_event_socket
	src/mod/event_handlers/mod_zeroconf src/mod/formats/mod_local_stream
	src/mod/formats/mod_native_file src/mod/formats/mod_shout
	src/mod/formats/mod_sndfile src/mod/formats/mod_tone_stream
	src/mod/languages/mod_lua src/mod/languages/mod_lua/lua
	src/mod/languages/mod_managed src/mod/languages/mod_spidermonkey
	src/mod/languages/mod_spidermonkey_core_db
	src/mod/languages/mod_spidermonkey_curl
	src/mod/languages/mod_spidermonkey_odbc
	src/mod/languages/mod_spidermonkey_socket
	src/mod/languages/mod_spidermonkey_teletone
	src/mod/loggers/mod_console src/mod/loggers/mod_logfile
	src/mod/say/mod_say_de src/mod/say/mod_say_en
	src/mod/say/mod_say_es src/mod/say/mod_say_fr
	src/mod/say/mod_say_it src/mod/say/mod_say_nl
	src/mod/say/mod_say_zh src/mod/xml_int/mod_xml_cdr
	src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc
	w32/Console w32/Library
Message-ID: <E1Lfs9p-0000o5-EH@svn.freeswitch.org>

Author: mikej
Date: Sat Mar  7 02:45:21 2009
New Revision: 12500

Log:
svn:ignore

Modified:
   freeswitch/trunk/libs/esl/   (props changed)
   freeswitch/trunk/libs/esl/src/   (props changed)
   freeswitch/trunk/libs/ilbc/   (props changed)
   freeswitch/trunk/libs/libdingaling/   (props changed)
   freeswitch/trunk/libs/speex/win32/VS2008/libspeex/   (props changed)
   freeswitch/trunk/libs/voipcodecs/   (props changed)
   freeswitch/trunk/libs/win32/apr-util/   (props changed)
   freeswitch/trunk/libs/win32/curl/   (props changed)
   freeswitch/trunk/libs/win32/flite/   (props changed)
   freeswitch/trunk/libs/win32/howl/   (props changed)
   freeswitch/trunk/libs/win32/iksemel/   (props changed)
   freeswitch/trunk/libs/win32/js/   (props changed)
   freeswitch/trunk/libs/win32/libg722_1/   (props changed)
   freeswitch/trunk/libs/win32/libmp3lame/   (props changed)
   freeswitch/trunk/libs/win32/libogg/   (props changed)
   freeswitch/trunk/libs/win32/libshout/   (props changed)
   freeswitch/trunk/libs/win32/libsndfile/   (props changed)
   freeswitch/trunk/libs/win32/mpg123/   (props changed)
   freeswitch/trunk/libs/win32/pocketsphinx/   (props changed)
   freeswitch/trunk/libs/win32/pthread/   (props changed)
   freeswitch/trunk/libs/win32/sofia/   (props changed)
   freeswitch/trunk/libs/win32/sphinxbase/   (props changed)
   freeswitch/trunk/libs/win32/udns/   (props changed)
   freeswitch/trunk/libs/xmlrpc-c/Windows/   (props changed)
   freeswitch/trunk/libs/xmlrpc-c/lib/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_commands/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_conference/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_dptools/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_easyroute/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_enum/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_esf/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_expr/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_fax/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_fifo/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_fsv/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_lcr/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_limit/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_rss/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_snom/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_vmd/   (props changed)
   freeswitch/trunk/src/mod/applications/mod_voicemail/   (props changed)
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_amr/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_g723_1/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_g729/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_h26x/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_ilbc/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_siren/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_speex/   (props changed)
   freeswitch/trunk/src/mod/codecs/mod_voipcodecs/   (props changed)
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/   (props changed)
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/   (props changed)
   freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/   (props changed)
   freeswitch/trunk/src/mod/directories/mod_ldap/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_dingaling/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_iax/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_loopback/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_portaudio/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_sofia/   (props changed)
   freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/   (props changed)
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/   (props changed)
   freeswitch/trunk/src/mod/event_handlers/mod_event_socket/   (props changed)
   freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/   (props changed)
   freeswitch/trunk/src/mod/formats/mod_local_stream/   (props changed)
   freeswitch/trunk/src/mod/formats/mod_native_file/   (props changed)
   freeswitch/trunk/src/mod/formats/mod_shout/   (props changed)
   freeswitch/trunk/src/mod/formats/mod_sndfile/   (props changed)
   freeswitch/trunk/src/mod/formats/mod_tone_stream/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_lua/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_lua/lua/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_managed/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_spidermonkey/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/   (props changed)
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/   (props changed)
   freeswitch/trunk/src/mod/loggers/mod_console/   (props changed)
   freeswitch/trunk/src/mod/loggers/mod_logfile/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_de/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_en/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_es/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_fr/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_it/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_nl/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_zh/   (props changed)
   freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/   (props changed)
   freeswitch/trunk/src/mod/xml_int/mod_xml_curl/   (props changed)
   freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/   (props changed)
   freeswitch/trunk/w32/Console/   (props changed)
   freeswitch/trunk/w32/Library/   (props changed)

Changes in other areas also in this revision:
Modified:
   freeswitch/trunk/   (props changed)


From mikej at freeswitch.org  Sat Mar  7 00:45:55 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 02:45:55 -0600
Subject: [Freeswitch-svn] [commit] r12501 -
	freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
Message-ID: <E1LfsAN-0000ph-4U@svn.freeswitch.org>

Author: mikej
Date: Sat Mar  7 02:45:54 2009
New Revision: 12501

Log:
fix dependencies

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj

Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj	Sat Mar  7 02:45:54 2009
@@ -213,7 +213,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseLibraryDependencyInputs="false"
-				AdditionalDependencies="sphinxbase.lib pocketsphinx.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
@@ -292,7 +291,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseLibraryDependencyInputs="false"
-				AdditionalDependencies="sphinxbase.lib pocketsphinx.lib"
 				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)$(ConfigurationName)&quot;"


From mikej at freeswitch.org  Sat Mar  7 01:33:39 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 03:33:39 -0600
Subject: [Freeswitch-svn] [commit] r12502 - in freeswitch/trunk: .
	src/mod/endpoints/mod_skypiax
Message-ID: <E1LfsuZ-00047K-TA@svn.freeswitch.org>

Author: mikej
Date: Sat Mar  7 03:33:39 2009
New Revision: 12502

Log:
add skypiax to sln file and fix some warnings

Modified:
   freeswitch/trunk/Freeswitch.2008.sln
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/   (props changed)
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c

Modified: freeswitch/trunk/Freeswitch.2008.sln
==============================================================================
--- freeswitch/trunk/Freeswitch.2008.sln	(original)
+++ freeswitch/trunk/Freeswitch.2008.sln	Sat Mar  7 03:33:39 2009
@@ -992,6 +992,11 @@
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skypiax", "src\mod\endpoints\mod_skypiax\mod_skypiax.2008.vcproj", "{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -2396,6 +2401,13 @@
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32
 		{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.Build.0 = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x64.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2415,6 +2427,7 @@
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{B3F424EC-3D8F-417C-B244-3919D5E1A577} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{05C9FB27-480E-4D53-B3B7-6338E2526666} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
+		{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c	Sat Mar  7 03:33:39 2009
@@ -158,10 +158,10 @@
   private_t *tech_pvt = NULL;
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
   switch_set_flag_locked(tech_pvt, TFLAG_IO);
 
   /* Move channel's state machine to ROUTING. This means the call is trying
@@ -184,10 +184,10 @@
   char msg_to_skype[256];
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   switch_clear_flag_locked(tech_pvt, TFLAG_IO);
   switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
@@ -226,10 +226,10 @@
   private_t *tech_pvt = NULL;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   DEBUGA_SKYPE("%s CHANNEL ROUTING\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
 
@@ -243,10 +243,10 @@
   private_t *tech_pvt = NULL;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   DEBUGA_SKYPE("%s CHANNEL EXECUTE\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
 
@@ -259,10 +259,10 @@
   private_t *tech_pvt = NULL;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   switch (sig) {
   case SWITCH_SIG_KILL:
@@ -320,10 +320,10 @@
   switch_byte_t *data;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
   tech_pvt->read_frame.flags = SFF_NONE;
   *frame = NULL;
 
@@ -390,10 +390,10 @@
   unsigned int sent;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
     ERRORA("CIAPA \n", SKYPIAX_P_LOG);
@@ -424,10 +424,10 @@
   switch_channel_t *channel = NULL;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   DEBUGA_SKYPE("ANSWERED! \n", SKYPIAX_P_LOG);
 
@@ -441,10 +441,10 @@
   private_t *tech_pvt;
 
   channel = switch_core_session_get_channel(session);
-  assert(channel != NULL);
+  switch_assert(channel != NULL);
 
   tech_pvt = (private_t *) switch_core_session_get_private(session);
-  assert(tech_pvt != NULL);
+  switch_assert(tech_pvt != NULL);
 
   switch (msg->message_id) {
   case SWITCH_MESSAGE_INDICATE_ANSWER:
@@ -521,11 +521,11 @@
       int found = 0;
       char interface_name[256];
 
-      if (strlen(outbound_profile->destination_number)) {
+      if (!switch_strlen_zero(outbound_profile->destination_number)) {
         int i;
         char *slash;
 
-        strncpy(interface_name, outbound_profile->destination_number, 255);
+        switch_copy_string(interface_name, outbound_profile->destination_number, 255);
         slash = strrchr(interface_name, '/');
         *slash = '\0';
 
@@ -657,12 +657,12 @@
         } else {
           DEBUGA_SKYPE("no session\n", SKYPIAX_P_LOG);
         }
-      } else {
+        tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
+        memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
+	  } else {
         ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG);
-      }
-      tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
-      memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
-    }
+	  }
+	}
   }
   return NULL;
 }
@@ -1217,25 +1217,29 @@
   switch_core_session_t *session = NULL;
   switch_channel_t *channel = NULL;
 
-  if (strlen(tech_pvt->session_uuid_str)) {
+  if (!switch_strlen_zero(tech_pvt->session_uuid_str)) {
     session = switch_core_session_locate(tech_pvt->session_uuid_str);
   } else {
     ERRORA("No session???\n", SKYPIAX_P_LOG);
+	goto done;
   }
   if (session) {
     channel = switch_core_session_get_channel(session);
   } else {
     ERRORA("No session???\n", SKYPIAX_P_LOG);
+	goto done;
   }
   if (channel) {
     switch_channel_mark_ring_ready(channel);
     DEBUGA_SKYPE("skype_call: REMOTE PARTY RINGING\n", SKYPIAX_P_LOG);
   } else {
     ERRORA("No channel???\n", SKYPIAX_P_LOG);
+	goto done;
   }
 
   switch_core_session_rwunlock(session);
 
+done:
   return 0;
 }
 
@@ -1244,26 +1248,30 @@
   switch_core_session_t *session = NULL;
   switch_channel_t *channel = NULL;
 
-  if (strlen(tech_pvt->session_uuid_str)) {
+  if (!switch_strlen_zero(tech_pvt->session_uuid_str)) {
     session = switch_core_session_locate(tech_pvt->session_uuid_str);
   } else {
     ERRORA("No session???\n", SKYPIAX_P_LOG);
+	goto done;
   }
   if (session) {
     channel = switch_core_session_get_channel(session);
     switch_core_session_add_stream(session, NULL);
   } else {
     ERRORA("No session???\n", SKYPIAX_P_LOG);
+	goto done;
   }
   if (channel) {
     switch_channel_mark_pre_answered(channel);
     NOTICA("skype_call: REMOTE PARTY EARLY MEDIA\n", SKYPIAX_P_LOG);
   } else {
     ERRORA("No channel???\n", SKYPIAX_P_LOG);
+	goto done;
   }
 
   switch_core_session_rwunlock(session);
 
+done:
   return 0;
 }
 
@@ -1272,24 +1280,29 @@
   switch_core_session_t *session = NULL;
   switch_channel_t *channel = NULL;
 
-  if (strlen(tech_pvt->session_uuid_str)) {
+  if (!switch_strlen_zero(tech_pvt->session_uuid_str)) {
     session = switch_core_session_locate(tech_pvt->session_uuid_str);
   } else {
     ERRORA("No session???\n", SKYPIAX_P_LOG);
+	goto done;
   }
   if (session) {
     channel = switch_core_session_get_channel(session);
   } else {
     ERRORA("No session???\n", SKYPIAX_P_LOG);
+	goto done;
   }
   if (channel) {
     switch_channel_mark_answered(channel);
     //DEBUGA_SKYPE("skype_call: %s, answered\n", SKYPIAX_P_LOG, id);
   } else {
     ERRORA("No channel???\n", SKYPIAX_P_LOG);
+	goto done;
   }
 
   switch_core_session_rwunlock(session);
+
+done:
   DEBUGA_SKYPE("HERE!\n", SKYPIAX_P_LOG);
 
   return 0;


From gmaruzz at freeswitch.org  Sat Mar  7 03:14:08 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 05:14:08 -0600
Subject: [Freeswitch-svn] [commit] r12503 -
	freeswitch/trunk/src/mod/endpoints/mod_skypiax
Message-ID: <E1LfuTo-0005H3-HD@svn.freeswitch.org>

Author: gmaruzz
Date: Sat Mar  7 05:14:08 2009
New Revision: 12503

Log:
skypiax: Visual C: use switch_string_copy instead of strncpy, fix the Release build (Release was lacking rpcrt4.lib in the linker command line of the mod_skypiax project)

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj	Sat Mar  7 05:14:08 2009
@@ -116,6 +116,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="rpcrt4.lib"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Sat Mar  7 05:14:08 2009
@@ -2,11 +2,13 @@
 
 #ifdef ASTERISK
 #define skypiax_sleep usleep
+#define skypiax_strncpy strncpy
 #define tech_pvt p
 extern int skypiax_debug;
 extern char *skypiax_console_active;
 #else /* FREESWITCH */
 #define skypiax_sleep switch_sleep
+#define skypiax_strncpy switch_copy_string
 extern switch_memory_pool_t *skypiax_module_pool;
 extern switch_endpoint_interface_t *skypiax_endpoint_interface;
 #endif /* ASTERISK */
@@ -75,7 +77,7 @@
           tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
         }
       }
-      strncpy(message_2, message, sizeof(message) - 1);
+      skypiax_strncpy(message_2, message, sizeof(message) - 1);
       buf = message;
       stringp = &buf;
       where = strsep(stringp, " ");
@@ -96,9 +98,9 @@
         }
       }
       if (!strcasecmp(message, "CURRENTUSERHANDLE")) {
-        strncpy(obj, where, sizeof(obj) - 1);
+        skypiax_strncpy(obj, where, sizeof(obj) - 1);
         where = strsep(stringp, " ");
-        strncpy(id, where, sizeof(id) - 1);
+        skypiax_strncpy(id, where, sizeof(id) - 1);
         if (!strcasecmp(id, tech_pvt->skype_user)) {
           tech_pvt->SkypiaxHandles.currentuserhandle = 1;
           DEBUGA_SKYPE
@@ -107,11 +109,11 @@
         }
       }
       if (!strcasecmp(message, "USER")) {
-        strncpy(obj, where, sizeof(obj) - 1);
+        skypiax_strncpy(obj, where, sizeof(obj) - 1);
         where = strsep(stringp, " ");
-        strncpy(id, where, sizeof(id) - 1);
+        skypiax_strncpy(id, where, sizeof(id) - 1);
         where = strsep(stringp, " ");
-        strncpy(prop, where, sizeof(prop) - 1);
+        skypiax_strncpy(prop, where, sizeof(prop) - 1);
         if (!strcasecmp(prop, "RECEIVEDAUTHREQUEST")) {
           char msg_to_skype[256];
           DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n",
@@ -122,14 +124,14 @@
         }
       }
       if (!strcasecmp(message, "MESSAGE")) {
-        strncpy(obj, where, sizeof(obj) - 1);
+        skypiax_strncpy(obj, where, sizeof(obj) - 1);
         where = strsep(stringp, " ");
-        strncpy(id, where, sizeof(id) - 1);
+        skypiax_strncpy(id, where, sizeof(id) - 1);
         where = strsep(stringp, " ");
-        strncpy(prop, where, sizeof(prop) - 1);
+        skypiax_strncpy(prop, where, sizeof(prop) - 1);
         if (!strcasecmp(prop, "STATUS")) {
           where = strsep(stringp, " ");
-          strncpy(value, where, sizeof(value) - 1);
+          skypiax_strncpy(value, where, sizeof(value) - 1);
           if (!strcasecmp(value, "RECEIVED")) {
             char msg_to_skype[256];
             DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s value: %s!\n",
@@ -148,13 +150,13 @@
         }
       }
       if (!strcasecmp(message, "CALL")) {
-        strncpy(obj, where, sizeof(obj) - 1);
+        skypiax_strncpy(obj, where, sizeof(obj) - 1);
         where = strsep(stringp, " ");
-        strncpy(id, where, sizeof(id) - 1);
+        skypiax_strncpy(id, where, sizeof(id) - 1);
         where = strsep(stringp, " ");
-        strncpy(prop, where, sizeof(prop) - 1);
+        skypiax_strncpy(prop, where, sizeof(prop) - 1);
         where = strsep(stringp, " ");
-        strncpy(value, where, sizeof(value) - 1);
+        skypiax_strncpy(value, where, sizeof(value) - 1);
         where = strsep(stringp, " ");
 
         DEBUGA_SKYPE
@@ -162,7 +164,7 @@
            SKYPIAX_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
 
         if (!strcasecmp(prop, "PARTNER_HANDLE")) {
-          strncpy(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1);
+          skypiax_strncpy(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1);
           DEBUGA_SKYPE
             ("the skype_call %s caller PARTNER_HANDLE (tech_pvt->callid_number) is: %s\n",
              SKYPIAX_P_LOG, id, tech_pvt->callid_number);
@@ -196,7 +198,7 @@
         }
         if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) {
           if (strcasecmp(id, tech_pvt->skype_call_id)) {
-            strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+            skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
             DEBUGA_SKYPE
               ("We called a Skype contact and he answered us on skype_call: %s.\n",
                SKYPIAX_P_LOG, id);
@@ -227,7 +229,7 @@
                 skypiax_signaling_write(tech_pvt, msg_to_skype);
                 DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPIAX_P_LOG,
                              id);
-                strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+                skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
               } else {
                 /* we're owned, we're in a call, let's try to transfer */
         /************************** TODO
@@ -264,7 +266,7 @@
               /* we are calling out */
               tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING;
               tech_pvt->interface_state = SKYPIAX_STATE_RINGING;
-              strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+              skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
               DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n",
                            SKYPIAX_P_LOG, id);
               remote_party_is_ringing(tech_pvt);
@@ -320,7 +322,7 @@
               ("we tried to call Skype on skype_call %s and Skype has now FAILED\n",
                SKYPIAX_P_LOG, id);
             tech_pvt->skype_call_id[0] = '\0';
-            strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+            skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
             tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
             return CALLFLOW_INCOMING_HANGUP;
           } else if (!strcasecmp(value, "REFUSED")) {
@@ -330,7 +332,7 @@
               DEBUGA_SKYPE
                 ("we tried to call Skype on skype_call %s and Skype has now REFUSED\n",
                  SKYPIAX_P_LOG, id);
-              strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+              skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
               tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
               tech_pvt->skype_call_id[0] = '\0';
               return CALLFLOW_INCOMING_HANGUP;
@@ -341,19 +343,19 @@
           } else if (!strcasecmp(value, "ROUTING")) {
             tech_pvt->skype_callflow = CALLFLOW_STATUS_ROUTING;
             tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
-            strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+            skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
             DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPIAX_P_LOG, id);
           } else if (!strcasecmp(value, "UNPLACED")) {
             tech_pvt->skype_callflow = CALLFLOW_STATUS_UNPLACED;
             tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
-            strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+            skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
             DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPIAX_P_LOG, id);
           } else if (!strcasecmp(value, "INPROGRESS")) {
             char msg_to_skype[1024];
 
             if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id)
                 || !strcasecmp(tech_pvt->skype_call_id, id)) {
-              strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+              skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
               DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id);
               if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) {
                 tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
@@ -389,19 +391,19 @@
         /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[11]: %s\n", SKYPIAX_P_LOG,
          * message_2, &message_2[11]); */
         memset(tech_pvt->skype_friends, 0, 4096);
-        strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
+        skypiax_strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
       }
       if (!strcasecmp(message, "#222")) {
         /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
          * message_2, &message_2[10]); */
         memset(tech_pvt->skype_fullname, 0, 512);
-        strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
+        skypiax_strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
       }
       if (!strcasecmp(message, "#765")) {
         /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
          * message_2, &message_2[10]); */
         memset(tech_pvt->skype_displayname, 0, 512);
-        strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
+        skypiax_strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
       }
       a = 0;
     }                           //message end
@@ -943,7 +945,7 @@
       PCOPYDATASTRUCT poCopyData = (PCOPYDATASTRUCT) ulParam;
 
       memset(msg_from_skype, '\0', sizeof(msg_from_skype));
-      strncpy(msg_from_skype, (const char *) poCopyData->lpData,
+      skypiax_strncpy(msg_from_skype, (const char *) poCopyData->lpData,
               sizeof(msg_from_skype) - 2);
 
       howmany = strlen(msg_from_skype) + 1;


From gmaruzz at freeswitch.org  Sat Mar  7 03:41:54 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 05:41:54 -0600
Subject: [Freeswitch-svn] [commit] r12504 -
	freeswitch/trunk/src/mod/endpoints/mod_skypiax
Message-ID: <E1Lfuug-0005hG-3S@svn.freeswitch.org>

Author: gmaruzz
Date: Sat Mar  7 05:41:54 2009
New Revision: 12504

Log:
skypiax: Visual C: correcting a typo, was causing 'argument 1' might be '0': this does not adhere to the specification for the function 'CloseHandle'

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Sat Mar  7 05:41:54 2009
@@ -1051,7 +1051,7 @@
     }
   }
   if (fReturnStatus == 0)
-    CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle),
+    CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle);
       tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL;
   return (fReturnStatus);
 }
@@ -1060,7 +1060,7 @@
 {
   UnregisterClass(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName,
                   tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle);
-  CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle),
+  CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle);
     tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL;
 }
 


From gmaruzz at freeswitch.org  Sat Mar  7 03:46:01 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 05:46:01 -0600
Subject: [Freeswitch-svn] [commit] r12505 -
	freeswitch/trunk/src/mod/endpoints/mod_skypiax
Message-ID: <E1Lfuyf-0005jw-8F@svn.freeswitch.org>

Author: gmaruzz
Date: Sat Mar  7 05:46:01 2009
New Revision: 12505

Log:
skypiax: Visual C: correcting the warning ' Potential comparison of a constant with another constant'

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Sat Mar  7 05:46:01 2009
@@ -12,6 +12,7 @@
 extern switch_memory_pool_t *skypiax_module_pool;
 extern switch_endpoint_interface_t *skypiax_endpoint_interface;
 #endif /* ASTERISK */
+int samplerate_skypiax = SAMPLERATE_SKYPIAX;
 
 extern int running;
 
@@ -484,7 +485,7 @@
         if (len == 320) {
           unsigned int howmany;
 
-          if (SAMPLERATE_SKYPIAX == 8000) {
+          if (samplerate_skypiax == 8000) {
             /* we're downsampling from 16khz to 8khz, srv_out will contain each other sample from srv_in */
             a = 0;
             for (i = 0; i < len / sizeof(short); i++) {
@@ -492,7 +493,7 @@
               i++;
               a++;
             }
-          } else if (SAMPLERATE_SKYPIAX == 16000) {
+          } else if (samplerate_skypiax == 16000) {
             /* we're NOT downsampling, srv_out will contain ALL samples from srv_in */
             for (i = 0; i < len / sizeof(short); i++) {
               srv_out[i] = srv_in[i];
@@ -647,7 +648,7 @@
         }
 
         if (got == SAMPLES_PER_FRAME * sizeof(short)) {
-          if (SAMPLERATE_SKYPIAX == 8000) {
+          if (samplerate_skypiax == 8000) {
 
             /* we're upsampling from 8khz to 16khz, cli_out will contain two times each sample from cli_in */
             a = 0;
@@ -658,7 +659,7 @@
               a++;
             }
             got = got * 2;
-          } else if (SAMPLERATE_SKYPIAX == 16000) {
+          } else if (samplerate_skypiax == 16000) {
             /* we're NOT upsampling, cli_out will contain just ALL samples from cli_in */
             for (i = 0; i < got / sizeof(short); i++) {
               cli_out[i] = cli_in[i];


From nicholas at freeswitch.org  Sat Mar  7 04:43:48 2009
From: nicholas at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 06:43:48 -0600
Subject: [Freeswitch-svn] [commit] r12506 - freeswitch/trunk/debian
Message-ID: <E1Lfvsa-0006K4-Fr@svn.freeswitch.org>

Author: nicholas
Date: Sat Mar  7 06:43:48 2009
New Revision: 12506

Log:
fixed openzap.conf issue in deb package

Modified:
   freeswitch/trunk/debian/freeswitch.install

Modified: freeswitch/trunk/debian/freeswitch.install
==============================================================================
--- freeswitch/trunk/debian/freeswitch.install	(original)
+++ freeswitch/trunk/debian/freeswitch.install	Sat Mar  7 06:43:48 2009
@@ -52,6 +52,7 @@
 opt/freeswitch/conf/web-vm.tpl
 opt/freeswitch/conf/tetris.ttml
 opt/freeswitch/conf/fur_elise.ttml
+opt/freeswitch/conf/openzap.conf
 opt/freeswitch/conf/dialplan/public.xml
 opt/freeswitch/conf/dialplan/default.xml
 opt/freeswitch/conf/dialplan/features.xml


From silik0n at freeswitch.org  Sat Mar  7 05:04:44 2009
From: silik0n at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 07:04:44 -0600
Subject: [Freeswitch-svn] [commit] r12507 - in
	freeswitch/trunk/scripts/contrib/swk/php: . amfphp
Message-ID: <E1LfwCq-0006kA-9Y@svn.freeswitch.org>

Author: silik0n
Date: Sat Mar  7 07:04:44 2009
New Revision: 12507

Log:
initial commit of AMF-PHP support this is pretty straight forward stuff and pretty simplistic in design

Added:
   freeswitch/trunk/scripts/contrib/swk/php/
   freeswitch/trunk/scripts/contrib/swk/php/amfphp/
   freeswitch/trunk/scripts/contrib/swk/php/amfphp/README
   freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php

Added: freeswitch/trunk/scripts/contrib/swk/php/amfphp/README
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/README	Sat Mar  7 07:04:44 2009
@@ -0,0 +1,14 @@
+AMF-PHP FreeSwitch Service
+
+Copy the freeswitch.php file to your AMF-PHP services directory
+
+the flex file goes in the normal spot... this is not dynamically configured so you'll have to edit a few things to get it right
+
+TODO: Dynamically detect where the AMF Feed is (ie: dont hardcode the URL)
+TODO: Make the UI better Looking
+TODO: Add some form of user management
+TODO: CDR Viewer
+TODO: Anything else I think I might want to add here
+
+Feel Free to submit patches It would be nice to figure out a good way to support as much of the API as possible via ESL and add things
+like basic Server monitoring

Added: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php	Sat Mar  7 07:04:44 2009
@@ -0,0 +1,148 @@
+<?php
+
+/* 
+ * FreeSWITCH AMF-PHP ESL Client Library
+ * Copyright (C) 2009, Ken Rice <krice at tollfreegateway.com>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Ken Rice <krice at tollfreegateway.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Ken Rice <krice at tollfreegateway.com>
+ *
+ * freeswitch.php -- Initial Class file for AMF-PHP FreeSwitch Class using ESL
+ *
+ ***************************************************************************************************
+ * 
+ * This Requires the FreeSWITCH ESL Extension to be installed properly on your system.
+ *
+ */
+
+require_once "ESL.php";
+ 
+class FreeSWITCH {
+	 var $esl;
+
+        public function __construct() { 
+		$this->esl = new eslConnection('127.0.0.1', '8021', 'ClueCon');
+	}
+	
+	public function getStatus() {
+		$e = $this->esl->sendRecv("api status");
+		$body = $e->getBody();
+		
+		return $body;
+	}
+
+	public function getConferenceList() {
+		$e = $this->esl->sendRecv("api conference list");
+		$body = $e->getBody();
+		
+		$data=explode("\n", $body);
+		$y=0;
+		foreach($data as $row){
+        		if(substr($row, 0, 10)=="Conference"){
+                		$temp_data = explode(" ", $row);
+                		$conf_data[$y] = $temp_data[1];
+                		$y++;
+        		}
+		}
+
+		return $conf_data;
+	}
+
+	public function getConferenceUsers($conference_name) {
+		$e = $this->esl->sendRecv("api conference $conference_name list");
+		$body = $e->getBody();
+		
+		$data=explode("\n", $body);
+		$y=0;
+		foreach($data as $row){
+        		if ($row!="" && substr($row, 0, 10) != "Conference"){
+                		$conf_data[$y] = explode(";", $row);
+                		$y++;
+        		}
+		}
+
+		return $conf_data;
+	}
+
+	public function getChannels() {
+		$e = $this->esl->sendRecv("api show channels");
+		$body = $e->getBody();
+		
+		$temp = explode  ("\n", $body);
+		$total_count = sizeof($temp);
+		$i = -1;
+		foreach($temp as $row){
+			if ($i == -1) { 
+				$header = explode(",", $row);
+			} else {
+				$temp_row = explode(",", $row);
+				$x=0;
+				foreach($temp_row as $col){
+					$data[$i][$header[$x]] = $col;
+					$x++;
+				}
+			}
+			$i++;
+			if ($i == $total_count - 4){
+				break;
+			}
+		}
+		return $data;
+	}
+	
+	public function getCalls() {
+		$e = $this->esl->sendRecv("api show calls");
+		$body = $e->getBody();
+		
+		$temp = explode  ("\n", $body);
+		$total_count = sizeof($temp);
+		$i = -1;
+		foreach($temp as $row){
+			if ($i == -1) { 
+				$header = explode(",", $row);
+			} else {
+				$temp_row = explode(",", $row);
+				$x=0;
+				foreach($temp_row as $col){
+					$data[$i][$header[$x]] = $col;
+					$x++;
+				}
+			}
+			$i++;
+			if ($i == $total_count - 3){
+				break;
+			}
+		}
+		return $data;
+	}
+
+	public function originate($call_url, $exten, $dialplan = "XML", $context= "default", $cid_name = "amf_php", $cid_number = "888", $timeout="30"){
+		$dialstring = "api originate $call_url $exten $dialplan $context $cid_name $cid_number $timeout";
+		$e = $this->esl->sendRecv($dialstring);
+		$body = $e->getBody();
+
+		return $dialstring . "\n" . $body;
+	}
+	
+}
+?>


From silik0n at freeswitch.org  Sat Mar  7 05:12:38 2009
From: silik0n at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 07 Mar 2009 07:12:38 -0600
Subject: [Freeswitch-svn] [commit] r12508 - in
	freeswitch/trunk/scripts/contrib/swk/flex: . amf-test1
	amf-test1/.settings amf-test1/bin-debug
	amf-test1/bin-debug/history amf-test1/html-template
	amf-test1/html-template/history amf-test1/libs amf-test1/src
	amf-test1/src/com amf-test1/src/com/tollfreegateway
Message-ID: <E1LfwKU-0006o9-MQ@svn.freeswitch.org>

Author: silik0n
Date: Sat Mar  7 07:12:38 2009
New Revision: 12508

Log:
and the initial client for AMF-PHP in flex use at your own risk this is really example code and probably will not work the way you expect

Added:
   freeswitch/trunk/scripts/contrib/swk/flex/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.actionScriptProperties
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.flexProperties
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.project
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.settings/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.settings/org.eclipse.core.resources.prefs
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/AC_OETags.js
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/history.css
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/history.js
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/historyFrame.html
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.html
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/AC_OETags.js
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/history.css
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/history.js
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/historyFrame.html
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/index.template.html
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/playerProductInstall.swf   (contents, props changed)
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/libs/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/com/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/com/tollfreegateway/
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/com/tollfreegateway/freeswitch.as
   freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.actionScriptProperties
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.actionScriptProperties	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="main.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compilerSourcePath/>
+<libraryPath defaultLinkType="1">
+<libraryPathEntry kind="4" path=""/>
+<libraryPathEntry kind="1" linkType="1" path="libs"/>
+</libraryPath>
+<sourceAttachmentPath/>
+</compiler>
+<applications>
+<application path="main.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.flexProperties
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.flexProperties	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flexProperties flexServerType="16" serverContextRoot="" serverRoot="/Users/krice/Documents/amf-test1" serverRootURL="http://192.168.1.140/amf-test1/" toolCompile="true" useServerFlexSDK="false" version="1"/>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.project
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.project	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>amf-test1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+</projectDescription>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.settings/org.eclipse.core.resources.prefs
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/.settings/org.eclipse.core.resources.prefs	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,3 @@
+#Sat Mar 07 02:10:09 CST 2009
+eclipse.preferences.version=1
+encoding/<project>=utf-8

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/AC_OETags.js
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/AC_OETags.js	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,276 @@
+// Flash Player Version Detection - Rev 1.6
+// Detect Client Browser type
+// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}	
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+    var str = '';
+    if (isIE && isWin && !isOpera)
+    {
+  		str += '<object ';
+  		for (var i in objAttrs)
+  			str += i + '="' + objAttrs[i] + '" ';
+  		str += '>';
+  		for (var i in params)
+  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+  		str += '</object>';
+    } else {
+  		str += '<embed ';
+  		for (var i in embedAttrs)
+  			str += i + '="' + embedAttrs[i] + '" ';
+  		str += '> </embed>';
+    }
+
+    document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblClick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "id":
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
+
+

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/history.css
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/history.css	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,6 @@
+/* This CSS stylesheet defines styles used by required elements in a flex application page that supports browser history */
+
+#ie_historyFrame { width: 0px; height: 0px; display:none }
+#firefox_anchorDiv { width: 0px; height: 0px; display:none }
+#safari_formDiv { width: 0px; height: 0px; display:none }
+#safari_rememberDiv { width: 0px; height: 0px; display:none }

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/history.js
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/history.js	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,645 @@
+BrowserHistoryUtils = {
+    addEvent: function(elm, evType, fn, useCapture) {
+        useCapture = useCapture || false;
+        if (elm.addEventListener) {
+            elm.addEventListener(evType, fn, useCapture);
+            return true;
+        }
+        else if (elm.attachEvent) {
+            var r = elm.attachEvent('on' + evType, fn);
+            return r;
+        }
+        else {
+            elm['on' + evType] = fn;
+        }
+    }
+}
+
+BrowserHistory = (function() {
+    // type of browser
+    var browser = {
+        ie: false, 
+        firefox: false, 
+        safari: false, 
+        opera: false, 
+        version: -1
+    };
+
+    // if setDefaultURL has been called, our first clue
+    // that the SWF is ready and listening
+    //var swfReady = false;
+
+    // the URL we'll send to the SWF once it is ready
+    //var pendingURL = '';
+
+    // Default app state URL to use when no fragment ID present
+    var defaultHash = '';
+
+    // Last-known app state URL
+    var currentHref = document.location.href;
+
+    // Initial URL (used only by IE)
+    var initialHref = document.location.href;
+
+    // Initial URL (used only by IE)
+    var initialHash = document.location.hash;
+
+    // History frame source URL prefix (used only by IE)
+    var historyFrameSourcePrefix = 'history/historyFrame.html?';
+
+    // History maintenance (used only by Safari)
+    var currentHistoryLength = -1;
+
+    var historyHash = [];
+
+    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
+
+    var backStack = [];
+    var forwardStack = [];
+
+    var currentObjectId = null;
+
+    //UserAgent detection
+    var useragent = navigator.userAgent.toLowerCase();
+
+    if (useragent.indexOf("opera") != -1) {
+        browser.opera = true;
+    } else if (useragent.indexOf("msie") != -1) {
+        browser.ie = true;
+        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
+    } else if (useragent.indexOf("safari") != -1) {
+        browser.safari = true;
+        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
+    } else if (useragent.indexOf("gecko") != -1) {
+        browser.firefox = true;
+    }
+
+    if (browser.ie == true && browser.version == 7) {
+        window["_ie_firstload"] = false;
+    }
+
+    // Accessor functions for obtaining specific elements of the page.
+    function getHistoryFrame()
+    {
+        return document.getElementById('ie_historyFrame');
+    }
+
+    function getAnchorElement()
+    {
+        return document.getElementById('firefox_anchorDiv');
+    }
+
+    function getFormElement()
+    {
+        return document.getElementById('safari_formDiv');
+    }
+
+    function getRememberElement()
+    {
+        return document.getElementById("safari_remember_field");
+    }
+
+    /* Get the Flash player object for performing ExternalInterface callbacks. */
+    function getPlayer(objectId) {
+        var objectId = objectId || null;
+        var player = null; /* AJH, needed?  = document.getElementById(getPlayerId()); */
+        if (browser.ie && objectId != null) {
+            player = document.getElementById(objectId);
+        }
+        if (player == null) {
+            player = document.getElementsByTagName('object')[0];
+        }
+        
+        if (player == null || player.object == null) {
+            player = document.getElementsByTagName('embed')[0];
+        }
+
+        return player;
+    }
+    
+    function getPlayers() {
+        var players = [];
+        if (players.length == 0) {
+            var tmp = document.getElementsByTagName('object');
+            players = tmp;
+        }
+        
+        if (players.length == 0 || players[0].object == null) {
+            var tmp = document.getElementsByTagName('embed');
+            players = tmp;
+        }
+        return players;
+    }
+
+	function getIframeHash() {
+		var doc = getHistoryFrame().contentWindow.document;
+		var hash = String(doc.location.search);
+		if (hash.length == 1 && hash.charAt(0) == "?") {
+			hash = "";
+		}
+		else if (hash.length >= 2 && hash.charAt(0) == "?") {
+			hash = hash.substring(1);
+		}
+		return hash;
+	}
+
+    /* Get the current location hash excluding the '#' symbol. */
+    function getHash() {
+       // It would be nice if we could use document.location.hash here,
+       // but it's faulty sometimes.
+       var idx = document.location.href.indexOf('#');
+       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
+    }
+
+    /* Get the current location hash excluding the '#' symbol. */
+    function setHash(hash) {
+       // It would be nice if we could use document.location.hash here,
+       // but it's faulty sometimes.
+       if (hash == '') hash = '#'
+       document.location.hash = hash;
+    }
+
+    function createState(baseUrl, newUrl, flexAppUrl) {
+        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
+    }
+
+    /* Add a history entry to the browser.
+     *   baseUrl: the portion of the location prior to the '#'
+     *   newUrl: the entire new URL, including '#' and following fragment
+     *   flexAppUrl: the portion of the location following the '#' only
+     */
+    function addHistoryEntry(baseUrl, newUrl, flexAppUrl) {
+
+        //delete all the history entries
+        forwardStack = [];
+
+        if (browser.ie) {
+            //Check to see if we are being asked to do a navigate for the first
+            //history entry, and if so ignore, because it's coming from the creation
+            //of the history iframe
+            if (flexAppUrl == defaultHash && document.location.href == initialHref && window['_ie_firstload']) {
+                currentHref = initialHref;
+                return;
+            }
+            if ((!flexAppUrl || flexAppUrl == defaultHash) && window['_ie_firstload']) {
+                newUrl = baseUrl + '#' + defaultHash;
+                flexAppUrl = defaultHash;
+            } else {
+                // for IE, tell the history frame to go somewhere without a '#'
+                // in order to get this entry into the browser history.
+                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
+            }
+            setHash(flexAppUrl);
+        } else {
+
+            //ADR
+            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
+                initialState = createState(baseUrl, newUrl, flexAppUrl);
+            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
+                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
+            }
+
+            if (browser.safari) {
+                // for Safari, submit a form whose action points to the desired URL
+                if (browser.version <= 419.3) {
+                    var file = window.location.pathname.toString();
+                    file = file.substring(file.lastIndexOf("/")+1);
+                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
+                    //get the current elements and add them to the form
+                    var qs = window.location.search.substring(1);
+                    var qs_arr = qs.split("&");
+                    for (var i = 0; i < qs_arr.length; i++) {
+                        var tmp = qs_arr[i].split("=");
+                        var elem = document.createElement("input");
+                        elem.type = "hidden";
+                        elem.name = tmp[0];
+                        elem.value = tmp[1];
+                        document.forms.historyForm.appendChild(elem);
+                    }
+                    document.forms.historyForm.submit();
+                } else {
+                    top.location.hash = flexAppUrl;
+                }
+                // We also have to maintain the history by hand for Safari
+                historyHash[history.length] = flexAppUrl;
+                _storeStates();
+            } else {
+                // Otherwise, write an anchor into the page and tell the browser to go there
+                addAnchor(flexAppUrl);
+                setHash(flexAppUrl);
+            }
+        }
+        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
+    }
+
+    function _storeStates() {
+        if (browser.safari) {
+            getRememberElement().value = historyHash.join(",");
+        }
+    }
+
+    function handleBackButton() {
+        //The "current" page is always at the top of the history stack.
+        var current = backStack.pop();
+        if (!current) { return; }
+        var last = backStack[backStack.length - 1];
+        if (!last && backStack.length == 0){
+            last = initialState;
+        }
+        forwardStack.push(current);
+    }
+
+    function handleForwardButton() {
+        //summary: private method. Do not call this directly.
+
+        var last = forwardStack.pop();
+        if (!last) { return; }
+        backStack.push(last);
+    }
+
+    function handleArbitraryUrl() {
+        //delete all the history entries
+        forwardStack = [];
+    }
+
+    /* Called periodically to poll to see if we need to detect navigation that has occurred */
+    function checkForUrlChange() {
+
+        if (browser.ie) {
+            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
+                //This occurs when the user has navigated to a specific URL
+                //within the app, and didn't use browser back/forward
+                //IE seems to have a bug where it stops updating the URL it
+                //shows the end-user at this point, but programatically it
+                //appears to be correct.  Do a full app reload to get around
+                //this issue.
+                if (browser.version < 7) {
+                    currentHref = document.location.href;
+                    document.location.reload();
+                } else {
+					if (getHash() != getIframeHash()) {
+						// this.iframe.src = this.blankURL + hash;
+						var sourceToSet = historyFrameSourcePrefix + getHash();
+						getHistoryFrame().src = sourceToSet;
+					}
+                }
+            }
+        }
+
+        if (browser.safari) {
+            // For Safari, we have to check to see if history.length changed.
+            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
+                //alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
+                // If it did change, then we have to look the old state up
+                // in our hand-maintained array since document.location.hash
+                // won't have changed, then call back into BrowserManager.
+                currentHistoryLength = history.length;
+                var flexAppUrl = historyHash[currentHistoryLength];
+                if (flexAppUrl == '') {
+                    //flexAppUrl = defaultHash;
+                }
+                //ADR: to fix multiple
+                if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                    var pl = getPlayers();
+                    for (var i = 0; i < pl.length; i++) {
+                        pl[i].browserURLChange(flexAppUrl);
+                    }
+                } else {
+                    getPlayer().browserURLChange(flexAppUrl);
+                }
+                _storeStates();
+            }
+        }
+        if (browser.firefox) {
+            if (currentHref != document.location.href) {
+                var bsl = backStack.length;
+
+                var urlActions = {
+                    back: false, 
+                    forward: false, 
+                    set: false
+                }
+
+                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
+                    urlActions.back = true;
+                    // FIXME: could this ever be a forward button?
+                    // we can't clear it because we still need to check for forwards. Ugg.
+                    // clearInterval(this.locationTimer);
+                    handleBackButton();
+                }
+                
+                // first check to see if we could have gone forward. We always halt on
+                // a no-hash item.
+                if (forwardStack.length > 0) {
+                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
+                        urlActions.forward = true;
+                        handleForwardButton();
+                    }
+                }
+
+                // ok, that didn't work, try someplace back in the history stack
+                if ((bsl >= 2) && (backStack[bsl - 2])) {
+                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
+                        urlActions.back = true;
+                        handleBackButton();
+                    }
+                }
+                
+                if (!urlActions.back && !urlActions.forward) {
+                    var foundInStacks = {
+                        back: -1, 
+                        forward: -1
+                    }
+
+                    for (var i = 0; i < backStack.length; i++) {
+                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
+                            arbitraryUrl = true;
+                            foundInStacks.back = i;
+                        }
+                    }
+                    for (var i = 0; i < forwardStack.length; i++) {
+                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
+                            arbitraryUrl = true;
+                            foundInStacks.forward = i;
+                        }
+                    }
+                    handleArbitraryUrl();
+                }
+
+                // Firefox changed; do a callback into BrowserManager to tell it.
+                currentHref = document.location.href;
+                var flexAppUrl = getHash();
+                if (flexAppUrl == '') {
+                    //flexAppUrl = defaultHash;
+                }
+                //ADR: to fix multiple
+                if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                    var pl = getPlayers();
+                    for (var i = 0; i < pl.length; i++) {
+                        pl[i].browserURLChange(flexAppUrl);
+                    }
+                } else {
+                    getPlayer().browserURLChange(flexAppUrl);
+                }
+            }
+        }
+        //setTimeout(checkForUrlChange, 50);
+    }
+
+    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
+    function addAnchor(flexAppUrl)
+    {
+       if (document.getElementsByName(flexAppUrl).length == 0) {
+           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
+       }
+    }
+
+    var _initialize = function () {
+        if (browser.ie)
+        {
+            var scripts = document.getElementsByTagName('script');
+            for (var i = 0, s; s = scripts[i]; i++) {
+                if (s.src.indexOf("history.js") > -1) {
+                    var iframe_location = (new String(s.src)).replace("history.js", "historyFrame.html");
+                }
+            }
+            historyFrameSourcePrefix = iframe_location + "?";
+            var src = historyFrameSourcePrefix;
+
+            var iframe = document.createElement("iframe");
+            iframe.id = 'ie_historyFrame';
+            iframe.name = 'ie_historyFrame';
+            //iframe.src = historyFrameSourcePrefix;
+            try {
+                document.body.appendChild(iframe);
+            } catch(e) {
+                setTimeout(function() {
+                    document.body.appendChild(iframe);
+                }, 0);
+            }
+        }
+
+        if (browser.safari)
+        {
+            var rememberDiv = document.createElement("div");
+            rememberDiv.id = 'safari_rememberDiv';
+            document.body.appendChild(rememberDiv);
+            rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
+
+            var formDiv = document.createElement("div");
+            formDiv.id = 'safari_formDiv';
+            document.body.appendChild(formDiv);
+
+            var reloader_content = document.createElement('div');
+            reloader_content.id = 'safarireloader';
+            var scripts = document.getElementsByTagName('script');
+            for (var i = 0, s; s = scripts[i]; i++) {
+                if (s.src.indexOf("history.js") > -1) {
+                    html = (new String(s.src)).replace(".js", ".html");
+                }
+            }
+            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
+            document.body.appendChild(reloader_content);
+            reloader_content.style.position = 'absolute';
+            reloader_content.style.left = reloader_content.style.top = '-9999px';
+            iframe = reloader_content.getElementsByTagName('iframe')[0];
+
+            if (document.getElementById("safari_remember_field").value != "" ) {
+                historyHash = document.getElementById("safari_remember_field").value.split(",");
+            }
+
+        }
+
+        if (browser.firefox)
+        {
+            var anchorDiv = document.createElement("div");
+            anchorDiv.id = 'firefox_anchorDiv';
+            document.body.appendChild(anchorDiv);
+        }
+        
+        //setTimeout(checkForUrlChange, 50);
+    }
+
+    return {
+        historyHash: historyHash, 
+        backStack: function() { return backStack; }, 
+        forwardStack: function() { return forwardStack }, 
+        getPlayer: getPlayer, 
+        initialize: function(src) {
+            _initialize(src);
+        }, 
+        setURL: function(url) {
+            document.location.href = url;
+        }, 
+        getURL: function() {
+            return document.location.href;
+        }, 
+        getTitle: function() {
+            return document.title;
+        }, 
+        setTitle: function(title) {
+            try {
+                backStack[backStack.length - 1].title = title;
+            } catch(e) { }
+            //if on safari, set the title to be the empty string. 
+            if (browser.safari) {
+                if (title == "") {
+                    try {
+                    var tmp = window.location.href.toString();
+                    title = tmp.substring((tmp.lastIndexOf("/")+1), tmp.lastIndexOf("#"));
+                    } catch(e) {
+                        title = "";
+                    }
+                }
+            }
+            document.title = title;
+        }, 
+        setDefaultURL: function(def)
+        {
+            defaultHash = def;
+            def = getHash();
+            //trailing ? is important else an extra frame gets added to the history
+            //when navigating back to the first page.  Alternatively could check
+            //in history frame navigation to compare # and ?.
+            if (browser.ie)
+            {
+                window['_ie_firstload'] = true;
+                var sourceToSet = historyFrameSourcePrefix + def;
+                var func = function() {
+                    getHistoryFrame().src = sourceToSet;
+                    window.location.replace("#" + def);
+                    setInterval(checkForUrlChange, 50);
+                }
+                try {
+                    func();
+                } catch(e) {
+                    window.setTimeout(function() { func(); }, 0);
+                }
+            }
+
+            if (browser.safari)
+            {
+                currentHistoryLength = history.length;
+                if (historyHash.length == 0) {
+                    historyHash[currentHistoryLength] = def;
+                    var newloc = "#" + def;
+                    window.location.replace(newloc);
+                } else {
+                    //alert(historyHash[historyHash.length-1]);
+                }
+                //setHash(def);
+                setInterval(checkForUrlChange, 50);
+            }
+            
+            
+            if (browser.firefox || browser.opera)
+            {
+                var reg = new RegExp("#" + def + "$");
+                if (window.location.toString().match(reg)) {
+                } else {
+                    var newloc ="#" + def;
+                    window.location.replace(newloc);
+                }
+                setInterval(checkForUrlChange, 50);
+                //setHash(def);
+            }
+
+        }, 
+
+        /* Set the current browser URL; called from inside BrowserManager to propagate
+         * the application state out to the container.
+         */
+        setBrowserURL: function(flexAppUrl, objectId) {
+            if (browser.ie && typeof objectId != "undefined") {
+                currentObjectId = objectId;
+            }
+           //fromIframe = fromIframe || false;
+           //fromFlex = fromFlex || false;
+           //alert("setBrowserURL: " + flexAppUrl);
+           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
+
+           var pos = document.location.href.indexOf('#');
+           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
+           var newUrl = baseUrl + '#' + flexAppUrl;
+
+           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
+               currentHref = newUrl;
+               addHistoryEntry(baseUrl, newUrl, flexAppUrl);
+               currentHistoryLength = history.length;
+           }
+
+           return false;
+        }, 
+
+        browserURLChange: function(flexAppUrl) {
+            var objectId = null;
+            if (browser.ie && currentObjectId != null) {
+                objectId = currentObjectId;
+            }
+            pendingURL = '';
+            
+            if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                var pl = getPlayers();
+                for (var i = 0; i < pl.length; i++) {
+                    try {
+                        pl[i].browserURLChange(flexAppUrl);
+                    } catch(e) { }
+                }
+            } else {
+                try {
+                    getPlayer(objectId).browserURLChange(flexAppUrl);
+                } catch(e) { }
+            }
+
+            currentObjectId = null;
+        }
+
+    }
+
+})();
+
+// Initialization
+
+// Automated unit testing and other diagnostics
+
+function setURL(url)
+{
+    document.location.href = url;
+}
+
+function backButton()
+{
+    history.back();
+}
+
+function forwardButton()
+{
+    history.forward();
+}
+
+function goForwardOrBackInHistory(step)
+{
+    history.go(step);
+}
+
+//BrowserHistoryUtils.addEvent(window, "load", function() { BrowserHistory.initialize(); });
+(function(i) {
+    var u =navigator.userAgent;var e=/*@cc_on!@*/false; 
+    var st = setTimeout;
+    if(/webkit/i.test(u)){
+        st(function(){
+            var dr=document.readyState;
+            if(dr=="loaded"||dr=="complete"){i()}
+            else{st(arguments.callee,10);}},10);
+    } else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
+        document.addEventListener("DOMContentLoaded",i,false);
+    } else if(e){
+    (function(){
+        var t=document.createElement('doc:rdy');
+        try{t.doScroll('left');
+            i();t=null;
+        }catch(e){st(arguments.callee,0);}})();
+    } else{
+        window.onload=i;
+    }
+})( function() {BrowserHistory.initialize();} );

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/historyFrame.html
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/history/historyFrame.html	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,29 @@
+<html>
+    <head>
+        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
+        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
+    </head>
+    <body>
+    <script>
+        function processUrl()
+        {
+
+            var pos = url.indexOf("?");
+            url = pos != -1 ? url.substr(pos + 1) : "";
+            if (!parent._ie_firstload) {
+                parent.BrowserHistory.setBrowserURL(url);
+                try {
+                    parent.BrowserHistory.browserURLChange(url);
+                } catch(e) { }
+            } else {
+                parent._ie_firstload = false;
+            }
+        }
+
+        var url = document.location.href;
+        processUrl();
+        document.write(url);
+    </script>
+    Hidden frame for Browser History support.
+    </body>
+</html>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.html
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.html	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,121 @@
+<!-- saved from url=(0014)about:internet -->
+<html lang="en">
+
+<!-- 
+Smart developers always View Source. 
+
+This application was built using Adobe Flex, an open source framework
+for building rich Internet applications that get delivered via the
+Flash Player or to desktops via Adobe AIR. 
+
+Learn more about Flex at http://flex.org 
+// -->
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!--  BEGIN Browser History required section -->
+<link rel="stylesheet" type="text/css" href="history/history.css" />
+<!--  END Browser History required section -->
+
+<title></title>
+<script src="AC_OETags.js" language="javascript"></script>
+
+<!--  BEGIN Browser History required section -->
+<script src="history/history.js" language="javascript"></script>
+<!--  END Browser History required section -->
+
+<style>
+body { margin: 0px; overflow:hidden }
+</style>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = 9;
+// Minor version of Flash required
+var requiredMinorVersion = 0;
+// Minor version of Flash required
+var requiredRevision = 28;
+// -----------------------------------------------------------------------------
+// -->
+</script>
+</head>
+
+<body scroll="no">
+<script language="JavaScript" type="text/javascript">
+<!--
+// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+var hasProductInstall = DetectFlashVer(6, 0, 65);
+
+// Version check based upon the values defined in globals
+var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+
+if ( hasProductInstall && !hasRequestedVersion ) {
+	// DO NOT MODIFY THE FOLLOWING FOUR LINES
+	// Location visited after installation is complete if installation is required
+	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+	var MMredirectURL = window.location;
+    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+    var MMdoctitle = document.title;
+
+	AC_FL_RunContent(
+		"src", "playerProductInstall",
+		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+		"width", "100%",
+		"height", "100%",
+		"align", "middle",
+		"id", "main",
+		"quality", "high",
+		"bgcolor", "#869ca7",
+		"name", "main",
+		"allowScriptAccess","sameDomain",
+		"type", "application/x-shockwave-flash",
+		"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+} else if (hasRequestedVersion) {
+	// if we've detected an acceptable version
+	// embed the Flash Content SWF when all tests are passed
+	AC_FL_RunContent(
+			"src", "main",
+			"width", "100%",
+			"height", "100%",
+			"align", "middle",
+			"id", "main",
+			"quality", "high",
+			"bgcolor", "#869ca7",
+			"name", "main",
+			"allowScriptAccess","sameDomain",
+			"type", "application/x-shockwave-flash",
+			"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+  } else {  // flash is too old or we can't detect the plugin
+    var alternateContent = 'Alternate HTML content should be placed here. '
+  	+ 'This content requires the Adobe Flash Player. '
+   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+    document.write(alternateContent);  // insert non-flash content
+  }
+// -->
+</script>
+<noscript>
+  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+			id="main" width="100%" height="100%"
+			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+			<param name="movie" value="main.swf" />
+			<param name="quality" value="high" />
+			<param name="bgcolor" value="#869ca7" />
+			<param name="allowScriptAccess" value="sameDomain" />
+			<embed src="main.swf" quality="high" bgcolor="#869ca7"
+				width="100%" height="100%" name="main" align="middle"
+				play="true"
+				loop="false"
+				quality="high"
+				allowScriptAccess="sameDomain"
+				type="application/x-shockwave-flash"
+				pluginspage="http://www.adobe.com/go/getflashplayer">
+			</embed>
+	</object>
+</noscript>
+</body>
+</html>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/AC_OETags.js
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/AC_OETags.js	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,276 @@
+// Flash Player Version Detection - Rev 1.6
+// Detect Client Browser type
+// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}	
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+    var str = '';
+    if (isIE && isWin && !isOpera)
+    {
+  		str += '<object ';
+  		for (var i in objAttrs)
+  			str += i + '="' + objAttrs[i] + '" ';
+  		str += '>';
+  		for (var i in params)
+  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+  		str += '</object>';
+    } else {
+  		str += '<embed ';
+  		for (var i in embedAttrs)
+  			str += i + '="' + embedAttrs[i] + '" ';
+  		str += '> </embed>';
+    }
+
+    document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblClick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "id":
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
+
+

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/history.css
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/history.css	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,6 @@
+/* This CSS stylesheet defines styles used by required elements in a flex application page that supports browser history */
+
+#ie_historyFrame { width: 0px; height: 0px; display:none }
+#firefox_anchorDiv { width: 0px; height: 0px; display:none }
+#safari_formDiv { width: 0px; height: 0px; display:none }
+#safari_rememberDiv { width: 0px; height: 0px; display:none }

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/history.js
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/history.js	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,645 @@
+BrowserHistoryUtils = {
+    addEvent: function(elm, evType, fn, useCapture) {
+        useCapture = useCapture || false;
+        if (elm.addEventListener) {
+            elm.addEventListener(evType, fn, useCapture);
+            return true;
+        }
+        else if (elm.attachEvent) {
+            var r = elm.attachEvent('on' + evType, fn);
+            return r;
+        }
+        else {
+            elm['on' + evType] = fn;
+        }
+    }
+}
+
+BrowserHistory = (function() {
+    // type of browser
+    var browser = {
+        ie: false, 
+        firefox: false, 
+        safari: false, 
+        opera: false, 
+        version: -1
+    };
+
+    // if setDefaultURL has been called, our first clue
+    // that the SWF is ready and listening
+    //var swfReady = false;
+
+    // the URL we'll send to the SWF once it is ready
+    //var pendingURL = '';
+
+    // Default app state URL to use when no fragment ID present
+    var defaultHash = '';
+
+    // Last-known app state URL
+    var currentHref = document.location.href;
+
+    // Initial URL (used only by IE)
+    var initialHref = document.location.href;
+
+    // Initial URL (used only by IE)
+    var initialHash = document.location.hash;
+
+    // History frame source URL prefix (used only by IE)
+    var historyFrameSourcePrefix = 'history/historyFrame.html?';
+
+    // History maintenance (used only by Safari)
+    var currentHistoryLength = -1;
+
+    var historyHash = [];
+
+    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
+
+    var backStack = [];
+    var forwardStack = [];
+
+    var currentObjectId = null;
+
+    //UserAgent detection
+    var useragent = navigator.userAgent.toLowerCase();
+
+    if (useragent.indexOf("opera") != -1) {
+        browser.opera = true;
+    } else if (useragent.indexOf("msie") != -1) {
+        browser.ie = true;
+        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
+    } else if (useragent.indexOf("safari") != -1) {
+        browser.safari = true;
+        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
+    } else if (useragent.indexOf("gecko") != -1) {
+        browser.firefox = true;
+    }
+
+    if (browser.ie == true && browser.version == 7) {
+        window["_ie_firstload"] = false;
+    }
+
+    // Accessor functions for obtaining specific elements of the page.
+    function getHistoryFrame()
+    {
+        return document.getElementById('ie_historyFrame');
+    }
+
+    function getAnchorElement()
+    {
+        return document.getElementById('firefox_anchorDiv');
+    }
+
+    function getFormElement()
+    {
+        return document.getElementById('safari_formDiv');
+    }
+
+    function getRememberElement()
+    {
+        return document.getElementById("safari_remember_field");
+    }
+
+    /* Get the Flash player object for performing ExternalInterface callbacks. */
+    function getPlayer(objectId) {
+        var objectId = objectId || null;
+        var player = null; /* AJH, needed?  = document.getElementById(getPlayerId()); */
+        if (browser.ie && objectId != null) {
+            player = document.getElementById(objectId);
+        }
+        if (player == null) {
+            player = document.getElementsByTagName('object')[0];
+        }
+        
+        if (player == null || player.object == null) {
+            player = document.getElementsByTagName('embed')[0];
+        }
+
+        return player;
+    }
+    
+    function getPlayers() {
+        var players = [];
+        if (players.length == 0) {
+            var tmp = document.getElementsByTagName('object');
+            players = tmp;
+        }
+        
+        if (players.length == 0 || players[0].object == null) {
+            var tmp = document.getElementsByTagName('embed');
+            players = tmp;
+        }
+        return players;
+    }
+
+	function getIframeHash() {
+		var doc = getHistoryFrame().contentWindow.document;
+		var hash = String(doc.location.search);
+		if (hash.length == 1 && hash.charAt(0) == "?") {
+			hash = "";
+		}
+		else if (hash.length >= 2 && hash.charAt(0) == "?") {
+			hash = hash.substring(1);
+		}
+		return hash;
+	}
+
+    /* Get the current location hash excluding the '#' symbol. */
+    function getHash() {
+       // It would be nice if we could use document.location.hash here,
+       // but it's faulty sometimes.
+       var idx = document.location.href.indexOf('#');
+       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
+    }
+
+    /* Get the current location hash excluding the '#' symbol. */
+    function setHash(hash) {
+       // It would be nice if we could use document.location.hash here,
+       // but it's faulty sometimes.
+       if (hash == '') hash = '#'
+       document.location.hash = hash;
+    }
+
+    function createState(baseUrl, newUrl, flexAppUrl) {
+        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
+    }
+
+    /* Add a history entry to the browser.
+     *   baseUrl: the portion of the location prior to the '#'
+     *   newUrl: the entire new URL, including '#' and following fragment
+     *   flexAppUrl: the portion of the location following the '#' only
+     */
+    function addHistoryEntry(baseUrl, newUrl, flexAppUrl) {
+
+        //delete all the history entries
+        forwardStack = [];
+
+        if (browser.ie) {
+            //Check to see if we are being asked to do a navigate for the first
+            //history entry, and if so ignore, because it's coming from the creation
+            //of the history iframe
+            if (flexAppUrl == defaultHash && document.location.href == initialHref && window['_ie_firstload']) {
+                currentHref = initialHref;
+                return;
+            }
+            if ((!flexAppUrl || flexAppUrl == defaultHash) && window['_ie_firstload']) {
+                newUrl = baseUrl + '#' + defaultHash;
+                flexAppUrl = defaultHash;
+            } else {
+                // for IE, tell the history frame to go somewhere without a '#'
+                // in order to get this entry into the browser history.
+                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
+            }
+            setHash(flexAppUrl);
+        } else {
+
+            //ADR
+            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
+                initialState = createState(baseUrl, newUrl, flexAppUrl);
+            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
+                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
+            }
+
+            if (browser.safari) {
+                // for Safari, submit a form whose action points to the desired URL
+                if (browser.version <= 419.3) {
+                    var file = window.location.pathname.toString();
+                    file = file.substring(file.lastIndexOf("/")+1);
+                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
+                    //get the current elements and add them to the form
+                    var qs = window.location.search.substring(1);
+                    var qs_arr = qs.split("&");
+                    for (var i = 0; i < qs_arr.length; i++) {
+                        var tmp = qs_arr[i].split("=");
+                        var elem = document.createElement("input");
+                        elem.type = "hidden";
+                        elem.name = tmp[0];
+                        elem.value = tmp[1];
+                        document.forms.historyForm.appendChild(elem);
+                    }
+                    document.forms.historyForm.submit();
+                } else {
+                    top.location.hash = flexAppUrl;
+                }
+                // We also have to maintain the history by hand for Safari
+                historyHash[history.length] = flexAppUrl;
+                _storeStates();
+            } else {
+                // Otherwise, write an anchor into the page and tell the browser to go there
+                addAnchor(flexAppUrl);
+                setHash(flexAppUrl);
+            }
+        }
+        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
+    }
+
+    function _storeStates() {
+        if (browser.safari) {
+            getRememberElement().value = historyHash.join(",");
+        }
+    }
+
+    function handleBackButton() {
+        //The "current" page is always at the top of the history stack.
+        var current = backStack.pop();
+        if (!current) { return; }
+        var last = backStack[backStack.length - 1];
+        if (!last && backStack.length == 0){
+            last = initialState;
+        }
+        forwardStack.push(current);
+    }
+
+    function handleForwardButton() {
+        //summary: private method. Do not call this directly.
+
+        var last = forwardStack.pop();
+        if (!last) { return; }
+        backStack.push(last);
+    }
+
+    function handleArbitraryUrl() {
+        //delete all the history entries
+        forwardStack = [];
+    }
+
+    /* Called periodically to poll to see if we need to detect navigation that has occurred */
+    function checkForUrlChange() {
+
+        if (browser.ie) {
+            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
+                //This occurs when the user has navigated to a specific URL
+                //within the app, and didn't use browser back/forward
+                //IE seems to have a bug where it stops updating the URL it
+                //shows the end-user at this point, but programatically it
+                //appears to be correct.  Do a full app reload to get around
+                //this issue.
+                if (browser.version < 7) {
+                    currentHref = document.location.href;
+                    document.location.reload();
+                } else {
+					if (getHash() != getIframeHash()) {
+						// this.iframe.src = this.blankURL + hash;
+						var sourceToSet = historyFrameSourcePrefix + getHash();
+						getHistoryFrame().src = sourceToSet;
+					}
+                }
+            }
+        }
+
+        if (browser.safari) {
+            // For Safari, we have to check to see if history.length changed.
+            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
+                //alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
+                // If it did change, then we have to look the old state up
+                // in our hand-maintained array since document.location.hash
+                // won't have changed, then call back into BrowserManager.
+                currentHistoryLength = history.length;
+                var flexAppUrl = historyHash[currentHistoryLength];
+                if (flexAppUrl == '') {
+                    //flexAppUrl = defaultHash;
+                }
+                //ADR: to fix multiple
+                if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                    var pl = getPlayers();
+                    for (var i = 0; i < pl.length; i++) {
+                        pl[i].browserURLChange(flexAppUrl);
+                    }
+                } else {
+                    getPlayer().browserURLChange(flexAppUrl);
+                }
+                _storeStates();
+            }
+        }
+        if (browser.firefox) {
+            if (currentHref != document.location.href) {
+                var bsl = backStack.length;
+
+                var urlActions = {
+                    back: false, 
+                    forward: false, 
+                    set: false
+                }
+
+                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
+                    urlActions.back = true;
+                    // FIXME: could this ever be a forward button?
+                    // we can't clear it because we still need to check for forwards. Ugg.
+                    // clearInterval(this.locationTimer);
+                    handleBackButton();
+                }
+                
+                // first check to see if we could have gone forward. We always halt on
+                // a no-hash item.
+                if (forwardStack.length > 0) {
+                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
+                        urlActions.forward = true;
+                        handleForwardButton();
+                    }
+                }
+
+                // ok, that didn't work, try someplace back in the history stack
+                if ((bsl >= 2) && (backStack[bsl - 2])) {
+                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
+                        urlActions.back = true;
+                        handleBackButton();
+                    }
+                }
+                
+                if (!urlActions.back && !urlActions.forward) {
+                    var foundInStacks = {
+                        back: -1, 
+                        forward: -1
+                    }
+
+                    for (var i = 0; i < backStack.length; i++) {
+                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
+                            arbitraryUrl = true;
+                            foundInStacks.back = i;
+                        }
+                    }
+                    for (var i = 0; i < forwardStack.length; i++) {
+                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
+                            arbitraryUrl = true;
+                            foundInStacks.forward = i;
+                        }
+                    }
+                    handleArbitraryUrl();
+                }
+
+                // Firefox changed; do a callback into BrowserManager to tell it.
+                currentHref = document.location.href;
+                var flexAppUrl = getHash();
+                if (flexAppUrl == '') {
+                    //flexAppUrl = defaultHash;
+                }
+                //ADR: to fix multiple
+                if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                    var pl = getPlayers();
+                    for (var i = 0; i < pl.length; i++) {
+                        pl[i].browserURLChange(flexAppUrl);
+                    }
+                } else {
+                    getPlayer().browserURLChange(flexAppUrl);
+                }
+            }
+        }
+        //setTimeout(checkForUrlChange, 50);
+    }
+
+    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
+    function addAnchor(flexAppUrl)
+    {
+       if (document.getElementsByName(flexAppUrl).length == 0) {
+           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
+       }
+    }
+
+    var _initialize = function () {
+        if (browser.ie)
+        {
+            var scripts = document.getElementsByTagName('script');
+            for (var i = 0, s; s = scripts[i]; i++) {
+                if (s.src.indexOf("history.js") > -1) {
+                    var iframe_location = (new String(s.src)).replace("history.js", "historyFrame.html");
+                }
+            }
+            historyFrameSourcePrefix = iframe_location + "?";
+            var src = historyFrameSourcePrefix;
+
+            var iframe = document.createElement("iframe");
+            iframe.id = 'ie_historyFrame';
+            iframe.name = 'ie_historyFrame';
+            //iframe.src = historyFrameSourcePrefix;
+            try {
+                document.body.appendChild(iframe);
+            } catch(e) {
+                setTimeout(function() {
+                    document.body.appendChild(iframe);
+                }, 0);
+            }
+        }
+
+        if (browser.safari)
+        {
+            var rememberDiv = document.createElement("div");
+            rememberDiv.id = 'safari_rememberDiv';
+            document.body.appendChild(rememberDiv);
+            rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
+
+            var formDiv = document.createElement("div");
+            formDiv.id = 'safari_formDiv';
+            document.body.appendChild(formDiv);
+
+            var reloader_content = document.createElement('div');
+            reloader_content.id = 'safarireloader';
+            var scripts = document.getElementsByTagName('script');
+            for (var i = 0, s; s = scripts[i]; i++) {
+                if (s.src.indexOf("history.js") > -1) {
+                    html = (new String(s.src)).replace(".js", ".html");
+                }
+            }
+            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
+            document.body.appendChild(reloader_content);
+            reloader_content.style.position = 'absolute';
+            reloader_content.style.left = reloader_content.style.top = '-9999px';
+            iframe = reloader_content.getElementsByTagName('iframe')[0];
+
+            if (document.getElementById("safari_remember_field").value != "" ) {
+                historyHash = document.getElementById("safari_remember_field").value.split(",");
+            }
+
+        }
+
+        if (browser.firefox)
+        {
+            var anchorDiv = document.createElement("div");
+            anchorDiv.id = 'firefox_anchorDiv';
+            document.body.appendChild(anchorDiv);
+        }
+        
+        //setTimeout(checkForUrlChange, 50);
+    }
+
+    return {
+        historyHash: historyHash, 
+        backStack: function() { return backStack; }, 
+        forwardStack: function() { return forwardStack }, 
+        getPlayer: getPlayer, 
+        initialize: function(src) {
+            _initialize(src);
+        }, 
+        setURL: function(url) {
+            document.location.href = url;
+        }, 
+        getURL: function() {
+            return document.location.href;
+        }, 
+        getTitle: function() {
+            return document.title;
+        }, 
+        setTitle: function(title) {
+            try {
+                backStack[backStack.length - 1].title = title;
+            } catch(e) { }
+            //if on safari, set the title to be the empty string. 
+            if (browser.safari) {
+                if (title == "") {
+                    try {
+                    var tmp = window.location.href.toString();
+                    title = tmp.substring((tmp.lastIndexOf("/")+1), tmp.lastIndexOf("#"));
+                    } catch(e) {
+                        title = "";
+                    }
+                }
+            }
+            document.title = title;
+        }, 
+        setDefaultURL: function(def)
+        {
+            defaultHash = def;
+            def = getHash();
+            //trailing ? is important else an extra frame gets added to the history
+            //when navigating back to the first page.  Alternatively could check
+            //in history frame navigation to compare # and ?.
+            if (browser.ie)
+            {
+                window['_ie_firstload'] = true;
+                var sourceToSet = historyFrameSourcePrefix + def;
+                var func = function() {
+                    getHistoryFrame().src = sourceToSet;
+                    window.location.replace("#" + def);
+                    setInterval(checkForUrlChange, 50);
+                }
+                try {
+                    func();
+                } catch(e) {
+                    window.setTimeout(function() { func(); }, 0);
+                }
+            }
+
+            if (browser.safari)
+            {
+                currentHistoryLength = history.length;
+                if (historyHash.length == 0) {
+                    historyHash[currentHistoryLength] = def;
+                    var newloc = "#" + def;
+                    window.location.replace(newloc);
+                } else {
+                    //alert(historyHash[historyHash.length-1]);
+                }
+                //setHash(def);
+                setInterval(checkForUrlChange, 50);
+            }
+            
+            
+            if (browser.firefox || browser.opera)
+            {
+                var reg = new RegExp("#" + def + "$");
+                if (window.location.toString().match(reg)) {
+                } else {
+                    var newloc ="#" + def;
+                    window.location.replace(newloc);
+                }
+                setInterval(checkForUrlChange, 50);
+                //setHash(def);
+            }
+
+        }, 
+
+        /* Set the current browser URL; called from inside BrowserManager to propagate
+         * the application state out to the container.
+         */
+        setBrowserURL: function(flexAppUrl, objectId) {
+            if (browser.ie && typeof objectId != "undefined") {
+                currentObjectId = objectId;
+            }
+           //fromIframe = fromIframe || false;
+           //fromFlex = fromFlex || false;
+           //alert("setBrowserURL: " + flexAppUrl);
+           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
+
+           var pos = document.location.href.indexOf('#');
+           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
+           var newUrl = baseUrl + '#' + flexAppUrl;
+
+           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
+               currentHref = newUrl;
+               addHistoryEntry(baseUrl, newUrl, flexAppUrl);
+               currentHistoryLength = history.length;
+           }
+
+           return false;
+        }, 
+
+        browserURLChange: function(flexAppUrl) {
+            var objectId = null;
+            if (browser.ie && currentObjectId != null) {
+                objectId = currentObjectId;
+            }
+            pendingURL = '';
+            
+            if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                var pl = getPlayers();
+                for (var i = 0; i < pl.length; i++) {
+                    try {
+                        pl[i].browserURLChange(flexAppUrl);
+                    } catch(e) { }
+                }
+            } else {
+                try {
+                    getPlayer(objectId).browserURLChange(flexAppUrl);
+                } catch(e) { }
+            }
+
+            currentObjectId = null;
+        }
+
+    }
+
+})();
+
+// Initialization
+
+// Automated unit testing and other diagnostics
+
+function setURL(url)
+{
+    document.location.href = url;
+}
+
+function backButton()
+{
+    history.back();
+}
+
+function forwardButton()
+{
+    history.forward();
+}
+
+function goForwardOrBackInHistory(step)
+{
+    history.go(step);
+}
+
+//BrowserHistoryUtils.addEvent(window, "load", function() { BrowserHistory.initialize(); });
+(function(i) {
+    var u =navigator.userAgent;var e=/*@cc_on!@*/false; 
+    var st = setTimeout;
+    if(/webkit/i.test(u)){
+        st(function(){
+            var dr=document.readyState;
+            if(dr=="loaded"||dr=="complete"){i()}
+            else{st(arguments.callee,10);}},10);
+    } else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
+        document.addEventListener("DOMContentLoaded",i,false);
+    } else if(e){
+    (function(){
+        var t=document.createElement('doc:rdy');
+        try{t.doScroll('left');
+            i();t=null;
+        }catch(e){st(arguments.callee,0);}})();
+    } else{
+        window.onload=i;
+    }
+})( function() {BrowserHistory.initialize();} );

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/historyFrame.html
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/history/historyFrame.html	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,29 @@
+<html>
+    <head>
+        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
+        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
+    </head>
+    <body>
+    <script>
+        function processUrl()
+        {
+
+            var pos = url.indexOf("?");
+            url = pos != -1 ? url.substr(pos + 1) : "";
+            if (!parent._ie_firstload) {
+                parent.BrowserHistory.setBrowserURL(url);
+                try {
+                    parent.BrowserHistory.browserURLChange(url);
+                } catch(e) { }
+            } else {
+                parent._ie_firstload = false;
+            }
+        }
+
+        var url = document.location.href;
+        processUrl();
+        document.write(url);
+    </script>
+    Hidden frame for Browser History support.
+    </body>
+</html>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/index.template.html
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/index.template.html	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,121 @@
+<!-- saved from url=(0014)about:internet -->
+<html lang="en">
+
+<!-- 
+Smart developers always View Source. 
+
+This application was built using Adobe Flex, an open source framework
+for building rich Internet applications that get delivered via the
+Flash Player or to desktops via Adobe AIR. 
+
+Learn more about Flex at http://flex.org 
+// -->
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!--  BEGIN Browser History required section -->
+<link rel="stylesheet" type="text/css" href="history/history.css" />
+<!--  END Browser History required section -->
+
+<title>${title}</title>
+<script src="AC_OETags.js" language="javascript"></script>
+
+<!--  BEGIN Browser History required section -->
+<script src="history/history.js" language="javascript"></script>
+<!--  END Browser History required section -->
+
+<style>
+body { margin: 0px; overflow:hidden }
+</style>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = ${version_major};
+// Minor version of Flash required
+var requiredMinorVersion = ${version_minor};
+// Minor version of Flash required
+var requiredRevision = ${version_revision};
+// -----------------------------------------------------------------------------
+// -->
+</script>
+</head>
+
+<body scroll="no">
+<script language="JavaScript" type="text/javascript">
+<!--
+// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+var hasProductInstall = DetectFlashVer(6, 0, 65);
+
+// Version check based upon the values defined in globals
+var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+
+if ( hasProductInstall && !hasRequestedVersion ) {
+	// DO NOT MODIFY THE FOLLOWING FOUR LINES
+	// Location visited after installation is complete if installation is required
+	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+	var MMredirectURL = window.location;
+    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+    var MMdoctitle = document.title;
+
+	AC_FL_RunContent(
+		"src", "playerProductInstall",
+		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+		"width", "${width}",
+		"height", "${height}",
+		"align", "middle",
+		"id", "${application}",
+		"quality", "high",
+		"bgcolor", "${bgcolor}",
+		"name", "${application}",
+		"allowScriptAccess","sameDomain",
+		"type", "application/x-shockwave-flash",
+		"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+} else if (hasRequestedVersion) {
+	// if we've detected an acceptable version
+	// embed the Flash Content SWF when all tests are passed
+	AC_FL_RunContent(
+			"src", "${swf}",
+			"width", "${width}",
+			"height", "${height}",
+			"align", "middle",
+			"id", "${application}",
+			"quality", "high",
+			"bgcolor", "${bgcolor}",
+			"name", "${application}",
+			"allowScriptAccess","sameDomain",
+			"type", "application/x-shockwave-flash",
+			"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+  } else {  // flash is too old or we can't detect the plugin
+    var alternateContent = 'Alternate HTML content should be placed here. '
+  	+ 'This content requires the Adobe Flash Player. '
+   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+    document.write(alternateContent);  // insert non-flash content
+  }
+// -->
+</script>
+<noscript>
+  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+			id="${application}" width="${width}" height="${height}"
+			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+			<param name="movie" value="${swf}.swf" />
+			<param name="quality" value="high" />
+			<param name="bgcolor" value="${bgcolor}" />
+			<param name="allowScriptAccess" value="sameDomain" />
+			<embed src="${swf}.swf" quality="high" bgcolor="${bgcolor}"
+				width="${width}" height="${height}" name="${application}" align="middle"
+				play="true"
+				loop="false"
+				quality="high"
+				allowScriptAccess="sameDomain"
+				type="application/x-shockwave-flash"
+				pluginspage="http://www.adobe.com/go/getflashplayer">
+			</embed>
+	</object>
+</noscript>
+</body>
+</html>

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/html-template/playerProductInstall.swf
==============================================================================
Binary file. No diff available.

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/com/tollfreegateway/freeswitch.as
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/com/tollfreegateway/freeswitch.as	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,17 @@
+package com.tollfreegateway
+{
+	public class freeswitch
+	{
+		[RemoteClass(alias="com.tollfreegateway.freeswitch")]
+		[Bindable]
+		
+		public function freeswitch()
+		{
+	        public var id_aut:int;
+	        public var fname_aut:String;
+	        public var lname_aut:String;
+
+		}
+
+	}
+}
\ No newline at end of file

Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml	Sat Mar  7 07:12:38 2009
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute">
+
+	 <mx:Script>
+        <![CDATA[
+            import mx.controls.dataGridClasses.DataGridColumn;
+            import mx.events.DataGridEvent;
+            import mx.controls.Alert;
+            import mx.rpc.events.FaultEvent;
+            import mx.rpc.events.ResultEvent;
+            import mx.collections.ArrayCollection;
+
+            /**
+             * This function is called when an item was edited in the data grid.
+             * Calls the saveData() method on the PHP server 
+             */
+             /*
+            private function save(event:DataGridEvent):void {
+                var dataGrid:DataGrid = event.target as DataGrid;
+                var dsColumnIndex:Number = event.columnIndex;
+                var col:DataGridColumn = dataGrid.columns[dsColumnIndex];
+                var newValue:String = dataGrid.itemEditorInstance[col.editorDataField];
+                var dsFieldName:String = event.dataField;
+                var author:VOAuthor = event.itemRenderer.data as VOAuthor;
+                if (newValue == author[dsFieldName])
+                    return;
+                //get the new value for the first name or last name
+                author[dsFieldName] = newValue;
+                myRemote.saveData(author);
+            }
+            */
+        ]]>
+    </mx:Script>
+
+    <!-- this is the RemoteObject  used to make the RPC calls -->
+    <mx:RemoteObject id="freeswitch" destination="freeswitch" source="freeswitch"
+            endpoint="http://192.168.1.140/feeder/gateway.php" showBusyCursor="true"/>
+
+    
+    <mx:TabNavigator width="100%" height="100%">
+        <mx:Canvas label="Channels" width="100%" height="100%">
+        	<mx:VBox top="0" left="0" width="100%" height="100%">
+		        <mx:Button label="Get data" click="{freeswitch.getChannels()}" />
+		        <!-- <mx:DataGrid id="myGrid" dataProvider="{myRemote.getChannels.lastResult}" editable="true" itemEditEnd="save(event)"> -->
+		        <mx:DataGrid id="channelsGrid" dataProvider="{freeswitch.getChannels.lastResult}" width="100%" height="100%">
+		            <mx:columns>
+		                <mx:DataGridColumn dataField="uuid" editable="false"/>
+		                <mx:DataGridColumn dataField="cid_name"/>
+		                <mx:DataGridColumn dataField="cid_num"/>
+		                <mx:DataGridColumn dataField="dest"/>
+		                <mx:DataGridColumn dataField="created"/>
+		                <mx:DataGridColumn dataField="read_codec"/>
+		                <mx:DataGridColumn dataField="write_codec"/>
+		            </mx:columns>
+		        </mx:DataGrid>
+	        </mx:VBox>
+        </mx:Canvas>
+        <mx:Canvas label="Calls" width="100%" height="100%">
+        	<mx:VBox top="0" left="0" width="100%" height="100%">
+		        <mx:Button label="Get data" click="{freeswitch.getCalls()}" />
+		        <!-- <mx:DataGrid id="myGrid" dataProvider="{myRemote.getCalls.lastResult}" editable="true" itemEditEnd="save(event)"> -->
+		        <mx:DataGrid id="callsGrid" dataProvider="{freeswitch.getCalls.lastResult}" width="100%" height="100%">
+		            <mx:columns>
+		                <mx:DataGridColumn dataField="created"/>
+		                <mx:DataGridColumn dataField="caller_uuid"/>
+		                <mx:DataGridColumn dataField="callee_uuid"/>
+		                <mx:DataGridColumn dataField="caller_cid_name"/>
+		                <mx:DataGridColumn dataField="caller_cid_num"/>
+		                <mx:DataGridColumn dataField="caller_dest_num"/>
+		            </mx:columns>
+		        </mx:DataGrid>
+	        </mx:VBox>
+        </mx:Canvas>
+        <mx:Canvas label="Conference" width="100%" height="100%">
+        	<mx:ComboBox id="confPicker" horizontalCenter="0" top="10" dataProvider="{freeswitch.getConferenceList.lastResult}"></mx:ComboBox>
+	        <!-- <mx:DataGrid id="myGrid" dataProvider="{myRemote.getCalls.lastResult}" editable="true" itemEditEnd="save(event)"> -->
+	        <mx:DataGrid id="conferenceGrid" dataProvider="{freeswitch.getConferenceUsers.lastResult}" width="100%" top="43" bottom="115">
+	            <mx:columns>
+	                <mx:DataGridColumn headerText="id" dataField="0"/>
+	                <mx:DataGridColumn headerText="clid_name" dataField="3"/>
+	                <mx:DataGridColumn headerText="clid_num" dataField="4"/>
+	                <mx:DataGridColumn headerText="flags" dataField="5"/>
+	                <mx:DataGridColumn headerText="channel" dataField="1"/>
+	                <mx:DataGridColumn headerText="uuid" dataField="2"/>
+	                <mx:DataGridColumn headerText="volume" dataField="7"/>
+	                <mx:DataGridColumn headerText="mic_gain" dataField="6"/>
+	                <mx:DataGridColumn headerText="noise_floor" dataField="8"/>
+	            </mx:columns>
+	        </mx:DataGrid>
+	        <mx:Button label="Play File" click="{freeswitch.getConferenceList()}" horizontalCenter="-167" bottom="85"/>
+	        <mx:Button label="Speak" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-90" bottom="85"/>
+	        <mx:Button label="Kick" click="{freeswitch.getCalls()}" horizontalCenter="-13" bottom="85"/>
+	        <mx:Button label="DTMF" click="{freeswitch.getCalls()}" horizontalCenter="74" bottom="85"/>
+	        <mx:Button label="Transfer" click="{freeswitch.getCalls()}" horizontalCenter="165" bottom="85"/>
+	        <mx: