diff --git a/src/mod/languages/mod_managed/Makefile b/src/mod/languages/mod_managed/Makefile
index ec44ff5131..4a34afbc8f 100644
--- a/src/mod/languages/mod_managed/Makefile
+++ b/src/mod/languages/mod_managed/Makefile
@@ -34,7 +34,7 @@ swigclean: clean
 	rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs
 
 freeswitch_wrap.cxx:
-	swig -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i
+	swig2.0 -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i
 	rm -f ./managed/swig.cs
 	cat *.cs > ./managed/swig.cs
 	rm -f *.cs
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index 81cac6c201..af537fa7d9 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  * 
  * 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
@@ -8,20 +8,25 @@
  * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
+#define SWIGCSHARP
+
 
 #ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
 
 template <typename T> T SwigValueInit() {
@@ -71,6 +76,12 @@ template <typename T> T SwigValueInit() {
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -190,12 +201,12 @@ static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
 static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
   { SWIG_CSharpArgumentException, NULL },
   { SWIG_CSharpArgumentNullException, NULL },
-  { SWIG_CSharpArgumentOutOfRangeException, NULL },
+  { SWIG_CSharpArgumentOutOfRangeException, NULL }
 };
 
 static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
   SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
-  if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
+  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
     callback = SWIG_csharp_exceptions[code].callback;
   }
   callback(msg);
@@ -203,7 +214,7 @@ static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes
 
 static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
   SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
-  if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
+  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
     callback = SWIG_csharp_exceptions_argument[code].callback;
   }
   callback(msg, param_name);
@@ -303,8 +314,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_PEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "27880";
-  
+  result = (char *)("27880");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -314,8 +324,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_OID_PREFIX_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) ".1.3.6.1.4.1.27880";
-  
+  result = (char *)(".1.3.6.1.4.1.27880");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -325,8 +334,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_ITAD_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "543";
-  
+  result = (char *)("543");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -336,8 +344,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp___EXTENSIONS___get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
-  
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -347,8 +354,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp___BSD_VISIBLE_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
-  
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -358,8 +364,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENT_ORIGINATE_DELIM_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) ":_:";
-  
+  result = (char *)(":_:");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -369,8 +374,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BLANK_STRING_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\0";
-  
+  result = (char *)("\0");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -380,8 +384,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_TON_UNDEF_get() {
   int jresult ;
   int result;
   
-  result = (int) 255;
-  
+  result = (int)(255);
   jresult = result; 
   return jresult;
 }
@@ -391,8 +394,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_NUMPLAN_UNDEF_get() {
   int jresult ;
   int result;
   
-  result = (int) 255;
-  
+  result = (int)(255);
   jresult = result; 
   return jresult;
 }
@@ -402,8 +404,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_ESC_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[";
-  
+  result = (char *)("\33[");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -413,8 +414,7 @@ SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_CHAR_get() {
   char jresult ;
   char result;
   
-  result = (char) 'H';
-  
+  result = (char)('H');
   jresult = result; 
   return jresult;
 }
@@ -424,8 +424,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_CHAR_STR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "H";
-  
+  result = (char *)("H");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -435,8 +434,7 @@ SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_CHAR_get() {
   char jresult ;
   char result;
   
-  result = (char) '1';
-  
+  result = (char)('1');
   jresult = result; 
   return jresult;
 }
@@ -446,8 +444,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_CHAR_STR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "1";
-  
+  result = (char *)("1");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -457,8 +454,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINEEND_CHAR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "K";
-  
+  result = (char *)("K");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -468,8 +464,7 @@ SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR0_get() {
   char jresult ;
   char result;
   
-  result = (char) '2';
-  
+  result = (char)('2');
   jresult = result; 
   return jresult;
 }
@@ -479,8 +474,7 @@ SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR1_get() {
   char jresult ;
   char result;
   
-  result = (char) 'J';
-  
+  result = (char)('J');
   jresult = result; 
   return jresult;
 }
@@ -490,8 +484,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "2J";
-  
+  result = (char *)("2J");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -501,8 +494,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_AND_COLOR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) ";";
-  
+  result = (char *)(";");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -512,8 +504,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_END_COLOR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "m";
-  
+  result = (char *)("m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -523,8 +514,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_BLACK_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "30";
-  
+  result = (char *)("30");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -534,8 +524,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_RED_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "31";
-  
+  result = (char *)("31");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -545,8 +534,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_GREEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "32";
-  
+  result = (char *)("32");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -556,8 +544,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_YELLOW_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "33";
-  
+  result = (char *)("33");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -567,8 +554,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_BLUE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "34";
-  
+  result = (char *)("34");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -578,8 +564,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_MAGEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "35";
-  
+  result = (char *)("35");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -589,8 +574,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_CYAN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "36";
-  
+  result = (char *)("36");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -600,8 +584,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_WHITE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "37";
-  
+  result = (char *)("37");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -611,8 +594,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_BLACK_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "40";
-  
+  result = (char *)("40");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -622,8 +604,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_RED_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "41";
-  
+  result = (char *)("41");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -633,8 +614,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_GREEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "42";
-  
+  result = (char *)("42");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -644,8 +624,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_YELLOW_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "43";
-  
+  result = (char *)("43");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -655,8 +634,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_BLUE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "44";
-  
+  result = (char *)("44");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -666,8 +644,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_MAGEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "45";
-  
+  result = (char *)("45");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -677,8 +654,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_CYAN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "46";
-  
+  result = (char *)("46");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -688,8 +664,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_WHITE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "47";
-  
+  result = (char *)("47");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -699,8 +674,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FBLACK_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[30m";
-  
+  result = (char *)("\33[30m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -710,8 +684,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FRED_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[31m";
-  
+  result = (char *)("\33[31m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -721,8 +694,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FGREEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[32m";
-  
+  result = (char *)("\33[32m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -732,8 +704,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FYELLOW_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[33m";
-  
+  result = (char *)("\33[33m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -743,8 +714,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FBLUE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[34m";
-  
+  result = (char *)("\33[34m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -754,8 +724,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FMAGEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[35m";
-  
+  result = (char *)("\33[35m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -765,8 +734,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FCYAN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[36m";
-  
+  result = (char *)("\33[36m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -776,8 +744,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FWHITE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[37m";
-  
+  result = (char *)("\33[37m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -787,8 +754,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BBLACK_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[40m";
-  
+  result = (char *)("\33[40m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -798,8 +764,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BRED_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[41m";
-  
+  result = (char *)("\33[41m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -809,8 +774,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BGREEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[42m";
-  
+  result = (char *)("\33[42m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -820,8 +784,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BYELLOW_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[43m";
-  
+  result = (char *)("\33[43m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -831,8 +794,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BBLUE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[44m";
-  
+  result = (char *)("\33[44m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -842,8 +804,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BMAGEN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[45m";
-  
+  result = (char *)("\33[45m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -853,8 +814,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BCYAN_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[46m";
-  
+  result = (char *)("\33[46m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -864,8 +824,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BWHITE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[47m";
-  
+  result = (char *)("\33[47m");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -875,8 +834,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[H";
-  
+  result = (char *)("\33[H");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -886,8 +844,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[1";
-  
+  result = (char *)("\33[1");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -897,8 +854,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINEEND_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[K";
-  
+  result = (char *)("\33[K");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -908,8 +864,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\33[2J\33[H";
-  
+  result = (char *)("\33[2J\33[H");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -919,8 +874,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DEFAULT_CLID_NAME_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "\0";
-  
+  result = (char *)("\0");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -930,8 +884,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DEFAULT_CLID_NUMBER_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "0000000000";
-  
+  result = (char *)("0000000000");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -941,8 +894,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_DTMF_DURATION_get() {
   int jresult ;
   int result;
   
-  result = (int) 2000;
-  
+  result = (int)(2000);
   jresult = result; 
   return jresult;
 }
@@ -952,8 +904,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MIN_DTMF_DURATION_get() {
   int jresult ;
   int result;
   
-  result = (int) 400;
-  
+  result = (int)(400);
   jresult = result; 
   return jresult;
 }
@@ -963,8 +914,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_DTMF_DURATION_get() {
   int jresult ;
   int result;
   
-  result = (int) 192000;
-  
+  result = (int)(192000);
   jresult = result; 
   return jresult;
 }
@@ -974,8 +924,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PATH_SEPARATOR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "/";
-  
+  result = (char *)("/");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -985,8 +934,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_URL_SEPARATOR_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "://";
-  
+  result = (char *)("://");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -996,8 +944,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_IGNORE_DISPLAY_UPDATES_VARIABLE_get(
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "ignore_display_updates";
-  
+  result = (char *)("ignore_display_updates");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1007,8 +954,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_AUDIO_SPOOL_PATH_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "audio_spool_path";
-  
+  result = (char *)("audio_spool_path");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1018,8 +964,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bridge_hangup_cause";
-  
+  result = (char *)("bridge_hangup_cause");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1029,8 +974,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_READ_TERMINATOR_USED_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "read_terminator_used";
-  
+  result = (char *)("read_terminator_used");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1040,8 +984,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE_get(
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "send_silence_when_idle";
-  
+  result = (char *)("send_silence_when_idle");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1051,8 +994,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "current_application";
-  
+  result = (char *)("current_application");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1062,8 +1004,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_DATA_VARIABLE_ge
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "current_application_data";
-  
+  result = (char *)("current_application_data");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1073,8 +1014,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABL
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "current_application_response";
-  
+  result = (char *)("current_application_response");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1084,8 +1024,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PASSTHRU_PTIME_MISMATCH_VARIABLE_get
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "passthru_ptime_mismatch";
-  
+  result = (char *)("passthru_ptime_mismatch");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1095,8 +1034,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "enable_heartbeat_events";
-  
+  result = (char *)("enable_heartbeat_events");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1106,8 +1044,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_g
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bypass_media_after_bridge";
-  
+  result = (char *)("bypass_media_after_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1117,8 +1054,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_READ_RESULT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "read_result";
-  
+  result = (char *)("read_result");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1128,8 +1064,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ATT_XFER_RESULT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "att_xfer_result";
-  
+  result = (char *)("att_xfer_result");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1139,8 +1074,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_COPY_XML_CDR_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "copy_xml_cdr";
-  
+  result = (char *)("copy_xml_cdr");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1150,8 +1084,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_COPY_JSON_CDR_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "copy_json_cdr";
-  
+  result = (char *)("copy_json_cdr");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1161,8 +1094,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "proto_specific_hangup_cause";
-  
+  result = (char *)("proto_specific_hangup_cause");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1172,8 +1104,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_HISTORY_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "transfer_history";
-  
+  result = (char *)("transfer_history");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1183,8 +1114,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_SOURCE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "transfer_source";
-  
+  result = (char *)("transfer_source");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1194,8 +1124,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SENSITIVE_DTMF_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "sensitive_dtmf";
-  
+  result = (char *)("sensitive_dtmf");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1205,8 +1134,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RECORD_POST_PROCESS_EXEC_APP_VARIABL
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "record_post_process_exec_app";
-  
+  result = (char *)("record_post_process_exec_app");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1216,8 +1144,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RECORD_POST_PROCESS_EXEC_API_VARIABL
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "record_post_process_exec_api";
-  
+  result = (char *)("record_post_process_exec_api");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1227,8 +1154,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE_g
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_answer";
-  
+  result = (char *)("execute_on_answer");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1238,8 +1164,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_ANSWER_VARIAB
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_pre_answer";
-  
+  result = (char *)("execute_on_pre_answer");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1249,8 +1174,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE_ge
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_media";
-  
+  result = (char *)("execute_on_media");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1260,8 +1184,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_RING_VARIABLE_get
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_ring";
-  
+  result = (char *)("execute_on_ring");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1271,8 +1194,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_TONE_DETECT_VARIA
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_tone_detect";
-  
+  result = (char *)("execute_on_tone_detect");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1282,8 +1204,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_ORIGINATE_VARIABL
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_originate";
-  
+  result = (char *)("execute_on_originate");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1293,8 +1214,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_POST_ORIGINATE_VA
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_post_originate";
-  
+  result = (char *)("execute_on_post_originate");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1304,8 +1224,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_ORIGINATE_VAR
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_pre_originate";
-  
+  result = (char *)("execute_on_pre_originate");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1315,8 +1234,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_BRIDGE_VARIAB
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_pre_bridge";
-  
+  result = (char *)("execute_on_pre_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1326,8 +1244,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_POST_BRIDGE_VARIA
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "execute_on_post_bridge";
-  
+  result = (char *)("execute_on_post_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1337,8 +1254,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_ANSWER_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_answer";
-  
+  result = (char *)("api_on_answer");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1348,8 +1264,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_PRE_ANSWER_VARIABLE_g
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_pre_answer";
-  
+  result = (char *)("api_on_pre_answer");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1359,8 +1274,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_MEDIA_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_media";
-  
+  result = (char *)("api_on_media");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1370,8 +1284,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_RING_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_ring";
-  
+  result = (char *)("api_on_ring");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1381,8 +1294,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_TONE_DETECT_VARIABLE_
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_tone_detect";
-  
+  result = (char *)("api_on_tone_detect");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1392,8 +1304,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_ORIGINATE_VARIABLE_ge
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_originate";
-  
+  result = (char *)("api_on_originate");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1403,8 +1314,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_POST_ORIGINATE_VARIAB
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_post_originate";
-  
+  result = (char *)("api_on_post_originate");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1414,8 +1324,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_PRE_ORIGINATE_VARIABL
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_on_pre_originate";
-  
+  result = (char *)("api_on_pre_originate");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1425,8 +1334,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CALL_TIMEOUT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "call_timeout";
-  
+  result = (char *)("call_timeout");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1436,8 +1344,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLDING_UUID_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "holding_uuid";
-  
+  result = (char *)("holding_uuid");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1447,8 +1354,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SOFT_HOLDING_UUID_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "soft_holding_uuid";
-  
+  result = (char *)("soft_holding_uuid");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1458,8 +1364,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_END_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_after_bridge";
-  
+  result = (char *)("api_after_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1469,8 +1374,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_START_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_before_bridge";
-  
+  result = (char *)("api_before_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1480,8 +1384,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_HANGUP_HOOK_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_hangup_hook";
-  
+  result = (char *)("api_hangup_hook");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1491,8 +1394,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_REPORTING_HOOK_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "api_reporting_hook";
-  
+  result = (char *)("api_reporting_hook");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1502,8 +1404,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE_get(
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "session_in_hangup_hook";
-  
+  result = (char *)("session_in_hangup_hook");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1513,8 +1414,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROCESS_CDR_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "process_cdr";
-  
+  result = (char *)("process_cdr");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1524,8 +1424,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SKIP_CDR_CAUSES_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "skip_cdr_causes";
-  
+  result = (char *)("skip_cdr_causes");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1535,8 +1434,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_FORCE_PROCESS_CDR_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "force_process_cdr";
-  
+  result = (char *)("force_process_cdr");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1546,8 +1444,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_CHANNEL_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bridge_channel";
-  
+  result = (char *)("bridge_channel");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1557,8 +1454,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_NAME_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "channel_name";
-  
+  result = (char *)("channel_name");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1568,8 +1464,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_UUID_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bridge_uuid";
-  
+  result = (char *)("bridge_uuid");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1579,8 +1474,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "continue_on_fail";
-  
+  result = (char *)("continue_on_fail");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1590,8 +1484,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PLAYBACK_TERMINATORS_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "playback_terminators";
-  
+  result = (char *)("playback_terminators");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1601,8 +1494,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PLAYBACK_TERMINATOR_USED_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "playback_terminator_used";
-  
+  result = (char *)("playback_terminator_used");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1612,8 +1504,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CACHE_SPEECH_HANDLES_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "cache_speech_handles";
-  
+  result = (char *)("cache_speech_handles");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1623,8 +1514,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "__cache_speech_handles_obj__";
-  
+  result = (char *)("__cache_speech_handles_obj__");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1634,8 +1524,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bypass_media";
-  
+  result = (char *)("bypass_media");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1645,8 +1534,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROXY_MEDIA_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "proxy_media";
-  
+  result = (char *)("proxy_media");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1656,8 +1544,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ZRTP_PASSTHRU_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "zrtp_passthru";
-  
+  result = (char *)("zrtp_passthru");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1667,8 +1554,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENDPOINT_DISPOSITION_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "endpoint_disposition";
-  
+  result = (char *)("endpoint_disposition");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1678,8 +1564,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLD_MUSIC_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "hold_music";
-  
+  result = (char *)("hold_music");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1689,8 +1574,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TEMP_HOLD_MUSIC_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "temp_hold_music";
-  
+  result = (char *)("temp_hold_music");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1700,8 +1584,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXPORT_VARS_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "export_vars";
-  
+  result = (char *)("export_vars");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1711,8 +1594,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_EXPORT_VARS_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bridge_export_vars";
-  
+  result = (char *)("bridge_export_vars");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1722,8 +1604,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_R_SDP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "switch_r_sdp";
-  
+  result = (char *)("switch_r_sdp");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1733,8 +1614,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_L_SDP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "switch_l_sdp";
-  
+  result = (char *)("switch_l_sdp");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1744,8 +1624,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_B_SDP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "switch_m_sdp";
-  
+  result = (char *)("switch_m_sdp");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1755,8 +1634,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "bridge_to";
-  
+  result = (char *)("bridge_to");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1766,8 +1644,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LAST_BRIDGE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "last_bridge_to";
-  
+  result = (char *)("last_bridge_to");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1777,8 +1654,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SIGNAL_BRIDGE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "signal_bridge_to";
-  
+  result = (char *)("signal_bridge_to");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1788,8 +1664,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SIGNAL_BOND_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "signal_bond";
-  
+  result = (char *)("signal_bond");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1799,8 +1674,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATE_SIGNAL_BOND_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "originate_signal_bond";
-  
+  result = (char *)("originate_signal_bond");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1810,8 +1684,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "originator";
-  
+  result = (char *)("originator");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1821,8 +1694,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_CODEC_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "originator_codec";
-  
+  result = (char *)("originator_codec");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1832,8 +1704,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_VIDEO_CODEC_VARIABLE_get(
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "originator_video_codec";
-  
+  result = (char *)("originator_video_codec");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1843,8 +1714,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_MEDIA_IP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "local_media_ip";
-  
+  result = (char *)("local_media_ip");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1854,8 +1724,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_MEDIA_PORT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "local_media_port";
-  
+  result = (char *)("local_media_port");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1865,8 +1734,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ADVERTISED_MEDIA_IP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "advertised_media_ip";
-  
+  result = (char *)("advertised_media_ip");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1876,8 +1744,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_MEDIA_IP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "remote_media_ip";
-  
+  result = (char *)("remote_media_ip");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1887,8 +1754,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_MEDIA_PORT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "remote_media_port";
-  
+  result = (char *)("remote_media_port");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1898,8 +1764,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_VIDEO_IP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "remote_video_ip";
-  
+  result = (char *)("remote_video_ip");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1909,8 +1774,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_VIDEO_PORT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "remote_video_port";
-  
+  result = (char *)("remote_video_port");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1920,8 +1784,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_VIDEO_IP_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "local_video_ip";
-  
+  result = (char *)("local_video_ip");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1931,8 +1794,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_VIDEO_PORT_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "local_video_port";
-  
+  result = (char *)("local_video_port");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1942,8 +1804,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "hangup_after_bridge";
-  
+  result = (char *)("hangup_after_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1953,8 +1814,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "park_after_bridge";
-  
+  result = (char *)("park_after_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1964,8 +1824,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "transfer_after_bridge";
-  
+  result = (char *)("transfer_after_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1975,8 +1834,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "exec_after_bridge_app";
-  
+  result = (char *)("exec_after_bridge_app");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1986,8 +1844,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE_get()
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "exec_after_bridge_arg";
-  
+  result = (char *)("exec_after_bridge_arg");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -1997,8 +1854,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_MAX_FORWARDS_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "max_forwards";
-  
+  result = (char *)("max_forwards");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -2008,8 +1864,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DISABLE_APP_LOG_VARIABLE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "disable_app_log";
-  
+  result = (char *)("disable_app_log");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -2019,8 +1874,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SPEECH_KEY_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "speech";
-  
+  result = (char *)("speech");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -2030,8 +1884,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_UUID_BRIDGE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "uuid_bridge";
-  
+  result = (char *)("uuid_bridge");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -2041,8 +1894,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_BITS_PER_BYTE_get() {
   int jresult ;
   int result;
   
-  result = (int) 8;
-  
+  result = (int)(8);
   jresult = result; 
   return jresult;
 }
@@ -2052,8 +1904,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_FILE_BUFFER_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 65536;
-  
+  result = (int)(65536);
   jresult = result; 
   return jresult;
 }
@@ -2063,8 +1914,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DTMF_LOG_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 1000;
-  
+  result = (int)(1000);
   jresult = result; 
   return jresult;
 }
@@ -2074,8 +1924,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_TRANS_get() {
   int jresult ;
   int result;
   
-  result = (int) 2000;
-  
+  result = (int)(2000);
   jresult = result; 
   return jresult;
 }
@@ -2085,8 +1934,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_SESSION_MAX_PRIVATES_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
-  
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -2096,8 +1944,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_JITTER_VARIANCE_THRESHOLD_get() {
   double jresult ;
   double result;
   
-  result = (double) 400.0;
-  
+  result = (double)(400.0);
   jresult = result; 
   return jresult;
 }
@@ -2107,8 +1954,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_IPDV_THRESHOLD_get() {
   double jresult ;
   double result;
   
-  result = (double) 1.0;
-  
+  result = (double)(1.0);
   jresult = result; 
   return jresult;
 }
@@ -2118,8 +1964,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_LOST_BURST_ANALYZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 500;
-  
+  result = (int)(500);
   jresult = result; 
   return jresult;
 }
@@ -2129,8 +1974,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_LOST_BURST_CAPTURE_get() {
   int jresult ;
   int result;
   
-  result = (int) 1024;
-  
+  result = (int)(1024);
   jresult = result; 
   return jresult;
 }
@@ -2143,7 +1987,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char ja
   arg1 = (switch_dtmf_t *)jarg1; 
   arg2 = (char)jarg2; 
   if (arg1) (arg1)->digit = arg2;
-  
 }
 
 
@@ -2166,7 +2009,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_duration_set(void * jarg1, unsi
   arg1 = (switch_dtmf_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->duration = arg2;
-  
 }
 
 
@@ -2189,7 +2031,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_flags_set(void * jarg1, int jar
   arg1 = (switch_dtmf_t *)jarg1; 
   arg2 = (int32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -2212,7 +2053,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_source_set(void * jarg1, int ja
   arg1 = (switch_dtmf_t *)jarg1; 
   arg2 = (switch_dtmf_source_t)jarg2; 
   if (arg1) (arg1)->source = arg2;
-  
 }
 
 
@@ -2243,7 +2083,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_dtmf_t(void * jarg1) {
   
   arg1 = (switch_dtmf_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -2254,7 +2093,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_buf_set(void * jarg1, void *
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t *)jarg2; 
   if (arg1) (arg1)->buf = arg2;
-  
 }
 
 
@@ -2277,7 +2115,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_buflen_set(void * jarg1, uns
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->buflen = arg2;
-  
 }
 
 
@@ -2300,7 +2137,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_cur_set(void * jarg1, void *
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t *)jarg2; 
   if (arg1) (arg1)->cur = arg2;
-  
 }
 
 
@@ -2323,7 +2159,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bytes_set(void * jarg1, unsi
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->bytes = arg2;
-  
 }
 
 
@@ -2346,7 +2181,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_tot_set(void * jarg1, u
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->bits_tot = arg2;
-  
 }
 
 
@@ -2369,7 +2203,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_cur_set(void * jarg1, u
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->bits_cur = arg2;
-  
 }
 
 
@@ -2392,7 +2225,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_rem_set(void * jarg1, u
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->bits_rem = arg2;
-  
 }
 
 
@@ -2415,7 +2247,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_frame_bits_set(void * jarg1,
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->frame_bits = arg2;
-  
 }
 
 
@@ -2438,7 +2269,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_shiftby_set(void * jarg1, un
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->shiftby = arg2;
-  
 }
 
 
@@ -2461,7 +2291,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_this_byte_set(void * jarg1,
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->this_byte = arg2;
-  
 }
 
 
@@ -2484,7 +2313,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_under_set(void * jarg1, unsi
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->under = arg2;
-  
 }
 
 
@@ -2507,7 +2335,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_over_set(void * jarg1, unsig
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_byte_t)jarg2; 
   if (arg1) (arg1)->over = arg2;
-  
 }
 
 
@@ -2530,7 +2357,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_mode_set(void * jarg1, int j
   arg1 = (switch_bitpack_t *)jarg1; 
   arg2 = (switch_bitpack_mode_t)jarg2; 
   if (arg1) (arg1)->mode = arg2;
-  
 }
 
 
@@ -2561,7 +2387,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_bitpack_t(void * jarg1) {
   
   arg1 = (switch_bitpack_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -2572,7 +2397,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_base_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->base_dir) delete [] arg1->base_dir;
+    delete [] arg1->base_dir;
     if (arg2) {
       arg1->base_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->base_dir, (const char *)arg2);
@@ -2602,7 +2427,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_mod_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->mod_dir) delete [] arg1->mod_dir;
+    delete [] arg1->mod_dir;
     if (arg2) {
       arg1->mod_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->mod_dir, (const char *)arg2);
@@ -2632,7 +2457,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_conf_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->conf_dir) delete [] arg1->conf_dir;
+    delete [] arg1->conf_dir;
     if (arg2) {
       arg1->conf_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->conf_dir, (const char *)arg2);
@@ -2662,7 +2487,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_log_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->log_dir) delete [] arg1->log_dir;
+    delete [] arg1->log_dir;
     if (arg2) {
       arg1->log_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->log_dir, (const char *)arg2);
@@ -2692,7 +2517,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_run_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->run_dir) delete [] arg1->run_dir;
+    delete [] arg1->run_dir;
     if (arg2) {
       arg1->run_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->run_dir, (const char *)arg2);
@@ -2722,7 +2547,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_db_dir_set(void * jarg1, c
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->db_dir) delete [] arg1->db_dir;
+    delete [] arg1->db_dir;
     if (arg2) {
       arg1->db_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->db_dir, (const char *)arg2);
@@ -2752,7 +2577,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_script_dir_set(void * jarg
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->script_dir) delete [] arg1->script_dir;
+    delete [] arg1->script_dir;
     if (arg2) {
       arg1->script_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->script_dir, (const char *)arg2);
@@ -2782,7 +2607,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_temp_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->temp_dir) delete [] arg1->temp_dir;
+    delete [] arg1->temp_dir;
     if (arg2) {
       arg1->temp_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->temp_dir, (const char *)arg2);
@@ -2812,7 +2637,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_htdocs_dir_set(void * jarg
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->htdocs_dir) delete [] arg1->htdocs_dir;
+    delete [] arg1->htdocs_dir;
     if (arg2) {
       arg1->htdocs_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->htdocs_dir, (const char *)arg2);
@@ -2842,7 +2667,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_grammar_dir_set(void * jar
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->grammar_dir) delete [] arg1->grammar_dir;
+    delete [] arg1->grammar_dir;
     if (arg2) {
       arg1->grammar_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->grammar_dir, (const char *)arg2);
@@ -2872,7 +2697,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_storage_dir_set(void * jar
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->storage_dir) delete [] arg1->storage_dir;
+    delete [] arg1->storage_dir;
     if (arg2) {
       arg1->storage_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->storage_dir, (const char *)arg2);
@@ -2902,7 +2727,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_recordings_dir_set(void *
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->recordings_dir) delete [] arg1->recordings_dir;
+    delete [] arg1->recordings_dir;
     if (arg2) {
       arg1->recordings_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->recordings_dir, (const char *)arg2);
@@ -2932,7 +2757,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_sounds_dir_set(void * jarg
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->sounds_dir) delete [] arg1->sounds_dir;
+    delete [] arg1->sounds_dir;
     if (arg2) {
       arg1->sounds_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->sounds_dir, (const char *)arg2);
@@ -2962,7 +2787,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_lib_dir_set(void * jarg1,
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->lib_dir) delete [] arg1->lib_dir;
+    delete [] arg1->lib_dir;
     if (arg2) {
       arg1->lib_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->lib_dir, (const char *)arg2);
@@ -2992,7 +2817,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_certs_dir_set(void * jarg1
   arg1 = (switch_directories *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->certs_dir) delete [] arg1->certs_dir;
+    delete [] arg1->certs_dir;
     if (arg2) {
       arg1->certs_dir = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->certs_dir, (const char *)arg2);
@@ -3030,7 +2855,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directories(void * jarg1) {
   
   arg1 = (switch_directories *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -3039,7 +2863,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_SWITCH_GLOBAL_dirs_set(void * jarg1) {
   
   arg1 = (switch_directories *)jarg1; 
   SWITCH_GLOBAL_dirs = *arg1;
-  
 }
 
 
@@ -3060,7 +2883,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_filenames_conf_name_set(void * jarg1,
   arg1 = (switch_filenames *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->conf_name) delete [] arg1->conf_name;
+    delete [] arg1->conf_name;
     if (arg2) {
       arg1->conf_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->conf_name, (const char *)arg2);
@@ -3098,7 +2921,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_filenames(void * jarg1) {
   
   arg1 = (switch_filenames *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -3107,7 +2929,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_SWITCH_GLOBAL_filenames_set(void * jarg1) {
   
   arg1 = (switch_filenames *)jarg1; 
   SWITCH_GLOBAL_filenames = *arg1;
-  
 }
 
 
@@ -3125,8 +2946,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STACKS_get() {
   int jresult ;
   int result;
   
-  result = (int) 16;
-  
+  result = (int)(16);
   jresult = result; 
   return jresult;
 }
@@ -3136,8 +2956,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_THREAD_STACKSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 240*1024;
-  
+  result = (int)(240*1024);
   jresult = result; 
   return jresult;
 }
@@ -3147,8 +2966,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SYSTEM_THREAD_STACKSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 8192*1024;
-  
+  result = (int)(8192*1024);
   jresult = result; 
   return jresult;
 }
@@ -3158,8 +2976,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_INTERVAL_get() {
   int jresult ;
   int result;
   
-  result = (int) 120;
-  
+  result = (int)(120);
   jresult = result; 
   return jresult;
 }
@@ -3169,8 +2986,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_INTERVAL_PAD_get() {
   int jresult ;
   int result;
   
-  result = (int) 10;
-  
+  result = (int)(10);
   jresult = result; 
   return jresult;
 }
@@ -3180,8 +2996,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_SAMPLE_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 48;
-  
+  result = (int)(48);
   jresult = result; 
   return jresult;
 }
@@ -3191,8 +3006,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_BYTES_PER_SAMPLE_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
-  
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3202,8 +3016,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RECOMMENDED_BUFFER_SIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 4096;
-  
+  result = (int)(4096);
   jresult = result; 
   return jresult;
 }
@@ -3213,8 +3026,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_CODECS_get() {
   int jresult ;
   int result;
   
-  result = (int) 50;
-  
+  result = (int)(50);
   jresult = result; 
   return jresult;
 }
@@ -3224,8 +3036,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STATE_HANDLERS_get() {
   int jresult ;
   int result;
   
-  result = (int) 30;
-  
+  result = (int)(30);
   jresult = result; 
   return jresult;
 }
@@ -3235,8 +3046,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_QUEUE_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 100000;
-  
+  result = (int)(100000);
   jresult = result; 
   return jresult;
 }
@@ -3246,8 +3056,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 1024*8;
-  
+  result = (int)(1024*8);
   jresult = result; 
   return jresult;
 }
@@ -3266,7 +3075,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_raw_bytes_set(void * jar
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->raw_bytes = arg2;
-  
 }
 
 
@@ -3277,7 +3085,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_raw_bytes_get(void * j
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->raw_bytes);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3295,7 +3103,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_bytes_set(void * j
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->media_bytes = arg2;
-  
 }
 
 
@@ -3306,7 +3113,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_bytes_get(void *
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->media_bytes);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3324,7 +3131,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_packet_count_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->packet_count = arg2;
-  
 }
 
 
@@ -3335,7 +3141,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_packet_count_get(void
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3353,7 +3159,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_period_packet_count_set(
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->period_packet_count = arg2;
-  
 }
 
 
@@ -3364,7 +3169,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_period_packet_count_ge
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->period_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3382,7 +3187,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_packet_count_set(v
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->media_packet_count = arg2;
-  
 }
 
 
@@ -3393,7 +3197,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_packet_count_get
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->media_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3411,7 +3215,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_skip_packet_count_set(vo
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->skip_packet_count = arg2;
-  
 }
 
 
@@ -3422,7 +3225,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_skip_packet_count_get(
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->skip_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3440,7 +3243,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jb_packet_count_set(void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->jb_packet_count = arg2;
-  
 }
 
 
@@ -3451,7 +3253,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_jb_packet_count_get(vo
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->jb_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3469,7 +3271,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_dtmf_packet_count_set(vo
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->dtmf_packet_count = arg2;
-  
 }
 
 
@@ -3480,7 +3281,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_dtmf_packet_count_get(
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->dtmf_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3498,7 +3299,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_cng_packet_count_set(voi
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->cng_packet_count = arg2;
-  
 }
 
 
@@ -3509,7 +3309,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_cng_packet_count_get(v
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->cng_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3527,7 +3327,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_flush_packet_count_set(v
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->flush_packet_count = arg2;
-  
 }
 
 
@@ -3538,7 +3337,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_flush_packet_count_get
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->flush_packet_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3556,7 +3355,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_largest_jb_size_set(void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->largest_jb_size = arg2;
-  
 }
 
 
@@ -3567,7 +3365,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_largest_jb_size_get(vo
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->largest_jb_size);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3579,7 +3377,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_proc_time_set(void
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->last_proc_time = arg2;
-  
 }
 
 
@@ -3602,7 +3399,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_n_set(void * jarg
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->jitter_n = arg2;
-  
 }
 
 
@@ -3625,7 +3421,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_add_set(void * ja
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->jitter_add = arg2;
-  
 }
 
 
@@ -3648,7 +3443,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_addsq_set(void *
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->jitter_addsq = arg2;
-  
 }
 
 
@@ -3671,7 +3465,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_variance_set(void * jarg
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->variance = arg2;
-  
 }
 
 
@@ -3694,7 +3487,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_min_variance_set(void *
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->min_variance = arg2;
-  
 }
 
 
@@ -3717,7 +3509,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_max_variance_set(void *
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->max_variance = arg2;
-  
 }
 
 
@@ -3740,7 +3531,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_std_deviation_set(void *
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->std_deviation = arg2;
-  
 }
 
 
@@ -3763,7 +3553,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_lossrate_set(void * jarg
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->lossrate = arg2;
-  
 }
 
 
@@ -3786,7 +3575,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_burstrate_set(void * jar
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->burstrate = arg2;
-  
 }
 
 
@@ -3809,7 +3597,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_mean_interval_set(void *
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->mean_interval = arg2;
-  
 }
 
 
@@ -3858,7 +3645,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_loss_set(void * jar
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->last_loss = arg2;
-  
 }
 
 
@@ -3881,7 +3667,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_recved_set(void * jarg1,
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->recved = arg2;
-  
 }
 
 
@@ -3904,7 +3689,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_processed_seq_set(v
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->last_processed_seq = arg2;
-  
 }
 
 
@@ -3933,7 +3717,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_flaws_set(void * jarg1,
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->flaws = arg2;
-  
 }
 
 
@@ -3944,7 +3727,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_flaws_get(void * jarg1
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->flaws);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3962,7 +3745,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_flaw_set(void * jar
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->last_flaw = arg2;
-  
 }
 
 
@@ -3973,7 +3755,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_flaw_get(void * j
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   result =  ((arg1)->last_flaw);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -3985,7 +3767,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_R_set(void * jarg1, doub
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->R = arg2;
-  
 }
 
 
@@ -4008,7 +3789,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_mos_set(void * jarg1, do
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->mos = arg2;
-  
 }
 
 
@@ -4039,7 +3819,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_numbers_t(void * jarg1) {
   
   arg1 = (switch_rtp_numbers_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -4050,7 +3829,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_set(void *
   arg1 = (switch_rtcp_numbers_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->packet_count = arg2;
-  
 }
 
 
@@ -4073,7 +3851,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_set(void *
   arg1 = (switch_rtcp_numbers_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->octet_count = arg2;
-  
 }
 
 
@@ -4096,7 +3873,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_peer_ssrc_set(void * ja
   arg1 = (switch_rtcp_numbers_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->peer_ssrc = arg2;
-  
 }
 
 
@@ -4127,7 +3903,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_numbers_t(void * jarg1) {
   
   arg1 = (switch_rtcp_numbers_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -4138,7 +3913,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_inbound_set(void * jarg1,
   arg1 = (switch_rtp_stats_t *)jarg1; 
   arg2 = (switch_rtp_numbers_t *)jarg2; 
   if (arg1) (arg1)->inbound = *arg2;
-  
 }
 
 
@@ -4161,7 +3935,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_outbound_set(void * jarg1,
   arg1 = (switch_rtp_stats_t *)jarg1; 
   arg2 = (switch_rtp_numbers_t *)jarg2; 
   if (arg1) (arg1)->outbound = *arg2;
-  
 }
 
 
@@ -4184,7 +3957,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_set(void * jarg1, voi
   arg1 = (switch_rtp_stats_t *)jarg1; 
   arg2 = (switch_rtcp_numbers_t *)jarg2; 
   if (arg1) (arg1)->rtcp = *arg2;
-  
 }
 
 
@@ -4207,7 +3979,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_read_count_set(void * jarg
   arg1 = (switch_rtp_stats_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->read_count = arg2;
-  
 }
 
 
@@ -4238,7 +4009,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_stats_t(void * jarg1) {
   
   arg1 = (switch_rtp_stats_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -4246,8 +4016,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_CNG_PAYLOAD_get() {
   int jresult ;
   int result;
   
-  result = (int) 13;
-  
+  result = (int)(13);
   jresult = result; 
   return jresult;
 }
@@ -4260,7 +4029,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_version_set(void * jarg1, un
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->version = arg2;
-  
 }
 
 
@@ -4283,7 +4051,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_p_set(void * jarg1, unsigned
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->p = arg2;
-  
 }
 
 
@@ -4306,7 +4073,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_x_set(void * jarg1, unsigned
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->x = arg2;
-  
 }
 
 
@@ -4329,7 +4095,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_cc_set(void * jarg1, unsigne
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->cc = arg2;
-  
 }
 
 
@@ -4352,7 +4117,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_m_set(void * jarg1, unsigned
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->m = arg2;
-  
 }
 
 
@@ -4375,7 +4139,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_pt_set(void * jarg1, unsigne
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->pt = arg2;
-  
 }
 
 
@@ -4398,7 +4161,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_seq_set(void * jarg1, unsign
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->seq = arg2;
-  
 }
 
 
@@ -4421,7 +4183,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_ts_set(void * jarg1, unsigne
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->ts = arg2;
-  
 }
 
 
@@ -4444,7 +4205,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_ssrc_set(void * jarg1, unsig
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->ssrc = arg2;
-  
 }
 
 
@@ -4475,7 +4235,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_t(void * jarg1) {
   
   arg1 = (switch_rtp_hdr_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -4486,7 +4245,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_set(void * jarg1,
   arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->length = arg2;
-  
 }
 
 
@@ -4509,7 +4267,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_set(void * jarg1
   arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->profile = arg2;
-  
 }
 
 
@@ -4540,7 +4297,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_ext_t(void * jarg1) {
   
   arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -4551,7 +4307,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_version_set(void * jarg1, u
   arg1 = (switch_rtcp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->version = arg2;
-  
 }
 
 
@@ -4574,7 +4329,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_p_set(void * jarg1, unsigne
   arg1 = (switch_rtcp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->p = arg2;
-  
 }
 
 
@@ -4597,7 +4351,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_count_set(void * jarg1, uns
   arg1 = (switch_rtcp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->count = arg2;
-  
 }
 
 
@@ -4620,7 +4373,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_type_set(void * jarg1, unsi
   arg1 = (switch_rtcp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->type = arg2;
-  
 }
 
 
@@ -4643,7 +4395,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_length_set(void * jarg1, un
   arg1 = (switch_rtcp_hdr_t *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->length = arg2;
-  
 }
 
 
@@ -4674,27 +4425,25 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_hdr_t(void * jarg1) {
   
   arg1 = (switch_rtcp_hdr_t *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_audio_buffer_header_t_ts_set(void * jarg1, unsigned long jarg2) {
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  audio_buffer_header_s *arg1 = (audio_buffer_header_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg1 = (audio_buffer_header_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ts = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_ts_get(void * jarg1) {
   unsigned long jresult ;
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  audio_buffer_header_s *arg1 = (audio_buffer_header_s *) 0 ;
   uint32_t result;
   
-  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg1 = (audio_buffer_header_s *)jarg1; 
   result = (uint32_t) ((arg1)->ts);
   jresult = (unsigned long)result; 
   return jresult;
@@ -4702,22 +4451,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_ts_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_audio_buffer_header_t_len_set(void * jarg1, unsigned long jarg2) {
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  audio_buffer_header_s *arg1 = (audio_buffer_header_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg1 = (audio_buffer_header_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->len = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_len_get(void * jarg1) {
   unsigned long jresult ;
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  audio_buffer_header_s *arg1 = (audio_buffer_header_s *) 0 ;
   uint32_t result;
   
-  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg1 = (audio_buffer_header_s *)jarg1; 
   result = (uint32_t) ((arg1)->len);
   jresult = (unsigned long)result; 
   return jresult;
@@ -4726,20 +4474,19 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_len_get(void *
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_audio_buffer_header_t() {
   void * jresult ;
-  audio_buffer_header_t *result = 0 ;
+  audio_buffer_header_s *result = 0 ;
   
-  result = (audio_buffer_header_t *)new audio_buffer_header_t();
+  result = (audio_buffer_header_s *)new audio_buffer_header_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_audio_buffer_header_t(void * jarg1) {
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  audio_buffer_header_s *arg1 = (audio_buffer_header_s *) 0 ;
   
-  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg1 = (audio_buffer_header_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -4750,7 +4497,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxVersion_set(void *
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (uint16_t)jarg2; 
   if (arg1) (arg1)->T38FaxVersion = arg2;
-  
 }
 
 
@@ -4773,7 +4519,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_set(void *
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->T38MaxBitRate = arg2;
-  
 }
 
 
@@ -4796,7 +4541,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_set
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (switch_bool_t)jarg2; 
   if (arg1) (arg1)->T38FaxFillBitRemoval = arg2;
-  
 }
 
 
@@ -4819,7 +4563,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_set
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (switch_bool_t)jarg2; 
   if (arg1) (arg1)->T38FaxTranscodingMMR = arg2;
-  
 }
 
 
@@ -4842,7 +4585,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_se
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (switch_bool_t)jarg2; 
   if (arg1) (arg1)->T38FaxTranscodingJBIG = arg2;
-  
 }
 
 
@@ -4894,7 +4636,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_set(void
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->T38FaxMaxBuffer = arg2;
-  
 }
 
 
@@ -4917,7 +4658,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_set(vo
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->T38FaxMaxDatagram = arg2;
-  
 }
 
 
@@ -5027,7 +4767,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_set(void * j
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (uint16_t)jarg2; 
   if (arg1) (arg1)->remote_port = arg2;
-  
 }
 
 
@@ -5079,7 +4818,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_port_set(void * ja
   arg1 = (switch_t38_options_t *)jarg1; 
   arg2 = (uint16_t)jarg2; 
   if (arg1) (arg1)->local_port = arg2;
-  
 }
 
 
@@ -5139,7 +4877,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_t38_options_t(void * jarg1) {
   
   arg1 = (switch_t38_options_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -5147,8 +4884,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MEDIA_TYPE_TOTAL_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
-  
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -5161,7 +4897,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_node_val_set(vo
   arg1 = (switch_console_callback_match_node *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->val) delete [] arg1->val;
+    delete [] arg1->val;
     if (arg2) {
       arg1->val = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->val, (const char *)arg2);
@@ -5191,7 +4927,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_node_next_set(v
   arg1 = (switch_console_callback_match_node *)jarg1; 
   arg2 = (switch_console_callback_match_node *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -5222,7 +4957,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_console_callback_match_node(voi
   
   arg1 = (switch_console_callback_match_node *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -5233,7 +4967,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_head_set(void *
   arg1 = (switch_console_callback_match *)jarg1; 
   arg2 = (switch_console_callback_match_node *)jarg2; 
   if (arg1) (arg1)->head = arg2;
-  
 }
 
 
@@ -5256,7 +4989,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_end_set(void *
   arg1 = (switch_console_callback_match *)jarg1; 
   arg2 = (switch_console_callback_match_node *)jarg2; 
   if (arg1) (arg1)->end = arg2;
-  
 }
 
 
@@ -5279,7 +5011,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_count_set(void
   arg1 = (switch_console_callback_match *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->count = arg2;
-  
 }
 
 
@@ -5302,7 +5033,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_dynamic_set(voi
   arg1 = (switch_console_callback_match *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->dynamic = arg2;
-  
 }
 
 
@@ -5333,7 +5063,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_console_callback_match(void * j
   
   arg1 = (switch_console_callback_match *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -5341,8 +5070,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_DMACHINE_MAX_DIGIT_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 512;
-  
+  result = (int)(512);
   jresult = result; 
   return jresult;
 }
@@ -5355,7 +5083,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_dmachine_set(void *
   arg1 = (switch_ivr_dmachine_match *)jarg1; 
   arg2 = (switch_ivr_dmachine_t *)jarg2; 
   if (arg1) (arg1)->dmachine = arg2;
-  
 }
 
 
@@ -5407,7 +5134,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_key_set(void
   arg1 = (switch_ivr_dmachine_match *)jarg1; 
   arg2 = (int32_t)jarg2; 
   if (arg1) (arg1)->match_key = arg2;
-  
 }
 
 
@@ -5430,7 +5156,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_type_set(void * jar
   arg1 = (switch_ivr_dmachine_match *)jarg1; 
   arg2 = (dm_match_type_t)jarg2; 
   if (arg1) (arg1)->type = arg2;
-  
 }
 
 
@@ -5453,7 +5178,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_user_data_set(void
   arg1 = (switch_ivr_dmachine_match *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->user_data = arg2;
-  
 }
 
 
@@ -5484,7 +5208,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_ivr_dmachine_match(void * jarg1
   
   arg1 = (switch_ivr_dmachine_match *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -5492,8 +5215,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MAX_ARG_RECURSION_get() {
   int jresult ;
   int result;
   
-  result = (int) 25;
-  
+  result = (int)(25);
   jresult = result; 
   return jresult;
 }
@@ -5506,7 +5228,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_input_callback_set(void *
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (switch_input_callback_function_t)jarg2; 
   if (arg1) (arg1)->input_callback = arg2;
-  
 }
 
 
@@ -5529,7 +5250,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_buf_set(void * jarg1, voi
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->buf = arg2;
-  
 }
 
 
@@ -5552,7 +5272,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_buflen_set(void * jarg1,
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->buflen = arg2;
-  
 }
 
 
@@ -5575,7 +5294,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_read_frame_callback_set(v
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (switch_read_frame_callback_function_t)jarg2; 
   if (arg1) (arg1)->read_frame_callback = arg2;
-  
 }
 
 
@@ -5598,7 +5316,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_user_data_set(void * jarg
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->user_data = arg2;
-  
 }
 
 
@@ -5621,7 +5338,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_dmachine_set(void * jarg1
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (switch_ivr_dmachine_t *)jarg2; 
   if (arg1) (arg1)->dmachine = arg2;
-  
 }
 
 
@@ -5644,7 +5360,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_loops_set(void * jarg1, i
   arg1 = (switch_input_args_t *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->loops = arg2;
-  
 }
 
 
@@ -5675,7 +5390,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_input_args_t(void * jarg1) {
   
   arg1 = (switch_input_args_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -5686,7 +5400,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_type_set(void * jarg1, int
   arg1 = (switch_say_args_t *)jarg1; 
   arg2 = (switch_say_type_t)jarg2; 
   if (arg1) (arg1)->type = arg2;
-  
 }
 
 
@@ -5709,7 +5422,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_method_set(void * jarg1, in
   arg1 = (switch_say_args_t *)jarg1; 
   arg2 = (switch_say_method_t)jarg2; 
   if (arg1) (arg1)->method = arg2;
-  
 }
 
 
@@ -5732,7 +5444,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_gender_set(void * jarg1, in
   arg1 = (switch_say_args_t *)jarg1; 
   arg2 = (switch_say_gender_t)jarg2; 
   if (arg1) (arg1)->gender = arg2;
-  
 }
 
 
@@ -5792,7 +5503,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_say_args_t(void * jarg1) {
   
   arg1 = (switch_say_args_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -5800,30 +5510,28 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_API_VERSION_get() {
   int jresult ;
   int result;
   
-  result = (int) 5;
-  
+  result = (int)(5);
   jresult = result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch_api_version_set(void * jarg1, int jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   int arg2 ;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->switch_api_version = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch_api_version_get(void * jarg1) {
   int jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   int result;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   result = (int) ((arg1)->switch_api_version);
   jresult = result; 
   return jresult;
@@ -5831,22 +5539,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_load_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_load_t arg2 = (switch_module_load_t) 0 ;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   arg2 = (switch_module_load_t)jarg2; 
   if (arg1) (arg1)->load = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_load_get(void * jarg1) {
   void * jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_load_t result;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   result = (switch_module_load_t) ((arg1)->load);
   jresult = (void *)result; 
   return jresult;
@@ -5854,22 +5561,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_loa
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shutdown_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_shutdown_t arg2 = (switch_module_shutdown_t) 0 ;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   arg2 = (switch_module_shutdown_t)jarg2; 
   if (arg1) (arg1)->shutdown = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shutdown_get(void * jarg1) {
   void * jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_shutdown_t result;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   result = (switch_module_shutdown_t) ((arg1)->shutdown);
   jresult = (void *)result; 
   return jresult;
@@ -5877,22 +5583,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shu
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_runtime_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_runtime_t arg2 = (switch_module_runtime_t) 0 ;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   arg2 = (switch_module_runtime_t)jarg2; 
   if (arg1) (arg1)->runtime = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_runtime_get(void * jarg1) {
   void * jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_runtime_t result;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   result = (switch_module_runtime_t) ((arg1)->runtime);
   jresult = (void *)result; 
   return jresult;
@@ -5900,22 +5605,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_run
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_flag_t arg2 ;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   arg2 = (switch_module_flag_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_flags_get(void * jarg1) {
   unsigned long jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   switch_module_flag_t result;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   result = (switch_module_flag_t) ((arg1)->flags);
   jresult = (unsigned long)result; 
   return jresult;
@@ -5924,20 +5628,19 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_loadable_module_function_tabl
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_loadable_module_function_table_t() {
   void * jresult ;
-  switch_loadable_module_function_table_t *result = 0 ;
+  switch_loadable_module_function_table *result = 0 ;
   
-  result = (switch_loadable_module_function_table_t *)new switch_loadable_module_function_table_t();
+  result = (switch_loadable_module_function_table *)new switch_loadable_module_function_table();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_function_table_t(void * jarg1) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_loadable_module_function_table *arg1 = (switch_loadable_module_function_table *) 0 ;
   
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg1 = (switch_loadable_module_function_table *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -6243,8 +5946,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_OK_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
-  
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -6254,8 +5956,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ERROR_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
-  
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -6265,8 +5966,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_INTERNAL_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
-  
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -6276,8 +5976,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_PERM_get() {
   int jresult ;
   int result;
   
-  result = (int) 3;
-  
+  result = (int)(3);
   jresult = result; 
   return jresult;
 }
@@ -6287,8 +5986,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ABORT_get() {
   int jresult ;
   int result;
   
-  result = (int) 4;
-  
+  result = (int)(4);
   jresult = result; 
   return jresult;
 }
@@ -6298,8 +5996,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_BUSY_get() {
   int jresult ;
   int result;
   
-  result = (int) 5;
-  
+  result = (int)(5);
   jresult = result; 
   return jresult;
 }
@@ -6309,8 +6006,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_LOCKED_get() {
   int jresult ;
   int result;
   
-  result = (int) 6;
-  
+  result = (int)(6);
   jresult = result; 
   return jresult;
 }
@@ -6320,8 +6016,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOMEM_get() {
   int jresult ;
   int result;
   
-  result = (int) 7;
-  
+  result = (int)(7);
   jresult = result; 
   return jresult;
 }
@@ -6331,8 +6026,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_READONLY_get() {
   int jresult ;
   int result;
   
-  result = (int) 8;
-  
+  result = (int)(8);
   jresult = result; 
   return jresult;
 }
@@ -6342,8 +6036,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_INTERRUPT_get() {
   int jresult ;
   int result;
   
-  result = (int) 9;
-  
+  result = (int)(9);
   jresult = result; 
   return jresult;
 }
@@ -6353,8 +6046,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_IOERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 10;
-  
+  result = (int)(10);
   jresult = result; 
   return jresult;
 }
@@ -6364,8 +6056,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CORRUPT_get() {
   int jresult ;
   int result;
   
-  result = (int) 11;
-  
+  result = (int)(11);
   jresult = result; 
   return jresult;
 }
@@ -6375,8 +6066,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOTFOUND_get() {
   int jresult ;
   int result;
   
-  result = (int) 12;
-  
+  result = (int)(12);
   jresult = result; 
   return jresult;
 }
@@ -6386,8 +6076,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_FULL_get() {
   int jresult ;
   int result;
   
-  result = (int) 13;
-  
+  result = (int)(13);
   jresult = result; 
   return jresult;
 }
@@ -6397,8 +6086,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CANTOPEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 14;
-  
+  result = (int)(14);
   jresult = result; 
   return jresult;
 }
@@ -6408,8 +6096,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_PROTOCOL_get() {
   int jresult ;
   int result;
   
-  result = (int) 15;
-  
+  result = (int)(15);
   jresult = result; 
   return jresult;
 }
@@ -6419,8 +6106,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_EMPTY_get() {
   int jresult ;
   int result;
   
-  result = (int) 16;
-  
+  result = (int)(16);
   jresult = result; 
   return jresult;
 }
@@ -6430,8 +6116,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_SCHEMA_get() {
   int jresult ;
   int result;
   
-  result = (int) 17;
-  
+  result = (int)(17);
   jresult = result; 
   return jresult;
 }
@@ -6441,8 +6126,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_TOOBIG_get() {
   int jresult ;
   int result;
   
-  result = (int) 18;
-  
+  result = (int)(18);
   jresult = result; 
   return jresult;
 }
@@ -6452,8 +6136,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CONSTRAINT_get() {
   int jresult ;
   int result;
   
-  result = (int) 19;
-  
+  result = (int)(19);
   jresult = result; 
   return jresult;
 }
@@ -6463,8 +6146,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_MISMATCH_get() {
   int jresult ;
   int result;
   
-  result = (int) 20;
-  
+  result = (int)(20);
   jresult = result; 
   return jresult;
 }
@@ -6474,8 +6156,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_MISUSE_get() {
   int jresult ;
   int result;
   
-  result = (int) 21;
-  
+  result = (int)(21);
   jresult = result; 
   return jresult;
 }
@@ -6485,8 +6166,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOLFS_get() {
   int jresult ;
   int result;
   
-  result = (int) 22;
-  
+  result = (int)(22);
   jresult = result; 
   return jresult;
 }
@@ -6496,8 +6176,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_AUTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 23;
-  
+  result = (int)(23);
   jresult = result; 
   return jresult;
 }
@@ -6507,8 +6186,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_FORMAT_get() {
   int jresult ;
   int result;
   
-  result = (int) 24;
-  
+  result = (int)(24);
   jresult = result; 
   return jresult;
 }
@@ -6518,8 +6196,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_RANGE_get() {
   int jresult ;
   int result;
   
-  result = (int) 25;
-  
+  result = (int)(25);
   jresult = result; 
   return jresult;
 }
@@ -6529,8 +6206,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOTADB_get() {
   int jresult ;
   int result;
   
-  result = (int) 26;
-  
+  result = (int)(26);
   jresult = result; 
   return jresult;
 }
@@ -6540,8 +6216,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ROW_get() {
   int jresult ;
   int result;
   
-  result = (int) 100;
-  
+  result = (int)(100);
   jresult = result; 
   return jresult;
 }
@@ -6551,8 +6226,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_DONE_get() {
   int jresult ;
   int result;
   
-  result = (int) 101;
-  
+  result = (int)(101);
   jresult = result; 
   return jresult;
 }
@@ -6742,8 +6416,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_CORE_THREAD_SESSION_OBJS_get() {
   int jresult ;
   int result;
   
-  result = (int) 128;
-  
+  result = (int)(128);
   jresult = result; 
   return jresult;
 }
@@ -6753,8 +6426,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STREAMS_get() {
   int jresult ;
   int result;
   
-  result = (int) 128;
-  
+  result = (int)(128);
   jresult = result; 
   return jresult;
 }
@@ -6767,7 +6439,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_mms_set(void * jarg
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->mms = arg2;
-  
 }
 
 
@@ -6790,7 +6461,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_ms_set(void * jarg1
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ms = arg2;
-  
 }
 
 
@@ -6813,7 +6483,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_sec_set(void * jarg
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->sec = arg2;
-  
 }
 
 
@@ -6836,7 +6505,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_min_set(void * jarg
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->min = arg2;
-  
 }
 
 
@@ -6859,7 +6527,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_hr_set(void * jarg1
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->hr = arg2;
-  
 }
 
 
@@ -6882,7 +6549,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_day_set(void * jarg
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->day = arg2;
-  
 }
 
 
@@ -6905,7 +6571,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_yr_set(void * jarg1
   arg1 = (switch_core_time_duration *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->yr = arg2;
-  
 }
 
 
@@ -6936,7 +6601,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_time_duration(void * jarg1
   
   arg1 = (switch_core_time_duration *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -6947,7 +6611,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_app_set(void * jarg1, char * j
   arg1 = (switch_app_log *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->app) delete [] arg1->app;
+    delete [] arg1->app;
     if (arg2) {
       arg1->app = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->app, (const char *)arg2);
@@ -6977,7 +6641,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_arg_set(void * jarg1, char * j
   arg1 = (switch_app_log *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->arg) delete [] arg1->arg;
+    delete [] arg1->arg;
     if (arg2) {
       arg1->arg = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->arg, (const char *)arg2);
@@ -7013,7 +6677,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_stamp_set(void * jarg1, void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->stamp = arg2;
-  
 }
 
 
@@ -7024,7 +6687,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_app_log_stamp_get(void * jarg1) {
   
   arg1 = (switch_app_log *)jarg1; 
   result =  ((arg1)->stamp);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -7036,7 +6699,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_next_set(void * jarg1, void *
   arg1 = (switch_app_log *)jarg1; 
   arg2 = (switch_app_log *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -7067,16 +6729,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_app_log(void * jarg1) {
   
   arg1 = (switch_app_log *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_func_set(void * jarg1, void * jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   switch_thread_start_t arg2 ;
   switch_thread_start_t *argp2 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   argp2 = (switch_thread_start_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_thread_start_t", 0);
@@ -7084,39 +6745,37 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_func_set(void * jarg1, v
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->func = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_func_get(void * jarg1) {
   void * jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   switch_thread_start_t result;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   result =  ((arg1)->func);
-  jresult = new switch_thread_start_t((switch_thread_start_t &)result); 
+  jresult = new switch_thread_start_t((const switch_thread_start_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_obj_set(void * jarg1, void * jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   void *arg2 = (void *) 0 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->obj = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_obj_get(void * jarg1) {
   void * jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   void *result = 0 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   result = (void *) ((arg1)->obj);
   jresult = (void *)result; 
   return jresult;
@@ -7124,22 +6783,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_obj_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_alloc_set(void * jarg1, int jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   int arg2 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->alloc = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_thread_data_t_alloc_get(void * jarg1) {
   int jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   int result;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   result = (int) ((arg1)->alloc);
   jresult = result; 
   return jresult;
@@ -7147,22 +6805,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_thread_data_t_alloc_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_pool_set(void * jarg1, void * jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->pool = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_pool_get(void * jarg1) {
   void * jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   switch_memory_pool_t *result = 0 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   result = (switch_memory_pool_t *) ((arg1)->pool);
   jresult = (void *)result; 
   return jresult;
@@ -7171,29 +6828,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_pool_get(void * jarg1)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_thread_data_t() {
   void * jresult ;
-  switch_thread_data_t *result = 0 ;
+  switch_thread_data_s *result = 0 ;
   
-  result = (switch_thread_data_t *)new switch_thread_data_t();
+  result = (switch_thread_data_s *)new switch_thread_data_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_thread_data_t(void * jarg1) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_data_s *arg1 = (switch_thread_data_s *) 0 ;
   
-  arg1 = (switch_thread_data_t *)jarg1; 
+  arg1 = (switch_thread_data_s *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_on_set(void * jarg1, void * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -7201,28 +6857,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_on_set(void * jarg1, voi
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->on = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_on_get(void * jarg1) {
   void * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   result =  ((arg1)->on);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_off_set(void * jarg1, void * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -7230,30 +6885,29 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_off_set(void * jarg1, vo
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->off = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_off_get(void * jarg1) {
   void * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   result =  ((arg1)->off);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_uuid_set(void * jarg1, char * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->uuid) delete [] arg1->uuid;
+    delete [] arg1->uuid;
     if (arg2) {
       arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid, (const char *)arg2);
@@ -7266,10 +6920,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_uuid_set(void * jarg1, c
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_hold_record_t_uuid_get(void * jarg1) {
   char * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   result = (char *) ((arg1)->uuid);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -7277,22 +6931,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_hold_record_t_uuid_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_next_set(void * jarg1, void * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   switch_hold_record_s *arg2 = (switch_hold_record_s *) 0 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   arg2 = (switch_hold_record_s *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_next_get(void * jarg1) {
   void * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   switch_hold_record_s *result = 0 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   result = (switch_hold_record_s *) ((arg1)->next);
   jresult = (void *)result; 
   return jresult;
@@ -7301,31 +6954,30 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_next_get(void * jarg1)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_hold_record_t() {
   void * jresult ;
-  switch_hold_record_t *result = 0 ;
+  switch_hold_record_s *result = 0 ;
   
-  result = (switch_hold_record_t *)new switch_hold_record_t();
+  result = (switch_hold_record_s *)new switch_hold_record_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_hold_record_t(void * jarg1) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg1 = (switch_hold_record_s *) 0 ;
   
-  arg1 = (switch_hold_record_t *)jarg1; 
+  arg1 = (switch_hold_record_s *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_uuid_set(void * jarg1, char * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->uuid) delete [] arg1->uuid;
+    delete [] arg1->uuid;
     if (arg2) {
       arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid, (const char *)arg2);
@@ -7338,10 +6990,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_uuid_set(void * jarg1, c
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_node_t_uuid_get(void * jarg1) {
   char * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (char *) ((arg1)->uuid);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -7349,45 +7001,43 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_node_t_uuid_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_xml_cdr_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_xml_t arg2 = (switch_xml_t) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
   if (arg1) (arg1)->xml_cdr = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_xml_cdr_get(void * jarg1) {
   void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_xml_t result;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_xml_t) ((arg1)->xml_cdr);
   jresult = (void *)result; 
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_event_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t__event_set(void * jarg1, void * jarg2) {
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_event_t *arg2 = (switch_event_t *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_event_t *)jarg2; 
   if (arg1) (arg1)->event = arg2;
-  
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_event_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t__event_get(void * jarg1) {
   void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_event_t *result = 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_event_t *) ((arg1)->event);
   jresult = (void *)result; 
   return jresult;
@@ -7395,22 +7045,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_event_get(void * jarg1
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_callstate_set(void * jarg1, int jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_channel_callstate_t arg2 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_channel_callstate_t)jarg2; 
   if (arg1) (arg1)->callstate = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_callstate_get(void * jarg1) {
   int jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_channel_callstate_t result;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_channel_callstate_t) ((arg1)->callstate);
   jresult = result; 
   return jresult;
@@ -7418,22 +7067,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_callstate_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_hold_record_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_hold_record_t *arg2 = (switch_hold_record_t *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_hold_record_t *)jarg2; 
   if (arg1) (arg1)->hold_record = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hold_record_get(void * jarg1) {
   void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_hold_record_t *result = 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_hold_record_t *) ((arg1)->hold_record);
   jresult = (void *)result; 
   return jresult;
@@ -7441,22 +7089,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hold_record_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_caller_profile_t *)jarg2; 
   if (arg1) (arg1)->hup_profile = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_get(void * jarg1) {
   void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_caller_profile_t *result = 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_caller_profile_t *) ((arg1)->hup_profile);
   jresult = (void *)result; 
   return jresult;
@@ -7464,22 +7111,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_direction_set(void * jarg1, int jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_call_direction_t arg2 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_call_direction_t)jarg2; 
   if (arg1) (arg1)->direction = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_direction_get(void * jarg1) {
   int jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_call_direction_t result;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_call_direction_t) ((arg1)->direction);
   jresult = result; 
   return jresult;
@@ -7487,22 +7133,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_direction_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_parent_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_device_record_s *arg2 = (switch_device_record_s *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (switch_device_record_s *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_parent_get(void * jarg1) {
   void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   switch_device_record_s *result = 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (switch_device_record_s *) ((arg1)->parent);
   jresult = (void *)result; 
   return jresult;
@@ -7510,22 +7155,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_parent_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_next_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   arg2 = (device_uuid_node_s *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_next_get(void * jarg1) {
   void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   device_uuid_node_s *result = 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   result = (device_uuid_node_s *) ((arg1)->next);
   jresult = (void *)result; 
   return jresult;
@@ -7534,40 +7178,38 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_next_get(void * jarg1)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_node_t() {
   void * jresult ;
-  switch_device_node_t *result = 0 ;
+  device_uuid_node_s *result = 0 ;
   
-  result = (switch_device_node_t *)new switch_device_node_t();
+  result = (device_uuid_node_s *)new device_uuid_node_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_node_t(void * jarg1) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg1 = (device_uuid_node_s *) 0 ;
   
-  arg1 = (switch_device_node_t *)jarg1; 
+  arg1 = (device_uuid_node_s *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->total = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->total);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7575,22 +7217,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_get(void
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->total_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->total_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7598,22 +7239,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_in_get(v
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->total_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->total_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7621,22 +7261,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_out_get(
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->offhook = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->offhook);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7644,22 +7283,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_get(vo
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->offhook_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->offhook_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7667,22 +7305,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_get
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->offhook_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->offhook_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7690,22 +7327,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_ge
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->active = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->active);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7713,22 +7349,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_get(voi
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->active_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->active_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7736,22 +7371,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_in_get(
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->active_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->active_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7759,22 +7393,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_out_get
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->held = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->held);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7782,22 +7415,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_get(void
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->held_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->held_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7805,22 +7437,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_in_get(vo
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->held_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->held_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7828,22 +7459,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_out_get(v
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->hup = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->hup);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7851,22 +7481,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->hup_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->hup_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7874,22 +7503,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_get(voi
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->hup_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->hup_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7897,22 +7525,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_get(vo
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ringing = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->ringing);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7920,22 +7547,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_get(vo
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ringing_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->ringing_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7943,22 +7569,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_get
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ringing_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->ringing_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7966,22 +7591,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_ge
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->early = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->early);
   jresult = (unsigned long)result; 
   return jresult;
@@ -7989,22 +7613,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_get(void
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->early_in = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_in_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->early_in);
   jresult = (unsigned long)result; 
   return jresult;
@@ -8012,22 +7635,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_in_get(v
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->early_out = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_out_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->early_out);
   jresult = (unsigned long)result; 
   return jresult;
@@ -8035,22 +7657,21 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_out_get(
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ring_wait = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_get(void * jarg1) {
   unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   uint32_t result;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   result = (uint32_t) ((arg1)->ring_wait);
   jresult = (unsigned long)result; 
   return jresult;
@@ -8059,31 +7680,30 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_get(
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_stats_t() {
   void * jresult ;
-  switch_device_stats_t *result = 0 ;
+  switch_device_stats_s *result = 0 ;
   
-  result = (switch_device_stats_t *)new switch_device_stats_t();
+  result = (switch_device_stats_s *)new switch_device_stats_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_stats_t(void * jarg1) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  switch_device_stats_s *arg1 = (switch_device_stats_s *) 0 ;
   
-  arg1 = (switch_device_stats_t *)jarg1; 
+  arg1 = (switch_device_stats_s *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_device_id_set(void * jarg1, char * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->device_id) delete [] arg1->device_id;
+    delete [] arg1->device_id;
     if (arg2) {
       arg1->device_id = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->device_id, (const char *)arg2);
@@ -8096,10 +7716,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_device_id_set(void * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_device_id_get(void * jarg1) {
   char * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (char *) ((arg1)->device_id);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8107,13 +7727,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_device_id_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_set(void * jarg1, char * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->uuid) delete [] arg1->uuid;
+    delete [] arg1->uuid;
     if (arg2) {
       arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid, (const char *)arg2);
@@ -8126,10 +7746,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_set(void * jarg1,
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_uuid_get(void * jarg1) {
   char * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (char *) ((arg1)->uuid);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8137,22 +7757,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_uuid_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_refs_set(void * jarg1, int jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   int arg2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_refs_get(void * jarg1) {
   int jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   int result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (int) ((arg1)->refs);
   jresult = result; 
   return jresult;
@@ -8160,22 +7779,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_refs_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_stats_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_stats_t *arg2 = (switch_device_stats_t *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (switch_device_stats_t *)jarg2; 
   if (arg1) (arg1)->stats = *arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_stats_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_stats_t *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (switch_device_stats_t *)& ((arg1)->stats);
   jresult = (void *)result; 
   return jresult;
@@ -8183,22 +7801,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_stats_get(void * jar
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_stats_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_stats_t *arg2 = (switch_device_stats_t *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (switch_device_stats_t *)jarg2; 
   if (arg1) (arg1)->last_stats = *arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_stats_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_stats_t *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (switch_device_stats_t *)& ((arg1)->last_stats);
   jresult = (void *)result; 
   return jresult;
@@ -8206,22 +7823,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_stats_get(void
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_state_set(void * jarg1, int jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_state_t arg2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (switch_device_state_t)jarg2; 
   if (arg1) (arg1)->state = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_state_get(void * jarg1) {
   int jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_state_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (switch_device_state_t) ((arg1)->state);
   jresult = result; 
   return jresult;
@@ -8229,22 +7845,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_state_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_state_set(void * jarg1, int jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_state_t arg2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (switch_device_state_t)jarg2; 
   if (arg1) (arg1)->last_state = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_last_state_get(void * jarg1) {
   int jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_device_state_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (switch_device_state_t) ((arg1)->last_state);
   jresult = result; 
   return jresult;
@@ -8252,11 +7867,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_last_state_get(void * j
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8264,28 +7879,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_start_set(void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->active_start = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_active_start_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->active_start);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_stop_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8293,28 +7907,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_stop_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->active_stop = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_active_stop_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->active_stop);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8322,28 +7935,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_set(voi
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->last_call_time = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->last_call_time);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8351,28 +7963,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_start_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->ring_start = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_ring_start_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->ring_start);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8380,28 +7991,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_set(void * j
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->ring_stop = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->ring_stop);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8409,28 +8019,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_start_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->hold_start = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_hold_start_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->hold_start);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8438,28 +8047,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_set(void * j
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->hold_stop = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->hold_stop);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_call_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t arg2 ;
   switch_time_t *argp2 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   argp2 = (switch_time_t *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
@@ -8467,39 +8075,37 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_call_start_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->call_start = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_call_start_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_time_t result;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result =  ((arg1)->call_start);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (device_uuid_node_s *)jarg2; 
   if (arg1) (arg1)->uuid_list = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   device_uuid_node_s *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (device_uuid_node_s *) ((arg1)->uuid_list);
   jresult = (void *)result; 
   return jresult;
@@ -8507,22 +8113,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (device_uuid_node_s *)jarg2; 
   if (arg1) (arg1)->uuid_tail = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   device_uuid_node_s *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (device_uuid_node_s *) ((arg1)->uuid_tail);
   jresult = (void *)result; 
   return jresult;
@@ -8530,22 +8135,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_mutex_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->mutex = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_mutex_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_mutex_t *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (switch_mutex_t *) ((arg1)->mutex);
   jresult = (void *)result; 
   return jresult;
@@ -8553,22 +8157,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_mutex_get(void * jar
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_pool_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->pool = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_pool_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   switch_memory_pool_t *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (switch_memory_pool_t *) ((arg1)->pool);
   jresult = (void *)result; 
   return jresult;
@@ -8576,22 +8179,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_pool_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_user_data_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   void *arg2 = (void *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->user_data = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_user_data_get(void * jarg1) {
   void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   void *result = 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   result = (void *) ((arg1)->user_data);
   jresult = (void *)result; 
   return jresult;
@@ -8600,20 +8202,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_user_data_get(void *
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_record_t() {
   void * jresult ;
-  switch_device_record_t *result = 0 ;
+  switch_device_record_s *result = 0 ;
   
-  result = (switch_device_record_t *)new switch_device_record_t();
+  result = (switch_device_record_s *)new switch_device_record_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_record_t(void * jarg1) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_record_s *arg1 = (switch_device_record_s *) 0 ;
   
-  arg1 = (switch_device_record_t *)jarg1; 
+  arg1 = (switch_device_record_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -8621,8 +8222,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_DTLS_SRTP_FNAME_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "dtls-srtp";
-  
+  result = (char *)("dtls-srtp");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -8632,8 +8232,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MAX_FPLEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 64;
-  
+  result = (int)(64);
   jresult = result; 
   return jresult;
 }
@@ -8643,30 +8242,28 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MAX_FPSTRLEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 192;
-  
+  result = (int)(192);
   jresult = result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_len_set(void * jarg1, unsigned long jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->len = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_dtls_fingerprint_t_len_get(void * jarg1) {
   unsigned long jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   uint32_t result;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   result = (uint32_t) ((arg1)->len);
   jresult = (unsigned long)result; 
   return jresult;
@@ -8674,10 +8271,10 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_dtls_fingerprint_t_len_get(void * ja
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_data_set(void * jarg1, void * jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   uint8_t *arg2 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   arg2 = (uint8_t *)jarg2; 
   {
     size_t ii;
@@ -8689,10 +8286,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_data_set(void * jarg1, voi
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_dtls_fingerprint_t_data_get(void * jarg1) {
   void * jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   uint8_t *result = 0 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   result = (uint8_t *)(uint8_t *) ((arg1)->data);
   jresult = result; 
   return jresult;
@@ -8700,13 +8297,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_dtls_fingerprint_t_data_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_type_set(void * jarg1, char * jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->type) delete [] arg1->type;
+    delete [] arg1->type;
     if (arg2) {
       arg1->type = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->type, (const char *)arg2);
@@ -8719,10 +8316,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_type_set(void * jarg1, cha
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_type_get(void * jarg1) {
   char * jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   result = (char *) ((arg1)->type);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8730,24 +8327,28 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_type_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_str_set(void * jarg1, char * jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   char *arg2 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->str, (const char *)arg2, 192);
-    else arg1->str[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->str, (const char *)arg2, 192-1);
+      arg1->str[192-1] = 0;
+    } else {
+      arg1->str[0] = 0;
+    }
   }
 }
 
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_str_get(void * jarg1) {
   char * jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   result = (char *)(char *) ((arg1)->str);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8756,20 +8357,19 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_str_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_dtls_fingerprint_t() {
   void * jresult ;
-  dtls_fingerprint_t *result = 0 ;
+  dtls_fp_s *result = 0 ;
   
-  result = (dtls_fingerprint_t *)new dtls_fingerprint_t();
+  result = (dtls_fp_s *)new dtls_fp_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_dtls_fingerprint_t(void * jarg1) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  dtls_fp_s *arg1 = (dtls_fp_s *) 0 ;
   
-  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg1 = (dtls_fp_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -8777,8 +8377,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MESSAGE_STRING_ARG_MAX_get() {
   int jresult ;
   int result;
   
-  result = (int) 10;
-  
+  result = (int)(10);
   jresult = result; 
   return jresult;
 }
@@ -8791,7 +8390,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_from_set(void * j
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->from) delete [] arg1->from;
+    delete [] arg1->from;
     if (arg2) {
       arg1->from = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->from, (const char *)arg2);
@@ -8821,7 +8420,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_message_id_set(vo
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (switch_core_session_message_types_t)jarg2; 
   if (arg1) (arg1)->message_id = arg2;
-  
 }
 
 
@@ -8844,7 +8442,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_numeric_arg_set(v
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->numeric_arg = arg2;
-  
 }
 
 
@@ -8902,7 +8499,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_arg_size_s
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->string_arg_size = arg2;
-  
 }
 
 
@@ -8913,7 +8509,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_arg_size
   
   arg1 = (switch_core_session_message *)jarg1; 
   result =  ((arg1)->string_arg_size);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -8925,7 +8521,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_set(v
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->pointer_arg = arg2;
-  
 }
 
 
@@ -8954,7 +8549,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_size_
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->pointer_arg_size = arg2;
-  
 }
 
 
@@ -8965,7 +8559,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_siz
   
   arg1 = (switch_core_session_message *)jarg1; 
   result =  ((arg1)->pointer_arg_size);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -8977,7 +8571,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_numeric_reply_set
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->numeric_reply = arg2;
-  
 }
 
 
@@ -9000,7 +8593,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_reply_set(
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->string_reply) delete [] arg1->string_reply;
+    delete [] arg1->string_reply;
     if (arg2) {
       arg1->string_reply = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->string_reply, (const char *)arg2);
@@ -9036,7 +8629,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_reply_size
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->string_reply_size = arg2;
-  
 }
 
 
@@ -9047,7 +8639,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_reply_si
   
   arg1 = (switch_core_session_message *)jarg1; 
   result =  ((arg1)->string_reply_size);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -9059,7 +8651,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_set
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->pointer_reply = arg2;
-  
 }
 
 
@@ -9088,7 +8679,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_siz
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->pointer_reply_size = arg2;
-  
 }
 
 
@@ -9099,7 +8689,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_s
   
   arg1 = (switch_core_session_message *)jarg1; 
   result =  ((arg1)->pointer_reply_size);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -9111,7 +8701,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_flags_set(void *
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (switch_core_session_message_flag_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -9192,7 +8781,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__line_set(void *
   arg1 = (switch_core_session_message *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->_line = arg2;
-  
 }
 
 
@@ -9247,7 +8835,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_delivery_time_set
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->delivery_time = arg2;
-  
 }
 
 
@@ -9258,7 +8845,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_delivery_time_g
   
   arg1 = (switch_core_session_message *)jarg1; 
   result =  ((arg1)->delivery_time);
-  jresult = new time_t((time_t &)result); 
+  jresult = new time_t((const time_t &)result); 
   return jresult;
 }
 
@@ -9278,7 +8865,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_session_message(void * jar
   
   arg1 = (switch_core_session_message *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -9289,7 +8875,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_running_set(void *
   arg1 = (switch_core_thread_session *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->running = arg2;
-  
 }
 
 
@@ -9312,7 +8897,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_mutex_set(void * j
   arg1 = (switch_core_thread_session *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->mutex = arg2;
-  
 }
 
 
@@ -9361,7 +8945,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_input_callback_set
   arg1 = (switch_core_thread_session *)jarg1; 
   arg2 = (switch_input_callback_function_t)jarg2; 
   if (arg1) (arg1)->input_callback = arg2;
-  
 }
 
 
@@ -9384,7 +8967,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_pool_set(void * ja
   arg1 = (switch_core_thread_session *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->pool = arg2;
-  
 }
 
 
@@ -9415,7 +8997,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_thread_session(void * jarg
   
   arg1 = (switch_core_thread_session *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -9523,8 +9104,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_add(void * jarg1, char *
   time_t arg6 ;
   switch_media_bug_flag_t arg7 ;
   switch_media_bug_t **arg8 = (switch_media_bug_t **) 0 ;
-  switch_status_t result;
   time_t *argp6 ;
+  switch_status_t result;
   
   arg1 = (switch_core_session_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -10251,8 +9832,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_permanent_alloc(void *
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int arg4 ;
-  void *result = 0 ;
   switch_size_t *argp1 ;
+  void *result = 0 ;
   
   argp1 = (switch_size_t *)jarg1; 
   if (!argp1) {
@@ -10276,8 +9857,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_alloc(void * jarg1, voi
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   int arg5 ;
-  void *result = 0 ;
   switch_size_t *argp2 ;
+  void *result = 0 ;
   
   arg1 = (switch_memory_pool_t *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -10302,8 +9883,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_session_alloc(void * ja
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   int arg5 ;
-  void *result = 0 ;
   switch_size_t *argp2 ;
+  void *result = 0 ;
   
   arg1 = (switch_core_session_t *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -10528,7 +10109,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_id(void * jarg1) {
   
   arg1 = (switch_core_session_t *)jarg1; 
   result = switch_core_session_get_id(arg1);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -10538,7 +10119,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id() {
   switch_size_t result;
   
   result = switch_core_session_id();
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -10548,7 +10129,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id_dec() {
   switch_size_t result;
   
   result = switch_core_session_id_dec();
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -13232,8 +12813,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_management_exec(char * jarg1, int
   switch_management_action_t arg2 ;
   char *arg3 = (char *) 0 ;
   switch_size_t arg4 ;
-  switch_status_t result;
   switch_size_t *argp4 ;
+  switch_status_t result;
   
   arg1 = (char *)jarg1; 
   arg2 = (switch_management_action_t)jarg2; 
@@ -13345,7 +12926,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_uptime() {
   switch_time_t result;
   
   result = switch_core_uptime();
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -13476,7 +13057,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_micro_time_now() {
   switch_time_t result;
   
   result = switch_micro_time_now();
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -13486,7 +13067,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_mono_micro_time_now() {
   switch_time_t result;
   
   result = switch_mono_micro_time_now();
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -13521,7 +13102,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_time_ref() {
   switch_time_t result;
   
   result = switch_time_ref();
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -13538,7 +13119,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_epoch_time_now(void * jarg1) {
   
   arg1 = (time_t *)jarg1; 
   result = switch_epoch_time_now(arg1);
-  jresult = new time_t((time_t &)result); 
+  jresult = new time_t((const time_t &)result); 
   return jresult;
 }
 
@@ -13562,8 +13143,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_strftime_tz(char * jarg1, char * jarg2,
   char *arg3 = (char *) 0 ;
   size_t arg4 ;
   switch_time_t arg5 ;
-  switch_status_t result;
   switch_time_t *argp5 ;
+  switch_status_t result;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -13586,8 +13167,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_time_exp_tz_name(char * jarg1, void * j
   char *arg1 = (char *) 0 ;
   switch_time_exp_t *arg2 = (switch_time_exp_t *) 0 ;
   switch_time_t arg3 ;
-  switch_status_t result;
   switch_time_t *argp3 ;
+  switch_status_t result;
   
   arg1 = (char *)jarg1; 
   arg2 = (switch_time_exp_t *)jarg2; 
@@ -13888,8 +13469,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_CACHE_DB_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 256;
-  
+  result = (int)(256);
   jresult = result; 
   return jresult;
 }
@@ -13902,7 +13482,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_core_db_dbh_s
   arg1 = (switch_cache_db_native_handle_t *)jarg1; 
   arg2 = (switch_core_db_t *)jarg2; 
   if (arg1) (arg1)->core_db_dbh = arg2;
-  
 }
 
 
@@ -13925,7 +13504,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_odbc_dbh_set(
   arg1 = (switch_cache_db_native_handle_t *)jarg1; 
   arg2 = (switch_odbc_handle_t *)jarg2; 
   if (arg1) (arg1)->odbc_dbh = arg2;
-  
 }
 
 
@@ -13948,7 +13526,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_pgsql_dbh_set
   arg1 = (switch_cache_db_native_handle_t *)jarg1; 
   arg2 = (switch_pgsql_handle_t *)jarg2; 
   if (arg1) (arg1)->pgsql_dbh = arg2;
-  
 }
 
 
@@ -13979,7 +13556,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_native_handle_t(void *
   
   arg1 = (switch_cache_db_native_handle_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -13990,7 +13566,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_core_db_options_t_db_path_set
   arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->db_path) delete [] arg1->db_path;
+    delete [] arg1->db_path;
     if (arg2) {
       arg1->db_path = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->db_path, (const char *)arg2);
@@ -14028,7 +13604,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_core_db_options_t(void
   
   arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -14039,7 +13614,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_dsn_set(void *
   arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->dsn) delete [] arg1->dsn;
+    delete [] arg1->dsn;
     if (arg2) {
       arg1->dsn = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->dsn, (const char *)arg2);
@@ -14069,7 +13644,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_user_set(void
   arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->user) delete [] arg1->user;
+    delete [] arg1->user;
     if (arg2) {
       arg1->user = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->user, (const char *)arg2);
@@ -14099,7 +13674,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_pass_set(void
   arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->pass) delete [] arg1->pass;
+    delete [] arg1->pass;
     if (arg2) {
       arg1->pass = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->pass, (const char *)arg2);
@@ -14137,7 +13712,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_odbc_options_t(void *
   
   arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -14148,7 +13722,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_pgsql_options_t_dsn_set(void
   arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->dsn) delete [] arg1->dsn;
+    delete [] arg1->dsn;
     if (arg2) {
       arg1->dsn = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->dsn, (const char *)arg2);
@@ -14186,7 +13760,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_pgsql_options_t(void *
   
   arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -14197,7 +13770,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_core_db_
   arg1 = (switch_cache_db_connection_options_t *)jarg1; 
   arg2 = (switch_cache_db_core_db_options_t *)jarg2; 
   if (arg1) (arg1)->core_db_options = *arg2;
-  
 }
 
 
@@ -14220,7 +13792,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_odbc_opt
   arg1 = (switch_cache_db_connection_options_t *)jarg1; 
   arg2 = (switch_cache_db_odbc_options_t *)jarg2; 
   if (arg1) (arg1)->odbc_options = *arg2;
-  
 }
 
 
@@ -14243,7 +13814,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_pgsql_op
   arg1 = (switch_cache_db_connection_options_t *)jarg1; 
   arg2 = (switch_cache_db_pgsql_options_t *)jarg2; 
   if (arg1) (arg1)->pgsql_options = *arg2;
-  
 }
 
 
@@ -14274,7 +13844,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_connection_options_t(v
   
   arg1 = (switch_cache_db_connection_options_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -15021,7 +14590,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fork() {
   pid_t result;
   
   result = switch_fork();
-  jresult = new pid_t((pid_t &)result); 
+  jresult = new pid_t((const pid_t &)result); 
   return jresult;
 }
 
@@ -15230,7 +14799,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_endpoint_int
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_endpoint_interface_t *)jarg2; 
   if (arg1) (arg1)->endpoint_interface = arg2;
-  
 }
 
 
@@ -15253,7 +14821,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_timer_interf
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_timer_interface_t *)jarg2; 
   if (arg1) (arg1)->timer_interface = arg2;
-  
 }
 
 
@@ -15276,7 +14843,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_dialplan_int
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_dialplan_interface_t *)jarg2; 
   if (arg1) (arg1)->dialplan_interface = arg2;
-  
 }
 
 
@@ -15299,7 +14865,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_codec_interf
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_codec_interface_t *)jarg2; 
   if (arg1) (arg1)->codec_interface = arg2;
-  
 }
 
 
@@ -15322,7 +14887,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_application_
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_application_interface_t *)jarg2; 
   if (arg1) (arg1)->application_interface = arg2;
-  
 }
 
 
@@ -15345,7 +14909,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_applica
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_chat_application_interface_t *)jarg2; 
   if (arg1) (arg1)->chat_application_interface = arg2;
-  
 }
 
 
@@ -15368,7 +14931,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_api_interfac
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_api_interface_t *)jarg2; 
   if (arg1) (arg1)->api_interface = arg2;
-  
 }
 
 
@@ -15391,7 +14953,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_json_api_int
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_json_api_interface_t *)jarg2; 
   if (arg1) (arg1)->json_api_interface = arg2;
-  
 }
 
 
@@ -15414,7 +14975,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_file_interfa
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_file_interface_t *)jarg2; 
   if (arg1) (arg1)->file_interface = arg2;
-  
 }
 
 
@@ -15437,7 +14997,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_speech_inter
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_speech_interface_t *)jarg2; 
   if (arg1) (arg1)->speech_interface = arg2;
-  
 }
 
 
@@ -15460,7 +15019,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_directory_in
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_directory_interface_t *)jarg2; 
   if (arg1) (arg1)->directory_interface = arg2;
-  
 }
 
 
@@ -15483,7 +15041,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_interfa
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_chat_interface_t *)jarg2; 
   if (arg1) (arg1)->chat_interface = arg2;
-  
 }
 
 
@@ -15506,7 +15063,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_say_interfac
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_say_interface_t *)jarg2; 
   if (arg1) (arg1)->say_interface = arg2;
-  
 }
 
 
@@ -15529,7 +15085,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_asr_interfac
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_asr_interface_t *)jarg2; 
   if (arg1) (arg1)->asr_interface = arg2;
-  
 }
 
 
@@ -15552,7 +15107,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_management_i
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_management_interface_t *)jarg2; 
   if (arg1) (arg1)->management_interface = arg2;
-  
 }
 
 
@@ -15575,7 +15129,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_limit_interf
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_limit_interface_t *)jarg2; 
   if (arg1) (arg1)->limit_interface = arg2;
-  
 }
 
 
@@ -15598,7 +15151,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_rwlock_set(v
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -15621,7 +15173,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_refs_set(voi
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -15644,7 +15195,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_pool_set(voi
   arg1 = (switch_loadable_module_interface *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->pool = arg2;
-  
 }
 
 
@@ -15675,7 +15225,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_interface(void
   
   arg1 = (switch_loadable_module_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -16204,8 +15753,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CMD_CHUNK_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 1024;
-  
+  result = (int)(1024);
   jresult = result; 
   return jresult;
 }
@@ -16221,8 +15769,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_stream_raw_write(void * jarg1,
   switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
   uint8_t *arg2 = (uint8_t *) 0 ;
   switch_size_t arg3 ;
-  switch_status_t result;
   switch_size_t *argp3 ;
+  switch_status_t result;
   
   arg1 = (switch_stream_handle_t *)jarg1; 
   arg2 = (uint8_t *)jarg2; 
@@ -16612,7 +16160,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ip_t_v4_set(void * jarg1, unsigned long jarg2
   arg1 = (ip_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->v4 = arg2;
-  
 }
 
 
@@ -16641,7 +16188,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ip_t_v6_set(void * jarg1, void * jarg2) {
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->v6 = arg2;
-  
 }
 
 
@@ -16652,7 +16198,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_ip_t_v6_get(void * jarg1) {
   
   arg1 = (ip_t *)jarg1; 
   result =  ((arg1)->v6);
-  jresult = new in6_addr((in6_addr &)result); 
+  jresult = new in6_addr((const in6_addr &)result); 
   return jresult;
 }
 
@@ -16672,7 +16218,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_ip_t(void * jarg1) {
   
   arg1 = (ip_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -16681,10 +16226,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_testv6_subnet(void * jarg1, void * jarg
   ip_t arg1 ;
   ip_t arg2 ;
   ip_t arg3 ;
-  switch_bool_t result;
   ip_t *argp1 ;
   ip_t *argp2 ;
   ip_t *argp3 ;
+  switch_bool_t result;
   
   argp1 = (ip_t *)jarg1; 
   if (!argp1) {
@@ -16715,8 +16260,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_print_host(void * jarg1, char * jarg
   switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
+  char *result = 0 ;
   
   arg1 = (switch_sockaddr_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -16736,8 +16281,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SMAX_get() {
   int jresult ;
   int result;
   
-  result = (int) 32767;
-  
+  result = (int)(32767);
   jresult = result; 
   return jresult;
 }
@@ -16747,8 +16291,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SMIN_get() {
   int jresult ;
   int result;
   
-  result = (int) -32768;
-  
+  result = (int)(-32768);
   jresult = result; 
   return jresult;
 }
@@ -16812,9 +16355,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_b64_encode(void * jarg1, void * jarg2,
   switch_size_t arg2 ;
   unsigned char *arg3 = (unsigned char *) 0 ;
   switch_size_t arg4 ;
-  switch_status_t result;
   switch_size_t *argp2 ;
   switch_size_t *argp4 ;
+  switch_status_t result;
   
   arg1 = (unsigned char *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -16841,8 +16384,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_b64_decode(char * jarg1, char * jarg
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -16853,7 +16396,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_b64_decode(char * jarg1, char * jarg
   }
   arg3 = *argp3; 
   result = switch_b64_decode(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -16863,8 +16406,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_amp_encode(char * jarg1, char * jarg
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -16933,8 +16476,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_line(int jarg1, char * jarg2
   int arg1 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (int)jarg1; 
   arg2 = (char *)jarg2; 
@@ -16945,7 +16488,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_line(int jarg1, char * jarg2
   }
   arg3 = *argp3; 
   result = switch_fd_read_line(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -16961,7 +16504,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_dline(int jarg1, void * jarg
   arg2 = (char **)jarg2; 
   arg3 = (switch_size_t *)jarg3; 
   result = switch_fd_read_dline(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -16977,7 +16520,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fp_read_dline(void * jarg1, void * j
   arg2 = (char **)jarg2; 
   arg3 = (switch_size_t *)jarg3; 
   result = switch_fp_read_dline(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -16986,8 +16529,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_alloc(void * jarg1, void * jarg2)
   int jresult ;
   switch_frame_t **arg1 = (switch_frame_t **) 0 ;
   switch_size_t arg2 ;
-  switch_status_t result;
   switch_size_t *argp2 ;
+  switch_status_t result;
   
   arg1 = (switch_frame_t **)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -17152,9 +16695,9 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr(char * jarg1, void * jarg2, void *
   switch_size_t arg2 ;
   sockaddr *arg3 = (sockaddr *) 0 ;
   socklen_t arg4 ;
-  char *result = 0 ;
   switch_size_t *argp2 ;
   socklen_t *argp4 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -17182,9 +16725,9 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr6(char * jarg1, void * jarg2, void
   switch_size_t arg2 ;
   sockaddr_in6 *arg3 = (sockaddr_in6 *) 0 ;
   socklen_t arg4 ;
-  char *result = 0 ;
   switch_size_t *argp2 ;
   socklen_t *argp4 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -17252,8 +16795,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_build_uri(char * jarg1, void * jarg2, c
   char *arg4 = (char *) 0 ;
   switch_sockaddr_t *arg5 = (switch_sockaddr_t *) 0 ;
   int arg6 ;
-  int result;
   switch_size_t *argp2 ;
+  int result;
   
   arg1 = (char *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -17453,7 +16996,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_str_time(char * jarg1) {
   
   arg1 = (char *)jarg1; 
   result = switch_str_time((char const *)arg1);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -17525,8 +17068,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_commas(char * jarg1, char * ja
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -17547,8 +17090,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_nonnumerics(char * jarg1, char
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -17659,8 +17202,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_string(char * jarg1, char * j
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -17962,8 +17505,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_validate_ip6_token(void *
   switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
   ip_t arg2 ;
   char **arg3 = (char **) 0 ;
-  switch_bool_t result;
   ip_t *argp2 ;
+  switch_bool_t result;
   
   arg1 = (switch_network_list_t *)jarg1; 
   argp2 = (ip_t *)jarg2; 
@@ -18107,8 +17650,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_uuid_str(char * jarg1, void * jarg2)
   char * jresult ;
   char *arg1 = (char *) 0 ;
   switch_size_t arg2 ;
-  char *result = 0 ;
   switch_size_t *argp2 ;
+  char *result = 0 ;
   
   arg1 = (char *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -18164,8 +17707,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strerror_r(int jarg1, char * jarg2,
   int arg1 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
+  char *result = 0 ;
   
   arg1 = (int)jarg1; 
   arg2 = (char *)jarg2; 
@@ -18182,13 +17725,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strerror_r(int jarg1, char * jarg2,
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_var_set(void * jarg1, char * jarg2) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->var) delete [] arg1->var;
+    delete [] arg1->var;
     if (arg2) {
       arg1->var = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->var, (const char *)arg2);
@@ -18201,10 +17744,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_var_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_var_get(void * jarg1) {
   char * jresult ;
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   result = (char *) ((arg1)->var);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -18212,13 +17755,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_var_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_val_set(void * jarg1, char * jarg2) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->val) delete [] arg1->val;
+    delete [] arg1->val;
     if (arg2) {
       arg1->val = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->val, (const char *)arg2);
@@ -18231,10 +17774,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_val_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_val_get(void * jarg1) {
   char * jresult ;
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   result = (char *) ((arg1)->val);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -18242,22 +17785,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_val_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_next_set(void * jarg1, void * jarg2) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   profile_node_s *arg2 = (profile_node_s *) 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   arg2 = (profile_node_s *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_profile_node_t_next_get(void * jarg1) {
   void * jresult ;
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   profile_node_s *result = 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   result = (profile_node_s *) ((arg1)->next);
   jresult = (void *)result; 
   return jresult;
@@ -18266,20 +17808,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_profile_node_t_next_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_profile_node_t() {
   void * jresult ;
-  profile_node_t *result = 0 ;
+  profile_node_s *result = 0 ;
   
-  result = (profile_node_t *)new profile_node_t();
+  result = (profile_node_s *)new profile_node_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_profile_node_t(void * jarg1) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg1 = (profile_node_s *) 0 ;
   
-  arg1 = (profile_node_t *)jarg1; 
+  arg1 = (profile_node_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -18522,7 +18063,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_ton_set(void * j
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->caller_ton = arg2;
-  
 }
 
 
@@ -18545,7 +18085,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_numplan_set(void
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->caller_numplan = arg2;
-  
 }
 
 
@@ -18626,7 +18165,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_ton_set(void * jarg
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->ani_ton = arg2;
-  
 }
 
 
@@ -18649,7 +18187,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_numplan_set(void *
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->ani_numplan = arg2;
-  
 }
 
 
@@ -18730,7 +18267,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_ton_set(void * ja
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->rdnis_ton = arg2;
-  
 }
 
 
@@ -18753,7 +18289,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_numplan_set(void
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->rdnis_numplan = arg2;
-  
 }
 
 
@@ -18776,7 +18311,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_set(
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->destination_number) delete [] arg1->destination_number;
+    delete [] arg1->destination_number;
     if (arg2) {
       arg1->destination_number = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->destination_number, (const char *)arg2);
@@ -18806,7 +18341,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_ton_
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->destination_number_ton = arg2;
-  
 }
 
 
@@ -18829,7 +18363,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_nump
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->destination_number_numplan = arg2;
-  
 }
 
 
@@ -18881,7 +18414,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_chan_name_set(void * ja
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->chan_name) delete [] arg1->chan_name;
+    delete [] arg1->chan_name;
     if (arg2) {
       arg1->chan_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->chan_name, (const char *)arg2);
@@ -18911,7 +18444,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_uuid_set(void * jarg1,
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->uuid) delete [] arg1->uuid;
+    delete [] arg1->uuid;
     if (arg2) {
       arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid, (const char *)arg2);
@@ -18999,7 +18532,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_flags_set(void * jarg1,
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_profile_flag_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -19022,7 +18554,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_originator_caller_profi
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_profile *)jarg2; 
   if (arg1) (arg1)->originator_caller_profile = arg2;
-  
 }
 
 
@@ -19045,7 +18576,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_originatee_caller_profi
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_profile *)jarg2; 
   if (arg1) (arg1)->originatee_caller_profile = arg2;
-  
 }
 
 
@@ -19068,7 +18598,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_prof
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_profile *)jarg2; 
   if (arg1) (arg1)->origination_caller_profile = arg2;
-  
 }
 
 
@@ -19091,7 +18620,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_hunt_caller_profile_set
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_profile *)jarg2; 
   if (arg1) (arg1)->hunt_caller_profile = arg2;
-  
 }
 
 
@@ -19114,7 +18642,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_times_set(void * jarg1,
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_channel_timetable *)jarg2; 
   if (arg1) (arg1)->times = arg2;
-  
 }
 
 
@@ -19137,7 +18664,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_old_times_set(void * ja
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_channel_timetable *)jarg2; 
   if (arg1) (arg1)->old_times = arg2;
-  
 }
 
 
@@ -19160,7 +18686,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_extension_set(vo
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_extension *)jarg2; 
   if (arg1) (arg1)->caller_extension = arg2;
-  
 }
 
 
@@ -19183,7 +18708,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_pool_set(void * jarg1,
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->pool = arg2;
-  
 }
 
 
@@ -19206,7 +18730,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_next_set(void * jarg1,
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_caller_profile *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -19229,7 +18752,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_direction_set(void * ja
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_call_direction_t)jarg2; 
   if (arg1) (arg1)->direction = arg2;
-  
 }
 
 
@@ -19252,7 +18774,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_logical_direction_set(v
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (switch_call_direction_t)jarg2; 
   if (arg1) (arg1)->logical_direction = arg2;
-  
 }
 
 
@@ -19275,7 +18796,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_soft_set(void * jarg1,
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (profile_node_t *)jarg2; 
   if (arg1) (arg1)->soft = arg2;
-  
 }
 
 
@@ -19298,7 +18818,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_uuid_str_set(void * jar
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->uuid_str) delete [] arg1->uuid_str;
+    delete [] arg1->uuid_str;
     if (arg2) {
       arg1->uuid_str = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid_str, (const char *)arg2);
@@ -19328,7 +18848,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_clone_of_set(void * jar
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->clone_of) delete [] arg1->clone_of;
+    delete [] arg1->clone_of;
     if (arg2) {
       arg1->clone_of = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->clone_of, (const char *)arg2);
@@ -19358,7 +18878,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_transfer_source_set(voi
   arg1 = (switch_caller_profile *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->transfer_source) delete [] arg1->transfer_source;
+    delete [] arg1->transfer_source;
     if (arg2) {
       arg1->transfer_source = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->transfer_source, (const char *)arg2);
@@ -19396,7 +18916,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_profile(void * jarg1) {
   
   arg1 = (switch_caller_profile *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -19407,7 +18926,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_name_se
   arg1 = (switch_caller_application *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->application_name) delete [] arg1->application_name;
+    delete [] arg1->application_name;
     if (arg2) {
       arg1->application_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->application_name, (const char *)arg2);
@@ -19437,7 +18956,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_data_se
   arg1 = (switch_caller_application *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->application_data) delete [] arg1->application_data;
+    delete [] arg1->application_data;
     if (arg2) {
       arg1->application_data = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->application_data, (const char *)arg2);
@@ -19467,7 +18986,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_functio
   arg1 = (switch_caller_application *)jarg1; 
   arg2 = (switch_application_function_t)jarg2; 
   if (arg1) (arg1)->application_function = arg2;
-  
 }
 
 
@@ -19490,7 +19008,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_next_set(void * jar
   arg1 = (switch_caller_application *)jarg1; 
   arg2 = (switch_caller_application *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -19521,7 +19038,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_application(void * jarg1
   
   arg1 = (switch_caller_application *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -19532,7 +19048,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_extension_name_set(vo
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->extension_name) delete [] arg1->extension_name;
+    delete [] arg1->extension_name;
     if (arg2) {
       arg1->extension_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->extension_name, (const char *)arg2);
@@ -19562,7 +19078,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_extension_number_set(
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->extension_number) delete [] arg1->extension_number;
+    delete [] arg1->extension_number;
     if (arg2) {
       arg1->extension_number = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->extension_number, (const char *)arg2);
@@ -19592,7 +19108,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_current_application_s
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (switch_caller_application_t *)jarg2; 
   if (arg1) (arg1)->current_application = arg2;
-  
 }
 
 
@@ -19615,7 +19130,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_last_application_set(
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (switch_caller_application_t *)jarg2; 
   if (arg1) (arg1)->last_application = arg2;
-  
 }
 
 
@@ -19638,7 +19152,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_applications_set(void
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (switch_caller_application_t *)jarg2; 
   if (arg1) (arg1)->applications = arg2;
-  
 }
 
 
@@ -19661,7 +19174,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_children_set(void * j
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (switch_caller_profile *)jarg2; 
   if (arg1) (arg1)->children = arg2;
-  
 }
 
 
@@ -19684,7 +19196,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_next_set(void * jarg1
   arg1 = (switch_caller_extension *)jarg1; 
   arg2 = (switch_caller_extension *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -19715,7 +19226,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_extension(void * jarg1)
   
   arg1 = (switch_caller_extension *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -19875,7 +19385,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_codec_set(void * jarg1, void * j
   arg1 = (switch_frame *)jarg1; 
   arg2 = (switch_codec_t *)jarg2; 
   if (arg1) (arg1)->codec = arg2;
-  
 }
 
 
@@ -19927,7 +19436,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_packet_set(void * jarg1, void *
   arg1 = (switch_frame *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->packet = arg2;
-  
 }
 
 
@@ -19950,7 +19458,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_packetlen_set(void * jarg1, unsi
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->packetlen = arg2;
-  
 }
 
 
@@ -19973,7 +19480,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_extra_data_set(void * jarg1, voi
   arg1 = (switch_frame *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->extra_data = arg2;
-  
 }
 
 
@@ -19996,7 +19502,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_data_set(void * jarg1, void * ja
   arg1 = (switch_frame *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->data = arg2;
-  
 }
 
 
@@ -20019,7 +19524,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_datalen_set(void * jarg1, unsign
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->datalen = arg2;
-  
 }
 
 
@@ -20042,7 +19546,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_buflen_set(void * jarg1, unsigne
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->buflen = arg2;
-  
 }
 
 
@@ -20065,7 +19568,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_samples_set(void * jarg1, unsign
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samples = arg2;
-  
 }
 
 
@@ -20088,7 +19590,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_rate_set(void * jarg1, unsigned
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->rate = arg2;
-  
 }
 
 
@@ -20111,7 +19612,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_payload_set(void * jarg1, unsign
   arg1 = (switch_frame *)jarg1; 
   arg2 = (switch_payload_t)jarg2; 
   if (arg1) (arg1)->payload = arg2;
-  
 }
 
 
@@ -20140,7 +19640,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_timestamp_set(void * jarg1, void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->timestamp = arg2;
-  
 }
 
 
@@ -20151,7 +19650,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_timestamp_get(void * jarg1) {
   
   arg1 = (switch_frame *)jarg1; 
   result =  ((arg1)->timestamp);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -20163,7 +19662,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_seq_set(void * jarg1, unsigned s
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint16_t)jarg2; 
   if (arg1) (arg1)->seq = arg2;
-  
 }
 
 
@@ -20186,7 +19684,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_ssrc_set(void * jarg1, unsigned
   arg1 = (switch_frame *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->ssrc = arg2;
-  
 }
 
 
@@ -20209,7 +19706,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_m_set(void * jarg1, int jarg2) {
   arg1 = (switch_frame *)jarg1; 
   arg2 = (switch_bool_t)jarg2; 
   if (arg1) (arg1)->m = arg2;
-  
 }
 
 
@@ -20232,7 +19728,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_flags_set(void * jarg1, unsigned
   arg1 = (switch_frame *)jarg1; 
   arg2 = (switch_frame_flag_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -20255,7 +19750,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_user_data_set(void * jarg1, void
   arg1 = (switch_frame *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->user_data = arg2;
-  
 }
 
 
@@ -20278,7 +19772,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_pmap_set(void * jarg1, void * ja
   arg1 = (switch_frame *)jarg1; 
   arg2 = (payload_map_t *)jarg2; 
   if (arg1) (arg1)->pmap = arg2;
-  
 }
 
 
@@ -20309,7 +19802,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_frame(void * jarg1) {
   
   arg1 = (switch_frame *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -20320,7 +19812,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_init_set(void *
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_init = arg2;
-  
 }
 
 
@@ -20343,7 +19834,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_routing_set(voi
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_routing = arg2;
-  
 }
 
 
@@ -20366,7 +19856,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_execute_set(voi
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_execute = arg2;
-  
 }
 
 
@@ -20389,7 +19878,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_hangup_set(void
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_hangup = arg2;
-  
 }
 
 
@@ -20412,7 +19900,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_exchange_media_
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_exchange_media = arg2;
-  
 }
 
 
@@ -20435,7 +19922,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_soft_execute_se
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_soft_execute = arg2;
-  
 }
 
 
@@ -20458,7 +19944,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_consume_media_s
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_consume_media = arg2;
-  
 }
 
 
@@ -20481,7 +19966,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_hibernate_set(v
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_hibernate = arg2;
-  
 }
 
 
@@ -20504,7 +19988,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reset_set(void
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_reset = arg2;
-  
 }
 
 
@@ -20527,7 +20010,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_park_set(void *
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_park = arg2;
-  
 }
 
 
@@ -20550,7 +20032,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_set(v
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_reporting = arg2;
-  
 }
 
 
@@ -20573,7 +20054,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_destroy_set(voi
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (switch_state_handler_t)jarg2; 
   if (arg1) (arg1)->on_destroy = arg2;
-  
 }
 
 
@@ -20596,7 +20076,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_flags_set(void * j
   arg1 = (switch_state_handler_table *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -20653,7 +20132,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_state_handler_table(void * jarg
   
   arg1 = (switch_state_handler_table *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -20664,7 +20142,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_write_function_set(void
   arg1 = (switch_stream_handle *)jarg1; 
   arg2 = (switch_stream_handle_write_function_t)jarg2; 
   if (arg1) (arg1)->write_function = arg2;
-  
 }
 
 
@@ -20687,7 +20164,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_raw_write_function_set(v
   arg1 = (switch_stream_handle *)jarg1; 
   arg2 = (switch_stream_handle_raw_write_function_t)jarg2; 
   if (arg1) (arg1)->raw_write_function = arg2;
-  
 }
 
 
@@ -20710,7 +20186,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_set(void * jarg1, v
   arg1 = (switch_stream_handle *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->data = arg2;
-  
 }
 
 
@@ -20733,7 +20208,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_end_set(void * jarg1, vo
   arg1 = (switch_stream_handle *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->end = arg2;
-  
 }
 
 
@@ -20762,7 +20236,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_size_set(void * jar
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->data_size = arg2;
-  
 }
 
 
@@ -20773,7 +20246,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_size_get(void * j
   
   arg1 = (switch_stream_handle *)jarg1; 
   result =  ((arg1)->data_size);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -20791,7 +20264,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_len_set(void * jarg
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->data_len = arg2;
-  
 }
 
 
@@ -20802,7 +20274,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_len_get(void * ja
   
   arg1 = (switch_stream_handle *)jarg1; 
   result =  ((arg1)->data_len);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -20820,7 +20292,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_alloc_len_set(void * jar
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->alloc_len = arg2;
-  
 }
 
 
@@ -20831,7 +20302,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_alloc_len_get(void * j
   
   arg1 = (switch_stream_handle *)jarg1; 
   result =  ((arg1)->alloc_len);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -20849,7 +20320,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_alloc_chunk_set(void * j
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->alloc_chunk = arg2;
-  
 }
 
 
@@ -20860,7 +20330,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_alloc_chunk_get(void *
   
   arg1 = (switch_stream_handle *)jarg1; 
   result =  ((arg1)->alloc_chunk);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -20872,7 +20342,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_param_event_set(void * j
   arg1 = (switch_stream_handle *)jarg1; 
   arg2 = (switch_event_t *)jarg2; 
   if (arg1) (arg1)->param_event = arg2;
-  
 }
 
 
@@ -20903,7 +20372,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_stream_handle(void * jarg1) {
   
   arg1 = (switch_stream_handle *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -20914,7 +20382,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_outgoing_channel_set(void
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_outgoing_channel_t)jarg2; 
   if (arg1) (arg1)->outgoing_channel = arg2;
-  
 }
 
 
@@ -20937,7 +20404,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_read_frame_set(void * jarg
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_read_frame_t)jarg2; 
   if (arg1) (arg1)->read_frame = arg2;
-  
 }
 
 
@@ -20960,7 +20426,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_write_frame_set(void * jar
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_write_frame_t)jarg2; 
   if (arg1) (arg1)->write_frame = arg2;
-  
 }
 
 
@@ -20983,7 +20448,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_kill_channel_set(void * ja
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_kill_channel_t)jarg2; 
   if (arg1) (arg1)->kill_channel = arg2;
-  
 }
 
 
@@ -21006,7 +20470,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_send_dtmf_set(void * jarg1
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_send_dtmf_t)jarg2; 
   if (arg1) (arg1)->send_dtmf = arg2;
-  
 }
 
 
@@ -21029,7 +20492,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_receive_message_set(void *
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_receive_message_t)jarg2; 
   if (arg1) (arg1)->receive_message = arg2;
-  
 }
 
 
@@ -21052,7 +20514,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_receive_event_set(void * j
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_receive_event_t)jarg2; 
   if (arg1) (arg1)->receive_event = arg2;
-  
 }
 
 
@@ -21075,7 +20536,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_state_change_set(void * ja
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_state_change_t)jarg2; 
   if (arg1) (arg1)->state_change = arg2;
-  
 }
 
 
@@ -21098,7 +20558,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_read_video_frame_set(void
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_read_video_frame_t)jarg2; 
   if (arg1) (arg1)->read_video_frame = arg2;
-  
 }
 
 
@@ -21121,7 +20580,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_write_video_frame_set(void
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_write_video_frame_t)jarg2; 
   if (arg1) (arg1)->write_video_frame = arg2;
-  
 }
 
 
@@ -21144,7 +20602,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_state_run_set(void * jarg1
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_state_run_t)jarg2; 
   if (arg1) (arg1)->state_run = arg2;
-  
 }
 
 
@@ -21167,7 +20624,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_get_jb_set(void * jarg1, v
   arg1 = (switch_io_routines *)jarg1; 
   arg2 = (switch_io_get_jb_t)jarg2; 
   if (arg1) (arg1)->get_jb = arg2;
-  
 }
 
 
@@ -21224,7 +20680,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_routines(void * jarg1) {
   
   arg1 = (switch_io_routines *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -21264,7 +20719,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_io_routines_set(voi
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_io_routines_t *)jarg2; 
   if (arg1) (arg1)->io_routines = arg2;
-  
 }
 
 
@@ -21287,7 +20741,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_state_handler_set(v
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_state_handler_table_t *)jarg2; 
   if (arg1) (arg1)->state_handler = arg2;
-  
 }
 
 
@@ -21310,7 +20763,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_private_info_set(vo
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -21333,7 +20785,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_rwlock_set(void * j
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -21356,7 +20807,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_refs_set(void * jar
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -21379,7 +20829,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_reflock_set(void *
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -21402,7 +20851,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_parent_set(void * j
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -21425,7 +20873,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_next_set(void * jar
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_endpoint_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -21448,7 +20895,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_recover_callback_se
   arg1 = (switch_endpoint_interface *)jarg1; 
   arg2 = (switch_core_recover_callback_t)jarg2; 
   if (arg1) (arg1)->recover_callback = arg2;
-  
 }
 
 
@@ -21479,7 +20925,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_endpoint_interface(void * jarg1
   
   arg1 = (switch_endpoint_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -21490,7 +20935,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interval_set(void * jarg1, int j
   arg1 = (switch_timer *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->interval = arg2;
-  
 }
 
 
@@ -21513,7 +20957,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_flags_set(void * jarg1, unsigned
   arg1 = (switch_timer *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -21536,7 +20979,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_samples_set(void * jarg1, unsign
   arg1 = (switch_timer *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->samples = arg2;
-  
 }
 
 
@@ -21559,7 +21001,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_samplecount_set(void * jarg1, un
   arg1 = (switch_timer *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samplecount = arg2;
-  
 }
 
 
@@ -21582,7 +21023,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_timer_interface_set(void * jarg1
   arg1 = (switch_timer *)jarg1; 
   arg2 = (switch_timer_interface_t *)jarg2; 
   if (arg1) (arg1)->timer_interface = arg2;
-  
 }
 
 
@@ -21605,7 +21045,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_memory_pool_set(void * jarg1, vo
   arg1 = (switch_timer *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->memory_pool = arg2;
-  
 }
 
 
@@ -21628,7 +21067,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_private_info_set(void * jarg1, v
   arg1 = (switch_timer *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -21657,7 +21095,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_diff_set(void * jarg1, void * ja
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->diff = arg2;
-  
 }
 
 
@@ -21668,7 +21105,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_diff_get(void * jarg1) {
   
   arg1 = (switch_timer *)jarg1; 
   result =  ((arg1)->diff);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -21686,7 +21123,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_tick_set(void * jarg1, void * ja
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->tick = arg2;
-  
 }
 
 
@@ -21697,7 +21133,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_tick_get(void * jarg1) {
   
   arg1 = (switch_timer *)jarg1; 
   result =  ((arg1)->tick);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -21717,7 +21153,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_timer(void * jarg1) {
   
   arg1 = (switch_timer *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -21757,7 +21192,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_init_set(void *
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
   if (arg1) (arg1)->timer_init = arg2;
-  
 }
 
 
@@ -21780,7 +21214,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_next_set(void *
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
   if (arg1) (arg1)->timer_next = arg2;
-  
 }
 
 
@@ -21803,7 +21236,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_step_set(void *
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
   if (arg1) (arg1)->timer_step = arg2;
-  
 }
 
 
@@ -21826,7 +21258,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_sync_set(void *
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
   if (arg1) (arg1)->timer_sync = arg2;
-  
 }
 
 
@@ -21849,7 +21280,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_check_set(void *
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_timer_t *,switch_bool_t))jarg2; 
   if (arg1) (arg1)->timer_check = arg2;
-  
 }
 
 
@@ -21872,7 +21302,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_destroy_set(void
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
   if (arg1) (arg1)->timer_destroy = arg2;
-  
 }
 
 
@@ -21895,7 +21324,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_rwlock_set(void * jarg
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -21918,7 +21346,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_refs_set(void * jarg1,
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -21941,7 +21368,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_reflock_set(void * jar
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -21964,7 +21390,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_parent_set(void * jarg
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -21987,7 +21412,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_next_set(void * jarg1,
   arg1 = (switch_timer_interface *)jarg1; 
   arg2 = (switch_timer_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -22018,7 +21442,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_timer_interface(void * jarg1) {
   
   arg1 = (switch_timer_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -22058,7 +21481,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_hunt_function_set(v
   arg1 = (switch_dialplan_interface *)jarg1; 
   arg2 = (switch_dialplan_hunt_function_t)jarg2; 
   if (arg1) (arg1)->hunt_function = arg2;
-  
 }
 
 
@@ -22081,7 +21503,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_rwlock_set(void * j
   arg1 = (switch_dialplan_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -22104,7 +21525,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_refs_set(void * jar
   arg1 = (switch_dialplan_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -22127,7 +21547,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_reflock_set(void *
   arg1 = (switch_dialplan_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -22150,7 +21569,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_parent_set(void * j
   arg1 = (switch_dialplan_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -22173,7 +21591,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_next_set(void * jar
   arg1 = (switch_dialplan_interface *)jarg1; 
   arg2 = (switch_dialplan_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -22204,7 +21621,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_dialplan_interface(void * jarg1
   
   arg1 = (switch_dialplan_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -22244,7 +21660,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_open_set(void * ja
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,char const *))jarg2; 
   if (arg1) (arg1)->file_open = arg2;
-  
 }
 
 
@@ -22267,7 +21682,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_close_set(void * j
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *))jarg2; 
   if (arg1) (arg1)->file_close = arg2;
-  
 }
 
 
@@ -22290,7 +21704,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_truncate_set(void
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,int64_t))jarg2; 
   if (arg1) (arg1)->file_truncate = arg2;
-  
 }
 
 
@@ -22313,7 +21726,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_read_set(void * ja
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
   if (arg1) (arg1)->file_read = arg2;
-  
 }
 
 
@@ -22336,7 +21748,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_write_set(void * j
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
   if (arg1) (arg1)->file_write = arg2;
-  
 }
 
 
@@ -22359,7 +21770,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_read_video_set(voi
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
   if (arg1) (arg1)->file_read_video = arg2;
-  
 }
 
 
@@ -22382,7 +21792,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_write_video_set(vo
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
   if (arg1) (arg1)->file_write_video = arg2;
-  
 }
 
 
@@ -22405,7 +21814,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_seek_set(void * ja
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int))jarg2; 
   if (arg1) (arg1)->file_seek = arg2;
-  
 }
 
 
@@ -22428,7 +21836,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_set_string_set(voi
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *))jarg2; 
   if (arg1) (arg1)->file_set_string = arg2;
-  
 }
 
 
@@ -22451,7 +21858,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_get_string_set(voi
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **))jarg2; 
   if (arg1) (arg1)->file_get_string = arg2;
-  
 }
 
 
@@ -22474,7 +21880,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_extens_set(void * jarg1
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (char **)jarg2; 
   if (arg1) (arg1)->extens = arg2;
-  
 }
 
 
@@ -22497,7 +21902,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_rwlock_set(void * jarg1
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -22520,7 +21924,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_refs_set(void * jarg1,
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -22543,7 +21946,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_reflock_set(void * jarg
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -22566,7 +21968,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_parent_set(void * jarg1
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -22589,7 +21990,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_next_set(void * jarg1,
   arg1 = (switch_file_interface *)jarg1; 
   arg2 = (switch_file_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -22620,7 +22020,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_file_interface(void * jarg1) {
   
   arg1 = (switch_file_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -22631,7 +22030,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_interface_set(void *
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_file_interface_t *)jarg2; 
   if (arg1) (arg1)->file_interface = arg2;
-  
 }
 
 
@@ -22654,7 +22052,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_flags_set(void * jarg1, un
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -22677,7 +22074,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_fd_set(void * jarg1, void
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_file_t *)jarg2; 
   if (arg1) (arg1)->fd = arg2;
-  
 }
 
 
@@ -22700,7 +22096,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_set(void * jarg1,
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->samples = arg2;
-  
 }
 
 
@@ -22723,7 +22118,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samplerate_set(void * jarg
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samplerate = arg2;
-  
 }
 
 
@@ -22746,7 +22140,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_native_rate_set(void * jar
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->native_rate = arg2;
-  
 }
 
 
@@ -22769,7 +22162,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_channels_set(void * jarg1,
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->channels = arg2;
-  
 }
 
 
@@ -22792,7 +22184,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_format_set(void * jarg1, u
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->format = arg2;
-  
 }
 
 
@@ -22815,7 +22206,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sections_set(void * jarg1,
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->sections = arg2;
-  
 }
 
 
@@ -22838,7 +22228,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_seekable_set(void * jarg1,
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->seekable = arg2;
-  
 }
 
 
@@ -22867,7 +22256,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sample_count_set(void * ja
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->sample_count = arg2;
-  
 }
 
 
@@ -22878,7 +22266,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_sample_count_get(void *
   
   arg1 = (switch_file_handle *)jarg1; 
   result =  ((arg1)->sample_count);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -22890,7 +22278,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_speed_set(void * jarg1, in
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->speed = arg2;
-  
 }
 
 
@@ -22913,7 +22300,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_memory_pool_set(void * jar
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->memory_pool = arg2;
-  
 }
 
 
@@ -22936,7 +22322,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_prebuf_set(void * jarg1, u
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->prebuf = arg2;
-  
 }
 
 
@@ -22959,7 +22344,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_interval_set(void * jarg1,
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->interval = arg2;
-  
 }
 
 
@@ -22982,7 +22366,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_private_info_set(void * ja
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -23005,7 +22388,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_handler_set(void * jarg1,
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->handler) delete [] arg1->handler;
+    delete [] arg1->handler;
     if (arg2) {
       arg1->handler = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->handler, (const char *)arg2);
@@ -23035,7 +22418,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pos_set(void * jarg1, long
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->pos = arg2;
-  
 }
 
 
@@ -23058,7 +22440,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_audio_buffer_set(void * ja
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_buffer_t *)jarg2; 
   if (arg1) (arg1)->audio_buffer = arg2;
-  
 }
 
 
@@ -23081,7 +22462,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sp_audio_buffer_set(void *
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_buffer_t *)jarg2; 
   if (arg1) (arg1)->sp_audio_buffer = arg2;
-  
 }
 
 
@@ -23104,7 +22484,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_thresh_set(void * jarg1, u
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->thresh = arg2;
-  
 }
 
 
@@ -23127,7 +22506,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_silence_hits_set(void * ja
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->silence_hits = arg2;
-  
 }
 
 
@@ -23150,7 +22528,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_offset_pos_set(void * jarg
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->offset_pos = arg2;
-  
 }
 
 
@@ -23179,7 +22556,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_in_set(void * jarg
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->samples_in = arg2;
-  
 }
 
 
@@ -23190,7 +22566,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_in_get(void * ja
   
   arg1 = (switch_file_handle *)jarg1; 
   result =  ((arg1)->samples_in);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -23208,7 +22584,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_out_set(void * jar
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->samples_out = arg2;
-  
 }
 
 
@@ -23219,7 +22594,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_out_get(void * j
   
   arg1 = (switch_file_handle *)jarg1; 
   result =  ((arg1)->samples_out);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -23231,7 +22606,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_vol_set(void * jarg1, int
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (int32_t)jarg2; 
   if (arg1) (arg1)->vol = arg2;
-  
 }
 
 
@@ -23254,7 +22628,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_resampler_set(void * jarg1
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_audio_resampler_t *)jarg2; 
   if (arg1) (arg1)->resampler = arg2;
-  
 }
 
 
@@ -23277,7 +22650,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_buffer_set(void * jarg1, v
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_buffer_t *)jarg2; 
   if (arg1) (arg1)->buffer = arg2;
-  
 }
 
 
@@ -23300,7 +22672,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_dbuf_set(void * jarg1, voi
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_byte_t *)jarg2; 
   if (arg1) (arg1)->dbuf = arg2;
-  
 }
 
 
@@ -23329,7 +22700,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_dbuflen_set(void * jarg1,
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->dbuflen = arg2;
-  
 }
 
 
@@ -23340,7 +22710,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_dbuflen_get(void * jarg1
   
   arg1 = (switch_file_handle *)jarg1; 
   result =  ((arg1)->dbuflen);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -23352,7 +22722,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_set(void * jarg
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_buffer_t *)jarg2; 
   if (arg1) (arg1)->pre_buffer = arg2;
-  
 }
 
 
@@ -23375,7 +22744,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_set(void *
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (unsigned char *)jarg2; 
   if (arg1) (arg1)->pre_buffer_data = arg2;
-  
 }
 
 
@@ -23404,7 +22772,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_set(voi
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->pre_buffer_datalen = arg2;
-  
 }
 
 
@@ -23415,7 +22782,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_get(v
   
   arg1 = (switch_file_handle *)jarg1; 
   result =  ((arg1)->pre_buffer_datalen);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -23485,7 +22852,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_line_set(void * jarg1, int
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->line = arg2;
-  
 }
 
 
@@ -23508,7 +22874,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_path_set(void * jarg1
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->file_path) delete [] arg1->file_path;
+    delete [] arg1->file_path;
     if (arg2) {
       arg1->file_path = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->file_path, (const char *)arg2);
@@ -23538,7 +22904,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_spool_path_set(void * jarg
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->spool_path) delete [] arg1->spool_path;
+    delete [] arg1->spool_path;
     if (arg2) {
       arg1->spool_path = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->spool_path, (const char *)arg2);
@@ -23597,7 +22963,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_max_samples_set(void * jar
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->max_samples = arg2;
-  
 }
 
 
@@ -23613,18 +22978,17 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_max_samples_get(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_params_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle__params_set(void * jarg1, void * jarg2) {
   switch_file_handle *arg1 = (switch_file_handle *) 0 ;
   switch_event_t *arg2 = (switch_event_t *) 0 ;
   
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (switch_event_t *)jarg2; 
   if (arg1) (arg1)->params = arg2;
-  
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_params_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle__params_get(void * jarg1) {
   void * jresult ;
   switch_file_handle *arg1 = (switch_file_handle *) 0 ;
   switch_event_t *result = 0 ;
@@ -23643,7 +23007,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_cur_channels_set(void * ja
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->cur_channels = arg2;
-  
 }
 
 
@@ -23666,7 +23029,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_cur_samplerate_set(void *
   arg1 = (switch_file_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->cur_samplerate = arg2;
-  
 }
 
 
@@ -23697,7 +23059,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_file_handle(void * jarg1) {
   
   arg1 = (switch_file_handle *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -23737,7 +23098,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_open_set(void * jarg
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_open = arg2;
-  
 }
 
 
@@ -23760,7 +23120,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_load_grammar_set(voi
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *))jarg2; 
   if (arg1) (arg1)->asr_load_grammar = arg2;
-  
 }
 
 
@@ -23783,7 +23142,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_unload_grammar_set(v
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
   if (arg1) (arg1)->asr_unload_grammar = arg2;
-  
 }
 
 
@@ -23806,7 +23164,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_close_set(void * jar
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_close = arg2;
-  
 }
 
 
@@ -23829,7 +23186,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_set(void * jarg
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_feed = arg2;
-  
 }
 
 
@@ -23852,7 +23208,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_resume_set(void * ja
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
   if (arg1) (arg1)->asr_resume = arg2;
-  
 }
 
 
@@ -23875,7 +23230,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_pause_set(void * jar
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
   if (arg1) (arg1)->asr_pause = arg2;
-  
 }
 
 
@@ -23898,7 +23252,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_check_results_set(vo
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_check_results = arg2;
-  
 }
 
 
@@ -23921,7 +23274,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_set(void
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_get_results = arg2;
-  
 }
 
 
@@ -23944,7 +23296,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_s
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_get_result_headers = arg2;
-  
 }
 
 
@@ -23967,7 +23318,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_s
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
   if (arg1) (arg1)->asr_start_input_timers = arg2;
-  
 }
 
 
@@ -23990,7 +23340,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_set(void
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (void (*)(switch_asr_handle_t *,char *,char const *))jarg2; 
   if (arg1) (arg1)->asr_text_param = arg2;
-  
 }
 
 
@@ -24013,7 +23362,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_set(vo
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (void (*)(switch_asr_handle_t *,char *,int))jarg2; 
   if (arg1) (arg1)->asr_numeric_param = arg2;
-  
 }
 
 
@@ -24036,7 +23384,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_set(void
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (void (*)(switch_asr_handle_t *,char *,double))jarg2; 
   if (arg1) (arg1)->asr_float_param = arg2;
-  
 }
 
 
@@ -24059,7 +23406,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_rwlock_set(void * jarg1,
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -24082,7 +23428,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_refs_set(void * jarg1, i
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -24105,7 +23450,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_reflock_set(void * jarg1
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -24128,7 +23472,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_parent_set(void * jarg1,
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -24151,7 +23494,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_next_set(void * jarg1, v
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_asr_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -24174,7 +23516,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_enable_grammar_set(v
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
   if (arg1) (arg1)->asr_enable_grammar = arg2;
-  
 }
 
 
@@ -24197,7 +23538,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_grammar_set(
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
   if (arg1) (arg1)->asr_disable_grammar = arg2;
-  
 }
 
 
@@ -24220,7 +23560,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_all_grammars
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
   if (arg1) (arg1)->asr_disable_all_grammars = arg2;
-  
 }
 
 
@@ -24243,7 +23582,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_dtmf_set(void *
   arg1 = (switch_asr_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *))jarg2; 
   if (arg1) (arg1)->asr_feed_dtmf = arg2;
-  
 }
 
 
@@ -24274,7 +23612,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_asr_interface(void * jarg1) {
   
   arg1 = (switch_asr_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -24285,7 +23622,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_asr_interface_set(void * ja
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (switch_asr_interface_t *)jarg2; 
   if (arg1) (arg1)->asr_interface = arg2;
-  
 }
 
 
@@ -24308,7 +23644,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_flags_set(void * jarg1, uns
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -24331,7 +23666,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_name_set(void * jarg1, char
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->name) delete [] arg1->name;
+    delete [] arg1->name;
     if (arg2) {
       arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->name, (const char *)arg2);
@@ -24361,7 +23696,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_codec_set(void * jarg1, cha
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->codec) delete [] arg1->codec;
+    delete [] arg1->codec;
     if (arg2) {
       arg1->codec = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->codec, (const char *)arg2);
@@ -24391,7 +23726,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_rate_set(void * jarg1, unsi
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->rate = arg2;
-  
 }
 
 
@@ -24414,7 +23748,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_grammar_set(void * jarg1, c
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->grammar) delete [] arg1->grammar;
+    delete [] arg1->grammar;
     if (arg2) {
       arg1->grammar = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->grammar, (const char *)arg2);
@@ -24444,7 +23778,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_param_set(void * jarg1, cha
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->param) delete [] arg1->param;
+    delete [] arg1->param;
     if (arg2) {
       arg1->param = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->param, (const char *)arg2);
@@ -24474,7 +23808,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_memory_pool_set(void * jarg
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->memory_pool = arg2;
-  
 }
 
 
@@ -24497,7 +23830,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_buffer_set(void * jarg1, vo
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (switch_buffer_t *)jarg2; 
   if (arg1) (arg1)->buffer = arg2;
-  
 }
 
 
@@ -24520,7 +23852,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_dbuf_set(void * jarg1, void
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (switch_byte_t *)jarg2; 
   if (arg1) (arg1)->dbuf = arg2;
-  
 }
 
 
@@ -24549,7 +23880,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_dbuflen_set(void * jarg1, v
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->dbuflen = arg2;
-  
 }
 
 
@@ -24560,7 +23890,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_dbuflen_get(void * jarg1)
   
   arg1 = (switch_asr_handle *)jarg1; 
   result =  ((arg1)->dbuflen);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -24572,7 +23902,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_resampler_set(void * jarg1,
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (switch_audio_resampler_t *)jarg2; 
   if (arg1) (arg1)->resampler = arg2;
-  
 }
 
 
@@ -24595,7 +23924,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_samplerate_set(void * jarg1
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samplerate = arg2;
-  
 }
 
 
@@ -24618,7 +23946,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_native_rate_set(void * jarg
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->native_rate = arg2;
-  
 }
 
 
@@ -24641,7 +23968,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_private_info_set(void * jar
   arg1 = (switch_asr_handle *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -24672,7 +23998,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_asr_handle(void * jarg1) {
   
   arg1 = (switch_asr_handle *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -24712,7 +24037,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_open_set(void
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *))jarg2; 
   if (arg1) (arg1)->speech_open = arg2;
-  
 }
 
 
@@ -24735,7 +24059,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_close_set(void
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *))jarg2; 
   if (arg1) (arg1)->speech_close = arg2;
-  
 }
 
 
@@ -24758,7 +24081,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_feed_tts_set(v
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *))jarg2; 
   if (arg1) (arg1)->speech_feed_tts = arg2;
-  
 }
 
 
@@ -24781,7 +24103,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_set(v
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *))jarg2; 
   if (arg1) (arg1)->speech_read_tts = arg2;
-  
 }
 
 
@@ -24804,7 +24125,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_flush_tts_set(
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (void (*)(switch_speech_handle_t *))jarg2; 
   if (arg1) (arg1)->speech_flush_tts = arg2;
-  
 }
 
 
@@ -24827,7 +24147,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_text_param_tts
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (void (*)(switch_speech_handle_t *,char *,char const *))jarg2; 
   if (arg1) (arg1)->speech_text_param_tts = arg2;
-  
 }
 
 
@@ -24850,7 +24169,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_numeric_param_
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (void (*)(switch_speech_handle_t *,char *,int))jarg2; 
   if (arg1) (arg1)->speech_numeric_param_tts = arg2;
-  
 }
 
 
@@ -24873,7 +24191,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_float_param_tt
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (void (*)(switch_speech_handle_t *,char *,double))jarg2; 
   if (arg1) (arg1)->speech_float_param_tts = arg2;
-  
 }
 
 
@@ -24896,7 +24213,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_rwlock_set(void * jar
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -24919,7 +24235,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_refs_set(void * jarg1
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -24942,7 +24257,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_reflock_set(void * ja
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -24965,7 +24279,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_parent_set(void * jar
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -24988,7 +24301,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_next_set(void * jarg1
   arg1 = (switch_speech_interface *)jarg1; 
   arg2 = (switch_speech_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -25019,7 +24331,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_speech_interface(void * jarg1)
   
   arg1 = (switch_speech_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -25030,7 +24341,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_speech_interface_set(voi
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (switch_speech_interface_t *)jarg2; 
   if (arg1) (arg1)->speech_interface = arg2;
-  
 }
 
 
@@ -25053,7 +24363,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_flags_set(void * jarg1,
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -25076,7 +24385,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_name_set(void * jarg1, c
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->name) delete [] arg1->name;
+    delete [] arg1->name;
     if (arg2) {
       arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->name, (const char *)arg2);
@@ -25106,7 +24415,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_rate_set(void * jarg1, u
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->rate = arg2;
-  
 }
 
 
@@ -25129,7 +24437,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_speed_set(void * jarg1,
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->speed = arg2;
-  
 }
 
 
@@ -25152,7 +24459,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samples_set(void * jarg1
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samples = arg2;
-  
 }
 
 
@@ -25175,8 +24481,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_voice_set(void * jarg1,
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->voice, (const char *)arg2, 80);
-    else arg1->voice[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->voice, (const char *)arg2, 80-1);
+      arg1->voice[80-1] = 0;
+    } else {
+      arg1->voice[0] = 0;
+    }
   }
 }
 
@@ -25200,7 +24510,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_engine_set(void * jarg1,
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->engine) delete [] arg1->engine;
+    delete [] arg1->engine;
     if (arg2) {
       arg1->engine = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->engine, (const char *)arg2);
@@ -25230,7 +24540,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_param_set(void * jarg1,
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->param) delete [] arg1->param;
+    delete [] arg1->param;
     if (arg2) {
       arg1->param = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->param, (const char *)arg2);
@@ -25260,7 +24570,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_memory_pool_set(void * j
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->memory_pool = arg2;
-  
 }
 
 
@@ -25283,7 +24592,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_resampler_set(void * jar
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (switch_audio_resampler_t *)jarg2; 
   if (arg1) (arg1)->resampler = arg2;
-  
 }
 
 
@@ -25306,7 +24614,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_buffer_set(void * jarg1,
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (switch_buffer_t *)jarg2; 
   if (arg1) (arg1)->buffer = arg2;
-  
 }
 
 
@@ -25329,7 +24636,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuf_set(void * jarg1, v
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (switch_byte_t *)jarg2; 
   if (arg1) (arg1)->dbuf = arg2;
-  
 }
 
 
@@ -25358,7 +24664,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_set(void * jarg1
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->dbuflen = arg2;
-  
 }
 
 
@@ -25369,7 +24674,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_get(void * jar
   
   arg1 = (switch_speech_handle *)jarg1; 
   result =  ((arg1)->dbuflen);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -25381,7 +24686,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samplerate_set(void * ja
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samplerate = arg2;
-  
 }
 
 
@@ -25404,7 +24708,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_native_rate_set(void * j
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->native_rate = arg2;
-  
 }
 
 
@@ -25427,7 +24730,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_private_info_set(void *
   arg1 = (switch_speech_handle *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -25458,7 +24760,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_speech_handle(void * jarg1) {
   
   arg1 = (switch_speech_handle *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -25498,7 +24799,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_say_function_set(void *
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (switch_say_callback_t)jarg2; 
   if (arg1) (arg1)->say_function = arg2;
-  
 }
 
 
@@ -25521,7 +24821,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_say_string_function_set(
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (switch_say_string_callback_t)jarg2; 
   if (arg1) (arg1)->say_string_function = arg2;
-  
 }
 
 
@@ -25544,7 +24843,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_rwlock_set(void * jarg1,
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -25567,7 +24865,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_refs_set(void * jarg1, i
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -25590,7 +24887,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_reflock_set(void * jarg1
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -25613,7 +24909,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_parent_set(void * jarg1,
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -25636,7 +24931,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_next_set(void * jarg1, v
   arg1 = (switch_say_interface *)jarg1; 
   arg2 = (switch_say_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -25667,7 +24961,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_say_interface(void * jarg1) {
   
   arg1 = (switch_say_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -25707,7 +25000,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_chat_send_set(void * ja
   arg1 = (switch_chat_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_event_t *))jarg2; 
   if (arg1) (arg1)->chat_send = arg2;
-  
 }
 
 
@@ -25730,7 +25022,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_rwlock_set(void * jarg1
   arg1 = (switch_chat_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -25753,7 +25044,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_refs_set(void * jarg1,
   arg1 = (switch_chat_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -25776,7 +25066,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_reflock_set(void * jarg
   arg1 = (switch_chat_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -25799,7 +25088,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_parent_set(void * jarg1
   arg1 = (switch_chat_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -25822,7 +25110,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_next_set(void * jarg1,
   arg1 = (switch_chat_interface *)jarg1; 
   arg2 = (switch_chat_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -25853,7 +25140,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_chat_interface(void * jarg1) {
   
   arg1 = (switch_chat_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -25893,7 +25179,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_management_functi
   arg1 = (switch_management_interface *)jarg1; 
   arg2 = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t))jarg2; 
   if (arg1) (arg1)->management_function = arg2;
-  
 }
 
 
@@ -25916,7 +25201,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_rwlock_set(void *
   arg1 = (switch_management_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -25939,7 +25223,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_refs_set(void * j
   arg1 = (switch_management_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -25962,7 +25245,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_reflock_set(void
   arg1 = (switch_management_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -25985,7 +25267,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_parent_set(void *
   arg1 = (switch_management_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -26008,7 +25289,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_next_set(void * j
   arg1 = (switch_management_interface *)jarg1; 
   arg2 = (switch_management_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -26039,7 +25319,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_management_interface(void * jar
   
   arg1 = (switch_management_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -26079,7 +25358,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_incr_set(void * jarg1,
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const))jarg2; 
   if (arg1) (arg1)->incr = arg2;
-  
 }
 
 
@@ -26102,7 +25380,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_release_set(void * jar
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_core_session_t *,char const *,char const *))jarg2; 
   if (arg1) (arg1)->release = arg2;
-  
 }
 
 
@@ -26125,7 +25402,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_usage_set(void * jarg1
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (int (*)(char const *,char const *,uint32_t *))jarg2; 
   if (arg1) (arg1)->usage = arg2;
-  
 }
 
 
@@ -26148,7 +25424,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_reset_set(void * jarg1
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_status_t (*)(void))jarg2; 
   if (arg1) (arg1)->reset = arg2;
-  
 }
 
 
@@ -26171,7 +25446,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_status_set(void * jarg
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (char *(*)(void))jarg2; 
   if (arg1) (arg1)->status = arg2;
-  
 }
 
 
@@ -26194,7 +25468,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_interval_reset_set(voi
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_status_t (*)(char const *,char const *))jarg2; 
   if (arg1) (arg1)->interval_reset = arg2;
-  
 }
 
 
@@ -26217,7 +25490,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_rwlock_set(void * jarg
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -26240,7 +25512,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_refs_set(void * jarg1,
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -26263,7 +25534,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_reflock_set(void * jar
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -26286,7 +25556,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_parent_set(void * jarg
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -26309,7 +25578,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_next_set(void * jarg1,
   arg1 = (switch_limit_interface *)jarg1; 
   arg2 = (switch_limit_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -26340,7 +25608,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_limit_interface(void * jarg1) {
   
   arg1 = (switch_limit_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -26380,7 +25647,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_open_set
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *))jarg2; 
   if (arg1) (arg1)->directory_open = arg2;
-  
 }
 
 
@@ -26403,7 +25669,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_close_se
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; 
   if (arg1) (arg1)->directory_close = arg2;
-  
 }
 
 
@@ -26426,7 +25691,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_query_se
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *))jarg2; 
   if (arg1) (arg1)->directory_query = arg2;
-  
 }
 
 
@@ -26449,7 +25713,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_next_set
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; 
   if (arg1) (arg1)->directory_next = arg2;
-  
 }
 
 
@@ -26472,7 +25735,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_next_pai
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_status_t (*)(switch_directory_handle_t *,char **,char **))jarg2; 
   if (arg1) (arg1)->directory_next_pair = arg2;
-  
 }
 
 
@@ -26495,7 +25757,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_rwlock_set(void *
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -26518,7 +25779,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_refs_set(void * ja
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -26541,7 +25801,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_reflock_set(void *
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -26564,7 +25823,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_parent_set(void *
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -26587,7 +25845,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_next_set(void * ja
   arg1 = (switch_directory_interface *)jarg1; 
   arg2 = (switch_directory_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -26618,7 +25875,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directory_interface(void * jarg
   
   arg1 = (switch_directory_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -26629,7 +25885,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_directory_interface_s
   arg1 = (switch_directory_handle *)jarg1; 
   arg2 = (switch_directory_interface_t *)jarg2; 
   if (arg1) (arg1)->directory_interface = arg2;
-  
 }
 
 
@@ -26652,7 +25907,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_flags_set(void * jarg
   arg1 = (switch_directory_handle *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -26675,7 +25929,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_memory_pool_set(void
   arg1 = (switch_directory_handle *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->memory_pool = arg2;
-  
 }
 
 
@@ -26698,7 +25951,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_private_info_set(void
   arg1 = (switch_directory_handle *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -26729,7 +25981,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directory_handle(void * jarg1)
   
   arg1 = (switch_directory_handle *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -26740,7 +25991,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_settings_unused_set(void * jarg1
   arg1 = (switch_codec_settings *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->unused = arg2;
-  
 }
 
 
@@ -26771,7 +26021,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_settings(void * jarg1) {
   
   arg1 = (switch_codec_settings *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -26782,7 +26031,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_actual_samples_per_second_s
   arg1 = (switch_codec_fmtp *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->actual_samples_per_second = arg2;
-  
 }
 
 
@@ -26805,7 +26053,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_bits_per_second_set(void *
   arg1 = (switch_codec_fmtp *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->bits_per_second = arg2;
-  
 }
 
 
@@ -26828,7 +26075,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_microseconds_per_packet_set
   arg1 = (switch_codec_fmtp *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->microseconds_per_packet = arg2;
-  
 }
 
 
@@ -26851,7 +26097,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_private_info_set(void * jar
   arg1 = (switch_codec_fmtp *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -26882,7 +26127,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_fmtp(void * jarg1) {
   
   arg1 = (switch_codec_fmtp *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -26893,7 +26137,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_codec_interface_set(void * jarg1
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_codec_interface_t *)jarg2; 
   if (arg1) (arg1)->codec_interface = arg2;
-  
 }
 
 
@@ -26916,7 +26159,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_set(void * jarg1,
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_codec_implementation_t *)jarg2; 
   if (arg1) (arg1)->implementation = (switch_codec_implementation_t const *)arg2;
-  
 }
 
 
@@ -26939,7 +26181,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_in_set(void * jarg1, char *
   arg1 = (switch_codec *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->fmtp_in) delete [] arg1->fmtp_in;
+    delete [] arg1->fmtp_in;
     if (arg2) {
       arg1->fmtp_in = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->fmtp_in, (const char *)arg2);
@@ -26969,7 +26211,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_out_set(void * jarg1, char
   arg1 = (switch_codec *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->fmtp_out) delete [] arg1->fmtp_out;
+    delete [] arg1->fmtp_out;
     if (arg2) {
       arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->fmtp_out, (const char *)arg2);
@@ -26999,7 +26241,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_flags_set(void * jarg1, unsigned
   arg1 = (switch_codec *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -27022,7 +26263,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_memory_pool_set(void * jarg1, vo
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_memory_pool_t *)jarg2; 
   if (arg1) (arg1)->memory_pool = arg2;
-  
 }
 
 
@@ -27045,7 +26285,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_private_info_set(void * jarg1, v
   arg1 = (switch_codec *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->private_info = arg2;
-  
 }
 
 
@@ -27068,7 +26307,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_agreed_pt_set(void * jarg1, unsi
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_payload_t)jarg2; 
   if (arg1) (arg1)->agreed_pt = arg2;
-  
 }
 
 
@@ -27091,7 +26329,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_mutex_set(void * jarg1, void * j
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->mutex = arg2;
-  
 }
 
 
@@ -27114,7 +26351,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_next_set(void * jarg1, void * ja
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_codec *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -27137,7 +26373,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_session_set(void * jarg1, void *
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_core_session_t *)jarg2; 
   if (arg1) (arg1)->session = arg2;
-  
 }
 
 
@@ -27160,7 +26395,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_cur_frame_set(void * jarg1, void
   arg1 = (switch_codec *)jarg1; 
   arg2 = (switch_frame_t *)jarg2; 
   if (arg1) (arg1)->cur_frame = arg2;
-  
 }
 
 
@@ -27191,7 +26425,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec(void * jarg1) {
   
   arg1 = (switch_codec *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -27202,7 +26435,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_type_set(vo
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_codec_type_t)jarg2; 
   if (arg1) (arg1)->codec_type = arg2;
-  
 }
 
 
@@ -27225,7 +26457,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_ianacode_set(void
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_payload_t)jarg2; 
   if (arg1) (arg1)->ianacode = arg2;
-  
 }
 
 
@@ -27248,7 +26479,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_iananame_set(void
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->iananame) delete [] arg1->iananame;
+    delete [] arg1->iananame;
     if (arg2) {
       arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->iananame, (const char *)arg2);
@@ -27278,7 +26509,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_fmtp_set(void * j
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->fmtp) delete [] arg1->fmtp;
+    delete [] arg1->fmtp;
     if (arg2) {
       arg1->fmtp = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->fmtp, (const char *)arg2);
@@ -27308,7 +26539,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_secon
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samples_per_second = arg2;
-  
 }
 
 
@@ -27331,7 +26561,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_actual_samples_pe
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->actual_samples_per_second = arg2;
-  
 }
 
 
@@ -27354,7 +26583,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_bits_per_second_s
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->bits_per_second = arg2;
-  
 }
 
 
@@ -27377,7 +26605,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->microseconds_per_packet = arg2;
-  
 }
 
 
@@ -27400,7 +26627,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packe
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->samples_per_packet = arg2;
-  
 }
 
 
@@ -27423,7 +26649,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->decoded_bytes_per_packet = arg2;
-  
 }
 
 
@@ -27446,7 +26671,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->encoded_bytes_per_packet = arg2;
-  
 }
 
 
@@ -27469,7 +26693,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_number_of_channel
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->number_of_channels = arg2;
-  
 }
 
 
@@ -27492,7 +26715,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->codec_frames_per_packet = arg2;
-  
 }
 
 
@@ -27515,7 +26737,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_init_set(void * j
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_core_codec_init_func_t)jarg2; 
   if (arg1) (arg1)->init = arg2;
-  
 }
 
 
@@ -27538,7 +26759,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encode_set(void *
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_core_codec_encode_func_t)jarg2; 
   if (arg1) (arg1)->encode = arg2;
-  
 }
 
 
@@ -27561,7 +26781,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decode_set(void *
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_core_codec_decode_func_t)jarg2; 
   if (arg1) (arg1)->decode = arg2;
-  
 }
 
 
@@ -27584,7 +26803,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_destroy_set(void
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_core_codec_destroy_func_t)jarg2; 
   if (arg1) (arg1)->destroy = arg2;
-  
 }
 
 
@@ -27607,7 +26825,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_id_set(void
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->codec_id = arg2;
-  
 }
 
 
@@ -27630,7 +26847,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_impl_id_set(void
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->impl_id = arg2;
-  
 }
 
 
@@ -27653,7 +26869,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_next_set(void * j
   arg1 = (switch_codec_implementation *)jarg1; 
   arg2 = (switch_codec_implementation *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -27684,7 +26899,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_implementation(void * jar
   
   arg1 = (switch_codec_implementation *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -27724,7 +26938,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_implementations_set(vo
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (switch_codec_implementation_t *)jarg2; 
   if (arg1) (arg1)->implementations = arg2;
-  
 }
 
 
@@ -27747,7 +26960,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_parse_fmtp_set(void *
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (switch_core_codec_fmtp_parse_func_t)jarg2; 
   if (arg1) (arg1)->parse_fmtp = arg2;
-  
 }
 
 
@@ -27770,7 +26982,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_codec_id_set(void * ja
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->codec_id = arg2;
-  
 }
 
 
@@ -27793,7 +27004,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_rwlock_set(void * jarg
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -27816,7 +27026,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_refs_set(void * jarg1,
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -27839,7 +27048,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_reflock_set(void * jar
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -27862,7 +27070,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_parent_set(void * jarg
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -27885,7 +27092,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_next_set(void * jarg1,
   arg1 = (switch_codec_interface *)jarg1; 
   arg2 = (switch_codec_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -27916,7 +27122,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_interface(void * jarg1) {
   
   arg1 = (switch_codec_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -27956,7 +27161,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_application_func
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (switch_application_function_t)jarg2; 
   if (arg1) (arg1)->application_function = arg2;
-  
 }
 
 
@@ -28066,7 +27270,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_flags_set(void *
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -28089,7 +27292,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_rwlock_set(void
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -28112,7 +27314,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_refs_set(void *
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -28135,7 +27336,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_reflock_set(void
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -28158,7 +27358,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_parent_set(void
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -28181,7 +27380,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_next_set(void *
   arg1 = (switch_application_interface *)jarg1; 
   arg2 = (switch_application_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -28212,7 +27410,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_application_interface(void * ja
   
   arg1 = (switch_application_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -28252,7 +27449,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_chat_applic
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (switch_chat_application_function_t)jarg2; 
   if (arg1) (arg1)->chat_application_function = arg2;
-  
 }
 
 
@@ -28362,7 +27558,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_flags_set(v
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -28385,7 +27580,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_rwlock_set(
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -28408,7 +27602,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_refs_set(vo
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -28431,7 +27624,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_reflock_set
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -28454,7 +27646,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_parent_set(
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -28477,7 +27668,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_next_set(vo
   arg1 = (switch_chat_application_interface *)jarg1; 
   arg2 = (switch_chat_application_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -28508,7 +27698,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_chat_application_interface(void
   
   arg1 = (switch_chat_application_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -28577,7 +27766,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_function_set(void * jarg
   arg1 = (switch_api_interface *)jarg1; 
   arg2 = (switch_api_function_t)jarg2; 
   if (arg1) (arg1)->function = arg2;
-  
 }
 
 
@@ -28629,7 +27817,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_rwlock_set(void * jarg1,
   arg1 = (switch_api_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -28652,7 +27839,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_refs_set(void * jarg1, i
   arg1 = (switch_api_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -28675,7 +27861,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_reflock_set(void * jarg1
   arg1 = (switch_api_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -28698,7 +27883,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_parent_set(void * jarg1,
   arg1 = (switch_api_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -28721,7 +27905,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_next_set(void * jarg1, v
   arg1 = (switch_api_interface *)jarg1; 
   arg2 = (switch_api_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -28752,7 +27935,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_api_interface(void * jarg1) {
   
   arg1 = (switch_api_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -28821,7 +28003,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_function_set(void *
   arg1 = (switch_json_api_interface *)jarg1; 
   arg2 = (switch_json_api_function_t)jarg2; 
   if (arg1) (arg1)->function = arg2;
-  
 }
 
 
@@ -28873,7 +28054,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_rwlock_set(void * j
   arg1 = (switch_json_api_interface *)jarg1; 
   arg2 = (switch_thread_rwlock_t *)jarg2; 
   if (arg1) (arg1)->rwlock = arg2;
-  
 }
 
 
@@ -28896,7 +28076,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_refs_set(void * jar
   arg1 = (switch_json_api_interface *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -28919,7 +28098,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_reflock_set(void *
   arg1 = (switch_json_api_interface *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->reflock = arg2;
-  
 }
 
 
@@ -28942,7 +28120,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_parent_set(void * j
   arg1 = (switch_json_api_interface *)jarg1; 
   arg2 = (switch_loadable_module_interface_t *)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -28965,7 +28142,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_next_set(void * jar
   arg1 = (switch_json_api_interface *)jarg1; 
   arg2 = (switch_json_api_interface *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -28996,7 +28172,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_json_api_interface(void * jarg1
   
   arg1 = (switch_json_api_interface *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -29007,7 +28182,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_session_set(void * jarg1, vo
   arg1 = (switch_slin_data *)jarg1; 
   arg2 = (switch_core_session_t *)jarg2; 
   if (arg1) (arg1)->session = arg2;
-  
 }
 
 
@@ -29030,7 +28204,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_write_frame_set(void * jarg1
   arg1 = (switch_slin_data *)jarg1; 
   arg2 = (switch_frame_t *)jarg2; 
   if (arg1) (arg1)->write_frame = *arg2;
-  
 }
 
 
@@ -29053,7 +28226,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_codec_set(void * jarg1, void
   arg1 = (switch_slin_data *)jarg1; 
   arg2 = (switch_codec_t *)jarg2; 
   if (arg1) (arg1)->codec = *arg2;
-  
 }
 
 
@@ -29076,8 +28248,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_frame_data_set(void * jarg1,
   arg1 = (switch_slin_data *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->frame_data, (const char *)arg2, 4096);
-    else arg1->frame_data[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->frame_data, (const char *)arg2, 4096-1);
+      arg1->frame_data[4096-1] = 0;
+    } else {
+      arg1->frame_data[0] = 0;
+    }
   }
 }
 
@@ -29109,7 +28285,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_slin_data(void * jarg1) {
   
   arg1 = (switch_slin_data *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -29126,7 +28301,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_profile_created_set(
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->profile_created = arg2;
-  
 }
 
 
@@ -29137,7 +28311,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_profile_created_ge
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->profile_created);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29155,7 +28329,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_created_set(void * j
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->created = arg2;
-  
 }
 
 
@@ -29166,7 +28339,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_created_get(void *
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->created);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29184,7 +28357,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_answered_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->answered = arg2;
-  
 }
 
 
@@ -29195,7 +28367,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_answered_get(void
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->answered);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29213,7 +28385,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_progress_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->progress = arg2;
-  
 }
 
 
@@ -29224,7 +28395,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_progress_get(void
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->progress);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29242,7 +28413,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_progress_media_set(v
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->progress_media = arg2;
-  
 }
 
 
@@ -29253,7 +28423,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_progress_media_get
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->progress_media);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29271,7 +28441,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_hungup_set(void * ja
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->hungup = arg2;
-  
 }
 
 
@@ -29282,7 +28451,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_hungup_get(void *
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->hungup);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29300,7 +28469,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_transferred_set(void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->transferred = arg2;
-  
 }
 
 
@@ -29311,7 +28479,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_transferred_get(vo
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->transferred);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29329,7 +28497,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_resurrected_set(void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->resurrected = arg2;
-  
 }
 
 
@@ -29340,7 +28507,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_resurrected_get(vo
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->resurrected);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29358,7 +28525,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_bridged_set(void * j
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->bridged = arg2;
-  
 }
 
 
@@ -29369,7 +28535,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_bridged_get(void *
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->bridged);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29387,7 +28553,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_last_hold_set(void *
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->last_hold = arg2;
-  
 }
 
 
@@ -29398,7 +28563,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_last_hold_get(void
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->last_hold);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29416,7 +28581,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_hold_accum_set(void
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->hold_accum = arg2;
-  
 }
 
 
@@ -29427,7 +28591,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_hold_accum_get(voi
   
   arg1 = (switch_channel_timetable *)jarg1; 
   result =  ((arg1)->hold_accum);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -29439,7 +28603,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_next_set(void * jarg
   arg1 = (switch_channel_timetable *)jarg1; 
   arg2 = (switch_channel_timetable *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -29470,7 +28633,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_channel_timetable(void * jarg1)
   
   arg1 = (switch_channel_timetable *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -30686,7 +29848,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_has_dtmf(void * jarg1) {
   
   arg1 = (switch_channel_t *)jarg1; 
   result = switch_channel_has_dtmf(arg1);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -30782,8 +29944,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_dequeue_dtmf_string(void * j
   switch_channel_t *arg1 = (switch_channel_t *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_channel_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -30794,7 +29956,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_dequeue_dtmf_string(void * j
   }
   arg3 = *argp3; 
   result = switch_channel_dequeue_dtmf_string(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31177,6 +30339,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_api_on(void * jarg1, char * jar
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_process_device_hangup(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_process_device_hangup(arg1);
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_queued_extension(void * jarg1) {
   void * jresult ;
   switch_channel_t *arg1 = (switch_channel_t *) 0 ;
@@ -31359,8 +30529,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create(void * jarg1, void * jarg
   switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
   switch_buffer_t **arg2 = (switch_buffer_t **) 0 ;
   switch_size_t arg3 ;
-  switch_status_t result;
   switch_size_t *argp3 ;
+  switch_status_t result;
   
   arg1 = (switch_memory_pool_t *)jarg1; 
   arg2 = (switch_buffer_t **)jarg2; 
@@ -31382,10 +30552,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create_dynamic(void * jarg1, voi
   switch_size_t arg2 ;
   switch_size_t arg3 ;
   switch_size_t arg4 ;
-  switch_status_t result;
   switch_size_t *argp2 ;
   switch_size_t *argp3 ;
   switch_size_t *argp4 ;
+  switch_status_t result;
   
   arg1 = (switch_buffer_t **)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -31457,7 +30627,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_len(void * jarg1) {
   
   arg1 = (switch_buffer_t *)jarg1; 
   result = switch_buffer_len(arg1);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31469,7 +30639,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_freespace(void * jarg1) {
   
   arg1 = (switch_buffer_t *)jarg1; 
   result = switch_buffer_freespace(arg1);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31481,7 +30651,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_inuse(void * jarg1) {
   
   arg1 = (switch_buffer_t *)jarg1; 
   result = switch_buffer_inuse(arg1);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31491,8 +30661,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read(void * jarg1, void * jar
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void *)jarg2; 
@@ -31503,7 +30673,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read(void * jarg1, void * jar
   }
   arg3 = *argp3; 
   result = switch_buffer_read(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31513,8 +30683,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek(void * jarg1, void * jar
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void *)jarg2; 
@@ -31525,7 +30695,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek(void * jarg1, void * jar
   }
   arg3 = *argp3; 
   result = switch_buffer_peek(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31539,7 +30709,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek_zerocopy(void * jarg1, v
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void **)jarg2; 
   result = switch_buffer_peek_zerocopy(arg1,(void const **)arg2);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31549,8 +30719,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read_loop(void * jarg1, void
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void *)jarg2; 
@@ -31561,7 +30731,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read_loop(void * jarg1, void
   }
   arg3 = *argp3; 
   result = switch_buffer_read_loop(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31581,8 +30751,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_write(void * jarg1, void * ja
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void *)jarg2; 
@@ -31593,7 +30763,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_write(void * jarg1, void * ja
   }
   arg3 = *argp3; 
   result = switch_buffer_write(arg1,(void const *)arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31602,8 +30772,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_toss(void * jarg1, void * jar
   void * jresult ;
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   switch_size_t arg2 ;
-  switch_size_t result;
   switch_size_t *argp2 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -31613,7 +30783,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_toss(void * jarg1, void * jar
   }
   arg2 = *argp2; 
   result = switch_buffer_toss(arg1,arg2);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31631,8 +30801,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_slide_write(void * jarg1, voi
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void *)jarg2; 
@@ -31643,7 +30813,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_slide_write(void * jarg1, voi
   }
   arg3 = *argp3; 
   result = switch_buffer_slide_write(arg1,(void const *)arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31661,8 +30831,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_zwrite(void * jarg1, void * j
   switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (switch_buffer_t *)jarg1; 
   arg2 = (void *)jarg2; 
@@ -31673,7 +30843,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_zwrite(void * jarg1, void * j
   }
   arg3 = *argp3; 
   result = switch_buffer_zwrite(arg1,(void const *)arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -31685,7 +30855,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_name_set(void * jarg1, ch
   arg1 = (switch_event_header *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->name) delete [] arg1->name;
+    delete [] arg1->name;
     if (arg2) {
       arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->name, (const char *)arg2);
@@ -31715,7 +30885,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_value_set(void * jarg1, c
   arg1 = (switch_event_header *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->value) delete [] arg1->value;
+    delete [] arg1->value;
     if (arg2) {
       arg1->value = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->value, (const char *)arg2);
@@ -31745,7 +30915,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_array_set(void * jarg1, v
   arg1 = (switch_event_header *)jarg1; 
   arg2 = (char **)jarg2; 
   if (arg1) (arg1)->array = arg2;
-  
 }
 
 
@@ -31768,7 +30937,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_idx_set(void * jarg1, int
   arg1 = (switch_event_header *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->idx = arg2;
-  
 }
 
 
@@ -31791,7 +30959,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_hash_set(void * jarg1, un
   arg1 = (switch_event_header *)jarg1; 
   arg2 = (unsigned long)jarg2; 
   if (arg1) (arg1)->hash = arg2;
-  
 }
 
 
@@ -31814,7 +30981,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_next_set(void * jarg1, vo
   arg1 = (switch_event_header *)jarg1; 
   arg2 = (switch_event_header *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -31845,7 +31011,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_event_header(void * jarg1) {
   
   arg1 = (switch_event_header *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -31856,7 +31021,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_event_id_set(void * jarg1, int j
   arg1 = (switch_event *)jarg1; 
   arg2 = (switch_event_types_t)jarg2; 
   if (arg1) (arg1)->event_id = arg2;
-  
 }
 
 
@@ -31879,7 +31043,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_priority_set(void * jarg1, int j
   arg1 = (switch_event *)jarg1; 
   arg2 = (switch_priority_t)jarg2; 
   if (arg1) (arg1)->priority = arg2;
-  
 }
 
 
@@ -31902,7 +31065,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_owner_set(void * jarg1, char * j
   arg1 = (switch_event *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->owner) delete [] arg1->owner;
+    delete [] arg1->owner;
     if (arg2) {
       arg1->owner = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->owner, (const char *)arg2);
@@ -31932,7 +31095,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_subclass_name_set(void * jarg1,
   arg1 = (switch_event *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->subclass_name) delete [] arg1->subclass_name;
+    delete [] arg1->subclass_name;
     if (arg2) {
       arg1->subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->subclass_name, (const char *)arg2);
@@ -31962,7 +31125,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_headers_set(void * jarg1, void *
   arg1 = (switch_event *)jarg1; 
   arg2 = (switch_event_header_t *)jarg2; 
   if (arg1) (arg1)->headers = arg2;
-  
 }
 
 
@@ -31985,7 +31147,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_last_header_set(void * jarg1, vo
   arg1 = (switch_event *)jarg1; 
   arg2 = (switch_event_header_t *)jarg2; 
   if (arg1) (arg1)->last_header = arg2;
-  
 }
 
 
@@ -32008,7 +31169,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_body_set(void * jarg1, char * ja
   arg1 = (switch_event *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->body) delete [] arg1->body;
+    delete [] arg1->body;
     if (arg2) {
       arg1->body = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->body, (const char *)arg2);
@@ -32038,7 +31199,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_bind_user_data_set(void * jarg1,
   arg1 = (switch_event *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->bind_user_data = arg2;
-  
 }
 
 
@@ -32061,7 +31221,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_event_user_data_set(void * jarg1
   arg1 = (switch_event *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->event_user_data = arg2;
-  
 }
 
 
@@ -32084,7 +31243,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_key_set(void * jarg1, unsigned l
   arg1 = (switch_event *)jarg1; 
   arg2 = (unsigned long)jarg2; 
   if (arg1) (arg1)->key = arg2;
-  
 }
 
 
@@ -32107,7 +31265,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_next_set(void * jarg1, void * ja
   arg1 = (switch_event *)jarg1; 
   arg2 = (switch_event *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -32130,7 +31287,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_flags_set(void * jarg1, int jarg
   arg1 = (switch_event *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -32161,27 +31317,25 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_event(void * jarg1) {
   
   arg1 = (switch_event *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_event_id_set(void * jarg1, int jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   int arg2 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->event_id = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_event_id_get(void * jarg1) {
   int jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   int result;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   result = (int) ((arg1)->event_id);
   jresult = result; 
   return jresult;
@@ -32189,22 +31343,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_event_id_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_priority_set(void * jarg1, int jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   int arg2 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->priority = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_priority_get(void * jarg1) {
   int jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   int result;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   result = (int) ((arg1)->priority);
   jresult = result; 
   return jresult;
@@ -32212,22 +31365,21 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_priority_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_flags_set(void * jarg1, int jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   int arg2 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_flags_get(void * jarg1) {
   int jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   int result;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   result = (int) ((arg1)->flags);
   jresult = result; 
   return jresult;
@@ -32235,13 +31387,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_flags_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_owner_set(void * jarg1, char * jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->owner) delete [] arg1->owner;
+    delete [] arg1->owner;
     if (arg2) {
       arg1->owner = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->owner, (const char *)arg2);
@@ -32254,10 +31406,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_owner_set(void * jarg1,
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_owner_get(void * jarg1) {
   char * jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   result = (char *) ((arg1)->owner);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -32265,13 +31417,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_owner_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_set(void * jarg1, char * jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->subclass_name) delete [] arg1->subclass_name;
+    delete [] arg1->subclass_name;
     if (arg2) {
       arg1->subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->subclass_name, (const char *)arg2);
@@ -32284,10 +31436,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_set(void
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_get(void * jarg1) {
   char * jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   result = (char *) ((arg1)->subclass_name);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -32295,13 +31447,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_get(voi
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_body_set(void * jarg1, char * jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->body) delete [] arg1->body;
+    delete [] arg1->body;
     if (arg2) {
       arg1->body = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->body, (const char *)arg2);
@@ -32314,10 +31466,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_body_set(void * jarg1,
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_body_get(void * jarg1) {
   char * jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   result = (char *) ((arg1)->body);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -32326,31 +31478,30 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_body_get(void * jarg1
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_serial_event_t() {
   void * jresult ;
-  switch_serial_event_t *result = 0 ;
+  switch_serial_event_s *result = 0 ;
   
-  result = (switch_serial_event_t *)new switch_serial_event_t();
+  result = (switch_serial_event_s *)new switch_serial_event_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_serial_event_t(void * jarg1) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  switch_serial_event_s *arg1 = (switch_serial_event_s *) 0 ;
   
-  arg1 = (switch_serial_event_t *)jarg1; 
+  arg1 = (switch_serial_event_s *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_name_set(void * jarg1, char * jarg2) {
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  switch_serial_event_header_s *arg1 = (switch_serial_event_header_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg1 = (switch_serial_event_header_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->name) delete [] arg1->name;
+    delete [] arg1->name;
     if (arg2) {
       arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->name, (const char *)arg2);
@@ -32363,10 +31514,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_name_set(void *
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_name_get(void * jarg1) {
   char * jresult ;
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  switch_serial_event_header_s *arg1 = (switch_serial_event_header_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg1 = (switch_serial_event_header_s *)jarg1; 
   result = (char *) ((arg1)->name);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -32374,13 +31525,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_name_get(void
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_value_set(void * jarg1, char * jarg2) {
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  switch_serial_event_header_s *arg1 = (switch_serial_event_header_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg1 = (switch_serial_event_header_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->value) delete [] arg1->value;
+    delete [] arg1->value;
     if (arg2) {
       arg1->value = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->value, (const char *)arg2);
@@ -32393,10 +31544,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_value_set(void *
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_value_get(void * jarg1) {
   char * jresult ;
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  switch_serial_event_header_s *arg1 = (switch_serial_event_header_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg1 = (switch_serial_event_header_s *)jarg1; 
   result = (char *) ((arg1)->value);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -32405,20 +31556,19 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_value_get(void
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_serial_event_header_t() {
   void * jresult ;
-  switch_serial_event_header_t *result = 0 ;
+  switch_serial_event_header_s *result = 0 ;
   
-  result = (switch_serial_event_header_t *)new switch_serial_event_header_t();
+  result = (switch_serial_event_header_s *)new switch_serial_event_header_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_serial_event_header_t(void * jarg1) {
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  switch_serial_event_header_s *arg1 = (switch_serial_event_header_s *) 0 ;
   
-  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg1 = (switch_serial_event_header_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -32808,8 +31958,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_binary_deserialize(void * jarg1,
   void **arg2 = (void **) 0 ;
   switch_size_t arg3 ;
   switch_bool_t arg4 ;
-  switch_status_t result;
   switch_size_t *argp3 ;
+  switch_status_t result;
   
   arg1 = (switch_event_t **)jarg1; 
   arg2 = (void **)jarg2; 
@@ -33162,8 +32312,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NO_EVENT_CHANNEL_ID_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
-  
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -33173,8 +32322,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EVENT_CHANNEL_GLOBAL_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "__global__";
-  
+  result = (char *)("__global__");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -33444,8 +32592,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RESAMPLE_QUALITY_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
-  
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -33458,7 +32605,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_resampler_set(void *
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->resampler = arg2;
-  
 }
 
 
@@ -33481,7 +32627,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_from_rate_set(void *
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->from_rate = arg2;
-  
 }
 
 
@@ -33504,7 +32649,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_rate_set(void * j
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->to_rate = arg2;
-  
 }
 
 
@@ -33527,7 +32671,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_factor_set(void * ja
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->factor = arg2;
-  
 }
 
 
@@ -33550,7 +32693,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_rfactor_set(void * j
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->rfactor = arg2;
-  
 }
 
 
@@ -33573,7 +32715,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_set(void * jarg1,
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (int16_t *)jarg2; 
   if (arg1) (arg1)->to = arg2;
-  
 }
 
 
@@ -33596,7 +32737,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_len_set(void * ja
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->to_len = arg2;
-  
 }
 
 
@@ -33619,7 +32759,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_size_set(void * j
   arg1 = (switch_audio_resampler_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->to_size = arg2;
-  
 }
 
 
@@ -33650,7 +32789,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_audio_resampler_t(void * jarg1)
   
   arg1 = (switch_audio_resampler_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -33711,8 +32849,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_float_to_short(void * jarg1, void *
   float *arg1 = (float *) 0 ;
   short *arg2 = (short *) 0 ;
   switch_size_t arg3 ;
-  switch_size_t result;
   switch_size_t *argp3 ;
+  switch_size_t result;
   
   arg1 = (float *)jarg1; 
   arg2 = (short *)jarg2; 
@@ -33723,7 +32861,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_float_to_short(void * jarg1, void *
   }
   arg3 = *argp3; 
   result = switch_float_to_short(arg1,arg2,arg3);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -33883,7 +33021,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_session_set(void * ja
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_core_session_t *)jarg2; 
   if (arg1) (arg1)->session = arg2;
-  
 }
 
 
@@ -33906,7 +33043,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_read_codec_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_codec_t *)jarg2; 
   if (arg1) (arg1)->read_codec = *arg2;
-  
 }
 
 
@@ -33929,7 +33065,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_set(void
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_frame_t *)jarg2; 
   if (arg1) (arg1)->write_frame = *arg2;
-  
 }
 
 
@@ -33978,7 +33113,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_socket_set(void * jar
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_socket_t *)jarg2; 
   if (arg1) (arg1)->socket = arg2;
-  
 }
 
 
@@ -34001,7 +33135,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_ip_set(void * j
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->local_ip) delete [] arg1->local_ip;
+    delete [] arg1->local_ip;
     if (arg2) {
       arg1->local_ip = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->local_ip, (const char *)arg2);
@@ -34031,7 +33165,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_port_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_port_t)jarg2; 
   if (arg1) (arg1)->local_port = arg2;
-  
 }
 
 
@@ -34054,7 +33187,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_ip_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->remote_ip) delete [] arg1->remote_ip;
+    delete [] arg1->remote_ip;
     if (arg2) {
       arg1->remote_ip = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->remote_ip, (const char *)arg2);
@@ -34084,7 +33217,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_port_set(void
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_port_t)jarg2; 
   if (arg1) (arg1)->remote_port = arg2;
-  
 }
 
 
@@ -34107,7 +33239,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_addr_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_sockaddr_t *)jarg2; 
   if (arg1) (arg1)->local_addr = arg2;
-  
 }
 
 
@@ -34130,7 +33261,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_addr_set(void
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_sockaddr_t *)jarg2; 
   if (arg1) (arg1)->remote_addr = arg2;
-  
 }
 
 
@@ -34153,7 +33283,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_flag_mutex_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (switch_mutex_t *)jarg2; 
   if (arg1) (arg1)->flag_mutex = arg2;
-  
 }
 
 
@@ -34176,7 +33305,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_flags_set(void * jarg
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (int32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -34199,7 +33327,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_type_set(void * jarg1
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->type = arg2;
-  
 }
 
 
@@ -34222,7 +33349,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_transport_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->transport = arg2;
-  
 }
 
 
@@ -34245,7 +33371,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_stream_id_set(void *
   arg1 = (switch_unicast_conninfo *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->stream_id = arg2;
-  
 }
 
 
@@ -34276,7 +33401,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_unicast_conninfo(void * jarg1)
   
   arg1 = (switch_unicast_conninfo *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -34515,9 +33639,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_collect_digits_count(void * jarg1,
   uint32_t arg7 ;
   uint32_t arg8 ;
   uint32_t arg9 ;
-  switch_status_t result;
   switch_size_t *argp3 ;
   switch_size_t *argp4 ;
+  switch_status_t result;
   
   arg1 = (switch_core_session_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -35001,8 +34125,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_tone_detect_session(void * jarg1, c
   char *arg7 = (char *) 0 ;
   char *arg8 = (char *) 0 ;
   switch_tone_detect_callback_t arg9 = (switch_tone_detect_callback_t) 0 ;
-  switch_status_t result;
   time_t *argp5 ;
+  switch_status_t result;
   
   arg1 = (switch_core_session_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -35327,8 +34451,8 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_transfer(void *
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
-  uint32_t result;
   time_t *argp1 ;
+  uint32_t result;
   
   argp1 = (time_t *)jarg1; 
   if (!argp1) {
@@ -35352,8 +34476,8 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_hangup(void * ja
   char *arg2 = (char *) 0 ;
   switch_call_cause_t arg3 ;
   switch_bool_t arg4 ;
-  uint32_t result;
   time_t *argp1 ;
+  uint32_t result;
   
   argp1 = (time_t *)jarg1; 
   if (!argp1) {
@@ -35490,8 +34614,8 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_broadcast(void *
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   switch_media_flag_t arg4 ;
-  uint32_t result;
   time_t *argp1 ;
+  uint32_t result;
   
   argp1 = (time_t *)jarg1; 
   if (!argp1) {
@@ -35889,8 +35013,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_find_bridged_uuid(char * jarg1, cha
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  switch_status_t result;
   switch_size_t *argp3 ;
+  switch_status_t result;
   
   arg1 = (char *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -35952,8 +35076,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_read(void * jarg1, unsigned long ja
   uint32_t arg8 ;
   char *arg9 = (char *) 0 ;
   uint32_t arg10 ;
-  switch_status_t result;
   switch_size_t *argp7 ;
+  switch_status_t result;
   
   arg1 = (switch_core_session_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
@@ -36524,8 +35648,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_insert_file(void * jarg1, char * ja
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   switch_size_t arg4 ;
-  switch_status_t result;
   switch_size_t *argp4 ;
+  switch_status_t result;
   
   arg1 = (switch_core_session_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -36620,8 +35744,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 16384;
-  
+  result = (int)(16384);
   jresult = result; 
   return jresult;
 }
@@ -36631,8 +35754,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTCP_MAX_BUF_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 16384;
-  
+  result = (int)(16384);
   jresult = result; 
   return jresult;
 }
@@ -36642,8 +35764,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_WORDS_get() {
   int jresult ;
   int result;
   
-  result = (int) 4094;
-  
+  result = (int)(4094);
   jresult = result; 
   return jresult;
 }
@@ -36653,8 +35774,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 64;
-  
+  result = (int)(64);
   jresult = result; 
   return jresult;
 }
@@ -36664,8 +35784,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_KEY_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 30;
-  
+  result = (int)(30);
   jresult = result; 
   return jresult;
 }
@@ -36675,8 +35794,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_32_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "AES_CM_128_HMAC_SHA1_32";
-  
+  result = (char *)("AES_CM_128_HMAC_SHA1_32");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -36686,8 +35804,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "AES_CM_128_HMAC_SHA1_80";
-  
+  result = (char *)("AES_CM_128_HMAC_SHA1_80");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -36700,7 +35817,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_set(void * jarg1,
   arg1 = (switch_rtp_crypto_key *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->index = arg2;
-  
 }
 
 
@@ -36723,7 +35839,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_type_set(void * jarg1,
   arg1 = (switch_rtp_crypto_key *)jarg1; 
   arg2 = (switch_rtp_crypto_key_type_t)jarg2; 
   if (arg1) (arg1)->type = arg2;
-  
 }
 
 
@@ -36778,7 +35893,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_keylen_set(void * jarg1
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->keylen = arg2;
-  
 }
 
 
@@ -36789,7 +35903,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_keylen_get(void * jar
   
   arg1 = (switch_rtp_crypto_key *)jarg1; 
   result =  ((arg1)->keylen);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -36801,7 +35915,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_next_set(void * jarg1,
   arg1 = (switch_rtp_crypto_key *)jarg1; 
   arg2 = (switch_rtp_crypto_key *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -36832,18 +35945,17 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_crypto_key(void * jarg1) {
   
   arg1 = (switch_rtp_crypto_key *)jarg1; 
   delete arg1;
-  
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_foundation_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->foundation) delete [] arg1->foundation;
+    delete [] arg1->foundation;
     if (arg2) {
       arg1->foundation = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->foundation, (const char *)arg2);
@@ -36856,10 +35968,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_foundation_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_foundation_get(void * jarg1) {
   char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (char *) ((arg1)->foundation);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -36867,22 +35979,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_foundation_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_component_id_set(void * jarg1, int jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   int arg2 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->component_id = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_icand_t_component_id_get(void * jarg1) {
   int jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   int result;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (int) ((arg1)->component_id);
   jresult = result; 
   return jresult;
@@ -36890,13 +36001,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_icand_t_component_id_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_transport_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->transport) delete [] arg1->transport;
+    delete [] arg1->transport;
     if (arg2) {
       arg1->transport = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->transport, (const char *)arg2);
@@ -36909,10 +36020,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_transport_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_transport_get(void * jarg1) {
   char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (char *) ((arg1)->transport);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -36920,22 +36031,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_transport_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_priority_set(void * jarg1, unsigned long jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   uint32_t arg2 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->priority = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_icand_t_priority_get(void * jarg1) {
   unsigned long jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   uint32_t result;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (uint32_t) ((arg1)->priority);
   jresult = (unsigned long)result; 
   return jresult;
@@ -36943,13 +36053,13 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_icand_t_priority_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_addr_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->con_addr) delete [] arg1->con_addr;
+    delete [] arg1->con_addr;
     if (arg2) {
       arg1->con_addr = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->con_addr, (const char *)arg2);
@@ -36962,10 +36072,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_addr_set(void * jarg1, char * jar
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_con_addr_get(void * jarg1) {
   char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (char *) ((arg1)->con_addr);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -36973,22 +36083,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_con_addr_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_port_set(void * jarg1, unsigned short jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   switch_port_t arg2 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (switch_port_t)jarg2; 
   if (arg1) (arg1)->con_port = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_con_port_get(void * jarg1) {
   unsigned short jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   switch_port_t result;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (switch_port_t) ((arg1)->con_port);
   jresult = result; 
   return jresult;
@@ -36996,13 +36105,13 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_con_port_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_cand_type_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->cand_type) delete [] arg1->cand_type;
+    delete [] arg1->cand_type;
     if (arg2) {
       arg1->cand_type = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->cand_type, (const char *)arg2);
@@ -37015,10 +36124,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_cand_type_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_cand_type_get(void * jarg1) {
   char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (char *) ((arg1)->cand_type);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -37026,13 +36135,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_cand_type_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_raddr_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->raddr) delete [] arg1->raddr;
+    delete [] arg1->raddr;
     if (arg2) {
       arg1->raddr = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->raddr, (const char *)arg2);
@@ -37045,10 +36154,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_raddr_set(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_raddr_get(void * jarg1) {
   char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (char *) ((arg1)->raddr);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -37056,22 +36165,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_raddr_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_rport_set(void * jarg1, unsigned short jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   switch_port_t arg2 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (switch_port_t)jarg2; 
   if (arg1) (arg1)->rport = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_rport_get(void * jarg1) {
   unsigned short jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   switch_port_t result;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (switch_port_t) ((arg1)->rport);
   jresult = result; 
   return jresult;
@@ -37079,13 +36187,13 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_rport_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_generation_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->generation) delete [] arg1->generation;
+    delete [] arg1->generation;
     if (arg2) {
       arg1->generation = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->generation, (const char *)arg2);
@@ -37098,10 +36206,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_generation_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_generation_get(void * jarg1) {
   char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (char *) ((arg1)->generation);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -37109,22 +36217,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_generation_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_ready_set(void * jarg1, unsigned char jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   uint8_t arg2 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   arg2 = (uint8_t)jarg2; 
   if (arg1) (arg1)->ready = arg2;
-  
 }
 
 
 SWIGEXPORT unsigned char SWIGSTDCALL CSharp_icand_t_ready_get(void * jarg1) {
   unsigned char jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   uint8_t result;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   result = (uint8_t) ((arg1)->ready);
   jresult = result; 
   return jresult;
@@ -37133,20 +36240,19 @@ SWIGEXPORT unsigned char SWIGSTDCALL CSharp_icand_t_ready_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_icand_t() {
   void * jresult ;
-  icand_t *result = 0 ;
+  icand_s *result = 0 ;
   
-  result = (icand_t *)new icand_t();
+  result = (icand_s *)new icand_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_icand_t(void * jarg1) {
-  icand_t *arg1 = (icand_t *) 0 ;
+  icand_s *arg1 = (icand_s *) 0 ;
   
-  arg1 = (icand_t *)jarg1; 
+  arg1 = (icand_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -37154,18 +36260,17 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MAX_CAND_get() {
   int jresult ;
   int result;
   
-  result = (int) 50;
-  
+  result = (int)(50);
   jresult = result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cands_set(void * jarg1, void * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   icand_t (*arg2)[2] ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   arg2 = (icand_t (*)[2])jarg2; 
   {
     icand_t (*inp)[2] = (icand_t (*)[2])(arg2);
@@ -37183,10 +36288,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cands_set(void * jarg1, void * jarg2) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_cands_get(void * jarg1) {
   void * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   icand_t (*result)[2] = 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   result = (icand_t (*)[2])(icand_t (*)[2]) ((arg1)->cands);
   jresult = result; 
   return jresult;
@@ -37194,22 +36299,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_cands_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cand_idx_set(void * jarg1, int jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   int arg2 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->cand_idx = arg2;
-  
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_ice_t_cand_idx_get(void * jarg1) {
   int jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   int result;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   result = (int) ((arg1)->cand_idx);
   jresult = result; 
   return jresult;
@@ -37217,10 +36321,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_ice_t_cand_idx_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_chosen_set(void * jarg1, void * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   int *arg2 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   arg2 = (int *)jarg2; 
   {
     size_t ii;
@@ -37232,10 +36336,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_chosen_set(void * jarg1, void * jarg2)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_chosen_get(void * jarg1) {
   void * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   int *result = 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   result = (int *)(int *) ((arg1)->chosen);
   jresult = result; 
   return jresult;
@@ -37243,13 +36347,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_chosen_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_ufrag_set(void * jarg1, char * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->ufrag) delete [] arg1->ufrag;
+    delete [] arg1->ufrag;
     if (arg2) {
       arg1->ufrag = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->ufrag, (const char *)arg2);
@@ -37262,10 +36366,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_ufrag_set(void * jarg1, char * jarg2) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_ufrag_get(void * jarg1) {
   char * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   result = (char *) ((arg1)->ufrag);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -37273,13 +36377,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_ufrag_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_pwd_set(void * jarg1, char * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->pwd) delete [] arg1->pwd;
+    delete [] arg1->pwd;
     if (arg2) {
       arg1->pwd = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->pwd, (const char *)arg2);
@@ -37292,10 +36396,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_pwd_set(void * jarg1, char * jarg2) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_pwd_get(void * jarg1) {
   char * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   result = (char *) ((arg1)->pwd);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -37303,13 +36407,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_pwd_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_options_set(void * jarg1, char * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->options) delete [] arg1->options;
+    delete [] arg1->options;
     if (arg2) {
       arg1->options = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->options, (const char *)arg2);
@@ -37322,10 +36426,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_options_set(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_options_get(void * jarg1) {
   char * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   char *result = 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   result = (char *) ((arg1)->options);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -37334,20 +36438,19 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_options_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ice_t() {
   void * jresult ;
-  ice_t *result = 0 ;
+  ice_s *result = 0 ;
   
-  result = (ice_t *)new ice_t();
+  result = (ice_s *)new ice_s();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_ice_t(void * jarg1) {
-  ice_t *arg1 = (ice_t *) 0 ;
+  ice_s *arg1 = (ice_s *) 0 ;
   
-  arg1 = (ice_t *)jarg1; 
+  arg1 = (ice_s *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -37359,8 +36462,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_add_crypto_key(void * jarg1, int ja
   switch_rtp_crypto_key_type_t arg4 ;
   unsigned char *arg5 = (unsigned char *) 0 ;
   switch_size_t arg6 ;
-  switch_status_t result;
   switch_size_t *argp6 ;
+  switch_status_t result;
   
   arg1 = (switch_rtp_t *)jarg1; 
   arg2 = (switch_rtp_crypto_direction_t)jarg2; 
@@ -37714,8 +36817,8 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * j
   ice_proto_t arg6 ;
   switch_core_media_ice_type_t arg7 ;
   ice_t *arg8 = (ice_t *) 0 ;
-  switch_status_t result;
   switch_core_media_ice_type_t *argp7 ;
+  switch_status_t result;
   
   arg1 = (switch_rtp_t *)jarg1; 
   arg2 = (char *)jarg2; 
@@ -38003,7 +37106,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_has_dtmf(void * jarg1) {
   
   arg1 = (switch_rtp_t *)jarg1; 
   result = switch_rtp_has_dtmf(arg1);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -38017,7 +37120,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_dequeue_dtmf(void * jarg1, void
   arg1 = (switch_rtp_t *)jarg1; 
   arg2 = (switch_dtmf_t *)jarg2; 
   result = switch_rtp_dequeue_dtmf(arg1,arg2);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -38333,7 +37436,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_data_set(void * jarg1, char
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->data) delete [] arg1->data;
+    delete [] arg1->data;
     if (arg2) {
       arg1->data = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->data, (const char *)arg2);
@@ -38363,8 +37466,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_file_set(void * jarg1, char
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->file, (const char *)arg2, 80);
-    else arg1->file[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->file, (const char *)arg2, 80-1);
+      arg1->file[80-1] = 0;
+    } else {
+      arg1->file[0] = 0;
+    }
   }
 }
 
@@ -38388,7 +37495,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_line_set(void * jarg1, unsi
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->line = arg2;
-  
 }
 
 
@@ -38411,8 +37517,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_func_set(void * jarg1, char
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->func, (const char *)arg2, 80);
-    else arg1->func[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->func, (const char *)arg2, 80-1);
+      arg1->func[80-1] = 0;
+    } else {
+      arg1->func[0] = 0;
+    }
   }
 }
 
@@ -38436,7 +37546,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_level_set(void * jarg1, int
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (switch_log_level_t)jarg2; 
   if (arg1) (arg1)->level = arg2;
-  
 }
 
 
@@ -38465,7 +37574,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_timestamp_set(void * jarg1,
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->timestamp = arg2;
-  
 }
 
 
@@ -38476,7 +37584,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_log_node_t_timestamp_get(void * jarg
   
   arg1 = (switch_log_node_t *)jarg1; 
   result =  ((arg1)->timestamp);
-  jresult = new switch_time_t((switch_time_t &)result); 
+  jresult = new switch_time_t((const switch_time_t &)result); 
   return jresult;
 }
 
@@ -38488,7 +37596,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_content_set(void * jarg1, c
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->content) delete [] arg1->content;
+    delete [] arg1->content;
     if (arg2) {
       arg1->content = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->content, (const char *)arg2);
@@ -38518,7 +37626,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_userdata_set(void * jarg1,
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->userdata) delete [] arg1->userdata;
+    delete [] arg1->userdata;
     if (arg2) {
       arg1->userdata = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->userdata, (const char *)arg2);
@@ -38548,7 +37656,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_channel_set(void * jarg1, i
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (switch_text_channel_t)jarg2; 
   if (arg1) (arg1)->channel = arg2;
-  
 }
 
 
@@ -38571,7 +37678,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_slevel_set(void * jarg1, in
   arg1 = (switch_log_node_t *)jarg1; 
   arg2 = (switch_log_level_t)jarg2; 
   if (arg1) (arg1)->slevel = arg2;
-  
 }
 
 
@@ -38602,7 +37708,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_log_node_t(void * jarg1) {
   
   arg1 = (switch_log_node_t *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -38718,8 +37823,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_XML_BUFSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 1024;
-  
+  result = (int)(1024);
   jresult = result; 
   return jresult;
 }
@@ -38732,7 +37836,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_name_set(void * jarg1, char * jarg
   arg1 = (switch_xml *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->name) delete [] arg1->name;
+    delete [] arg1->name;
     if (arg2) {
       arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->name, (const char *)arg2);
@@ -38762,7 +37866,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_attr_set(void * jarg1, void * jarg
   arg1 = (switch_xml *)jarg1; 
   arg2 = (char **)jarg2; 
   if (arg1) (arg1)->attr = arg2;
-  
 }
 
 
@@ -38785,7 +37888,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_txt_set(void * jarg1, char * jarg2
   arg1 = (switch_xml *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->txt) delete [] arg1->txt;
+    delete [] arg1->txt;
     if (arg2) {
       arg1->txt = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->txt, (const char *)arg2);
@@ -38815,7 +37918,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free_path_set(void * jarg1, char *
   arg1 = (switch_xml *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->free_path) delete [] arg1->free_path;
+    delete [] arg1->free_path;
     if (arg2) {
       arg1->free_path = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->free_path, (const char *)arg2);
@@ -38851,7 +37954,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_off_set(void * jarg1, void * jarg2
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->off = arg2;
-  
 }
 
 
@@ -38862,7 +37964,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_off_get(void * jarg1) {
   
   arg1 = (switch_xml *)jarg1; 
   result =  ((arg1)->off);
-  jresult = new switch_size_t((switch_size_t &)result); 
+  jresult = new switch_size_t((const switch_size_t &)result); 
   return jresult;
 }
 
@@ -38874,7 +37976,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_next_set(void * jarg1, void * jarg
   arg1 = (switch_xml *)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -38897,7 +37998,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_sibling_set(void * jarg1, void * j
   arg1 = (switch_xml *)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
   if (arg1) (arg1)->sibling = arg2;
-  
 }
 
 
@@ -38920,7 +38020,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_ordered_set(void * jarg1, void * j
   arg1 = (switch_xml *)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
   if (arg1) (arg1)->ordered = arg2;
-  
 }
 
 
@@ -38943,7 +38042,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_child_set(void * jarg1, void * jar
   arg1 = (switch_xml *)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
   if (arg1) (arg1)->child = arg2;
-  
 }
 
 
@@ -38966,7 +38064,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_parent_set(void * jarg1, void * ja
   arg1 = (switch_xml *)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
   if (arg1) (arg1)->parent = arg2;
-  
 }
 
 
@@ -38989,7 +38086,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_flags_set(void * jarg1, unsigned l
   arg1 = (switch_xml *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -39012,7 +38108,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_is_switch_xml_root_t_set(void * ja
   arg1 = (switch_xml *)jarg1; 
   arg2 = (switch_bool_t)jarg2; 
   if (arg1) (arg1)->is_switch_xml_root_t = arg2;
-  
 }
 
 
@@ -39035,7 +38130,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_refs_set(void * jarg1, unsigned lo
   arg1 = (switch_xml *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->refs = arg2;
-  
 }
 
 
@@ -39066,7 +38160,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_xml(void * jarg1) {
   
   arg1 = (switch_xml *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -39088,8 +38181,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str(char * jarg1, void * j
   void * jresult ;
   char *arg1 = (char *) 0 ;
   switch_size_t arg2 ;
-  switch_xml_t result;
   switch_size_t *argp2 ;
+  switch_xml_t result;
   
   arg1 = (char *)jarg1; 
   argp2 = (switch_size_t *)jarg2; 
@@ -39289,9 +38382,9 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml_buf(void * jarg1, char * j
   switch_size_t arg3 ;
   switch_size_t arg4 ;
   switch_bool_t arg5 ;
-  char *result = 0 ;
   switch_size_t *argp3 ;
   switch_size_t *argp4 ;
+  char *result = 0 ;
   
   arg1 = (switch_xml_t)jarg1; 
   arg2 = (char *)jarg2; 
@@ -39361,8 +38454,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_add_child(void * jarg1, char * j
   switch_xml_t arg1 = (switch_xml_t) 0 ;
   char *arg2 = (char *) 0 ;
   switch_size_t arg3 ;
-  switch_xml_t result;
   switch_size_t *argp3 ;
+  switch_xml_t result;
   
   arg1 = (switch_xml_t)jarg1; 
   arg2 = (char *)jarg2; 
@@ -39439,8 +38532,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_insert(void * jarg1, void * jarg
   switch_xml_t arg1 = (switch_xml_t) 0 ;
   switch_xml_t arg2 = (switch_xml_t) 0 ;
   switch_size_t arg3 ;
-  switch_xml_t result;
   switch_size_t *argp3 ;
+  switch_xml_t result;
   
   arg1 = (switch_xml_t)jarg1; 
   arg2 = (switch_xml_t)jarg2; 
@@ -39877,7 +38970,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_outgoin
   arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
   arg2 = (switch_outgoing_channel_hook_t)jarg2; 
   if (arg1) (arg1)->outgoing_channel = arg2;
-  
 }
 
 
@@ -39900,7 +38992,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_next_se
   arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
   arg2 = (switch_io_event_hook_outgoing_channel *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -39931,7 +39022,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_outgoing_channel(
   
   arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -39942,7 +39032,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_receive_
   arg1 = (switch_io_event_hook_receive_message *)jarg1; 
   arg2 = (switch_receive_message_hook_t)jarg2; 
   if (arg1) (arg1)->receive_message = arg2;
-  
 }
 
 
@@ -39965,7 +39054,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_next_set
   arg1 = (switch_io_event_hook_receive_message *)jarg1; 
   arg2 = (switch_io_event_hook_receive_message *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -39996,7 +39084,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_receive_message(v
   
   arg1 = (switch_io_event_hook_receive_message *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40007,7 +39094,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_receive_ev
   arg1 = (switch_io_event_hook_receive_event *)jarg1; 
   arg2 = (switch_receive_event_hook_t)jarg2; 
   if (arg1) (arg1)->receive_event = arg2;
-  
 }
 
 
@@ -40030,7 +39116,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_next_set(v
   arg1 = (switch_io_event_hook_receive_event *)jarg1; 
   arg2 = (switch_io_event_hook_receive_event *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40061,7 +39146,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_receive_event(voi
   
   arg1 = (switch_io_event_hook_receive_event *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40072,7 +39156,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_read_frame_se
   arg1 = (switch_io_event_hook_read_frame *)jarg1; 
   arg2 = (switch_read_frame_hook_t)jarg2; 
   if (arg1) (arg1)->read_frame = arg2;
-  
 }
 
 
@@ -40095,7 +39178,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_next_set(void
   arg1 = (switch_io_event_hook_read_frame *)jarg1; 
   arg2 = (switch_io_event_hook_read_frame *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40126,7 +39208,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_read_frame(void *
   
   arg1 = (switch_io_event_hook_read_frame *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40137,7 +39218,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_video_r
   arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
   arg2 = (switch_read_frame_hook_t)jarg2; 
   if (arg1) (arg1)->video_read_frame = arg2;
-  
 }
 
 
@@ -40160,7 +39240,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_next_se
   arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
   arg2 = (switch_io_event_hook_video_read_frame *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40191,7 +39270,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_video_read_frame(
   
   arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40202,7 +39280,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_write_frame_
   arg1 = (switch_io_event_hook_write_frame *)jarg1; 
   arg2 = (switch_write_frame_hook_t)jarg2; 
   if (arg1) (arg1)->write_frame = arg2;
-  
 }
 
 
@@ -40225,7 +39302,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_next_set(voi
   arg1 = (switch_io_event_hook_write_frame *)jarg1; 
   arg2 = (switch_io_event_hook_write_frame *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40256,7 +39332,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_write_frame(void
   
   arg1 = (switch_io_event_hook_write_frame *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40267,7 +39342,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_video_
   arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
   arg2 = (switch_video_write_frame_hook_t)jarg2; 
   if (arg1) (arg1)->video_write_frame = arg2;
-  
 }
 
 
@@ -40290,7 +39364,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_next_s
   arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
   arg2 = (switch_io_event_hook_video_write_frame *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40321,7 +39394,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_video_write_frame
   
   arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40332,7 +39404,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_kill_channe
   arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
   arg2 = (switch_kill_channel_hook_t)jarg2; 
   if (arg1) (arg1)->kill_channel = arg2;
-  
 }
 
 
@@ -40355,7 +39426,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_next_set(vo
   arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
   arg2 = (switch_io_event_hook_kill_channel *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40386,7 +39456,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_kill_channel(void
   
   arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40397,7 +39466,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_send_dtmf_set(
   arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
   arg2 = (switch_send_dtmf_hook_t)jarg2; 
   if (arg1) (arg1)->send_dtmf = arg2;
-  
 }
 
 
@@ -40420,7 +39488,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_next_set(void
   arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
   arg2 = (switch_io_event_hook_send_dtmf *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40451,7 +39518,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_send_dtmf(void *
   
   arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40462,7 +39528,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_recv_dtmf_set(
   arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
   arg2 = (switch_recv_dtmf_hook_t)jarg2; 
   if (arg1) (arg1)->recv_dtmf = arg2;
-  
 }
 
 
@@ -40485,7 +39550,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_next_set(void
   arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
   arg2 = (switch_io_event_hook_recv_dtmf *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40516,7 +39580,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_recv_dtmf(void *
   
   arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40527,7 +39590,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_change_state_chang
   arg1 = (switch_io_event_hook_state_change *)jarg1; 
   arg2 = (switch_state_change_hook_t)jarg2; 
   if (arg1) (arg1)->state_change = arg2;
-  
 }
 
 
@@ -40550,7 +39612,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_change_next_set(vo
   arg1 = (switch_io_event_hook_state_change *)jarg1; 
   arg2 = (switch_io_event_hook_state_change *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40581,7 +39642,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_state_change(void
   
   arg1 = (switch_io_event_hook_state_change *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40592,7 +39652,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_run_state_run_set(
   arg1 = (switch_io_event_hook_state_run *)jarg1; 
   arg2 = (switch_state_run_hook_t)jarg2; 
   if (arg1) (arg1)->state_run = arg2;
-  
 }
 
 
@@ -40615,7 +39674,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_run_next_set(void
   arg1 = (switch_io_event_hook_state_run *)jarg1; 
   arg2 = (switch_io_event_hook_state_run *)jarg2; 
   if (arg1) (arg1)->next = arg2;
-  
 }
 
 
@@ -40646,7 +39704,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_state_run(void *
   
   arg1 = (switch_io_event_hook_state_run *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -40657,7 +39714,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_outgoing_channel_set(vo
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_outgoing_channel_t *)jarg2; 
   if (arg1) (arg1)->outgoing_channel = arg2;
-  
 }
 
 
@@ -40680,7 +39736,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_receive_message_set(voi
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_receive_message_t *)jarg2; 
   if (arg1) (arg1)->receive_message = arg2;
-  
 }
 
 
@@ -40703,7 +39758,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_receive_event_set(void
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_receive_event_t *)jarg2; 
   if (arg1) (arg1)->receive_event = arg2;
-  
 }
 
 
@@ -40726,7 +39780,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_read_frame_set(void * j
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_read_frame_t *)jarg2; 
   if (arg1) (arg1)->read_frame = arg2;
-  
 }
 
 
@@ -40749,7 +39802,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_video_read_frame_set(vo
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_video_read_frame_t *)jarg2; 
   if (arg1) (arg1)->video_read_frame = arg2;
-  
 }
 
 
@@ -40772,7 +39824,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_write_frame_set(void *
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_write_frame_t *)jarg2; 
   if (arg1) (arg1)->write_frame = arg2;
-  
 }
 
 
@@ -40795,7 +39846,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_video_write_frame_set(v
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_video_write_frame_t *)jarg2; 
   if (arg1) (arg1)->video_write_frame = arg2;
-  
 }
 
 
@@ -40818,7 +39868,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_kill_channel_set(void *
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_kill_channel_t *)jarg2; 
   if (arg1) (arg1)->kill_channel = arg2;
-  
 }
 
 
@@ -40841,7 +39890,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_send_dtmf_set(void * ja
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_send_dtmf_t *)jarg2; 
   if (arg1) (arg1)->send_dtmf = arg2;
-  
 }
 
 
@@ -40864,7 +39912,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_recv_dtmf_set(void * ja
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_recv_dtmf_t *)jarg2; 
   if (arg1) (arg1)->recv_dtmf = arg2;
-  
 }
 
 
@@ -40887,7 +39934,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_state_change_set(void *
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_state_change_t *)jarg2; 
   if (arg1) (arg1)->state_change = arg2;
-  
 }
 
 
@@ -40910,7 +39956,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_state_run_set(void * ja
   arg1 = (switch_io_event_hooks *)jarg1; 
   arg2 = (switch_io_event_hook_state_run_t *)jarg2; 
   if (arg1) (arg1)->state_run = arg2;
-  
 }
 
 
@@ -40941,7 +39986,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hooks(void * jarg1) {
   
   arg1 = (switch_io_event_hooks *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -41288,7 +40332,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_created_set(void * jarg
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->created = arg2;
-  
 }
 
 
@@ -41311,7 +40354,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_runtime_set(void * jarg
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (int64_t)jarg2; 
   if (arg1) (arg1)->runtime = arg2;
-  
 }
 
 
@@ -41334,7 +40376,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_cmd_id_set(void * jarg1
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->cmd_id = arg2;
-  
 }
 
 
@@ -41357,7 +40398,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_repeat_set(void * jarg1
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->repeat = arg2;
-  
 }
 
 
@@ -41380,7 +40420,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_group_set(void * jarg1,
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->group) delete [] arg1->group;
+    delete [] arg1->group;
     if (arg2) {
       arg1->group = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->group, (const char *)arg2);
@@ -41410,7 +40450,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_cmd_arg_set(void * jarg
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->cmd_arg = arg2;
-  
 }
 
 
@@ -41433,7 +40472,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_task_id_set(void * jarg
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->task_id = arg2;
-  
 }
 
 
@@ -41456,7 +40494,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_hash_set(void * jarg1,
   arg1 = (switch_scheduler_task *)jarg1; 
   arg2 = (unsigned long)jarg2; 
   if (arg1) (arg1)->hash = arg2;
-  
 }
 
 
@@ -41487,7 +40524,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_scheduler_task(void * jarg1) {
   
   arg1 = (switch_scheduler_task *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -41500,8 +40536,8 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_add_task(void * jar
   uint32_t arg5 ;
   void *arg6 = (void *) 0 ;
   switch_scheduler_flag_t arg7 ;
-  uint32_t result;
   time_t *argp1 ;
+  uint32_t result;
   
   argp1 = (time_t *)jarg1; 
   if (!argp1) {
@@ -41562,7 +40598,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_file_set(void * jarg1, void * j
   arg1 = (switch_config *)jarg1; 
   arg2 = (FILE *)jarg2; 
   if (arg1) (arg1)->file = arg2;
-  
 }
 
 
@@ -41585,8 +40620,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_path_set(void * jarg1, char * j
   arg1 = (switch_config *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->path, (const char *)arg2, 512);
-    else arg1->path[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->path, (const char *)arg2, 512-1);
+      arg1->path[512-1] = 0;
+    } else {
+      arg1->path[0] = 0;
+    }
   }
 }
 
@@ -41610,8 +40649,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_category_set(void * jarg1, char
   arg1 = (switch_config *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->category, (const char *)arg2, 256);
-    else arg1->category[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->category, (const char *)arg2, 256-1);
+      arg1->category[256-1] = 0;
+    } else {
+      arg1->category[0] = 0;
+    }
   }
 }
 
@@ -41635,8 +40678,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_section_set(void * jarg1, char
   arg1 = (switch_config *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->section, (const char *)arg2, 256);
-    else arg1->section[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->section, (const char *)arg2, 256-1);
+      arg1->section[256-1] = 0;
+    } else {
+      arg1->section[0] = 0;
+    }
   }
 }
 
@@ -41660,8 +40707,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_buf_set(void * jarg1, char * ja
   arg1 = (switch_config *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg2) strncpy((char *)arg1->buf, (const char *)arg2, 1024);
-    else arg1->buf[0] = 0;
+    if(arg2) {
+      strncpy((char*)arg1->buf, (const char *)arg2, 1024-1);
+      arg1->buf[1024-1] = 0;
+    } else {
+      arg1->buf[0] = 0;
+    }
   }
 }
 
@@ -41685,7 +40736,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_lineno_set(void * jarg1, int ja
   arg1 = (switch_config *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->lineno = arg2;
-  
 }
 
 
@@ -41708,7 +40758,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_catno_set(void * jarg1, int jar
   arg1 = (switch_config *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->catno = arg2;
-  
 }
 
 
@@ -41731,7 +40780,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_sectno_set(void * jarg1, int ja
   arg1 = (switch_config *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->sectno = arg2;
-  
 }
 
 
@@ -41754,7 +40802,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_lockto_set(void * jarg1, int ja
   arg1 = (switch_config *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->lockto = arg2;
-  
 }
 
 
@@ -41785,7 +40832,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_config(void * jarg1) {
   
   arg1 = (switch_config *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -41951,7 +40997,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_IvrMenu(void * jarg1) {
   
   arg1 = (IVRMenu *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -41998,7 +41043,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_Api(void * jarg1) {
   
   arg1 = (API *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42045,22 +41089,21 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Api_getTime(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_function_set(void * jarg1, void * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *arg2 = (void *) 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->function = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_function_get(void * jarg1) {
   void * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *result = 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   result = (void *) ((arg1)->function);
   jresult = (void *)result; 
   return jresult;
@@ -42068,22 +41111,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_function_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_threadState_set(void * jarg1, void * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *arg2 = (void *) 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->threadState = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_threadState_get(void * jarg1) {
   void * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *result = 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   result = (void *) ((arg1)->threadState);
   jresult = (void *)result; 
   return jresult;
@@ -42091,22 +41133,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_threadState_get(void
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_extra_set(void * jarg1, void * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *arg2 = (void *) 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   arg2 = (void *)jarg2; 
   if (arg1) (arg1)->extra = arg2;
-  
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_extra_get(void * jarg1) {
   void * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *result = 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   result = (void *) ((arg1)->extra);
   jresult = (void *)result; 
   return jresult;
@@ -42114,13 +41155,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_extra_get(void * jar
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_funcargs_set(void * jarg1, char * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->funcargs) delete [] arg1->funcargs;
+    delete [] arg1->funcargs;
     if (arg2) {
       arg1->funcargs = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->funcargs, (const char *)arg2);
@@ -42133,10 +41174,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_funcargs_set(void * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_input_callback_state_t_funcargs_get(void * jarg1) {
   char * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   char *result = 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   result = (char *) ((arg1)->funcargs);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -42145,20 +41186,19 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_input_callback_state_t_funcargs_get(void *
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_input_callback_state_t() {
   void * jresult ;
-  input_callback_state_t *result = 0 ;
+  input_callback_state *result = 0 ;
   
-  result = (input_callback_state_t *)new input_callback_state_t();
+  result = (input_callback_state *)new input_callback_state();
   jresult = (void *)result; 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_input_callback_state_t(void * jarg1) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   
-  arg1 = (input_callback_state_t *)jarg1; 
+  arg1 = (input_callback_state *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42169,7 +41209,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_DTMF_digit_set(void * jarg1, char jarg2) {
   arg1 = (DTMF *)jarg1; 
   arg2 = (char)jarg2; 
   if (arg1) (arg1)->digit = arg2;
-  
 }
 
 
@@ -42192,7 +41231,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_DTMF_duration_set(void * jarg1, unsigned long
   arg1 = (DTMF *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->duration = arg2;
-  
 }
 
 
@@ -42227,7 +41265,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_DTMF(void * jarg1) {
   
   arg1 = (DTMF *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42258,7 +41295,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_Stream(void * jarg1) {
   
   arg1 = (Stream *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42291,7 +41327,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Event_InternalEvent_set(void * jarg1, void *
   arg1 = (Event *)jarg1; 
   arg2 = (switch_event_t *)jarg2; 
   if (arg1) (arg1)->event = arg2;
-  
 }
 
 
@@ -42314,7 +41349,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Event_serialized_string_set(void * jarg1, cha
   arg1 = (Event *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->serialized_string) delete [] arg1->serialized_string;
+    delete [] arg1->serialized_string;
     if (arg2) {
       arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->serialized_string, (const char *)arg2);
@@ -42344,7 +41379,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Event_mine_set(void * jarg1, int jarg2) {
   arg1 = (Event *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->mine = arg2;
-  
 }
 
 
@@ -42393,7 +41427,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_Event(void * jarg1) {
   
   arg1 = (Event *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42556,7 +41589,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_events_set(void * jarg1, void *
   arg1 = (EventConsumer *)jarg1; 
   arg2 = (switch_queue_t *)jarg2; 
   if (arg1) (arg1)->events = arg2;
-  
 }
 
 
@@ -42579,7 +41611,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_event_id_set(void * jarg1, in
   arg1 = (EventConsumer *)jarg1; 
   arg2 = (switch_event_types_t)jarg2; 
   if (arg1) (arg1)->e_event_id = arg2;
-  
 }
 
 
@@ -42602,7 +41633,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_callback_set(void * jarg1, ch
   arg1 = (EventConsumer *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->e_callback) delete [] arg1->e_callback;
+    delete [] arg1->e_callback;
     if (arg2) {
       arg1->e_callback = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->e_callback, (const char *)arg2);
@@ -42632,7 +41663,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_subclass_name_set(void * jarg
   arg1 = (EventConsumer *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->e_subclass_name) delete [] arg1->e_subclass_name;
+    delete [] arg1->e_subclass_name;
     if (arg2) {
       arg1->e_subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->e_subclass_name, (const char *)arg2);
@@ -42662,7 +41693,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_cb_arg_set(void * jarg1, char
   arg1 = (EventConsumer *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->e_cb_arg) delete [] arg1->e_cb_arg;
+    delete [] arg1->e_cb_arg;
     if (arg2) {
       arg1->e_cb_arg = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->e_cb_arg, (const char *)arg2);
@@ -42718,7 +41749,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_node_index_set(void * jarg1, un
   arg1 = (EventConsumer *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   if (arg1) (arg1)->node_index = arg2;
-  
 }
 
 
@@ -42755,7 +41785,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_EventConsumer(void * jarg1) {
   
   arg1 = (EventConsumer *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42804,7 +41833,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_CoreSession(void * jarg1) {
   
   arg1 = (CoreSession *)jarg1; 
   delete arg1;
-  
 }
 
 
@@ -42815,7 +41843,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_InternalSession_set(void * jarg1,
   arg1 = (CoreSession *)jarg1; 
   arg2 = (switch_core_session_t *)jarg2; 
   if (arg1) (arg1)->session = arg2;
-  
 }
 
 
@@ -42838,7 +41865,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_channel_set(void * jarg1, void *
   arg1 = (CoreSession *)jarg1; 
   arg2 = (switch_channel_t *)jarg2; 
   if (arg1) (arg1)->channel = arg2;
-  
 }
 
 
@@ -42861,7 +41887,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_flags_set(void * jarg1, unsigned
   arg1 = (CoreSession *)jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -42884,7 +41909,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_allocated_set(void * jarg1, int j
   arg1 = (CoreSession *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->allocated = arg2;
-  
 }
 
 
@@ -42907,7 +41931,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_cb_state_set(void * jarg1, void *
   arg1 = (CoreSession *)jarg1; 
   arg2 = (input_callback_state *)jarg2; 
   if (arg1) (arg1)->cb_state = *arg2;
-  
 }
 
 
@@ -42930,7 +41953,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_HookState_set(void * jarg1, int j
   arg1 = (CoreSession *)jarg1; 
   arg2 = (switch_channel_state_t)jarg2; 
   if (arg1) (arg1)->hook_state = arg2;
-  
 }
 
 
@@ -42953,7 +41975,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_cause_set(void * jarg1, int jarg2
   arg1 = (CoreSession *)jarg1; 
   arg2 = (switch_call_cause_t)jarg2; 
   if (arg1) (arg1)->cause = arg2;
-  
 }
 
 
@@ -42976,7 +41997,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_uuid_set(void * jarg1, char * jar
   arg1 = (CoreSession *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->uuid) delete [] arg1->uuid;
+    delete [] arg1->uuid;
     if (arg2) {
       arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid, (const char *)arg2);
@@ -43006,7 +42027,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_tts_name_set(void * jarg1, char *
   arg1 = (CoreSession *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->tts_name) delete [] arg1->tts_name;
+    delete [] arg1->tts_name;
     if (arg2) {
       arg1->tts_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->tts_name, (const char *)arg2);
@@ -43036,7 +42057,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_voice_name_set(void * jarg1, char
   arg1 = (CoreSession *)jarg1; 
   arg2 = (char *)jarg2; 
   {
-    if (arg1->voice_name) delete [] arg1->voice_name;
+    delete [] arg1->voice_name;
     if (arg2) {
       arg1->voice_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->voice_name, (const char *)arg2);
@@ -43671,10 +42692,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_get_cb_args(void * jarg1) {
   switch_input_args_t *result = 0 ;
   
   arg1 = (CoreSession *)jarg1; 
-  {
-    switch_input_args_t const &_result_ref = ((CoreSession const *)arg1)->get_cb_args();
-    result = (switch_input_args_t *) &_result_ref;
-  }
+  result = (switch_input_args_t *) &((CoreSession const *)arg1)->get_cb_args();
   jresult = (void *)result; 
   return jresult;
 }
@@ -43731,12 +42749,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_bridge(void * jarg1, void * jarg2) {
   CoreSession *arg2 = 0 ;
   
   arg1 = (CoreSession *)jarg1;
-  if(!arg1) {
+  if (!arg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "CoreSession & type is null", 0);
     return ;
   } 
   arg2 = (CoreSession *)jarg2;
-  if(!arg2) {
+  if (!arg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "CoreSession & type is null", 0);
     return ;
   } 
@@ -43815,12 +42833,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_ManagedSession(void * jarg1) {
   
   arg1 = (ManagedSession *)jarg1; 
   delete arg1;
-  
 }
 
 
-SWIGEXPORT CoreSession * SWIGSTDCALL CSharp_ManagedSessionUpcast(ManagedSession *objectRef) {
-    return (CoreSession *)objectRef;
+SWIGEXPORT CoreSession * SWIGSTDCALL CSharp_ManagedSession_SWIGUpcast(ManagedSession *jarg1) {
+    return (CoreSession *)jarg1;
 }
 
 #ifdef __cplusplus
diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs
index 15e28c691e..ef496f5e37 100644
--- a/src/mod/languages/mod_managed/managed/swig.cs
+++ b/src/mod/languages/mod_managed/managed/swig.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30,11 +30,13 @@ public class Api : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_Api(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_Api(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -62,7 +64,7 @@ public class Api : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -92,11 +94,13 @@ public class audio_buffer_header_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_audio_buffer_header_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_audio_buffer_header_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -129,7 +133,7 @@ public class audio_buffer_header_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -145,7 +149,7 @@ public enum cache_db_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -175,11 +179,13 @@ public class CoreSession : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_CoreSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_CoreSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -508,7 +514,7 @@ public class CoreSession : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -524,7 +530,7 @@ public enum dm_match_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -554,11 +560,13 @@ public class dtls_fingerprint_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_dtls_fingerprint_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_dtls_fingerprint_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -612,7 +620,7 @@ public class dtls_fingerprint_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -631,7 +639,7 @@ public enum dtls_state_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -649,7 +657,7 @@ public enum dtls_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -679,11 +687,13 @@ public class DTMF : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_DTMF(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_DTMF(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -716,7 +726,7 @@ public class DTMF : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -732,7 +742,7 @@ public enum dtmf_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -762,11 +772,13 @@ public class EventConsumer : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_EventConsumer(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_EventConsumer(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -866,7 +878,7 @@ public class EventConsumer : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -896,11 +908,13 @@ public partial class Event : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_Event(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_Event(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -1002,7 +1016,7 @@ public partial class Event : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -4688,6 +4702,10 @@ public class freeswitch {
     return ret;
   }
 
+  public static void switch_channel_process_device_hangup(SWIGTYPE_p_switch_channel channel) {
+    freeswitchPINVOKE.switch_channel_process_device_hangup(SWIGTYPE_p_switch_channel.getCPtr(channel));
+  }
+
   public static switch_caller_extension switch_channel_get_queued_extension(SWIGTYPE_p_switch_channel channel) {
     IntPtr cPtr = freeswitchPINVOKE.switch_channel_get_queued_extension(SWIGTYPE_p_switch_channel.getCPtr(channel));
     switch_caller_extension ret = (cPtr == IntPtr.Zero) ? null : new switch_caller_extension(cPtr, false);
@@ -5700,8 +5718,8 @@ public class freeswitch {
     return ret;
   }
 
-  public static switch_status_t switch_ivr_menu_bind_function(SWIGTYPE_p_switch_ivr_menu menu, SWIGTYPE_p_switch_ivr_menu_action_function_t function, string arg, string bind) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_bind_function(SWIGTYPE_p_switch_ivr_menu.getCPtr(menu), SWIGTYPE_p_switch_ivr_menu_action_function_t.getCPtr(function), arg, bind);
+  public static switch_status_t switch_ivr_menu_bind_function(SWIGTYPE_p_switch_ivr_menu menu, SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t function, string arg, string bind) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_bind_function(SWIGTYPE_p_switch_ivr_menu.getCPtr(menu), SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t.getCPtr(function), arg, bind);
     return ret;
   }
 
@@ -5725,8 +5743,8 @@ public class freeswitch {
     return ret;
   }
 
-  public static switch_status_t switch_ivr_menu_stack_xml_add_custom(SWIGTYPE_p_switch_ivr_menu_xml_ctx xml_menu_ctx, string name, SWIGTYPE_p_switch_ivr_menu_action_function_t function) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_stack_xml_add_custom(SWIGTYPE_p_switch_ivr_menu_xml_ctx.getCPtr(xml_menu_ctx), name, SWIGTYPE_p_switch_ivr_menu_action_function_t.getCPtr(function));
+  public static switch_status_t switch_ivr_menu_stack_xml_add_custom(SWIGTYPE_p_switch_ivr_menu_xml_ctx xml_menu_ctx, string name, SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t function) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_menu_stack_xml_add_custom(SWIGTYPE_p_switch_ivr_menu_xml_ctx.getCPtr(xml_menu_ctx), name, SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t.getCPtr(function));
     return ret;
   }
 
@@ -7105,7 +7123,7 @@ public class freeswitch {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -7270,6 +7288,10 @@ class freeswitchPINVOKE {
   }
 
 
+  static freeswitchPINVOKE() {
+  }
+
+
 
   protected class SWIGStringHelper {
 
@@ -9082,11 +9104,11 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_device_node_t_xml_cdr_get")]
   public static extern IntPtr switch_device_node_t_xml_cdr_get(HandleRef jarg1);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_switch_device_node_t_event_set")]
-  public static extern void switch_device_node_t_event_set(HandleRef jarg1, HandleRef jarg2);
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_device_node_t__event_set")]
+  public static extern void switch_device_node_t__event_set(HandleRef jarg1, HandleRef jarg2);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_switch_device_node_t_event_get")]
-  public static extern IntPtr switch_device_node_t_event_get(HandleRef jarg1);
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_device_node_t__event_get")]
+  public static extern IntPtr switch_device_node_t__event_get(HandleRef jarg1);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_device_node_t_callstate_set")]
   public static extern void switch_device_node_t_callstate_set(HandleRef jarg1, int jarg2);
@@ -12883,11 +12905,11 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_max_samples_get")]
   public static extern int switch_file_handle_max_samples_get(HandleRef jarg1);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_params_set")]
-  public static extern void switch_file_handle_params_set(HandleRef jarg1, HandleRef jarg2);
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle__params_set")]
+  public static extern void switch_file_handle__params_set(HandleRef jarg1, HandleRef jarg2);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_params_get")]
-  public static extern IntPtr switch_file_handle_params_get(HandleRef jarg1);
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle__params_get")]
+  public static extern IntPtr switch_file_handle__params_get(HandleRef jarg1);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_cur_channels_set")]
   public static extern void switch_file_handle_cur_channels_set(HandleRef jarg1, uint jarg2);
@@ -14746,6 +14768,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_api_on")]
   public static extern int switch_channel_api_on(HandleRef jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_process_device_hangup")]
+  public static extern void switch_channel_process_device_hangup(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_queued_extension")]
   public static extern IntPtr switch_channel_get_queued_extension(HandleRef jarg1);
 
@@ -17566,14 +17591,14 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_delete_ManagedSession")]
   public static extern void delete_ManagedSession(HandleRef jarg1);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_ManagedSessionUpcast")]
-  public static extern IntPtr ManagedSessionUpcast(IntPtr objectRef);
+  [DllImport("mod_managed", EntryPoint="CSharp_ManagedSession_SWIGUpcast")]
+  public static extern IntPtr ManagedSession_SWIGUpcast(IntPtr jarg1);
 }
 
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17603,11 +17628,13 @@ public class icand_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_icand_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_icand_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -17730,7 +17757,7 @@ public class icand_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17746,7 +17773,7 @@ public enum ice_proto_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17776,11 +17803,13 @@ public class ice_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_ice_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_ice_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -17855,7 +17884,7 @@ public class ice_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17885,11 +17914,13 @@ public class input_callback_state_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_input_callback_state_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_input_callback_state_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -17945,7 +17976,7 @@ public class input_callback_state_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17975,11 +18006,13 @@ public class ip_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_ip_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_ip_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -18014,7 +18047,7 @@ public class ip_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18044,11 +18077,13 @@ public class IvrMenu : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_IvrMenu(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_IvrMenu(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -18069,7 +18104,7 @@ public class IvrMenu : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18083,7 +18118,7 @@ using System.Runtime.InteropServices;
 public partial class ManagedSession : CoreSession {
   private HandleRef swigCPtr;
 
-  internal ManagedSession(IntPtr cPtr, bool cMemoryOwn) : base(freeswitchPINVOKE.ManagedSessionUpcast(cPtr), cMemoryOwn) {
+  internal ManagedSession(IntPtr cPtr, bool cMemoryOwn) : base(freeswitchPINVOKE.ManagedSession_SWIGUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
@@ -18097,11 +18132,13 @@ public partial class ManagedSession : CoreSession {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_ManagedSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_ManagedSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }
@@ -18121,7 +18158,7 @@ public partial class ManagedSession : CoreSession {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18151,11 +18188,13 @@ public class profile_node_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_profile_node_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_profile_node_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -18199,7 +18238,7 @@ public class profile_node_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18216,7 +18255,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18246,11 +18285,13 @@ public partial class Stream : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_Stream(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_Stream(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -18275,7 +18316,7 @@ public partial class Stream : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18305,7 +18346,7 @@ public class SWIGTYPE_p_a_2__icand_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18335,7 +18376,7 @@ public class SWIGTYPE_p_apr_pool_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18365,7 +18406,7 @@ public class SWIGTYPE_p_cJSON {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18395,7 +18436,7 @@ public class SWIGTYPE_p_FILE {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18425,7 +18466,7 @@ public class SWIGTYPE_p_float {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18455,7 +18496,7 @@ public class SWIGTYPE_p_f_p_char_enum_switch_management_action_t_p_char_switch_s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18485,7 +18526,7 @@ public class SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__swi
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18515,7 +18556,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_cJSON_p_q_const__char_unsigned_long_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18545,7 +18586,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_p_switch_console_cal
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18575,7 +18616,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_co
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18605,7 +18646,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_unsigned_long__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18635,7 +18676,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18665,7 +18706,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18695,7 +18736,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_switch_codec_fmtp__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18725,7 +18766,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_switch_core_session_p_switch_stream_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18755,7 +18796,7 @@ public class SWIGTYPE_p_f_p_q_const__cJSON_p_switch_core_session_p_p_cJSON__swit
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18785,7 +18826,7 @@ public class SWIGTYPE_p_f_p_q_const__switch_log_node_t_enum_switch_log_level_t__
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18815,7 +18856,7 @@ public class SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18845,7 +18886,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18875,7 +18916,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18905,7 +18946,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18935,7 +18976,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_p_char_p_unsigned_long__switch_s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18965,7 +19006,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18995,7 +19036,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_int_p_q_const__cha
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19025,7 +19066,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_p_q_const__char__s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19055,7 +19096,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19085,7 +19126,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__switch_dtmf_t_p_unsigne
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19115,7 +19156,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_unsigned_long__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19145,7 +19186,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_void_unsigned_int_p_unsigned_lon
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19175,7 +19216,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19205,7 +19246,7 @@ public class SWIGTYPE_p_f_p_switch_codec_p_switch_codec_p_void_unsigned_long_uns
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19235,7 +19276,7 @@ public class SWIGTYPE_p_f_p_switch_codec__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19265,7 +19306,7 @@ public class SWIGTYPE_p_f_p_switch_codec_unsigned_long_p_q_const__switch_codec_s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19295,7 +19336,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_enum_switch_channel_callstate_t_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19325,7 +19366,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_enum_switch_media_type_t__p_stfu
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19355,7 +19396,7 @@ public class SWIGTYPE_p_f_p_switch_core_session__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19385,7 +19426,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_int__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19415,7 +19456,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_char_p_switch_say_args_t_p_p_c
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19445,7 +19486,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_char_p_switch_say_args_t_p_swi
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19475,7 +19516,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_p_switch_frame_unsigned_long_i
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19505,7 +19546,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19535,7 +19576,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19565,7 +19606,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19595,7 +19636,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19625,7 +19666,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t_enum_sw
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19655,7 +19696,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t__switch
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19685,7 +19726,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_core_session_message__s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19715,7 +19756,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_p
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19745,7 +19786,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_p
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19775,7 +19816,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_event__switch_status_t
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19805,7 +19846,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_p_void__switch_st
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19835,7 +19876,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_unsigned_long_int
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19865,7 +19906,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_void_enum_switch_input_type_t_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19895,7 +19936,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_void__p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19925,7 +19966,7 @@ public class SWIGTYPE_p_f_p_switch_core_session__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19955,7 +19996,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_t_p_void_p_switch_caller_profile
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19985,7 +20026,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char_p_char__switch
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20015,7 +20056,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char__switch_status
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20045,7 +20086,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle_p_p_char_p_p_char__switch_st
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20075,7 +20116,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20105,7 +20146,7 @@ public class SWIGTYPE_p_f_p_switch_event_p_q_const__char__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20135,7 +20176,7 @@ public class SWIGTYPE_p_f_p_switch_event__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20165,7 +20206,7 @@ public class SWIGTYPE_p_f_p_switch_event__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20195,7 +20236,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_p_q_con
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20225,7 +20266,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_q_const
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20255,7 +20296,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_long_long__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20285,7 +20326,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_p_q_const__char__switch_status_t
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20315,7 +20356,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_p_unsigned_int_long_long_int__swi
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20345,7 +20386,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_p_void_p_switch_size_t__switch_st
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20375,7 +20416,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20405,7 +20446,37 @@ public class SWIGTYPE_p_f_p_switch_ivr_dmachine_match__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
+public class SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_ivr_action_t obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20435,7 +20506,7 @@ public class SWIGTYPE_p_f_p_switch_live_array_s_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20465,7 +20536,7 @@ public class SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__swit
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20495,7 +20566,7 @@ public class SWIGTYPE_p_f_p_switch_media_bug_p_void__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20525,7 +20596,7 @@ public class SWIGTYPE_p_f_p_switch_rtp_p_switch_socket_t_p_void_switch_size_t_p_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20555,7 +20626,7 @@ public class SWIGTYPE_p_f_p_switch_scheduler_task__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20585,7 +20656,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_double__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20615,7 +20686,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_int__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20645,7 +20716,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_q_const__char__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20675,7 +20746,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_unsigned_long__switch_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20705,7 +20776,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20735,7 +20806,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_unsigned_long__switch_status_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20765,7 +20836,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsign
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20795,7 +20866,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20825,7 +20896,7 @@ public class SWIGTYPE_p_f_p_switch_stream_handle_p_q_const__char_v_______switch_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20855,7 +20926,7 @@ public class SWIGTYPE_p_f_p_switch_stream_handle_p_unsigned_char_switch_size_t__
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20885,7 +20956,7 @@ public class SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20915,7 +20986,7 @@ public class SWIGTYPE_p_f_p_switch_timer_enum_switch_bool_t__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20945,7 +21016,7 @@ public class SWIGTYPE_p_f_p_switch_timer__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20975,7 +21046,7 @@ public class SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21005,7 +21076,7 @@ public class SWIGTYPE_p_f_p_void_p_q_const__char__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21035,7 +21106,7 @@ public class SWIGTYPE_p_f_p_void_p_switch_event__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21065,7 +21136,7 @@ public class SWIGTYPE_p_f_p_void__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21095,7 +21166,7 @@ public class SWIGTYPE_p_f_uint8_t_p_p_q_const__char_p_void__p_switch_xml {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21125,7 +21196,7 @@ public class SWIGTYPE_p_f_void__p_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21155,7 +21226,7 @@ public class SWIGTYPE_p_f_void__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21185,7 +21256,7 @@ public class SWIGTYPE_p_HashElem {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21215,7 +21286,7 @@ public class SWIGTYPE_p_in6_addr {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21245,7 +21316,7 @@ public class SWIGTYPE_p_int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21275,7 +21346,7 @@ public class SWIGTYPE_p_p_apr_pool_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21305,7 +21376,7 @@ public class SWIGTYPE_p_payload_map_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21335,7 +21406,7 @@ public class SWIGTYPE_p_p_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21365,7 +21436,7 @@ public class SWIGTYPE_p_p_cJSON {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21395,7 +21466,7 @@ public class SWIGTYPE_p_pid_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21425,7 +21496,7 @@ public class SWIGTYPE_p_p_payload_map_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21455,7 +21526,7 @@ public class SWIGTYPE_p_p_p_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21485,7 +21556,7 @@ public class SWIGTYPE_p_p_real_pcre {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21515,7 +21586,7 @@ public class SWIGTYPE_p_p_sqlite3 {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21545,7 +21616,7 @@ public class SWIGTYPE_p_p_sqlite3_stmt {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21575,7 +21646,7 @@ public class SWIGTYPE_p_p_switch_audio_resampler_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21605,7 +21676,7 @@ public class SWIGTYPE_p_p_switch_buffer {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21635,7 +21706,7 @@ public class SWIGTYPE_p_p_switch_cache_db_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21665,7 +21736,7 @@ public class SWIGTYPE_p_p_switch_caller_extension {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21695,7 +21766,7 @@ public class SWIGTYPE_p_p_switch_channel {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21725,7 +21796,7 @@ public class SWIGTYPE_p_p_switch_codec_implementation {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21755,7 +21826,7 @@ public class SWIGTYPE_p_p_switch_console_callback_match {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21785,7 +21856,7 @@ public class SWIGTYPE_p_p_switch_core_port_allocator {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21815,7 +21886,7 @@ public class SWIGTYPE_p_p_switch_core_session {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21845,7 +21916,7 @@ public class SWIGTYPE_p_p_switch_core_session_message {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21875,7 +21946,7 @@ public class SWIGTYPE_p_p_switch_device_record_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21905,7 +21976,7 @@ public class SWIGTYPE_p_p_switch_event {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21935,7 +22006,7 @@ public class SWIGTYPE_p_p_switch_event_node {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21965,7 +22036,7 @@ public class SWIGTYPE_p_p_switch_file_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21995,7 +22066,7 @@ public class SWIGTYPE_p_p_switch_frame {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22025,7 +22096,7 @@ public class SWIGTYPE_p_p_switch_hash {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22055,7 +22126,7 @@ public class SWIGTYPE_p_p_switch_ivr_digit_stream {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22085,7 +22156,7 @@ public class SWIGTYPE_p_p_switch_ivr_digit_stream_parser {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22115,7 +22186,7 @@ public class SWIGTYPE_p_p_switch_ivr_dmachine {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22145,7 +22216,7 @@ public class SWIGTYPE_p_p_switch_ivr_dmachine_match {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22175,7 +22246,7 @@ public class SWIGTYPE_p_p_switch_ivr_menu {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22205,7 +22276,7 @@ public class SWIGTYPE_p_p_switch_ivr_menu_xml_ctx {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22235,7 +22306,7 @@ public class SWIGTYPE_p_p_switch_live_array_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22265,7 +22336,7 @@ public class SWIGTYPE_p_p_switch_log_node_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22295,7 +22366,7 @@ public class SWIGTYPE_p_p_switch_media_bug {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22325,7 +22396,7 @@ public class SWIGTYPE_p_p_switch_network_list {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22355,7 +22426,7 @@ public class SWIGTYPE_p_p_switch_rtp {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22385,7 +22456,7 @@ public class SWIGTYPE_p_p_switch_say_file_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22415,7 +22486,7 @@ public class SWIGTYPE_p_p_switch_sql_queue_manager {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22445,7 +22516,7 @@ public class SWIGTYPE_p_p_switch_thread_data_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22475,7 +22546,7 @@ public class SWIGTYPE_p_p_switch_xml_binding {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22505,7 +22576,7 @@ public class SWIGTYPE_p_p_switch_xml {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22535,7 +22606,7 @@ public class SWIGTYPE_p_p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22565,7 +22636,7 @@ public class SWIGTYPE_p_real_pcre {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22595,7 +22666,7 @@ public class SWIGTYPE_p_short {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22625,7 +22696,7 @@ public class SWIGTYPE_p_sockaddr {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22655,7 +22726,7 @@ public class SWIGTYPE_p_sockaddr_in6 {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22685,7 +22756,7 @@ public class SWIGTYPE_p_socklen_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22715,7 +22786,7 @@ public class SWIGTYPE_p_sqlite3 {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22745,7 +22816,7 @@ public class SWIGTYPE_p_sqlite3_stmt {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22775,7 +22846,7 @@ public class SWIGTYPE_p_stfu_instance_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22805,7 +22876,7 @@ public class SWIGTYPE_p_switch_buffer {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22835,7 +22906,7 @@ public class SWIGTYPE_p_switch_cache_db_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22865,7 +22936,7 @@ public class SWIGTYPE_p_switch_call_cause_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22895,7 +22966,7 @@ public class SWIGTYPE_p_switch_channel {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22925,7 +22996,7 @@ public class SWIGTYPE_p_switch_core_media_ice_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22955,7 +23026,7 @@ public class SWIGTYPE_p_switch_core_port_allocator {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22985,7 +23056,7 @@ public class SWIGTYPE_p_switch_core_session {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23015,7 +23086,7 @@ public class SWIGTYPE_p_switch_event_types_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23045,7 +23116,7 @@ public class SWIGTYPE_p_switch_file_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23075,7 +23146,7 @@ public class SWIGTYPE_p_switch_hash {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23105,7 +23176,7 @@ public class SWIGTYPE_p_switch_interval_time_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23135,7 +23206,7 @@ public class SWIGTYPE_p_switch_ivr_action_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23165,7 +23236,7 @@ public class SWIGTYPE_p_switch_ivr_digit_stream {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23195,7 +23266,7 @@ public class SWIGTYPE_p_switch_ivr_digit_stream_parser {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23225,37 +23296,7 @@ public class SWIGTYPE_p_switch_ivr_dmachine {
 }
 /* ----------------------------------------------------------------------------
  * 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.
- * ----------------------------------------------------------------------------- */
-
-namespace FreeSWITCH.Native {
-
-using System;
-using System.Runtime.InteropServices;
-
-public class SWIGTYPE_p_switch_ivr_menu_action_function_t {
-  private HandleRef swigCPtr;
-
-  internal SWIGTYPE_p_switch_ivr_menu_action_function_t(IntPtr cPtr, bool futureUse) {
-    swigCPtr = new HandleRef(this, cPtr);
-  }
-
-  protected SWIGTYPE_p_switch_ivr_menu_action_function_t() {
-    swigCPtr = new HandleRef(null, IntPtr.Zero);
-  }
-
-  internal static HandleRef getCPtr(SWIGTYPE_p_switch_ivr_menu_action_function_t obj) {
-    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
-  }
-}
-
-}
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23285,7 +23326,7 @@ public class SWIGTYPE_p_switch_ivr_menu {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23315,7 +23356,7 @@ public class SWIGTYPE_p_switch_ivr_menu_xml_ctx {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23345,7 +23386,7 @@ public class SWIGTYPE_p_switch_live_array_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23375,7 +23416,7 @@ public class SWIGTYPE_p_switch_media_bug {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23405,7 +23446,7 @@ public class SWIGTYPE_p_switch_mutex_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23435,7 +23476,7 @@ public class SWIGTYPE_p_switch_network_list {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23465,7 +23506,7 @@ public class SWIGTYPE_p_switch_odbc_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23495,7 +23536,7 @@ public class SWIGTYPE_p_switch_pgsql_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23525,7 +23566,7 @@ public class SWIGTYPE_p_switch_pollfd_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23555,7 +23596,7 @@ public class SWIGTYPE_p_switch_queue_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23585,7 +23626,7 @@ public class SWIGTYPE_p_switch_rtcp_frame {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23615,7 +23656,7 @@ public class SWIGTYPE_p_switch_rtp {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23645,7 +23686,7 @@ public class SWIGTYPE_p_switch_rtp_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23675,7 +23716,7 @@ public class SWIGTYPE_p_switch_say_file_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23705,7 +23746,7 @@ public class SWIGTYPE_p_switch_size_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23735,7 +23776,7 @@ public class SWIGTYPE_p_switch_sockaddr_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23765,7 +23806,7 @@ public class SWIGTYPE_p_switch_socket_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23795,7 +23836,7 @@ public class SWIGTYPE_p_switch_sql_queue_manager {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23825,7 +23866,7 @@ public class SWIGTYPE_p_switch_ssize_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23855,7 +23896,7 @@ public class SWIGTYPE_p_switch_thread_rwlock_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23885,7 +23926,7 @@ public class SWIGTYPE_p_switch_thread_start_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23915,7 +23956,7 @@ public class SWIGTYPE_p_switch_time_exp_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23945,7 +23986,7 @@ public class SWIGTYPE_p_switch_time_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23975,7 +24016,7 @@ public class SWIGTYPE_p_switch_xml_binding {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24005,7 +24046,7 @@ public class SWIGTYPE_p_time_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24035,7 +24076,7 @@ public class SWIGTYPE_p_unsigned_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24065,7 +24106,7 @@ public class SWIGTYPE_p_unsigned_int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24095,7 +24136,7 @@ public class SWIGTYPE_p_unsigned_long {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24125,7 +24166,7 @@ public class SWIGTYPE_p_unsigned_short {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24155,7 +24196,7 @@ public class SWIGTYPE_p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24178,7 +24219,7 @@ public enum switch_abc_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24208,11 +24249,13 @@ public class switch_api_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_api_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_api_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -24320,7 +24363,7 @@ public class switch_api_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24340,7 +24383,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24370,11 +24413,13 @@ public class switch_application_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_application_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_application_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -24502,7 +24547,7 @@ public class switch_application_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24532,11 +24577,13 @@ public class switch_app_log : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_app_log(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_app_log(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -24592,7 +24639,7 @@ public class switch_app_log : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24612,7 +24659,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24642,11 +24689,13 @@ public class switch_asr_handle : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_asr_handle(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_asr_handle(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -24817,7 +24866,7 @@ public class switch_asr_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24847,11 +24896,13 @@ public class switch_asr_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_asr_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_asr_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25126,7 +25177,7 @@ public class switch_asr_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25146,7 +25197,7 @@ public enum switch_audio_col_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25176,11 +25227,13 @@ public class switch_audio_resampler_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_audio_resampler_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_audio_resampler_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25275,7 +25328,7 @@ public class switch_audio_resampler_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25297,7 +25350,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25313,7 +25366,7 @@ public enum switch_bitpack_mode_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25343,11 +25396,13 @@ public class switch_bitpack_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_bitpack_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_bitpack_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25492,7 +25547,7 @@ public class switch_bitpack_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25508,7 +25563,7 @@ public enum switch_bool_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25538,11 +25593,13 @@ public class switch_cache_db_connection_options_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_cache_db_connection_options_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_cache_db_connection_options_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25588,7 +25645,7 @@ public class switch_cache_db_connection_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25618,11 +25675,13 @@ public class switch_cache_db_core_db_options_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_cache_db_core_db_options_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_cache_db_core_db_options_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25645,7 +25704,7 @@ public class switch_cache_db_core_db_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25662,7 +25721,7 @@ public enum switch_cache_db_handle_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25692,11 +25751,13 @@ public class switch_cache_db_native_handle_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_cache_db_native_handle_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_cache_db_native_handle_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25742,7 +25803,7 @@ public class switch_cache_db_native_handle_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25772,11 +25833,13 @@ public class switch_cache_db_odbc_options_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_cache_db_odbc_options_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_cache_db_odbc_options_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25819,7 +25882,7 @@ public class switch_cache_db_odbc_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25849,11 +25912,13 @@ public class switch_cache_db_pgsql_options_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_cache_db_pgsql_options_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_cache_db_pgsql_options_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -25876,7 +25941,7 @@ public class switch_cache_db_pgsql_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25959,7 +26024,7 @@ public enum switch_call_cause_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25975,7 +26040,7 @@ public enum switch_call_direction_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26005,11 +26070,13 @@ public class switch_caller_application : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_caller_application(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_caller_application(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -26064,7 +26131,7 @@ public class switch_caller_application : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26094,11 +26161,13 @@ public class switch_caller_extension : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_caller_extension(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_caller_extension(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -26186,7 +26255,7 @@ public class switch_caller_extension : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26216,11 +26285,13 @@ public class switch_caller_profile : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_caller_profile(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_caller_profile(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -26663,7 +26734,7 @@ public class switch_caller_profile : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26681,7 +26752,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26700,7 +26771,7 @@ public enum switch_channel_app_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26723,7 +26794,7 @@ public enum switch_channel_callstate_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26744,7 +26815,7 @@ public enum switch_channel_cap_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26877,7 +26948,7 @@ public enum switch_channel_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26905,7 +26976,7 @@ public enum switch_channel_state_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26935,11 +27006,13 @@ public class switch_channel_timetable : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_channel_timetable(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_channel_timetable(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -27095,7 +27168,7 @@ public class switch_channel_timetable : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27110,7 +27183,7 @@ public enum switch_chat_application_flag_enum_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27140,11 +27213,13 @@ public class switch_chat_application_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_chat_application_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_chat_application_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -27272,7 +27347,7 @@ public class switch_chat_application_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27302,11 +27377,13 @@ public class switch_chat_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_chat_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_chat_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -27394,7 +27471,7 @@ public class switch_chat_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27424,11 +27501,13 @@ public class switch_codec : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_codec(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_codec(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -27569,7 +27648,7 @@ public class switch_codec : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27592,7 +27671,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27622,11 +27701,13 @@ public class switch_codec_fmtp : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_codec_fmtp(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_codec_fmtp(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -27680,7 +27761,7 @@ public class switch_codec_fmtp : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27710,11 +27791,13 @@ public class switch_codec_implementation : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_codec_implementation(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_codec_implementation(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -27932,7 +28015,7 @@ public class switch_codec_implementation : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27962,11 +28045,13 @@ public class switch_codec_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_codec_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_codec_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28075,7 +28160,7 @@ public class switch_codec_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28105,11 +28190,13 @@ public class switch_codec_settings : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_codec_settings(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_codec_settings(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28132,7 +28219,7 @@ public class switch_codec_settings : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28150,7 +28237,7 @@ public enum switch_codec_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28180,11 +28267,13 @@ public class switch_config : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_config(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_config(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28288,7 +28377,7 @@ public class switch_config : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28318,11 +28407,13 @@ public class switch_console_callback_match : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_console_callback_match(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_console_callback_match(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28377,7 +28468,7 @@ public class switch_console_callback_match : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28407,11 +28498,13 @@ public class switch_console_callback_match_node : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_console_callback_match_node(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_console_callback_match_node(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28445,7 +28538,7 @@ public class switch_console_callback_match_node : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28485,7 +28578,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28515,11 +28608,13 @@ public class switch_core_session_message : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_core_session_message(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_core_session_message(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28725,7 +28820,7 @@ public class switch_core_session_message : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28742,7 +28837,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28802,7 +28897,7 @@ public enum switch_core_session_message_types_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28832,11 +28927,13 @@ public class switch_core_thread_session : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_core_thread_session(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_core_thread_session(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -28903,7 +29000,7 @@ public class switch_core_thread_session : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28933,11 +29030,13 @@ public class switch_core_time_duration : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_core_time_duration(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_core_time_duration(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -29020,7 +29119,7 @@ public class switch_core_time_duration : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29050,11 +29149,13 @@ public class switch_device_node_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_device_node_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_device_node_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -29082,10 +29183,10 @@ public class switch_device_node_t : IDisposable {
 
   public switch_event _event {
     set {
-      freeswitchPINVOKE.switch_device_node_t_event_set(swigCPtr, switch_event.getCPtr(value));
+      freeswitchPINVOKE.switch_device_node_t__event_set(swigCPtr, switch_event.getCPtr(value));
     } 
     get {
-      IntPtr cPtr = freeswitchPINVOKE.switch_device_node_t_event_get(swigCPtr);
+      IntPtr cPtr = freeswitchPINVOKE.switch_device_node_t__event_get(swigCPtr);
       switch_event ret = (cPtr == IntPtr.Zero) ? null : new switch_event(cPtr, false);
       return ret;
     } 
@@ -29163,7 +29264,7 @@ public class switch_device_node_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29193,11 +29294,13 @@ public class switch_device_record_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_device_record_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_device_record_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -29433,7 +29536,7 @@ public class switch_device_record_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29453,7 +29556,7 @@ public enum switch_device_state_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29483,11 +29586,13 @@ public class switch_device_stats_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_device_stats_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_device_stats_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -29720,7 +29825,7 @@ public class switch_device_stats_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29750,11 +29855,13 @@ public class switch_dialplan_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_dialplan_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_dialplan_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -29842,7 +29949,7 @@ public class switch_dialplan_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29859,7 +29966,7 @@ public enum switch_digit_action_target_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29889,11 +29996,13 @@ public class switch_directories : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_directories(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_directories(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30056,7 +30165,7 @@ public class switch_directories : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30071,7 +30180,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30101,11 +30210,13 @@ public class switch_directory_handle : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_directory_handle(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_directory_handle(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30161,7 +30272,7 @@ public class switch_directory_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30191,11 +30302,13 @@ public class switch_directory_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_directory_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_directory_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30327,7 +30440,7 @@ public class switch_directory_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30343,7 +30456,7 @@ public enum switch_dtmf_direction_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30362,7 +30475,7 @@ public enum switch_dtmf_source_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30392,11 +30505,13 @@ public class switch_dtmf_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_dtmf_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_dtmf_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30449,7 +30564,7 @@ public class switch_dtmf_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30468,7 +30583,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30498,11 +30613,13 @@ public class switch_endpoint_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_endpoint_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_endpoint_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30623,7 +30740,7 @@ public class switch_endpoint_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30653,11 +30770,13 @@ public class switch_event : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_event(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_event(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30795,7 +30914,7 @@ public class switch_event : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30812,7 +30931,7 @@ public enum switch_event_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30842,11 +30961,13 @@ public class switch_event_header : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_event_header(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_event_header(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -30919,7 +31040,7 @@ public class switch_event_header : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31023,7 +31144,7 @@ public enum switch_event_types_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31056,7 +31177,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31086,11 +31207,13 @@ public class switch_file_handle : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_file_handle(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_file_handle(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -31518,10 +31641,10 @@ public class switch_file_handle : IDisposable {
 
   public switch_event _params {
     set {
-      freeswitchPINVOKE.switch_file_handle_params_set(swigCPtr, switch_event.getCPtr(value));
+      freeswitchPINVOKE.switch_file_handle__params_set(swigCPtr, switch_event.getCPtr(value));
     } 
     get {
-      IntPtr cPtr = freeswitchPINVOKE.switch_file_handle_params_get(swigCPtr);
+      IntPtr cPtr = freeswitchPINVOKE.switch_file_handle__params_get(swigCPtr);
       switch_event ret = (cPtr == IntPtr.Zero) ? null : new switch_event(cPtr, false);
       return ret;
     } 
@@ -31555,7 +31678,7 @@ public class switch_file_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31585,11 +31708,13 @@ public class switch_file_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_file_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_file_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -31785,7 +31910,7 @@ public class switch_file_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31815,11 +31940,13 @@ public class switch_filenames : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_filenames(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_filenames(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -31842,7 +31969,7 @@ public class switch_filenames : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31872,11 +31999,13 @@ public class switch_frame : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_frame(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_frame(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32077,7 +32206,7 @@ public class switch_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32103,7 +32232,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32133,11 +32262,13 @@ public class switch_hold_record_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_hold_record_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_hold_record_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32195,7 +32326,7 @@ public class switch_hold_record_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32212,7 +32343,7 @@ public enum switch_hup_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32242,11 +32373,13 @@ public class switch_input_args_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_input_args_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_input_args_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32334,7 +32467,7 @@ public class switch_input_args_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32350,7 +32483,7 @@ public enum switch_input_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32380,11 +32513,13 @@ public class switch_io_event_hook_kill_channel : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_kill_channel(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_kill_channel(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32419,7 +32554,7 @@ public class switch_io_event_hook_kill_channel : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32449,11 +32584,13 @@ public class switch_io_event_hook_outgoing_channel : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_outgoing_channel(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_outgoing_channel(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32488,7 +32625,7 @@ public class switch_io_event_hook_outgoing_channel : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32518,11 +32655,13 @@ public class switch_io_event_hook_read_frame : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_read_frame(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_read_frame(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32557,7 +32696,7 @@ public class switch_io_event_hook_read_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32587,11 +32726,13 @@ public class switch_io_event_hook_receive_event : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_receive_event(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_receive_event(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32626,7 +32767,7 @@ public class switch_io_event_hook_receive_event : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32656,11 +32797,13 @@ public class switch_io_event_hook_receive_message : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_receive_message(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_receive_message(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32695,7 +32838,7 @@ public class switch_io_event_hook_receive_message : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32725,11 +32868,13 @@ public class switch_io_event_hook_recv_dtmf : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_recv_dtmf(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_recv_dtmf(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32764,7 +32909,7 @@ public class switch_io_event_hook_recv_dtmf : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32794,11 +32939,13 @@ public class switch_io_event_hooks : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hooks(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hooks(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -32943,7 +33090,7 @@ public class switch_io_event_hooks : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32973,11 +33120,13 @@ public class switch_io_event_hook_send_dtmf : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_send_dtmf(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_send_dtmf(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33012,7 +33161,7 @@ public class switch_io_event_hook_send_dtmf : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33042,11 +33191,13 @@ public class switch_io_event_hook_state_change : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_state_change(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_state_change(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33081,7 +33232,7 @@ public class switch_io_event_hook_state_change : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33111,11 +33262,13 @@ public class switch_io_event_hook_state_run : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_state_run(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_state_run(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33150,7 +33303,7 @@ public class switch_io_event_hook_state_run : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33180,11 +33333,13 @@ public class switch_io_event_hook_video_read_frame : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_video_read_frame(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_video_read_frame(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33219,7 +33374,7 @@ public class switch_io_event_hook_video_read_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33249,11 +33404,13 @@ public class switch_io_event_hook_video_write_frame : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_video_write_frame(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_video_write_frame(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33288,7 +33445,7 @@ public class switch_io_event_hook_video_write_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33318,11 +33475,13 @@ public class switch_io_event_hook_write_frame : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_event_hook_write_frame(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_event_hook_write_frame(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33357,7 +33516,7 @@ public class switch_io_event_hook_write_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33374,7 +33533,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33399,7 +33558,7 @@ public enum switch_io_routine_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33429,11 +33588,13 @@ public class switch_io_routines : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_io_routines(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_io_routines(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33589,7 +33750,7 @@ public class switch_io_routines : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33610,7 +33771,7 @@ public enum switch_ivr_action_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33640,11 +33801,13 @@ public class switch_ivr_dmachine_match : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_ivr_dmachine_match(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_ivr_dmachine_match(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33709,7 +33872,7 @@ public class switch_ivr_dmachine_match : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33726,7 +33889,7 @@ public enum switch_ivr_menu_flags {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33743,7 +33906,7 @@ public enum switch_ivr_option_enum_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33773,11 +33936,13 @@ public class switch_json_api_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_json_api_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_json_api_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -33885,7 +34050,7 @@ public class switch_json_api_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33915,11 +34080,13 @@ public class switch_limit_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_limit_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_limit_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -34062,7 +34229,7 @@ public class switch_limit_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34092,11 +34259,13 @@ public class switch_loadable_module_function_table_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_loadable_module_function_table_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_loadable_module_function_table_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -34162,7 +34331,7 @@ public class switch_loadable_module_function_table_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34192,11 +34361,13 @@ public class switch_loadable_module_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_loadable_module_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_loadable_module_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -34427,7 +34598,7 @@ public class switch_loadable_module_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34461,7 +34632,7 @@ public enum switch_log_level_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34491,11 +34662,13 @@ public class switch_log_node_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_log_node_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_log_node_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -34610,7 +34783,7 @@ public class switch_log_node_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34627,7 +34800,7 @@ public enum switch_management_action_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34657,11 +34830,13 @@ public class switch_management_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_management_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_management_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -34749,7 +34924,7 @@ public class switch_management_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34781,7 +34956,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34805,7 +34980,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34821,7 +34996,7 @@ public enum switch_media_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34837,7 +35012,7 @@ public enum switch_module_flag_enum_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34867,7 +35042,7 @@ public enum switch_module_interface_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34889,7 +35064,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34908,7 +35083,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34925,7 +35100,7 @@ public enum switch_priority_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34941,7 +35116,7 @@ public enum switch_pvt_class_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34958,7 +35133,7 @@ public enum switch_ring_ready_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34988,11 +35163,13 @@ public class switch_rtcp_hdr_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtcp_hdr_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtcp_hdr_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -35055,7 +35232,7 @@ public class switch_rtcp_hdr_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35085,11 +35262,13 @@ public class switch_rtcp_numbers_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtcp_numbers_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtcp_numbers_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -35132,7 +35311,7 @@ public class switch_rtcp_numbers_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35159,7 +35338,7 @@ public enum switch_rtp_bug_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35178,7 +35357,7 @@ public enum switch_rtp_crypto_direction_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35208,11 +35387,13 @@ public class switch_rtp_crypto_key : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtp_crypto_key(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtp_crypto_key(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -35279,7 +35460,7 @@ public class switch_rtp_crypto_key : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35298,7 +35479,7 @@ public enum switch_rtp_crypto_key_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35351,7 +35532,7 @@ public enum switch_rtp_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35368,7 +35549,7 @@ public enum switch_rtp_flush_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35398,11 +35579,13 @@ public class switch_rtp_hdr_ext_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtp_hdr_ext_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtp_hdr_ext_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -35435,7 +35618,7 @@ public class switch_rtp_hdr_ext_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35465,11 +35648,13 @@ public class switch_rtp_hdr_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtp_hdr_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtp_hdr_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -35572,7 +35757,7 @@ public class switch_rtp_hdr_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35602,11 +35787,13 @@ public class switch_rtp_numbers_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtp_numbers_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtp_numbers_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -35946,7 +36133,7 @@ public class switch_rtp_numbers_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35976,11 +36163,13 @@ public class switch_rtp_stats_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_rtp_stats_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_rtp_stats_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36036,7 +36225,7 @@ public class switch_rtp_stats_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36066,11 +36255,13 @@ public class switch_say_args_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_say_args_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_say_args_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36123,7 +36314,7 @@ public class switch_say_args_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36141,7 +36332,7 @@ public enum switch_say_gender_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36171,11 +36362,13 @@ public class switch_say_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_say_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_say_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36274,7 +36467,7 @@ public class switch_say_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36293,7 +36486,7 @@ public enum switch_say_method_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36326,7 +36519,7 @@ public enum switch_say_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36344,7 +36537,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36374,11 +36567,13 @@ public class switch_scheduler_task : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_scheduler_task(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_scheduler_task(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36472,7 +36667,7 @@ public class switch_scheduler_task : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36502,11 +36697,13 @@ public class switch_serial_event_header_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_serial_event_header_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_serial_event_header_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36539,7 +36736,7 @@ public class switch_serial_event_header_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36569,11 +36766,13 @@ public class switch_serial_event_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_serial_event_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_serial_event_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36646,7 +36845,7 @@ public class switch_serial_event_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36702,7 +36901,7 @@ public enum switch_session_ctl_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36720,7 +36919,7 @@ public enum switch_signal_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36750,11 +36949,13 @@ public class switch_slin_data : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_slin_data(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_slin_data(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -36810,7 +37011,7 @@ public class switch_slin_data : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36832,7 +37033,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36862,11 +37063,13 @@ public class switch_speech_handle : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_speech_handle(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_speech_handle(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -37057,7 +37260,7 @@ public class switch_speech_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37087,11 +37290,13 @@ public class switch_speech_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_speech_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_speech_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -37256,7 +37461,7 @@ public class switch_speech_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37275,7 +37480,7 @@ public enum switch_stack_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37290,7 +37495,7 @@ public enum switch_state_handler_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37316,7 +37521,7 @@ public enum switch_state_handler_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37346,11 +37551,13 @@ public class switch_state_handler_table : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_state_handler_table(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_state_handler_table(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -37516,7 +37723,7 @@ public class switch_state_handler_table : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37555,7 +37762,7 @@ public enum switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37585,11 +37792,13 @@ public class switch_stream_handle : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_stream_handle(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_stream_handle(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -37705,7 +37914,7 @@ public class switch_stream_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37735,11 +37944,13 @@ public class switch_t38_options_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_t38_options_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_t38_options_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -37902,7 +38113,7 @@ public class switch_t38_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37920,7 +38131,7 @@ public enum switch_text_channel_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37950,11 +38161,13 @@ public class switch_thread_data_t : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_thread_data_t(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_thread_data_t(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -38011,7 +38224,7 @@ public class switch_thread_data_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38029,7 +38242,7 @@ public enum switch_thread_priority_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38059,11 +38272,13 @@ public class switch_timer : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_timer(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_timer(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -38173,7 +38388,7 @@ public class switch_timer : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38188,7 +38403,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38208,7 +38423,7 @@ public enum switch_timer_func_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38238,11 +38453,13 @@ public class switch_timer_interface : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_timer_interface(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_timer_interface(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -38385,7 +38602,7 @@ public class switch_timer_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38415,11 +38632,13 @@ public class switch_unicast_conninfo : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_unicast_conninfo(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_unicast_conninfo(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -38600,7 +38819,7 @@ public class switch_unicast_conninfo : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38618,7 +38837,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38635,7 +38854,7 @@ public enum switch_uri_flags {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38653,7 +38872,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38683,11 +38902,13 @@ public class switch_xml : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        freeswitchPINVOKE.delete_switch_xml(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_xml(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -38836,7 +39057,7 @@ public class switch_xml : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38854,7 +39075,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.