Add support for stack events.

trunk/bindings/_common/DDebug.cxx

@@ -19,12 +19,17 @@
 * along with DOUBANGO.
 *
 */
-#include "SipDebug.h"
+#include "DDebug.h"
 
 #include "SipStack.h"
 
 #include "Common.h"
 
+#if ANDROID /* callbacks will fail with jni */
+#	include <android/log.h>
+#	define ANDROID_DEBUG_TAG "tinyWRAP"
+#endif
+
 /* Very Important ==> never call functions which could raise debug callbacks into callback functions
 *  Callbacks should not used with Android (JNI).
 */
@@ -51,16 +56,36 @@ int debug_xxx_cb(const void* arg, const char* fmt, enum cb_type type, va_list *a
 		
 		switch(type){
 			case cb_info:
-				ret = stack->getDebugCallback()-> OnDebugInfo(message);
+				ret=
+#if ANDROID
+				__android_log_write(ANDROID_LOG_INFO, ANDROID_DEBUG_TAG, message);
+#else
+				stack->getDebugCallback()-> OnDebugInfo(message);
+#endif
 				break;
 			case cb_warn:
-				ret = stack->getDebugCallback()-> OnDebugWarn(message);
+				ret=
+#if ANDROID
+				__android_log_write(ANDROID_LOG_WARN, ANDROID_DEBUG_TAG, message);
+#else
+				stack->getDebugCallback()-> OnDebugWarn(message);
+#endif
 				break;
 			case cb_error:
-				ret = stack->getDebugCallback()-> OnDebugError(message);
+				ret=
+#if ANDROID
+				__android_log_write(ANDROID_LOG_ERROR, ANDROID_DEBUG_TAG, message);
+#else
+				stack->getDebugCallback()-> OnDebugError(message);
+#endif
 				break;
 			case cb_fatal:
-				ret = stack->getDebugCallback()-> OnDebugFatal(message);
+				ret=
+#if ANDROID
+				__android_log_write(ANDROID_LOG_FATAL, ANDROID_DEBUG_TAG, message);
+#else
+				stack->getDebugCallback()-> OnDebugFatal(message);
+#endif
 				break;
 		}
 		
@@ -70,7 +95,7 @@ int debug_xxx_cb(const void* arg, const char* fmt, enum cb_type type, va_list *a
 	return ret;
 }
 
-int SipDebugCallback::debug_info_cb(const void* arg, const char* fmt, ...)
+int DDebugCallback::debug_info_cb(const void* arg, const char* fmt, ...)
 {
 	va_list ap;
 	int ret;
@@ -82,7 +107,7 @@ int SipDebugCallback::debug_info_cb(const void* arg, const char* fmt, ...)
 	return ret;
 }
 
-int SipDebugCallback::debug_warn_cb(const void* arg, const char* fmt, ...){
+int DDebugCallback::debug_warn_cb(const void* arg, const char* fmt, ...){
 	va_list ap;
 	int ret;
 
@@ -93,7 +118,7 @@ int SipDebugCallback::debug_warn_cb(const void* arg, const char* fmt, ...){
 	return ret;
 }
 
-int SipDebugCallback::debug_error_cb(const void* arg, const char* fmt, ...){
+int DDebugCallback::debug_error_cb(const void* arg, const char* fmt, ...){
 	va_list ap;
 	int ret;
 
@@ -104,7 +129,7 @@ int SipDebugCallback::debug_error_cb(const void* arg, const char* fmt, ...){
 	return ret;
 }
 
-int SipDebugCallback::debug_fatal_cb(const void* arg, const char* fmt, ...){
+int DDebugCallback::debug_fatal_cb(const void* arg, const char* fmt, ...){
 	va_list ap;
 	int ret;
 

trunk/bindings/_common/DDebug.h

@@ -22,11 +22,11 @@
 #ifndef TINYWRAP_SIP_DEBUG_H
 #define TINYWRAP_SIP_DEBUG_H
 
-class SipDebugCallback
+class DDebugCallback
 {
 public:
-	SipDebugCallback() {  }
-	virtual ~SipDebugCallback() {}
+	DDebugCallback() {  }
+	virtual ~DDebugCallback() {}
 
 
 	virtual int OnDebugInfo(const char* message) { return -1; }

trunk/bindings/_common/SipCallback.h

@@ -23,6 +23,8 @@
 #define TINYWRAP_SIPCALLBACK_H
 
 class DialogEvent;
+class StackEvent;
+
 class MessagingEvent;
 class OptionsEvent;
 class PublicationEvent;
@@ -35,6 +37,8 @@ public:
 	SipCallback() {  }
 	virtual ~SipCallback() {}
 	virtual int OnDialogEvent(const DialogEvent* e) { return -1; }
+	virtual int OnStackEvent(const StackEvent* e) { return -1; }
+
 	virtual int OnMessagingEvent(const MessagingEvent* e) { return -1; }
 	virtual int OnOptionsEvent(const OptionsEvent* e) { return -1; }
 	virtual int OnPublicationEvent(const PublicationEvent* e) { return -1; }

trunk/bindings/_common/SipEvent.cxx

@@ -74,13 +74,16 @@ const SipMessage* SipEvent::getSipMessage() const
 
 /* ======================== DialogEvent ========================*/
 DialogEvent::DialogEvent(const tsip_event_t *_sipevent)
-:SipEvent(_sipevent)
-{
-}
+:SipEvent(_sipevent){ }
 
-DialogEvent::~DialogEvent()
-{
-}
+DialogEvent::~DialogEvent(){ }
+
+
+/* ======================== DialogEvent ========================*/
+StackEvent::StackEvent(const tsip_event_t *_sipevent)
+:SipEvent(_sipevent){ }
+
+StackEvent::~StackEvent(){ }
 
 
 

trunk/bindings/_common/SipEvent.h

@@ -67,6 +67,18 @@ public:
 public: /* Public API functions */
 };
 
+/* ======================== StackEvent ========================*/
+class StackEvent: public SipEvent
+{
+public:
+#if !defined(SWIG)
+	StackEvent(const tsip_event_t *sipevent);
+#endif
+	virtual ~StackEvent();
+
+public: /* Public API functions */
+};
+
 
 /* ======================== MessagingEvent ========================*/
 class MessagingEvent: public SipEvent

trunk/bindings/_common/SipStack.cxx

@@ -24,7 +24,7 @@
 #include "SipSession.h"
 #include "SipEvent.h"
 
-#include "SipDebug.h"
+#include "DDebug.h"
 
 #include "Common.h"
 
@@ -83,14 +83,14 @@ bool SipStack::start()
 	return (ret == 0);
 }
 
-bool SipStack::setDebugCallback(SipDebugCallback* callback)
+bool SipStack::setDebugCallback(DDebugCallback* callback)
 {
 	if((this->debugCallback = callback)){
 		tsk_debug_set_arg_data(this);
-		tsk_debug_set_info_cb(SipDebugCallback::debug_info_cb);
-		tsk_debug_set_warn_cb(SipDebugCallback::debug_warn_cb);
-		tsk_debug_set_error_cb(SipDebugCallback::debug_error_cb);
-		tsk_debug_set_fatal_cb(SipDebugCallback::debug_fatal_cb);
+		tsk_debug_set_info_cb(DDebugCallback::debug_info_cb);
+		tsk_debug_set_warn_cb(DDebugCallback::debug_warn_cb);
+		tsk_debug_set_error_cb(DDebugCallback::debug_error_cb);
+		tsk_debug_set_fatal_cb(DDebugCallback::debug_fatal_cb);
 		return true;
 	}
 
@@ -213,7 +213,7 @@ SipCallback* SipStack::getCallback()const
 	return this->callback;
 }
 
-SipDebugCallback* SipStack::getDebugCallback() const
+DDebugCallback* SipStack::getDebugCallback() const
 {
 	return this->debugCallback;
 }
@@ -228,12 +228,18 @@ int stack_callback(const tsip_event_t *sipevent)
 		TSK_DEBUG_WARN("Null SIP event.");
 		return -1;
 	}
-	else{
-		/* retrive the stack from the context */
-		const void* userdata;
-		const tsip_stack_handle_t* stack_handle = tsip_ssession_get_stack(sipevent->ss);
-		if(stack_handle && (userdata = tsip_stack_get_userdata(stack_handle))){
-			Stack = dyn_cast<const SipStack*>((const SipStack*)userdata);
+	else {
+		if(sipevent->type == tsip_event_stack && sipevent->userdata){
+			/* sessionless event */
+			Stack = dyn_cast<const SipStack*>((const SipStack*)sipevent->userdata);
+		}
+		else {
+			const void* userdata;
+			/* gets the stack from the session */
+			const tsip_stack_handle_t* stack_handle = tsip_ssession_get_stack(sipevent->ss);
+			if(stack_handle && (userdata = tsip_stack_get_userdata(stack_handle))){
+				Stack = dyn_cast<const SipStack*>((const SipStack*)userdata);
+			}
 		}
 	}
 
@@ -299,6 +305,15 @@ int stack_callback(const tsip_event_t *sipevent)
 				break;
 			}
 
+		case tsip_event_stack:
+			{	/* Stack event */
+				if(Stack->getCallback()){
+					e = new StackEvent(sipevent);
+					Stack->getCallback()->OnStackEvent((const StackEvent*)e);
+				}
+				break;
+			}
+
 		default:
 			{	/* Unsupported */
 				TSK_DEBUG_WARN("%d not supported as SIP event.", sipevent->type);

trunk/bindings/_common/SipStack.h

@@ -27,7 +27,7 @@
 
 #include "tinysip.h"
 
-class SipDebugCallback;
+class DDebugCallback;
 
 class SipStack: public SafeObject
 {
@@ -37,7 +37,7 @@ public: /* ctor() and dtor() */
 
 public: /* API functions */
 	bool start();
-	bool setDebugCallback(SipDebugCallback* callback);
+	bool setDebugCallback(DDebugCallback* callback);
 	bool setRealm(const char* realm_uri);
 	bool setIMPI(const char* impi);
 	bool setIMPU(const char* impu_uri);
@@ -58,12 +58,12 @@ public: /* Public helper function */
 #if !defined(SWIG)
 	tsip_stack_handle_t* getHandle()const;
 	SipCallback* getCallback()const;
-	SipDebugCallback* getDebugCallback() const;
+	DDebugCallback* getDebugCallback() const;
 #endif
 
 private:
 	SipCallback* callback;
-	SipDebugCallback* debugCallback;
+	DDebugCallback* debugCallback;
 	tsip_stack_handle_t *handle;
 
 	static unsigned count;

trunk/bindings/_common/SipStack.i

@@ -6,13 +6,11 @@
 #include "SipSession.h"
 
 #include "SipCallback.h"
-#include "SipDebug.h"
 #include "SafeObject.h"
 #include "SipStack.h"
 %}
 
 /* turn on director wrapping Callback */
-%feature("director") SipDebugCallback;
 %feature("director") SipCallback;
 
 
@@ -23,7 +21,6 @@
 %include "SipSession.h"
 
 %include "SipCallback.h"
-%include "SipDebug.h"
 %include "SafeObject.h"
 %include "SipStack.h"
 %clearnodefaultctor;

trunk/bindings/_common/tinyWRAP.i

@@ -1,6 +1,17 @@
 /* File : tinyWRAP.i */
 %module(directors="1") tinyWRAP
 
+%{
+#include "DDebug.h"
+%}
+
+%nodefaultctor;
+%include "DDebug.h"
+%clearnodefaultctor;
+
+
+%feature("director") DDebugCallback;
+
 %newobject getSipHeaderValue;
 %newobject getSipHeaderParamValue;
 // don't seem to work

trunk/bindings/autogen.sh

@@ -11,7 +11,7 @@ swig -c++ -java -package org.doubango.tinyWRAP -outdir java/android -o java/andr
 sed -i 's/dynamic_cast/static_cast/g' java/android/tinyWRAP_wrap.cxx
 sed -i 's/AttachCurrentThread((void \*\*)/AttachCurrentThread((JNIEnv \*\*)/g' java/android/tinyWRAP_wrap.cxx
 sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/SipCallback.java
-sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/SipDebugCallback.java
+sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/DDebugCallback.java
 
 
 ##### Python

trunk/bindings/csharp/DDebugCallback.cs

@@ -0,0 +1,66 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+using System;
+using System.Runtime.InteropServices;
+
+public class DDebugCallback : IDisposable {
+  private HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal DDebugCallback(IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(DDebugCallback obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~DDebugCallback() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_DDebugCallback(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      }
+      GC.SuppressFinalize(this);
+    }
+  }
+
+  public DDebugCallback() : this(tinyWRAPPINVOKE.new_DDebugCallback(), true) {
+  }
+
+  public virtual int OnDebugInfo(string message) {
+    int ret = tinyWRAPPINVOKE.DDebugCallback_OnDebugInfo(swigCPtr, message);
+    return ret;
+  }
+
+  public virtual int OnDebugWarn(string message) {
+    int ret = tinyWRAPPINVOKE.DDebugCallback_OnDebugWarn(swigCPtr, message);
+    return ret;
+  }
+
+  public virtual int OnDebugError(string message) {
+    int ret = tinyWRAPPINVOKE.DDebugCallback_OnDebugError(swigCPtr, message);
+    return ret;
+  }
+
+  public virtual int OnDebugFatal(string message) {
+    int ret = tinyWRAPPINVOKE.DDebugCallback_OnDebugFatal(swigCPtr, message);
+    return ret;
+  }
+
+}

trunk/bindings/csharp/DialogEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class DialogEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_DialogEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_DialogEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/MessagingEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class MessagingEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_MessagingEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_MessagingEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/MessagingSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class MessagingSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_MessagingSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_MessagingSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/OptionsEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class OptionsEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_OptionsEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_OptionsEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/OptionsSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class OptionsSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_OptionsSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_OptionsSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/PublicationEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class PublicationEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_PublicationEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_PublicationEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/PublicationSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class PublicationSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_PublicationSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_PublicationSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/RegistrationEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class RegistrationEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_RegistrationEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_RegistrationEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/RegistrationSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class RegistrationSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_RegistrationSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_RegistrationSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/SafeObject.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,11 +29,13 @@ public class SafeObject : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SafeObject(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SafeObject(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipCallback.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,11 +29,13 @@ public class SipCallback : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipCallback(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SipCallback(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -47,6 +49,11 @@ public class SipCallback : IDisposable {
     return ret;
   }
 
+  public virtual int OnStackEvent(StackEvent e) {
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnStackEvent(swigCPtr, StackEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnStackEventSwigExplicitSipCallback(swigCPtr, StackEvent.getCPtr(e)));
+    return ret;
+  }
+
   public virtual int OnMessagingEvent(MessagingEvent e) {
     int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnMessagingEvent(swigCPtr, MessagingEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnMessagingEventSwigExplicitSipCallback(swigCPtr, MessagingEvent.getCPtr(e)));
     return ret;
@@ -75,17 +82,19 @@ public class SipCallback : IDisposable {
   private void SwigDirectorConnect() {
     if (SwigDerivedClassHasMethod("OnDialogEvent", swigMethodTypes0))
       swigDelegate0 = new SwigDelegateSipCallback_0(SwigDirectorOnDialogEvent);
-    if (SwigDerivedClassHasMethod("OnMessagingEvent", swigMethodTypes1))
-      swigDelegate1 = new SwigDelegateSipCallback_1(SwigDirectorOnMessagingEvent);
-    if (SwigDerivedClassHasMethod("OnOptionsEvent", swigMethodTypes2))
-      swigDelegate2 = new SwigDelegateSipCallback_2(SwigDirectorOnOptionsEvent);
-    if (SwigDerivedClassHasMethod("OnPublicationEvent", swigMethodTypes3))
-      swigDelegate3 = new SwigDelegateSipCallback_3(SwigDirectorOnPublicationEvent);
-    if (SwigDerivedClassHasMethod("OnRegistrationEvent", swigMethodTypes4))
-      swigDelegate4 = new SwigDelegateSipCallback_4(SwigDirectorOnRegistrationEvent);
-    if (SwigDerivedClassHasMethod("OnSubscriptionEvent", swigMethodTypes5))
-      swigDelegate5 = new SwigDelegateSipCallback_5(SwigDirectorOnSubscriptionEvent);
-    tinyWRAPPINVOKE.SipCallback_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5);
+    if (SwigDerivedClassHasMethod("OnStackEvent", swigMethodTypes1))
+      swigDelegate1 = new SwigDelegateSipCallback_1(SwigDirectorOnStackEvent);
+    if (SwigDerivedClassHasMethod("OnMessagingEvent", swigMethodTypes2))
+      swigDelegate2 = new SwigDelegateSipCallback_2(SwigDirectorOnMessagingEvent);
+    if (SwigDerivedClassHasMethod("OnOptionsEvent", swigMethodTypes3))
+      swigDelegate3 = new SwigDelegateSipCallback_3(SwigDirectorOnOptionsEvent);
+    if (SwigDerivedClassHasMethod("OnPublicationEvent", swigMethodTypes4))
+      swigDelegate4 = new SwigDelegateSipCallback_4(SwigDirectorOnPublicationEvent);
+    if (SwigDerivedClassHasMethod("OnRegistrationEvent", swigMethodTypes5))
+      swigDelegate5 = new SwigDelegateSipCallback_5(SwigDirectorOnRegistrationEvent);
+    if (SwigDerivedClassHasMethod("OnSubscriptionEvent", swigMethodTypes6))
+      swigDelegate6 = new SwigDelegateSipCallback_6(SwigDirectorOnSubscriptionEvent);
+    tinyWRAPPINVOKE.SipCallback_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5, swigDelegate6);
   }
 
   private bool SwigDerivedClassHasMethod(string methodName, Type[] methodTypes) {
@@ -98,6 +107,10 @@ public class SipCallback : IDisposable {
     return OnDialogEvent((e == IntPtr.Zero) ? null : new DialogEvent(e, false));
   }
 
+  private int SwigDirectorOnStackEvent(IntPtr e) {
+    return OnStackEvent((e == IntPtr.Zero) ? null : new StackEvent(e, false));
+  }
+
   private int SwigDirectorOnMessagingEvent(IntPtr e) {
     return OnMessagingEvent((e == IntPtr.Zero) ? null : new MessagingEvent(e, false));
   }
@@ -124,6 +137,7 @@ public class SipCallback : IDisposable {
   public delegate int SwigDelegateSipCallback_3(IntPtr e);
   public delegate int SwigDelegateSipCallback_4(IntPtr e);
   public delegate int SwigDelegateSipCallback_5(IntPtr e);
+  public delegate int SwigDelegateSipCallback_6(IntPtr e);
 
   private SwigDelegateSipCallback_0 swigDelegate0;
   private SwigDelegateSipCallback_1 swigDelegate1;
@@ -131,11 +145,13 @@ public class SipCallback : IDisposable {
   private SwigDelegateSipCallback_3 swigDelegate3;
   private SwigDelegateSipCallback_4 swigDelegate4;
   private SwigDelegateSipCallback_5 swigDelegate5;
+  private SwigDelegateSipCallback_6 swigDelegate6;
 
   private static Type[] swigMethodTypes0 = new Type[] { typeof(DialogEvent) };
-  private static Type[] swigMethodTypes1 = new Type[] { typeof(MessagingEvent) };
-  private static Type[] swigMethodTypes2 = new Type[] { typeof(OptionsEvent) };
-  private static Type[] swigMethodTypes3 = new Type[] { typeof(PublicationEvent) };
-  private static Type[] swigMethodTypes4 = new Type[] { typeof(RegistrationEvent) };
-  private static Type[] swigMethodTypes5 = new Type[] { typeof(SubscriptionEvent) };
+  private static Type[] swigMethodTypes1 = new Type[] { typeof(StackEvent) };
+  private static Type[] swigMethodTypes2 = new Type[] { typeof(MessagingEvent) };
+  private static Type[] swigMethodTypes3 = new Type[] { typeof(OptionsEvent) };
+  private static Type[] swigMethodTypes4 = new Type[] { typeof(PublicationEvent) };
+  private static Type[] swigMethodTypes5 = new Type[] { typeof(RegistrationEvent) };
+  private static Type[] swigMethodTypes6 = new Type[] { typeof(SubscriptionEvent) };
 }

trunk/bindings/csharp/SipDebugCallback.cs

@@ -1,113 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-
-using System;
-using System.Runtime.InteropServices;
-
-public class SipDebugCallback : IDisposable {
-  private HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal SipDebugCallback(IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new HandleRef(this, cPtr);
-  }
-
-  internal static HandleRef getCPtr(SipDebugCallback obj) {
-    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~SipDebugCallback() {
-    Dispose();
-  }
-
-  public virtual void Dispose() {
-    lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipDebugCallback(swigCPtr);
-      }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
-      GC.SuppressFinalize(this);
-    }
-  }
-
-  public SipDebugCallback() : this(tinyWRAPPINVOKE.new_SipDebugCallback(), true) {
-    SwigDirectorConnect();
-  }
-
-  public virtual int OnDebugInfo(string message) {
-    int ret = ((this.GetType() == typeof(SipDebugCallback)) ? tinyWRAPPINVOKE.SipDebugCallback_OnDebugInfo(swigCPtr, message) : tinyWRAPPINVOKE.SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(swigCPtr, message));
-    return ret;
-  }
-
-  public virtual int OnDebugWarn(string message) {
-    int ret = ((this.GetType() == typeof(SipDebugCallback)) ? tinyWRAPPINVOKE.SipDebugCallback_OnDebugWarn(swigCPtr, message) : tinyWRAPPINVOKE.SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(swigCPtr, message));
-    return ret;
-  }
-
-  public virtual int OnDebugError(string message) {
-    int ret = ((this.GetType() == typeof(SipDebugCallback)) ? tinyWRAPPINVOKE.SipDebugCallback_OnDebugError(swigCPtr, message) : tinyWRAPPINVOKE.SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(swigCPtr, message));
-    return ret;
-  }
-
-  public virtual int OnDebugFatal(string message) {
-    int ret = ((this.GetType() == typeof(SipDebugCallback)) ? tinyWRAPPINVOKE.SipDebugCallback_OnDebugFatal(swigCPtr, message) : tinyWRAPPINVOKE.SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(swigCPtr, message));
-    return ret;
-  }
-
-  private void SwigDirectorConnect() {
-    if (SwigDerivedClassHasMethod("OnDebugInfo", swigMethodTypes0))
-      swigDelegate0 = new SwigDelegateSipDebugCallback_0(SwigDirectorOnDebugInfo);
-    if (SwigDerivedClassHasMethod("OnDebugWarn", swigMethodTypes1))
-      swigDelegate1 = new SwigDelegateSipDebugCallback_1(SwigDirectorOnDebugWarn);
-    if (SwigDerivedClassHasMethod("OnDebugError", swigMethodTypes2))
-      swigDelegate2 = new SwigDelegateSipDebugCallback_2(SwigDirectorOnDebugError);
-    if (SwigDerivedClassHasMethod("OnDebugFatal", swigMethodTypes3))
-      swigDelegate3 = new SwigDelegateSipDebugCallback_3(SwigDirectorOnDebugFatal);
-    tinyWRAPPINVOKE.SipDebugCallback_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3);
-  }
-
-  private bool SwigDerivedClassHasMethod(string methodName, Type[] methodTypes) {
-    System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(SipDebugCallback));
-    return hasDerivedMethod;
-  }
-
-  private int SwigDirectorOnDebugInfo(string message) {
-    return OnDebugInfo(message);
-  }
-
-  private int SwigDirectorOnDebugWarn(string message) {
-    return OnDebugWarn(message);
-  }
-
-  private int SwigDirectorOnDebugError(string message) {
-    return OnDebugError(message);
-  }
-
-  private int SwigDirectorOnDebugFatal(string message) {
-    return OnDebugFatal(message);
-  }
-
-  public delegate int SwigDelegateSipDebugCallback_0(string message);
-  public delegate int SwigDelegateSipDebugCallback_1(string message);
-  public delegate int SwigDelegateSipDebugCallback_2(string message);
-  public delegate int SwigDelegateSipDebugCallback_3(string message);
-
-  private SwigDelegateSipDebugCallback_0 swigDelegate0;
-  private SwigDelegateSipDebugCallback_1 swigDelegate1;
-  private SwigDelegateSipDebugCallback_2 swigDelegate2;
-  private SwigDelegateSipDebugCallback_3 swigDelegate3;
-
-  private static Type[] swigMethodTypes0 = new Type[] { typeof(string) };
-  private static Type[] swigMethodTypes1 = new Type[] { typeof(string) };
-  private static Type[] swigMethodTypes2 = new Type[] { typeof(string) };
-  private static Type[] swigMethodTypes3 = new Type[] { typeof(string) };
-}

trunk/bindings/csharp/SipEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,11 +29,13 @@ public class SipEvent : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SipEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipMessage.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,11 +29,13 @@ public class SipMessage : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipMessage(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SipMessage(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,11 +29,13 @@ public class SipSession : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SipSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipStack.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class SipStack : SafeObject {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipStack(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SipStack(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }
@@ -45,8 +47,8 @@ public class SipStack : SafeObject {
     return ret;
   }
 
-  public bool setDebugCallback(SipDebugCallback callback) {
-    bool ret = tinyWRAPPINVOKE.SipStack_setDebugCallback(swigCPtr, SipDebugCallback.getCPtr(callback));
+  public bool setDebugCallback(DDebugCallback callback) {
+    bool ret = tinyWRAPPINVOKE.SipStack_setDebugCallback(swigCPtr, DDebugCallback.getCPtr(callback));
     return ret;
   }
 

trunk/bindings/csharp/SipUri.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,11 +29,13 @@ public class SipUri : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SipUri(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SipUri(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/StackEvent.cs

@@ -0,0 +1,42 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+using System;
+using System.Runtime.InteropServices;
+
+public class StackEvent : SipEvent {
+  private HandleRef swigCPtr;
+
+  internal StackEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.StackEventUpcast(cPtr), cMemoryOwn) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(StackEvent obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~StackEvent() {
+    Dispose();
+  }
+
+  public override void Dispose() {
+    lock(this) {
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_StackEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      }
+      GC.SuppressFinalize(this);
+      base.Dispose();
+    }
+  }
+
+}

trunk/bindings/csharp/SubscriptionEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class SubscriptionEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SubscriptionEvent(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SubscriptionEvent(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/SubscriptionSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,11 +27,13 @@ public class SubscriptionSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPPINVOKE.delete_SubscriptionSession(swigCPtr);
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          tinyWRAPPINVOKE.delete_SubscriptionSession(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
-      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/tinyWRAP.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
 
 public class tinyWRAP {
   public static readonly int tsip_event_code_dialog_transport_error = tinyWRAPPINVOKE.tsip_event_code_dialog_transport_error_get();
-  public static readonly int tsip_event_code_global_error = tinyWRAPPINVOKE.tsip_event_code_global_error_get();
+  public static readonly int tsip_event_code_dialog_global_error = tinyWRAPPINVOKE.tsip_event_code_dialog_global_error_get();
   public static readonly int tsip_event_code_dialog_message_error = tinyWRAPPINVOKE.tsip_event_code_dialog_message_error_get();
   public static readonly int tsip_event_code_dialog_request_incoming = tinyWRAPPINVOKE.tsip_event_code_dialog_request_incoming_get();
   public static readonly int tsip_event_code_dialog_request_cancelled = tinyWRAPPINVOKE.tsip_event_code_dialog_request_cancelled_get();
@@ -21,4 +21,8 @@ public class tinyWRAP {
   public static readonly int tsip_event_code_dialog_connected = tinyWRAPPINVOKE.tsip_event_code_dialog_connected_get();
   public static readonly int tsip_event_code_dialog_terminating = tinyWRAPPINVOKE.tsip_event_code_dialog_terminating_get();
   public static readonly int tsip_event_code_dialog_terminated = tinyWRAPPINVOKE.tsip_event_code_dialog_terminated_get();
+  public static readonly int tsip_event_code_stack_started = tinyWRAPPINVOKE.tsip_event_code_stack_started_get();
+  public static readonly int tsip_event_code_stack_stopped = tinyWRAPPINVOKE.tsip_event_code_stack_stopped_get();
+  public static readonly int tsip_event_code_stack_failed_to_start = tinyWRAPPINVOKE.tsip_event_code_stack_failed_to_start_get();
+  public static readonly int tsip_event_code_stack_failed_to_stop = tinyWRAPPINVOKE.tsip_event_code_stack_failed_to_stop_get();
 }

trunk/bindings/csharp/tinyWRAPPINVOKE.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -184,6 +184,24 @@ class tinyWRAPPINVOKE {
   static protected SWIGStringHelper swigStringHelper = new SWIGStringHelper();
 
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_new_DDebugCallback")]
+  public static extern IntPtr new_DDebugCallback();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_delete_DDebugCallback")]
+  public static extern void delete_DDebugCallback(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_DDebugCallback_OnDebugInfo")]
+  public static extern int DDebugCallback_OnDebugInfo(HandleRef jarg1, string jarg2);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_DDebugCallback_OnDebugWarn")]
+  public static extern int DDebugCallback_OnDebugWarn(HandleRef jarg1, string jarg2);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_DDebugCallback_OnDebugError")]
+  public static extern int DDebugCallback_OnDebugError(HandleRef jarg1, string jarg2);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_DDebugCallback_OnDebugFatal")]
+  public static extern int DDebugCallback_OnDebugFatal(HandleRef jarg1, string jarg2);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_new_SipUri")]
   public static extern IntPtr new_SipUri(string jarg1);
 
@@ -238,6 +256,9 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_delete_DialogEvent")]
   public static extern void delete_DialogEvent(HandleRef jarg1);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_delete_StackEvent")]
+  public static extern void delete_StackEvent(HandleRef jarg1);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_delete_MessagingEvent")]
   public static extern void delete_MessagingEvent(HandleRef jarg1);
 
@@ -397,6 +418,12 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_SipCallback_OnDialogEventSwigExplicitSipCallback")]
   public static extern int SipCallback_OnDialogEventSwigExplicitSipCallback(HandleRef jarg1, HandleRef jarg2);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SipCallback_OnStackEvent")]
+  public static extern int SipCallback_OnStackEvent(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SipCallback_OnStackEventSwigExplicitSipCallback")]
+  public static extern int SipCallback_OnStackEventSwigExplicitSipCallback(HandleRef jarg1, HandleRef jarg2);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_SipCallback_OnMessagingEvent")]
   public static extern int SipCallback_OnMessagingEvent(HandleRef jarg1, HandleRef jarg2);
 
@@ -428,40 +455,7 @@ class tinyWRAPPINVOKE {
   public static extern int SipCallback_OnSubscriptionEventSwigExplicitSipCallback(HandleRef jarg1, HandleRef jarg2);
 
   [DllImport("tinyWRAP", EntryPoint="CSharp_SipCallback_director_connect")]
-  public static extern void SipCallback_director_connect(HandleRef jarg1, SipCallback.SwigDelegateSipCallback_0 delegate0, SipCallback.SwigDelegateSipCallback_1 delegate1, SipCallback.SwigDelegateSipCallback_2 delegate2, SipCallback.SwigDelegateSipCallback_3 delegate3, SipCallback.SwigDelegateSipCallback_4 delegate4, SipCallback.SwigDelegateSipCallback_5 delegate5);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_new_SipDebugCallback")]
-  public static extern IntPtr new_SipDebugCallback();
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_delete_SipDebugCallback")]
-  public static extern void delete_SipDebugCallback(HandleRef jarg1);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugInfo")]
-  public static extern int SipDebugCallback_OnDebugInfo(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback")]
-  public static extern int SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugWarn")]
-  public static extern int SipDebugCallback_OnDebugWarn(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback")]
-  public static extern int SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugError")]
-  public static extern int SipDebugCallback_OnDebugError(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback")]
-  public static extern int SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugFatal")]
-  public static extern int SipDebugCallback_OnDebugFatal(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback")]
-  public static extern int SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(HandleRef jarg1, string jarg2);
-
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipDebugCallback_director_connect")]
-  public static extern void SipDebugCallback_director_connect(HandleRef jarg1, SipDebugCallback.SwigDelegateSipDebugCallback_0 delegate0, SipDebugCallback.SwigDelegateSipDebugCallback_1 delegate1, SipDebugCallback.SwigDelegateSipDebugCallback_2 delegate2, SipDebugCallback.SwigDelegateSipDebugCallback_3 delegate3);
+  public static extern void SipCallback_director_connect(HandleRef jarg1, SipCallback.SwigDelegateSipCallback_0 delegate0, SipCallback.SwigDelegateSipCallback_1 delegate1, SipCallback.SwigDelegateSipCallback_2 delegate2, SipCallback.SwigDelegateSipCallback_3 delegate3, SipCallback.SwigDelegateSipCallback_4 delegate4, SipCallback.SwigDelegateSipCallback_5 delegate5, SipCallback.SwigDelegateSipCallback_6 delegate6);
 
   [DllImport("tinyWRAP", EntryPoint="CSharp_new_SafeObject")]
   public static extern IntPtr new_SafeObject();
@@ -532,8 +526,8 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_dialog_transport_error_get")]
   public static extern int tsip_event_code_dialog_transport_error_get();
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_global_error_get")]
-  public static extern int tsip_event_code_global_error_get();
+  [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_dialog_global_error_get")]
+  public static extern int tsip_event_code_dialog_global_error_get();
 
   [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_dialog_message_error_get")]
   public static extern int tsip_event_code_dialog_message_error_get();
@@ -559,9 +553,24 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_dialog_terminated_get")]
   public static extern int tsip_event_code_dialog_terminated_get();
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_stack_started_get")]
+  public static extern int tsip_event_code_stack_started_get();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_stack_stopped_get")]
+  public static extern int tsip_event_code_stack_stopped_get();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_stack_failed_to_start_get")]
+  public static extern int tsip_event_code_stack_failed_to_start_get();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_tsip_event_code_stack_failed_to_stop_get")]
+  public static extern int tsip_event_code_stack_failed_to_stop_get();
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_DialogEventUpcast")]
   public static extern IntPtr DialogEventUpcast(IntPtr objectRef);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_StackEventUpcast")]
+  public static extern IntPtr StackEventUpcast(IntPtr objectRef);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingEventUpcast")]
   public static extern IntPtr MessagingEventUpcast(IntPtr objectRef);
 

trunk/bindings/csharp/tinyWRAP_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  * 
  * 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
@@ -35,114 +35,114 @@ template <typename T> T SwigValueInit() {
 }
 #endif
 
-/* -----------------------------------------------------------------------------
- *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
-
-/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
-#endif
-
-/* inline attribute */
-#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
-# else
-#   define SWIGINLINE
-# endif
-#endif
-
-/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
-# else
-#   define SWIGUNUSED 
-# 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)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
-# endif
-#endif
-
-/* internal SWIG method */
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
-#endif
-
-/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
-
-/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
-#  endif
-#endif
-
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
-# else
-#   define SWIGSTDCALL
-# endif 
-#endif
-
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
+# else
+#   define SWIGUNUSED 
+# 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)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif 
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
 
 
 #include <stdlib.h>
@@ -202,7 +202,7 @@ 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) {
@@ -280,56 +280,59 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_tinyWRAP(SWIG_CSharpStrin
 
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, msg, ""); return nullreturn; } else
 
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * director.swg
- *
- * This file contains support for director classes so that C# proxy 
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-
-#if defined(DEBUG_DIRECTOR_OWNED)
-#include <iostream>
-#endif
-#include <string>
-
-namespace Swig {
-  /* Director base class - not currently used in C# directors */
-  class Director {
-  };
-
-  /* Base class for director exceptions */
-  class DirectorException {
-  protected:
-    std::string swig_msg;
-
-  public:
-    DirectorException(const char* msg) : swig_msg(msg) {
-    }
-    DirectorException(const std::string &msg) : swig_msg(msg) {
-    }
-    const std::string& what() const {
-      return swig_msg;
-    }
-    virtual ~DirectorException() {
-    }
-  };
-
-  /* Pure virtual method exception */
-  class DirectorPureVirtualException : public Swig::DirectorException {
-  public:
-    DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
-    }
-  };
-}
-
-#endif /* __cplusplus */
-
-
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * director.swg
+ *
+ * This file contains support for director classes so that C# proxy 
+ * methods can be called from C++.
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+
+#if defined(DEBUG_DIRECTOR_OWNED)
+#include <iostream>
+#endif
+#include <string>
+
+namespace Swig {
+  /* Director base class - not currently used in C# directors */
+  class Director {
+  };
+
+  /* Base class for director exceptions */
+  class DirectorException {
+  protected:
+    std::string swig_msg;
+
+  public:
+    DirectorException(const char* msg) : swig_msg(msg) {
+    }
+    DirectorException(const std::string &msg) : swig_msg(msg) {
+    }
+    const std::string& what() const {
+      return swig_msg;
+    }
+    virtual ~DirectorException() {
+    }
+  };
+
+  /* Pure virtual method exception */
+  class DirectorPureVirtualException : public Swig::DirectorException {
+  public:
+    DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
+    }
+  };
+}
+
+#endif /* __cplusplus */
+
+
+
+#include "DDebug.h"
+
 
 #include "SipUri.h"
 #include "SipMessage.h"
@@ -337,7 +340,6 @@ namespace Swig {
 #include "SipSession.h"
 
 #include "SipCallback.h"
-#include "SipDebug.h"
 #include "SafeObject.h"
 #include "SipStack.h"
 
@@ -373,6 +375,21 @@ int SwigDirector_SipCallback::OnDialogEvent(DialogEvent const *e) {
   return c_result;
 }
 
+int SwigDirector_SipCallback::OnStackEvent(StackEvent const *e) {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  void * je = 0 ;
+  
+  if (!swig_callbackOnStackEvent) {
+    return SipCallback::OnStackEvent(e);
+  } else {
+    je = (void *) e; 
+    jresult = (int) swig_callbackOnStackEvent(je);
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
 int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
   int c_result = SwigValueInit< int >() ;
   int jresult = 0 ;
@@ -448,8 +465,9 @@ int SwigDirector_SipCallback::OnSubscriptionEvent(SubscriptionEvent const *e) {
   return c_result;
 }
 
-void SwigDirector_SipCallback::swig_connect_director(SWIG_Callback0_t callbackOnDialogEvent, SWIG_Callback1_t callbackOnMessagingEvent, SWIG_Callback2_t callbackOnOptionsEvent, SWIG_Callback3_t callbackOnPublicationEvent, SWIG_Callback4_t callbackOnRegistrationEvent, SWIG_Callback5_t callbackOnSubscriptionEvent) {
+void SwigDirector_SipCallback::swig_connect_director(SWIG_Callback0_t callbackOnDialogEvent, SWIG_Callback1_t callbackOnStackEvent, SWIG_Callback2_t callbackOnMessagingEvent, SWIG_Callback3_t callbackOnOptionsEvent, SWIG_Callback4_t callbackOnPublicationEvent, SWIG_Callback5_t callbackOnRegistrationEvent, SWIG_Callback6_t callbackOnSubscriptionEvent) {
   swig_callbackOnDialogEvent = callbackOnDialogEvent;
+  swig_callbackOnStackEvent = callbackOnStackEvent;
   swig_callbackOnMessagingEvent = callbackOnMessagingEvent;
   swig_callbackOnOptionsEvent = callbackOnOptionsEvent;
   swig_callbackOnPublicationEvent = callbackOnPublicationEvent;
@@ -459,6 +477,7 @@ void SwigDirector_SipCallback::swig_connect_director(SWIG_Callback0_t callbackOn
 
 void SwigDirector_SipCallback::swig_init_callbacks() {
   swig_callbackOnDialogEvent = 0;
+  swig_callbackOnStackEvent = 0;
   swig_callbackOnMessagingEvent = 0;
   swig_callbackOnOptionsEvent = 0;
   swig_callbackOnPublicationEvent = 0;
@@ -466,94 +485,85 @@ void SwigDirector_SipCallback::swig_init_callbacks() {
   swig_callbackOnSubscriptionEvent = 0;
 }
 
-SwigDirector_SipDebugCallback::SwigDirector_SipDebugCallback() : SipDebugCallback(), Swig::Director() {
-  swig_init_callbacks();
-}
-
-SwigDirector_SipDebugCallback::~SwigDirector_SipDebugCallback() {
-  
-}
-
-
-int SwigDirector_SipDebugCallback::OnDebugInfo(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  int jresult = 0 ;
-  char * jmessage = 0 ;
-  
-  if (!swig_callbackOnDebugInfo) {
-    return SipDebugCallback::OnDebugInfo(message);
-  } else {
-    jmessage = SWIG_csharp_string_callback((const char *)message); 
-    jresult = (int) swig_callbackOnDebugInfo(jmessage);
-    c_result = (int)jresult; 
-  }
-  return c_result;
-}
-
-int SwigDirector_SipDebugCallback::OnDebugWarn(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  int jresult = 0 ;
-  char * jmessage = 0 ;
-  
-  if (!swig_callbackOnDebugWarn) {
-    return SipDebugCallback::OnDebugWarn(message);
-  } else {
-    jmessage = SWIG_csharp_string_callback((const char *)message); 
-    jresult = (int) swig_callbackOnDebugWarn(jmessage);
-    c_result = (int)jresult; 
-  }
-  return c_result;
-}
-
-int SwigDirector_SipDebugCallback::OnDebugError(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  int jresult = 0 ;
-  char * jmessage = 0 ;
-  
-  if (!swig_callbackOnDebugError) {
-    return SipDebugCallback::OnDebugError(message);
-  } else {
-    jmessage = SWIG_csharp_string_callback((const char *)message); 
-    jresult = (int) swig_callbackOnDebugError(jmessage);
-    c_result = (int)jresult; 
-  }
-  return c_result;
-}
-
-int SwigDirector_SipDebugCallback::OnDebugFatal(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  int jresult = 0 ;
-  char * jmessage = 0 ;
-  
-  if (!swig_callbackOnDebugFatal) {
-    return SipDebugCallback::OnDebugFatal(message);
-  } else {
-    jmessage = SWIG_csharp_string_callback((const char *)message); 
-    jresult = (int) swig_callbackOnDebugFatal(jmessage);
-    c_result = (int)jresult; 
-  }
-  return c_result;
-}
-
-void SwigDirector_SipDebugCallback::swig_connect_director(SWIG_Callback0_t callbackOnDebugInfo, SWIG_Callback1_t callbackOnDebugWarn, SWIG_Callback2_t callbackOnDebugError, SWIG_Callback3_t callbackOnDebugFatal) {
-  swig_callbackOnDebugInfo = callbackOnDebugInfo;
-  swig_callbackOnDebugWarn = callbackOnDebugWarn;
-  swig_callbackOnDebugError = callbackOnDebugError;
-  swig_callbackOnDebugFatal = callbackOnDebugFatal;
-}
-
-void SwigDirector_SipDebugCallback::swig_init_callbacks() {
-  swig_callbackOnDebugInfo = 0;
-  swig_callbackOnDebugWarn = 0;
-  swig_callbackOnDebugError = 0;
-  swig_callbackOnDebugFatal = 0;
-}
-
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_DDebugCallback() {
+  void * jresult ;
+  DDebugCallback *result = 0 ;
+  
+  result = (DDebugCallback *)new DDebugCallback();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_DDebugCallback(void * jarg1) {
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  
+  arg1 = (DDebugCallback *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_DDebugCallback_OnDebugInfo(void * jarg1, char * jarg2) {
+  int jresult ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (DDebugCallback *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)(arg1)->OnDebugInfo((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_DDebugCallback_OnDebugWarn(void * jarg1, char * jarg2) {
+  int jresult ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (DDebugCallback *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)(arg1)->OnDebugWarn((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_DDebugCallback_OnDebugError(void * jarg1, char * jarg2) {
+  int jresult ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (DDebugCallback *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)(arg1)->OnDebugError((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_DDebugCallback_OnDebugFatal(void * jarg1, char * jarg2) {
+  int jresult ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (DDebugCallback *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)(arg1)->OnDebugFatal((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_SipUri(char * jarg1) {
   void * jresult ;
   char *arg1 = (char *) 0 ;
@@ -776,6 +786,14 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_DialogEvent(void * jarg1) {
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_StackEvent(void * jarg1) {
+  StackEvent *arg1 = (StackEvent *) 0 ;
+  
+  arg1 = (StackEvent *)jarg1; 
+  delete arg1;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_MessagingEvent(void * jarg1) {
   MessagingEvent *arg1 = (MessagingEvent *) 0 ;
   
@@ -1396,6 +1414,34 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SipCallback_OnDialogEventSwigExplicitSipCallba
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_SipCallback_OnStackEvent(void * jarg1, void * jarg2) {
+  int jresult ;
+  SipCallback *arg1 = (SipCallback *) 0 ;
+  StackEvent *arg2 = (StackEvent *) 0 ;
+  int result;
+  
+  arg1 = (SipCallback *)jarg1; 
+  arg2 = (StackEvent *)jarg2; 
+  result = (int)(arg1)->OnStackEvent((StackEvent const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SipCallback_OnStackEventSwigExplicitSipCallback(void * jarg1, void * jarg2) {
+  int jresult ;
+  SipCallback *arg1 = (SipCallback *) 0 ;
+  StackEvent *arg2 = (StackEvent *) 0 ;
+  int result;
+  
+  arg1 = (SipCallback *)jarg1; 
+  arg2 = (StackEvent *)jarg2; 
+  result = (int)(arg1)->SipCallback::OnStackEvent((StackEvent const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_SipCallback_OnMessagingEvent(void * jarg1, void * jarg2) {
   int jresult ;
   SipCallback *arg1 = (SipCallback *) 0 ;
@@ -1536,150 +1582,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SipCallback_OnSubscriptionEventSwigExplicitSip
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_SipCallback_director_connect(void *objarg, SwigDirector_SipCallback::SWIG_Callback0_t callback0, SwigDirector_SipCallback::SWIG_Callback1_t callback1, SwigDirector_SipCallback::SWIG_Callback2_t callback2, SwigDirector_SipCallback::SWIG_Callback3_t callback3, SwigDirector_SipCallback::SWIG_Callback4_t callback4, SwigDirector_SipCallback::SWIG_Callback5_t callback5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_SipCallback_director_connect(void *objarg, SwigDirector_SipCallback::SWIG_Callback0_t callback0, SwigDirector_SipCallback::SWIG_Callback1_t callback1, SwigDirector_SipCallback::SWIG_Callback2_t callback2, SwigDirector_SipCallback::SWIG_Callback3_t callback3, SwigDirector_SipCallback::SWIG_Callback4_t callback4, SwigDirector_SipCallback::SWIG_Callback5_t callback5, SwigDirector_SipCallback::SWIG_Callback6_t callback6) {
   SipCallback *obj = (SipCallback *)objarg;
   SwigDirector_SipCallback *director = dynamic_cast<SwigDirector_SipCallback *>(obj);
   if (director) {
-    director->swig_connect_director(callback0, callback1, callback2, callback3, callback4, callback5);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_SipDebugCallback() {
-  void * jresult ;
-  SipDebugCallback *result = 0 ;
-  
-  result = (SipDebugCallback *)new SwigDirector_SipDebugCallback();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_SipDebugCallback(void * jarg1) {
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugInfo(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->OnDebugInfo((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->SipDebugCallback::OnDebugInfo((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugWarn(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->OnDebugWarn((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->SipDebugCallback::OnDebugWarn((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugError(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->OnDebugError((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->SipDebugCallback::OnDebugError((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugFatal(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->OnDebugFatal((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(void * jarg1, char * jarg2) {
-  int jresult ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (SipDebugCallback *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->SipDebugCallback::OnDebugFatal((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_SipDebugCallback_director_connect(void *objarg, SwigDirector_SipDebugCallback::SWIG_Callback0_t callback0, SwigDirector_SipDebugCallback::SWIG_Callback1_t callback1, SwigDirector_SipDebugCallback::SWIG_Callback2_t callback2, SwigDirector_SipDebugCallback::SWIG_Callback3_t callback3) {
-  SipDebugCallback *obj = (SipDebugCallback *)objarg;
-  SwigDirector_SipDebugCallback *director = dynamic_cast<SwigDirector_SipDebugCallback *>(obj);
-  if (director) {
-    director->swig_connect_director(callback0, callback1, callback2, callback3);
+    director->swig_connect_director(callback0, callback1, callback2, callback3, callback4, callback5, callback6);
   }
 }
 
@@ -1767,11 +1674,11 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_SipStack_start(void * jarg1) {
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_SipStack_setDebugCallback(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   SipStack *arg1 = (SipStack *) 0 ;
-  SipDebugCallback *arg2 = (SipDebugCallback *) 0 ;
+  DDebugCallback *arg2 = (DDebugCallback *) 0 ;
   bool result;
   
   arg1 = (SipStack *)jarg1; 
-  arg2 = (SipDebugCallback *)jarg2; 
+  arg2 = (DDebugCallback *)jarg2; 
   result = (bool)(arg1)->setDebugCallback(arg2);
   jresult = result; 
   return jresult;
@@ -1990,7 +1897,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_transport_error_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_global_error_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_global_error_get() {
   int jresult ;
   int result;
   
@@ -2080,10 +1987,54 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_terminated_get() {
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_started_get() {
+  int jresult ;
+  int result;
+  
+  result = (int) 950;
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_stopped_get() {
+  int jresult ;
+  int result;
+  
+  result = (int) 951;
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_failed_to_start_get() {
+  int jresult ;
+  int result;
+  
+  result = (int) 952;
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_failed_to_stop_get() {
+  int jresult ;
+  int result;
+  
+  result = (int) 953;
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_DialogEventUpcast(DialogEvent *objectRef) {
     return (SipEvent *)objectRef;
 }
 
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_StackEventUpcast(StackEvent *objectRef) {
+    return (SipEvent *)objectRef;
+}
+
 SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_MessagingEventUpcast(MessagingEvent *objectRef) {
     return (SipEvent *)objectRef;
 }

trunk/bindings/csharp/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  * 
  * 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
@@ -17,6 +17,7 @@ public:
     SwigDirector_SipCallback();
     virtual ~SwigDirector_SipCallback();
     virtual int OnDialogEvent(DialogEvent const *e);
+    virtual int OnStackEvent(StackEvent const *e);
     virtual int OnMessagingEvent(MessagingEvent const *e);
     virtual int OnOptionsEvent(OptionsEvent const *e);
     virtual int OnPublicationEvent(PublicationEvent const *e);
@@ -29,39 +30,17 @@ public:
     typedef int (SWIGSTDCALL* SWIG_Callback3_t)(void *);
     typedef int (SWIGSTDCALL* SWIG_Callback4_t)(void *);
     typedef int (SWIGSTDCALL* SWIG_Callback5_t)(void *);
-    void swig_connect_director(SWIG_Callback0_t callbackOnDialogEvent, SWIG_Callback1_t callbackOnMessagingEvent, SWIG_Callback2_t callbackOnOptionsEvent, SWIG_Callback3_t callbackOnPublicationEvent, SWIG_Callback4_t callbackOnRegistrationEvent, SWIG_Callback5_t callbackOnSubscriptionEvent);
+    typedef int (SWIGSTDCALL* SWIG_Callback6_t)(void *);
+    void swig_connect_director(SWIG_Callback0_t callbackOnDialogEvent, SWIG_Callback1_t callbackOnStackEvent, SWIG_Callback2_t callbackOnMessagingEvent, SWIG_Callback3_t callbackOnOptionsEvent, SWIG_Callback4_t callbackOnPublicationEvent, SWIG_Callback5_t callbackOnRegistrationEvent, SWIG_Callback6_t callbackOnSubscriptionEvent);
 
 private:
     SWIG_Callback0_t swig_callbackOnDialogEvent;
-    SWIG_Callback1_t swig_callbackOnMessagingEvent;
-    SWIG_Callback2_t swig_callbackOnOptionsEvent;
-    SWIG_Callback3_t swig_callbackOnPublicationEvent;
-    SWIG_Callback4_t swig_callbackOnRegistrationEvent;
-    SWIG_Callback5_t swig_callbackOnSubscriptionEvent;
-    void swig_init_callbacks();
-};
-
-class SwigDirector_SipDebugCallback : public SipDebugCallback, public Swig::Director {
-
-public:
-    SwigDirector_SipDebugCallback();
-    virtual ~SwigDirector_SipDebugCallback();
-    virtual int OnDebugInfo(char const *message);
-    virtual int OnDebugWarn(char const *message);
-    virtual int OnDebugError(char const *message);
-    virtual int OnDebugFatal(char const *message);
-
-    typedef int (SWIGSTDCALL* SWIG_Callback0_t)(char *);
-    typedef int (SWIGSTDCALL* SWIG_Callback1_t)(char *);
-    typedef int (SWIGSTDCALL* SWIG_Callback2_t)(char *);
-    typedef int (SWIGSTDCALL* SWIG_Callback3_t)(char *);
-    void swig_connect_director(SWIG_Callback0_t callbackOnDebugInfo, SWIG_Callback1_t callbackOnDebugWarn, SWIG_Callback2_t callbackOnDebugError, SWIG_Callback3_t callbackOnDebugFatal);
-
-private:
-    SWIG_Callback0_t swig_callbackOnDebugInfo;
-    SWIG_Callback1_t swig_callbackOnDebugWarn;
-    SWIG_Callback2_t swig_callbackOnDebugError;
-    SWIG_Callback3_t swig_callbackOnDebugFatal;
+    SWIG_Callback1_t swig_callbackOnStackEvent;
+    SWIG_Callback2_t swig_callbackOnMessagingEvent;
+    SWIG_Callback3_t swig_callbackOnOptionsEvent;
+    SWIG_Callback4_t swig_callbackOnPublicationEvent;
+    SWIG_Callback5_t swig_callbackOnRegistrationEvent;
+    SWIG_Callback6_t swig_callbackOnSubscriptionEvent;
     void swig_init_callbacks();
 };
 

trunk/bindings/csharp/tsip_event_type_t.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/csharp/tsip_message_event_type_t.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/csharp/tsip_options_event_type_t.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/csharp/tsip_publish_event_type_t.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/csharp/tsip_register_event_type_t.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/csharp/tsip_subscribe_event_type_t.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/DDebugCallback.java

@@ -0,0 +1,58 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class DDebugCallback {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected DDebugCallback(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(DDebugCallback obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_DDebugCallback(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public DDebugCallback() {
+    this(tinyWRAPJNI.new_DDebugCallback(), true);
+  }
+
+  public int OnDebugInfo(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugInfo(swigCPtr, this, message);
+  }
+
+  public int OnDebugWarn(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugWarn(swigCPtr, this, message);
+  }
+
+  public int OnDebugError(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugError(swigCPtr, this, message);
+  }
+
+  public int OnDebugFatal(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugFatal(swigCPtr, this, message);
+  }
+
+}

trunk/bindings/java/DialogEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class DialogEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_DialogEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_DialogEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/MessagingEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class MessagingEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/MessagingSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class MessagingSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_MessagingSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_MessagingSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/OptionsEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class OptionsEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/OptionsSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class OptionsSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_OptionsSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_OptionsSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/PublicationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class PublicationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/PublicationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class PublicationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_PublicationSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_PublicationSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/RegistrationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class RegistrationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/RegistrationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class RegistrationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/SafeObject.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SafeObject {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SafeObject(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SafeObject(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public SafeObject() {

trunk/bindings/java/SipCallback.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipCallback {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipCallback(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipCallback(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   protected void swigDirectorDisconnect() {
@@ -57,6 +59,10 @@ public class SipCallback {
     return (getClass() == SipCallback.class) ? tinyWRAPJNI.SipCallback_OnDialogEvent(swigCPtr, this, DialogEvent.getCPtr(e), e) : tinyWRAPJNI.SipCallback_OnDialogEventSwigExplicitSipCallback(swigCPtr, this, DialogEvent.getCPtr(e), e);
   }
 
+  public int OnStackEvent(StackEvent e) {
+    return (getClass() == SipCallback.class) ? tinyWRAPJNI.SipCallback_OnStackEvent(swigCPtr, this, StackEvent.getCPtr(e), e) : tinyWRAPJNI.SipCallback_OnStackEventSwigExplicitSipCallback(swigCPtr, this, StackEvent.getCPtr(e), e);
+  }
+
   public int OnMessagingEvent(MessagingEvent e) {
     return (getClass() == SipCallback.class) ? tinyWRAPJNI.SipCallback_OnMessagingEvent(swigCPtr, this, MessagingEvent.getCPtr(e), e) : tinyWRAPJNI.SipCallback_OnMessagingEventSwigExplicitSipCallback(swigCPtr, this, MessagingEvent.getCPtr(e), e);
   }

trunk/bindings/java/SipDebugCallback.java

@@ -1,72 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.doubango.tinyWRAP;
-
-public class SipDebugCallback {
-  private long swigCPtr;
-  protected boolean swigCMemOwn;
-
-  protected SipDebugCallback(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  protected static long getCPtr(SipDebugCallback obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-
-  protected void finalize() {
-    delete();
-  }
-
-  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipDebugCallback(swigCPtr);
-    }
-    swigCPtr = 0;
-  }
-
-  protected void swigDirectorDisconnect() {
-    swigCMemOwn = false;
-    delete();
-  }
-
-  public void swigReleaseOwnership() {
-    swigCMemOwn = false;
-    tinyWRAPJNI.SipDebugCallback_change_ownership(this, swigCPtr, false);
-  }
-
-  public void swigTakeOwnership() {
-    swigCMemOwn = true;
-    tinyWRAPJNI.SipDebugCallback_change_ownership(this, swigCPtr, true);
-  }
-
-  public SipDebugCallback() {
-    this(tinyWRAPJNI.new_SipDebugCallback(), true);
-    tinyWRAPJNI.SipDebugCallback_director_connect(this, swigCPtr, swigCMemOwn, true);
-  }
-
-  public int OnDebugInfo(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugInfo(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-  public int OnDebugWarn(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugWarn(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-  public int OnDebugError(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugError(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-  public int OnDebugFatal(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugFatal(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-}

trunk/bindings/java/SipEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public short getCode() {

trunk/bindings/java/SipMessage.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipMessage {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipMessage(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipMessage(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public byte[] getSipContent() {

trunk/bindings/java/SipSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   protected java.nio.ByteBuffer getByteBuffer(byte[] bytes) {

trunk/bindings/java/SipStack.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class SipStack extends SafeObject {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipStack(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipStack(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 
@@ -41,8 +43,8 @@ public class SipStack extends SafeObject {
     return tinyWRAPJNI.SipStack_start(swigCPtr, this);
   }
 
-  public boolean setDebugCallback(SipDebugCallback callback) {
-    return tinyWRAPJNI.SipStack_setDebugCallback(swigCPtr, this, SipDebugCallback.getCPtr(callback), callback);
+  public boolean setDebugCallback(DDebugCallback callback) {
+    return tinyWRAPJNI.SipStack_setDebugCallback(swigCPtr, this, DDebugCallback.getCPtr(callback), callback);
   }
 
   public boolean setRealm(String realm_uri) {

trunk/bindings/java/SipUri.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipUri {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipUri(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipUri(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public SipUri(String arg0) {

trunk/bindings/java/StackEvent.java

@@ -0,0 +1,38 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class StackEvent extends SipEvent {
+  private long swigCPtr;
+
+  protected StackEvent(long cPtr, boolean cMemoryOwn) {
+    super(tinyWRAPJNI.SWIGStackEventUpcast(cPtr), cMemoryOwn);
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(StackEvent obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_StackEvent(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+}

trunk/bindings/java/SubscriptionEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class SubscriptionEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/SubscriptionSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class SubscriptionSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/DDebugCallback.java

@@ -0,0 +1,58 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class DDebugCallback {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected DDebugCallback(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(DDebugCallback obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_DDebugCallback(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public DDebugCallback() {
+    this(tinyWRAPJNI.new_DDebugCallback(), true);
+  }
+
+  public int OnDebugInfo(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugInfo(swigCPtr, this, message);
+  }
+
+  public int OnDebugWarn(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugWarn(swigCPtr, this, message);
+  }
+
+  public int OnDebugError(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugError(swigCPtr, this, message);
+  }
+
+  public int OnDebugFatal(String message) {
+    return tinyWRAPJNI.DDebugCallback_OnDebugFatal(swigCPtr, this, message);
+  }
+
+}

trunk/bindings/java/android/DialogEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class DialogEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_DialogEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_DialogEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/MessagingEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class MessagingEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/MessagingSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class MessagingSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_MessagingSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_MessagingSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/OptionsEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class OptionsEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/OptionsSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class OptionsSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_OptionsSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_OptionsSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/PublicationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class PublicationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/PublicationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class PublicationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_PublicationSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_PublicationSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/RegistrationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class RegistrationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/RegistrationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class RegistrationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/SafeObject.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SafeObject {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SafeObject(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SafeObject(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public SafeObject() {

trunk/bindings/java/android/SipCallback.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipCallback {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipCallback(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipCallback(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   protected void swigDirectorDisconnect() {
@@ -57,6 +59,10 @@ public class SipCallback {
     return (getClass() == SipCallback.class) ? tinyWRAPJNI.SipCallback_OnDialogEvent(swigCPtr, this, DialogEvent.getCPtr(e), e) : tinyWRAPJNI.SipCallback_OnDialogEventSwigExplicitSipCallback(swigCPtr, this, DialogEvent.getCPtr(e), e);
   }
 
+  public int OnStackEvent(StackEvent e) {
+    return (getClass() == SipCallback.class) ? tinyWRAPJNI.SipCallback_OnStackEvent(swigCPtr, this, StackEvent.getCPtr(e), e) : tinyWRAPJNI.SipCallback_OnStackEventSwigExplicitSipCallback(swigCPtr, this, StackEvent.getCPtr(e), e);
+  }
+
   public int OnMessagingEvent(MessagingEvent e) {
     return (getClass() == SipCallback.class) ? tinyWRAPJNI.SipCallback_OnMessagingEvent(swigCPtr, this, MessagingEvent.getCPtr(e), e) : tinyWRAPJNI.SipCallback_OnMessagingEventSwigExplicitSipCallback(swigCPtr, this, MessagingEvent.getCPtr(e), e);
   }

trunk/bindings/java/android/SipDebugCallback.java

@@ -1,72 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.doubango.tinyWRAP;
-
-public class SipDebugCallback {
-  private long swigCPtr;
-  protected boolean swigCMemOwn;
-
-  protected SipDebugCallback(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  protected static long getCPtr(SipDebugCallback obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-
-  protected void finalize() {
-    delete();
-  }
-
-  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipDebugCallback(swigCPtr);
-    }
-    swigCPtr = 0;
-  }
-
-  protected void swigDirectorDisconnect() {
-    swigCMemOwn = false;
-    delete();
-  }
-
-  public void swigReleaseOwnership() {
-    swigCMemOwn = false;
-    tinyWRAPJNI.SipDebugCallback_change_ownership(this, swigCPtr, false);
-  }
-
-  public void swigTakeOwnership() {
-    swigCMemOwn = true;
-    tinyWRAPJNI.SipDebugCallback_change_ownership(this, swigCPtr, true);
-  }
-
-  public SipDebugCallback() {
-    this(tinyWRAPJNI.new_SipDebugCallback(), true);
-    tinyWRAPJNI.SipDebugCallback_director_connect(this, swigCPtr, swigCMemOwn, false);
-  }
-
-  public int OnDebugInfo(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugInfo(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-  public int OnDebugWarn(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugWarn(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-  public int OnDebugError(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugError(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-  public int OnDebugFatal(String message) {
-    return (getClass() == SipDebugCallback.class) ? tinyWRAPJNI.SipDebugCallback_OnDebugFatal(swigCPtr, this, message) : tinyWRAPJNI.SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(swigCPtr, this, message);
-  }
-
-}

trunk/bindings/java/android/SipEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public short getCode() {

trunk/bindings/java/android/SipMessage.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipMessage {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipMessage(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipMessage(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public byte[] getSipContent() {

trunk/bindings/java/android/SipSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   protected java.nio.ByteBuffer getByteBuffer(byte[] bytes) {

trunk/bindings/java/android/SipStack.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class SipStack extends SafeObject {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipStack(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipStack(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 
@@ -41,8 +43,8 @@ public class SipStack extends SafeObject {
     return tinyWRAPJNI.SipStack_start(swigCPtr, this);
   }
 
-  public boolean setDebugCallback(SipDebugCallback callback) {
-    return tinyWRAPJNI.SipStack_setDebugCallback(swigCPtr, this, SipDebugCallback.getCPtr(callback), callback);
+  public boolean setDebugCallback(DDebugCallback callback) {
+    return tinyWRAPJNI.SipStack_setDebugCallback(swigCPtr, this, DDebugCallback.getCPtr(callback), callback);
   }
 
   public boolean setRealm(String realm_uri) {

trunk/bindings/java/android/SipUri.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,11 +26,13 @@ public class SipUri {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SipUri(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SipUri(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
   }
 
   public SipUri(String arg0) {

trunk/bindings/java/android/StackEvent.java

@@ -0,0 +1,38 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class StackEvent extends SipEvent {
+  private long swigCPtr;
+
+  protected StackEvent(long cPtr, boolean cMemoryOwn) {
+    super(tinyWRAPJNI.SWIGStackEventUpcast(cPtr), cMemoryOwn);
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(StackEvent obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_StackEvent(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+    super.delete();
+  }
+
+}

trunk/bindings/java/android/SubscriptionEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class SubscriptionEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/SubscriptionSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,11 +25,13 @@ public class SubscriptionSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
+      }
+      swigCPtr = 0;
     }
-    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/droid-makefile

@@ -1,16 +1,16 @@
 APP := lib$(PROJECT).$(EXT)
 
 CFLAGS := $(CFLAGS_LIB) -fno-rtti -fno-exceptions -I../../_common -I../../. -I../../../tinySAK/src -I../../../tinyNET/src -I../../../tinyHTTP/include -I../../../tinySIP/include
-LDFLAGS := $(LDFLAGS_LIB) -lstdc++ -ltinySAK -ltinyHTTP -ltinyIPSec -ltinyNET -ltinySIP
+LDFLAGS := $(LDFLAGS_LIB) -lstdc++ -llog -ltinySAK -ltinyHTTP -ltinyIPSec -ltinyNET -ltinySIP
 
 
 
 all: $(APP)
 
 OBJS = tinyWRAP_wrap.o\
+	../../_common/DDebug.o \
 	../../_common/SafeObject.o \
 	../../_common/SipCallback.o \
-	../../_common/SipDebug.o \
 	../../_common/SipEvent.o \
 	../../_common/SipMessage.o \
 	../../_common/SipSession.o \

trunk/bindings/java/android/tinyWRAP.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/android/tinyWRAPConstants.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -10,7 +10,7 @@ package org.doubango.tinyWRAP;
 
 public interface tinyWRAPConstants {
   public final static int tsip_event_code_dialog_transport_error = 702;
-  public final static int tsip_event_code_global_error = 703;
+  public final static int tsip_event_code_dialog_global_error = 703;
   public final static int tsip_event_code_dialog_message_error = 704;
   public final static int tsip_event_code_dialog_request_incoming = 800;
   public final static int tsip_event_code_dialog_request_cancelled = 801;
@@ -19,4 +19,8 @@ public interface tinyWRAPConstants {
   public final static int tsip_event_code_dialog_connected = 901;
   public final static int tsip_event_code_dialog_terminating = 902;
   public final static int tsip_event_code_dialog_terminated = 903;
+  public final static int tsip_event_code_stack_started = 950;
+  public final static int tsip_event_code_stack_stopped = 951;
+  public final static int tsip_event_code_stack_failed_to_start = 952;
+  public final static int tsip_event_code_stack_failed_to_stop = 953;
 }

trunk/bindings/java/android/tinyWRAPJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -9,6 +9,12 @@
 package org.doubango.tinyWRAP;
 
 class tinyWRAPJNI {
+  public final static native long new_DDebugCallback();
+  public final static native void delete_DDebugCallback(long jarg1);
+  public final static native int DDebugCallback_OnDebugInfo(long jarg1, DDebugCallback jarg1_, String jarg2);
+  public final static native int DDebugCallback_OnDebugWarn(long jarg1, DDebugCallback jarg1_, String jarg2);
+  public final static native int DDebugCallback_OnDebugError(long jarg1, DDebugCallback jarg1_, String jarg2);
+  public final static native int DDebugCallback_OnDebugFatal(long jarg1, DDebugCallback jarg1_, String jarg2);
   public final static native long new_SipUri(String jarg1);
   public final static native void delete_SipUri(long jarg1);
   public final static native boolean SipUri_isValid__SWIG_0(String jarg1);
@@ -27,6 +33,7 @@ class tinyWRAPJNI {
   public final static native long SipEvent_getBaseSession(long jarg1, SipEvent jarg1_);
   public final static native long SipEvent_getSipMessage(long jarg1, SipEvent jarg1_);
   public final static native void delete_DialogEvent(long jarg1);
+  public final static native void delete_StackEvent(long jarg1);
   public final static native void delete_MessagingEvent(long jarg1);
   public final static native int MessagingEvent_getType(long jarg1, MessagingEvent jarg1_);
   public final static native long MessagingEvent_getSession(long jarg1, MessagingEvent jarg1_);
@@ -80,6 +87,8 @@ class tinyWRAPJNI {
   public final static native void delete_SipCallback(long jarg1);
   public final static native int SipCallback_OnDialogEvent(long jarg1, SipCallback jarg1_, long jarg2, DialogEvent jarg2_);
   public final static native int SipCallback_OnDialogEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, DialogEvent jarg2_);
+  public final static native int SipCallback_OnStackEvent(long jarg1, SipCallback jarg1_, long jarg2, StackEvent jarg2_);
+  public final static native int SipCallback_OnStackEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, StackEvent jarg2_);
   public final static native int SipCallback_OnMessagingEvent(long jarg1, SipCallback jarg1_, long jarg2, MessagingEvent jarg2_);
   public final static native int SipCallback_OnMessagingEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, MessagingEvent jarg2_);
   public final static native int SipCallback_OnOptionsEvent(long jarg1, SipCallback jarg1_, long jarg2, OptionsEvent jarg2_);
@@ -92,18 +101,6 @@ class tinyWRAPJNI {
   public final static native int SipCallback_OnSubscriptionEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, SubscriptionEvent jarg2_);
   public final static native void SipCallback_director_connect(SipCallback obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void SipCallback_change_ownership(SipCallback obj, long cptr, boolean take_or_release);
-  public final static native long new_SipDebugCallback();
-  public final static native void delete_SipDebugCallback(long jarg1);
-  public final static native int SipDebugCallback_OnDebugInfo(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugWarn(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugError(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugFatal(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native void SipDebugCallback_director_connect(SipDebugCallback obj, long cptr, boolean mem_own, boolean weak_global);
-  public final static native void SipDebugCallback_change_ownership(SipDebugCallback obj, long cptr, boolean take_or_release);
   public final static native long new_SafeObject();
   public final static native void delete_SafeObject(long jarg1);
   public final static native int SafeObject_Lock(long jarg1, SafeObject jarg1_);
@@ -111,7 +108,7 @@ class tinyWRAPJNI {
   public final static native long new_SipStack(long jarg1, SipCallback jarg1_, String jarg2, String jarg3, String jarg4);
   public final static native void delete_SipStack(long jarg1);
   public final static native boolean SipStack_start(long jarg1, SipStack jarg1_);
-  public final static native boolean SipStack_setDebugCallback(long jarg1, SipStack jarg1_, long jarg2, SipDebugCallback jarg2_);
+  public final static native boolean SipStack_setDebugCallback(long jarg1, SipStack jarg1_, long jarg2, DDebugCallback jarg2_);
   public final static native boolean SipStack_setRealm(long jarg1, SipStack jarg1_, String jarg2);
   public final static native boolean SipStack_setIMPI(long jarg1, SipStack jarg1_, String jarg2);
   public final static native boolean SipStack_setIMPU(long jarg1, SipStack jarg1_, String jarg2);
@@ -127,6 +124,7 @@ class tinyWRAPJNI {
   public final static native boolean SipStack_isValid(long jarg1, SipStack jarg1_);
   public final static native boolean SipStack_stop(long jarg1, SipStack jarg1_);
   public final static native long SWIGDialogEventUpcast(long jarg1);
+  public final static native long SWIGStackEventUpcast(long jarg1);
   public final static native long SWIGMessagingEventUpcast(long jarg1);
   public final static native long SWIGOptionsEventUpcast(long jarg1);
   public final static native long SWIGPublicationEventUpcast(long jarg1);
@@ -142,6 +140,9 @@ class tinyWRAPJNI {
   public static int SwigDirector_SipCallback_OnDialogEvent(SipCallback self, long e) {
     return self.OnDialogEvent((e == 0) ? null : new DialogEvent(e, false));
   }
+  public static int SwigDirector_SipCallback_OnStackEvent(SipCallback self, long e) {
+    return self.OnStackEvent((e == 0) ? null : new StackEvent(e, false));
+  }
   public static int SwigDirector_SipCallback_OnMessagingEvent(SipCallback self, long e) {
     return self.OnMessagingEvent((e == 0) ? null : new MessagingEvent(e, false));
   }
@@ -157,18 +158,6 @@ class tinyWRAPJNI {
   public static int SwigDirector_SipCallback_OnSubscriptionEvent(SipCallback self, long e) {
     return self.OnSubscriptionEvent((e == 0) ? null : new SubscriptionEvent(e, false));
   }
-  public static int SwigDirector_SipDebugCallback_OnDebugInfo(SipDebugCallback self, String message) {
-    return self.OnDebugInfo(message);
-  }
-  public static int SwigDirector_SipDebugCallback_OnDebugWarn(SipDebugCallback self, String message) {
-    return self.OnDebugWarn(message);
-  }
-  public static int SwigDirector_SipDebugCallback_OnDebugError(SipDebugCallback self, String message) {
-    return self.OnDebugError(message);
-  }
-  public static int SwigDirector_SipDebugCallback_OnDebugFatal(SipDebugCallback self, String message) {
-    return self.OnDebugFatal(message);
-  }
 
   private final static native void swig_module_init();
   static {

trunk/bindings/java/android/tinyWRAP_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  * 
  * 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
@@ -193,7 +193,8 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
     { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
     { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
     { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" } };
+    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
+  };
   const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
 
   while (except_ptr->code != code && except_ptr->code)
@@ -403,16 +404,18 @@ namespace Swig {
 
 namespace Swig {
   static jclass jclass_tinyWRAPJNI = NULL;
-  static jmethodID director_methids[10];
+  static jmethodID director_methids[7];
 }
 
+#include "DDebug.h"
+
+
 #include "SipUri.h"
 #include "SipMessage.h"
 #include "SipEvent.h"
 #include "SipSession.h"
 
 #include "SipCallback.h"
-#include "SipDebug.h"
 #include "SafeObject.h"
 #include "SipStack.h"
 
@@ -456,7 +459,7 @@ int SwigDirector_SipCallback::OnDialogEvent(DialogEvent const *e) {
   return c_result;
 }
 
-int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
+int SwigDirector_SipCallback::OnStackEvent(StackEvent const *e) {
   int c_result = SwigValueInit< int >() ;
   jint jresult = 0 ;
   JNIEnvWrapper swigjnienv(this) ;
@@ -465,12 +468,36 @@ int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
   jlong je = 0 ;
   
   if (!swig_override[1]) {
+    return SipCallback::OnStackEvent(e);
+  }
+  swigjobj = swig_get_self(jenv);
+  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
+    *((StackEvent **)&je) = (StackEvent *) e; 
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[1], swigjobj, je);
+    if (jenv->ExceptionOccurred()) return c_result;
+    c_result = (int)jresult; 
+  } else {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
+  }
+  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
+  return c_result;
+}
+
+int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
+  int c_result = SwigValueInit< int >() ;
+  jint jresult = 0 ;
+  JNIEnvWrapper swigjnienv(this) ;
+  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
+  jobject swigjobj = (jobject) NULL ;
+  jlong je = 0 ;
+  
+  if (!swig_override[2]) {
     return SipCallback::OnMessagingEvent(e);
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((MessagingEvent **)&je) = (MessagingEvent *) e; 
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[1], swigjobj, je);
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[2], swigjobj, je);
     if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
@@ -488,13 +515,13 @@ int SwigDirector_SipCallback::OnOptionsEvent(OptionsEvent const *e) {
   jobject swigjobj = (jobject) NULL ;
   jlong je = 0 ;
   
-  if (!swig_override[2]) {
+  if (!swig_override[3]) {
     return SipCallback::OnOptionsEvent(e);
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((OptionsEvent **)&je) = (OptionsEvent *) e; 
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[2], swigjobj, je);
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[3], swigjobj, je);
     if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
@@ -512,13 +539,13 @@ int SwigDirector_SipCallback::OnPublicationEvent(PublicationEvent const *e) {
   jobject swigjobj = (jobject) NULL ;
   jlong je = 0 ;
   
-  if (!swig_override[3]) {
+  if (!swig_override[4]) {
     return SipCallback::OnPublicationEvent(e);
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((PublicationEvent **)&je) = (PublicationEvent *) e; 
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[3], swigjobj, je);
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[4], swigjobj, je);
     if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
@@ -536,13 +563,13 @@ int SwigDirector_SipCallback::OnRegistrationEvent(RegistrationEvent const *e) {
   jobject swigjobj = (jobject) NULL ;
   jlong je = 0 ;
   
-  if (!swig_override[4]) {
+  if (!swig_override[5]) {
     return SipCallback::OnRegistrationEvent(e);
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((RegistrationEvent **)&je) = (RegistrationEvent *) e; 
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[4], swigjobj, je);
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[5], swigjobj, je);
     if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
@@ -560,13 +587,13 @@ int SwigDirector_SipCallback::OnSubscriptionEvent(SubscriptionEvent const *e) {
   jobject swigjobj = (jobject) NULL ;
   jlong je = 0 ;
   
-  if (!swig_override[5]) {
+  if (!swig_override[6]) {
     return SipCallback::OnSubscriptionEvent(e);
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((SubscriptionEvent **)&je) = (SubscriptionEvent *) e; 
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[5], swigjobj, je);
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[6], swigjobj, je);
     if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
@@ -585,6 +612,9 @@ void SwigDirector_SipCallback::swig_connect_director(JNIEnv *jenv, jobject jself
     {
       "OnDialogEvent", "(Lorg/doubango/tinyWRAP/DialogEvent;)I", NULL 
     },
+    {
+      "OnStackEvent", "(Lorg/doubango/tinyWRAP/StackEvent;)I", NULL 
+    },
     {
       "OnMessagingEvent", "(Lorg/doubango/tinyWRAP/MessagingEvent;)I", NULL 
     },
@@ -611,172 +641,7 @@ void SwigDirector_SipCallback::swig_connect_director(JNIEnv *jenv, jobject jself
       baseclass = (jclass) jenv->NewGlobalRef(baseclass);
     }
     bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);
-    for (int i = 0; i < 6; ++i) {
-      if (!methods[i].base_methid) {
-        methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);
-        if (!methods[i].base_methid) return;
-      }
-      swig_override[i] = false;
-      if (derived) {
-        jmethodID methid = jenv->GetMethodID(jcls, methods[i].mname, methods[i].mdesc);
-        swig_override[i] = (methid != methods[i].base_methid);
-        jenv->ExceptionClear();
-      }
-    }
-  }
-}
-
-
-SwigDirector_SipDebugCallback::SwigDirector_SipDebugCallback(JNIEnv *jenv) : SipDebugCallback(), Swig::Director(jenv) {
-}
-
-SwigDirector_SipDebugCallback::~SwigDirector_SipDebugCallback() {
-  swig_disconnect_director_self("swigDirectorDisconnect");
-}
-
-
-int SwigDirector_SipDebugCallback::OnDebugInfo(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  jint jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jmessage = 0 ;
-  
-  if (!swig_override[0]) {
-    return SipDebugCallback::OnDebugInfo(message);
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jmessage = 0;
-    if (message) {
-      jmessage = jenv->NewStringUTF((const char *)message);
-      if (!jmessage) return c_result;
-    }
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[6], swigjobj, jmessage);
-    if (jenv->ExceptionOccurred()) return c_result;
-    c_result = (int)jresult; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-int SwigDirector_SipDebugCallback::OnDebugWarn(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  jint jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jmessage = 0 ;
-  
-  if (!swig_override[1]) {
-    return SipDebugCallback::OnDebugWarn(message);
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jmessage = 0;
-    if (message) {
-      jmessage = jenv->NewStringUTF((const char *)message);
-      if (!jmessage) return c_result;
-    }
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[7], swigjobj, jmessage);
-    if (jenv->ExceptionOccurred()) return c_result;
-    c_result = (int)jresult; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-int SwigDirector_SipDebugCallback::OnDebugError(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  jint jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jmessage = 0 ;
-  
-  if (!swig_override[2]) {
-    return SipDebugCallback::OnDebugError(message);
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jmessage = 0;
-    if (message) {
-      jmessage = jenv->NewStringUTF((const char *)message);
-      if (!jmessage) return c_result;
-    }
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[8], swigjobj, jmessage);
-    if (jenv->ExceptionOccurred()) return c_result;
-    c_result = (int)jresult; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-int SwigDirector_SipDebugCallback::OnDebugFatal(char const *message) {
-  int c_result = SwigValueInit< int >() ;
-  jint jresult = 0 ;
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jmessage = 0 ;
-  
-  if (!swig_override[3]) {
-    return SipDebugCallback::OnDebugFatal(message);
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jmessage = 0;
-    if (message) {
-      jmessage = jenv->NewStringUTF((const char *)message);
-      if (!jmessage) return c_result;
-    }
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[9], swigjobj, jmessage);
-    if (jenv->ExceptionOccurred()) return c_result;
-    c_result = (int)jresult; 
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-  return c_result;
-}
-
-void SwigDirector_SipDebugCallback::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {
-  static struct {
-    const char *mname;
-    const char *mdesc;
-    jmethodID base_methid;
-  } methods[] = {
-    {
-      "OnDebugInfo", "(Ljava/lang/String;)I", NULL 
-    },
-    {
-      "OnDebugWarn", "(Ljava/lang/String;)I", NULL 
-    },
-    {
-      "OnDebugError", "(Ljava/lang/String;)I", NULL 
-    },
-    {
-      "OnDebugFatal", "(Ljava/lang/String;)I", NULL 
-    }
-  };
-  
-  static jclass baseclass = 0 ;
-  
-  if (swig_set_self(jenv, jself, swig_mem_own, weak_global)) {
-    if (!baseclass) {
-      baseclass = jenv->FindClass("org/doubango/tinyWRAP/SipDebugCallback");
-      if (!baseclass) return;
-      baseclass = (jclass) jenv->NewGlobalRef(baseclass);
-    }
-    bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < 7; ++i) {
       if (!methods[i].base_methid) {
         methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);
         if (!methods[i].base_methid) return;
@@ -797,6 +662,116 @@ void SwigDirector_SipDebugCallback::swig_connect_director(JNIEnv *jenv, jobject
 extern "C" {
 #endif
 
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_new_1DDebugCallback(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  DDebugCallback *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (DDebugCallback *)new DDebugCallback();
+  *(DDebugCallback **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1DDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(DDebugCallback **)&jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DDebugCallback_1OnDebugInfo(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jint jresult = 0 ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(DDebugCallback **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return 0;
+  }
+  result = (int)(arg1)->OnDebugInfo((char const *)arg2);
+  jresult = (jint)result; 
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DDebugCallback_1OnDebugWarn(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jint jresult = 0 ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(DDebugCallback **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return 0;
+  }
+  result = (int)(arg1)->OnDebugWarn((char const *)arg2);
+  jresult = (jint)result; 
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DDebugCallback_1OnDebugError(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jint jresult = 0 ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(DDebugCallback **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return 0;
+  }
+  result = (int)(arg1)->OnDebugError((char const *)arg2);
+  jresult = (jint)result; 
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DDebugCallback_1OnDebugFatal(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jint jresult = 0 ;
+  DDebugCallback *arg1 = (DDebugCallback *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(DDebugCallback **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return 0;
+  }
+  result = (int)(arg1)->OnDebugFatal((char const *)arg2);
+  jresult = (jint)result; 
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  return jresult;
+}
+
+
 SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_new_1SipUri(JNIEnv *jenv, jclass jcls, jstring jarg1) {
   jlong jresult = 0 ;
   char *arg1 = (char *) 0 ;
@@ -900,7 +875,7 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1ge
   }
   arg3 = (unsigned int)jarg3; 
   result = (char *)(arg1)->getSipHeaderValue((char const *)arg2,arg3);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   delete [] result;
   return jresult;
@@ -923,7 +898,7 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1ge
     if (!arg2) return 0;
   }
   result = (char *)(arg1)->getSipHeaderValue((char const *)arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   delete [] result;
   return jresult;
@@ -954,7 +929,7 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1ge
   }
   arg4 = (unsigned int)jarg4; 
   result = (char *)(arg1)->getSipHeaderParamValue((char const *)arg2,(char const *)arg3,arg4);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
   delete [] result;
@@ -984,7 +959,7 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1ge
     if (!arg3) return 0;
   }
   result = (char *)(arg1)->getSipHeaderParamValue((char const *)arg2,(char const *)arg3);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
   delete [] result;
@@ -1063,7 +1038,7 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipEvent_1getP
   (void)jarg1_;
   arg1 = *(SipEvent **)&jarg1; 
   result = (char *)((SipEvent const *)arg1)->getPhrase();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
   return jresult;
 }
 
@@ -1108,6 +1083,16 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1DialogEve
 }
 
 
+SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1StackEvent(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  StackEvent *arg1 = (StackEvent *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(StackEvent **)&jarg1; 
+  delete arg1;
+}
+
+
 SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1MessagingEvent(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   MessagingEvent *arg1 = (MessagingEvent *) 0 ;
   
@@ -1925,6 +1910,42 @@ SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipCallback_1OnDi
 }
 
 
+SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipCallback_1OnStackEvent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jint jresult = 0 ;
+  SipCallback *arg1 = (SipCallback *) 0 ;
+  StackEvent *arg2 = (StackEvent *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(SipCallback **)&jarg1; 
+  arg2 = *(StackEvent **)&jarg2; 
+  result = (int)(arg1)->OnStackEvent((StackEvent const *)arg2);
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipCallback_1OnStackEventSwigExplicitSipCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jint jresult = 0 ;
+  SipCallback *arg1 = (SipCallback *) 0 ;
+  StackEvent *arg2 = (StackEvent *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(SipCallback **)&jarg1; 
+  arg2 = *(StackEvent **)&jarg2; 
+  result = (int)(arg1)->SipCallback::OnStackEvent((StackEvent const *)arg2);
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipCallback_1OnMessagingEvent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
   jint jresult = 0 ;
   SipCallback *arg1 = (SipCallback *) 0 ;
@@ -2125,224 +2146,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipCallback_1chan
 }
 
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_new_1SipDebugCallback(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  SipDebugCallback *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (SipDebugCallback *)new SwigDirector_SipDebugCallback(jenv);
-  *(SipDebugCallback **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1SipDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugInfo(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->OnDebugInfo((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugInfoSwigExplicitSipDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->SipDebugCallback::OnDebugInfo((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugWarn(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->OnDebugWarn((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugWarnSwigExplicitSipDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->SipDebugCallback::OnDebugWarn((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugError(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->OnDebugError((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugErrorSwigExplicitSipDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->SipDebugCallback::OnDebugError((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugFatal(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->OnDebugFatal((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1OnDebugFatalSwigExplicitSipDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  SipDebugCallback *arg1 = (SipDebugCallback *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(SipDebugCallback **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)(arg1)->SipDebugCallback::OnDebugFatal((char const *)arg2);
-  jresult = (jint)result; 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1director_1connect(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jswig_mem_own, jboolean jweak_global) {
-  SipDebugCallback *obj = *((SipDebugCallback **)&objarg);
-  (void)jcls;
-  SwigDirector_SipDebugCallback *director = static_cast<SwigDirector_SipDebugCallback *>(obj);
-  if (director) {
-    director->swig_connect_director(jenv, jself, jenv->GetObjectClass(jself), (jswig_mem_own == JNI_TRUE), (jweak_global == JNI_TRUE));
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipDebugCallback_1change_1ownership(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jtake_or_release) {
-  SipDebugCallback *obj = *((SipDebugCallback **)&objarg);
-  SwigDirector_SipDebugCallback *director = static_cast<SwigDirector_SipDebugCallback *>(obj);
-  (void)jcls;
-  if (director) {
-    director->swig_java_change_ownership(jenv, jself, jtake_or_release ? true : false);
-  }
-}
-
-
 SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_new_1SafeObject(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   SafeObject *result = 0 ;
@@ -2459,7 +2262,7 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1sta
 SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1setDebugCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
   jboolean jresult = 0 ;
   SipStack *arg1 = (SipStack *) 0 ;
-  SipDebugCallback *arg2 = (SipDebugCallback *) 0 ;
+  DDebugCallback *arg2 = (DDebugCallback *) 0 ;
   bool result;
   
   (void)jenv;
@@ -2467,7 +2270,7 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1set
   (void)jarg1_;
   (void)jarg2_;
   arg1 = *(SipStack **)&jarg1; 
-  arg2 = *(SipDebugCallback **)&jarg2; 
+  arg2 = *(DDebugCallback **)&jarg2; 
   result = (bool)(arg1)->setDebugCallback(arg2);
   jresult = (jboolean)result; 
   return jresult;
@@ -2791,6 +2594,14 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGDialogEventU
     return baseptr;
 }
 
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGStackEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+    jlong baseptr = 0;
+    (void)jenv;
+    (void)jcls;
+    *(SipEvent **)&baseptr = *(StackEvent **)&jarg1;
+    return baseptr;
+}
+
 SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMessagingEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
@@ -2885,10 +2696,13 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_swig_1module_1ini
   static struct {
     const char *method;
     const char *signature;
-  } methods[10] = {
+  } methods[7] = {
     {
       "SwigDirector_SipCallback_OnDialogEvent", "(Lorg/doubango/tinyWRAP/SipCallback;J)I" 
     },
+    {
+      "SwigDirector_SipCallback_OnStackEvent", "(Lorg/doubango/tinyWRAP/SipCallback;J)I" 
+    },
     {
       "SwigDirector_SipCallback_OnMessagingEvent", "(Lorg/doubango/tinyWRAP/SipCallback;J)I" 
     },
@@ -2903,18 +2717,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_swig_1module_1ini
     },
     {
       "SwigDirector_SipCallback_OnSubscriptionEvent", "(Lorg/doubango/tinyWRAP/SipCallback;J)I" 
-    },
-    {
-      "SwigDirector_SipDebugCallback_OnDebugInfo", "(Lorg/doubango/tinyWRAP/SipDebugCallback;Ljava/lang/String;)I" 
-    },
-    {
-      "SwigDirector_SipDebugCallback_OnDebugWarn", "(Lorg/doubango/tinyWRAP/SipDebugCallback;Ljava/lang/String;)I" 
-    },
-    {
-      "SwigDirector_SipDebugCallback_OnDebugError", "(Lorg/doubango/tinyWRAP/SipDebugCallback;Ljava/lang/String;)I" 
-    },
-    {
-      "SwigDirector_SipDebugCallback_OnDebugFatal", "(Lorg/doubango/tinyWRAP/SipDebugCallback;Ljava/lang/String;)I" 
     }
   };
   Swig::jclass_tinyWRAPJNI = (jclass) jenv->NewGlobalRef(jcls);

trunk/bindings/java/android/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  * 
  * 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
@@ -18,6 +18,7 @@ public:
     SwigDirector_SipCallback(JNIEnv *jenv);
     virtual ~SwigDirector_SipCallback();
     virtual int OnDialogEvent(DialogEvent const *e);
+    virtual int OnStackEvent(StackEvent const *e);
     virtual int OnMessagingEvent(MessagingEvent const *e);
     virtual int OnOptionsEvent(OptionsEvent const *e);
     virtual int OnPublicationEvent(PublicationEvent const *e);
@@ -25,28 +26,10 @@ public:
     virtual int OnSubscriptionEvent(SubscriptionEvent const *e);
 public:
     bool swig_overrides(int n) {
-      return (n < 6 ? swig_override[n] : false);
+      return (n < 7 ? swig_override[n] : false);
     }
 protected:
-    bool swig_override[6];
-};
-
-class SwigDirector_SipDebugCallback : public SipDebugCallback, public Swig::Director {
-
-public:
-    void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global);
-    SwigDirector_SipDebugCallback(JNIEnv *jenv);
-    virtual ~SwigDirector_SipDebugCallback();
-    virtual int OnDebugInfo(char const *message);
-    virtual int OnDebugWarn(char const *message);
-    virtual int OnDebugError(char const *message);
-    virtual int OnDebugFatal(char const *message);
-public:
-    bool swig_overrides(int n) {
-      return (n < 4 ? swig_override[n] : false);
-    }
-protected:
-    bool swig_override[4];
+    bool swig_override[7];
 };
 
 

trunk/bindings/java/android/tsip_event_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/android/tsip_message_event_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/android/tsip_options_event_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/android/tsip_publish_event_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/android/tsip_register_event_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/android/tsip_subscribe_event_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/tinyWRAP.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/tinyWRAPConstants.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -10,7 +10,7 @@ package org.doubango.tinyWRAP;
 
 public interface tinyWRAPConstants {
   public final static int tsip_event_code_dialog_transport_error = 702;
-  public final static int tsip_event_code_global_error = 703;
+  public final static int tsip_event_code_dialog_global_error = 703;
   public final static int tsip_event_code_dialog_message_error = 704;
   public final static int tsip_event_code_dialog_request_incoming = 800;
   public final static int tsip_event_code_dialog_request_cancelled = 801;
@@ -19,4 +19,8 @@ public interface tinyWRAPConstants {
   public final static int tsip_event_code_dialog_connected = 901;
   public final static int tsip_event_code_dialog_terminating = 902;
   public final static int tsip_event_code_dialog_terminated = 903;
+  public final static int tsip_event_code_stack_started = 950;
+  public final static int tsip_event_code_stack_stopped = 951;
+  public final static int tsip_event_code_stack_failed_to_start = 952;
+  public final static int tsip_event_code_stack_failed_to_stop = 953;
 }

trunk/bindings/java/tinyWRAPJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -9,6 +9,12 @@
 package org.doubango.tinyWRAP;
 
 class tinyWRAPJNI {
+  public final static native long new_DDebugCallback();
+  public final static native void delete_DDebugCallback(long jarg1);
+  public final static native int DDebugCallback_OnDebugInfo(long jarg1, DDebugCallback jarg1_, String jarg2);
+  public final static native int DDebugCallback_OnDebugWarn(long jarg1, DDebugCallback jarg1_, String jarg2);
+  public final static native int DDebugCallback_OnDebugError(long jarg1, DDebugCallback jarg1_, String jarg2);
+  public final static native int DDebugCallback_OnDebugFatal(long jarg1, DDebugCallback jarg1_, String jarg2);
   public final static native long new_SipUri(String jarg1);
   public final static native void delete_SipUri(long jarg1);
   public final static native boolean SipUri_isValid__SWIG_0(String jarg1);
@@ -27,6 +33,7 @@ class tinyWRAPJNI {
   public final static native long SipEvent_getBaseSession(long jarg1, SipEvent jarg1_);
   public final static native long SipEvent_getSipMessage(long jarg1, SipEvent jarg1_);
   public final static native void delete_DialogEvent(long jarg1);
+  public final static native void delete_StackEvent(long jarg1);
   public final static native void delete_MessagingEvent(long jarg1);
   public final static native int MessagingEvent_getType(long jarg1, MessagingEvent jarg1_);
   public final static native long MessagingEvent_getSession(long jarg1, MessagingEvent jarg1_);
@@ -80,6 +87,8 @@ class tinyWRAPJNI {
   public final static native void delete_SipCallback(long jarg1);
   public final static native int SipCallback_OnDialogEvent(long jarg1, SipCallback jarg1_, long jarg2, DialogEvent jarg2_);
   public final static native int SipCallback_OnDialogEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, DialogEvent jarg2_);
+  public final static native int SipCallback_OnStackEvent(long jarg1, SipCallback jarg1_, long jarg2, StackEvent jarg2_);
+  public final static native int SipCallback_OnStackEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, StackEvent jarg2_);
   public final static native int SipCallback_OnMessagingEvent(long jarg1, SipCallback jarg1_, long jarg2, MessagingEvent jarg2_);
   public final static native int SipCallback_OnMessagingEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, MessagingEvent jarg2_);
   public final static native int SipCallback_OnOptionsEvent(long jarg1, SipCallback jarg1_, long jarg2, OptionsEvent jarg2_);
@@ -92,18 +101,6 @@ class tinyWRAPJNI {
   public final static native int SipCallback_OnSubscriptionEventSwigExplicitSipCallback(long jarg1, SipCallback jarg1_, long jarg2, SubscriptionEvent jarg2_);
   public final static native void SipCallback_director_connect(SipCallback obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void SipCallback_change_ownership(SipCallback obj, long cptr, boolean take_or_release);
-  public final static native long new_SipDebugCallback();
-  public final static native void delete_SipDebugCallback(long jarg1);
-  public final static native int SipDebugCallback_OnDebugInfo(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugInfoSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugWarn(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugWarnSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugError(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugErrorSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugFatal(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native int SipDebugCallback_OnDebugFatalSwigExplicitSipDebugCallback(long jarg1, SipDebugCallback jarg1_, String jarg2);
-  public final static native void SipDebugCallback_director_connect(SipDebugCallback obj, long cptr, boolean mem_own, boolean weak_global);
-  public final static native void SipDebugCallback_change_ownership(SipDebugCallback obj, long cptr, boolean take_or_release);
   public final static native long new_SafeObject();
   public final static native void delete_SafeObject(long jarg1);
   public final static native int SafeObject_Lock(long jarg1, SafeObject jarg1_);
@@ -111,7 +108,7 @@ class tinyWRAPJNI {
   public final static native long new_SipStack(long jarg1, SipCallback jarg1_, String jarg2, String jarg3, String jarg4);
   public final static native void delete_SipStack(long jarg1);
   public final static native boolean SipStack_start(long jarg1, SipStack jarg1_);
-  public final static native boolean SipStack_setDebugCallback(long jarg1, SipStack jarg1_, long jarg2, SipDebugCallback jarg2_);
+  public final static native boolean SipStack_setDebugCallback(long jarg1, SipStack jarg1_, long jarg2, DDebugCallback jarg2_);
   public final static native boolean SipStack_setRealm(long jarg1, SipStack jarg1_, String jarg2);
   public final static native boolean SipStack_setIMPI(long jarg1, SipStack jarg1_, String jarg2);
   public final static native boolean SipStack_setIMPU(long jarg1, SipStack jarg1_, String jarg2);
@@ -127,6 +124,7 @@ class tinyWRAPJNI {
   public final static native boolean SipStack_isValid(long jarg1, SipStack jarg1_);
   public final static native boolean SipStack_stop(long jarg1, SipStack jarg1_);
   public final static native long SWIGDialogEventUpcast(long jarg1);
+  public final static native long SWIGStackEventUpcast(long jarg1);
   public final static native long SWIGMessagingEventUpcast(long jarg1);
   public final static native long SWIGOptionsEventUpcast(long jarg1);
   public final static native long SWIGPublicationEventUpcast(long jarg1);
@@ -142,6 +140,9 @@ class tinyWRAPJNI {
   public static int SwigDirector_SipCallback_OnDialogEvent(SipCallback self, long e) {
     return self.OnDialogEvent((e == 0) ? null : new DialogEvent(e, false));
   }
+  public static int SwigDirector_SipCallback_OnStackEvent(SipCallback self, long e) {
+    return self.OnStackEvent((e == 0) ? null : new StackEvent(e, false));
+  }
   public static int SwigDirector_SipCallback_OnMessagingEvent(SipCallback self, long e) {
     return self.OnMessagingEvent((e == 0) ? null : new MessagingEvent(e, false));
   }
@@ -157,18 +158,6 @@ class tinyWRAPJNI {
   public static int SwigDirector_SipCallback_OnSubscriptionEvent(SipCallback self, long e) {
     return self.OnSubscriptionEvent((e == 0) ? null : new SubscriptionEvent(e, false));
   }
-  public static int SwigDirector_SipDebugCallback_OnDebugInfo(SipDebugCallback self, String message) {
-    return self.OnDebugInfo(message);
-  }
-  public static int SwigDirector_SipDebugCallback_OnDebugWarn(SipDebugCallback self, String message) {
-    return self.OnDebugWarn(message);
-  }
-  public static int SwigDirector_SipDebugCallback_OnDebugError(SipDebugCallback self, String message) {
-    return self.OnDebugError(message);
-  }
-  public static int SwigDirector_SipDebugCallback_OnDebugFatal(SipDebugCallback self, String message) {
-    return self.OnDebugFatal(message);
-  }
 
   private final static native void swig_module_init();
   static {

trunk/bindings/java/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 1.3.40
  * 
  * 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
@@ -18,6 +18,7 @@ public:
     SwigDirector_SipCallback(JNIEnv *jenv);
     virtual ~SwigDirector_SipCallback();
     virtual int OnDialogEvent(DialogEvent const *e);
+    virtual int OnStackEvent(StackEvent const *e);
     virtual int OnMessagingEvent(MessagingEvent const *e);
     virtual int OnOptionsEvent(OptionsEvent const *e);
     virtual int OnPublicationEvent(PublicationEvent const *e);
@@ -25,28 +26,10 @@ public:
     virtual int OnSubscriptionEvent(SubscriptionEvent const *e);
 public:
     bool swig_overrides(int n) {
-      return (n < 6 ? swig_override[n] : false);
+      return (n < 7 ? swig_override[n] : false);
     }
 protected:
-    bool swig_override[6];
-};
-
-class SwigDirector_SipDebugCallback : public SipDebugCallback, public Swig::Director {
-
-public:
-    void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global);
-    SwigDirector_SipDebugCallback(JNIEnv *jenv);
-    virtual ~SwigDirector_SipDebugCallback();
-    virtual int OnDebugInfo(char const *message);
-    virtual int OnDebugWarn(char const *message);
-    virtual int OnDebugError(char const *message);
-    virtual int OnDebugFatal(char const *message);
-public:
-    bool swig_overrides(int n) {
-      return (n < 4 ? swig_override[n] : false);
-    }
-protected:
-    bool swig_override[4];
+    bool swig_override[7];
 };