General Update.

trunk/bindings/_common/PublicationEvent.cxx

@@ -25,12 +25,12 @@
 #include "Common.h"
 
 PublicationEvent::PublicationEvent()
-:SipEvent(sipevent)
+:SipEvent(tsk_null)
 {
 }
 
-PublicationEvent::PublicationEvent(const tsip_event_t *sipevent)
+PublicationEvent::PublicationEvent(const tsip_event_t *_sipevent)
-:SipEvent(sipevent)
+:SipEvent(_sipevent)
 {
 }
 
@@ -46,4 +46,4 @@ tsip_publish_event_type_t PublicationEvent::getType() const
 const PublicationSession* PublicationEvent::getSession() const
 {
 	return dyn_cast<const PublicationSession*>(this->getBaseSession());
-}
+}

trunk/bindings/_common/PublicationEvent.h

@@ -38,7 +38,6 @@ public:
 public: /* Public API functions */
 	tsip_publish_event_type_t getType() const;
 	const PublicationSession* getSession() const;
-	
 };
 
 #endif /* TINYWRAP_PUBLICATIONEVENT_H */

trunk/bindings/_common/RegistrationEvent.cxx

@@ -29,8 +29,8 @@ RegistrationEvent::RegistrationEvent()
 {
 }
 
-RegistrationEvent::RegistrationEvent(const tsip_event_t *sipevent)
+RegistrationEvent::RegistrationEvent(const tsip_event_t *_sipevent)
-:SipEvent(sipevent)
+:SipEvent(_sipevent)
 {
 }
 

trunk/bindings/_common/SipMessage.cxx

@@ -36,16 +36,6 @@ SipMessage::~SipMessage()
 
 }
 
-const void* SipMessage::getSipContent() const
-{
-	if(this->sipmessage){
-		return TSIP_MESSAGE_CONTENT_DATA(this->sipmessage);
-	}
-	else{
-		return tsk_null;
-	}
-}
-
 const tsip_header_t* SipMessage::getSipHeader(const char* name, unsigned index /* =0 */)
 {
 	/* Do not worry about calling tsk_striequals() several times because the function
@@ -144,3 +134,27 @@ const char* SipMessage::getSipHeaderParamValue(const char* name, const char* par
 	}
 	return tsk_null;
 }
+
+/** Returns the content length.
+*/
+unsigned SipMessage::getSipContentLength()
+{
+	return TSIP_MESSAGE_CONTENT_DATA_LENGTH(this->sipmessage);
+}
+
+/** Gets the message content
+* @param output A pointer to the output buffer where to copy the data. MUST
+* be allocated by the caller.
+* @param maxsize The maximum number of octets to copy. Should be less than the size of the
+* @a output buffer. You can use @a getSipContentLength() to get the right value to use.
+* @retval The number of octet copied in the @a output buffer.
+*/
+unsigned SipMessage::getSipContent(void* output, unsigned maxsize)
+{
+	unsigned retsize = 0;
+	if(output && maxsize && TSIP_MESSAGE_HAS_CONTENT(this->sipmessage)){
+		retsize = (this->sipmessage->Content->size > maxsize) ? maxsize : this->sipmessage->Content->size;
+		memcpy(output, this->sipmessage->Content->data, retsize);
+	}
+	return retsize;
+}

trunk/bindings/_common/SipMessage.h

@@ -32,14 +32,12 @@ public:
 	SipMessage(const tsip_message_t *sipmessage);
 #endif
 	virtual ~SipMessage();
-
-#if !defined(SWIG)
-	const void* getSipContent() const;
-#endif
 	
 	//%newobject getHeaderValueAt;
 	char* getSipHeaderValue(const char* name, unsigned index = 0);
 	const char* getSipHeaderParamValue(const char* name, const char* param, unsigned index = 0);
+	unsigned getSipContentLength();
+	unsigned getSipContent(void* output, unsigned maxsize);
 
 private:
 	const tsip_header_t* getSipHeader(const char* name, unsigned index = 0);

trunk/bindings/csharp/PublicationEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class PublicationEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_PublicationEvent(swigCPtr);
-          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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class PublicationSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_PublicationSession(swigCPtr);
-          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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class RegistrationEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_RegistrationEvent(swigCPtr);
-          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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class RegistrationSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_RegistrationSession(swigCPtr);
-          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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SafeObject : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SafeObject(swigCPtr);
-          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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipCallback : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipCallback(swigCPtr);
-          tinyWRAPPINVOKE.delete_SipCallback(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipDebugCallback.cs

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

trunk/bindings/csharp/SipEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipEvent : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipEvent(swigCPtr);
-          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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipMessage : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
-        if (swigCMemOwn) {
+        swigCMemOwn = false;
-          swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipMessage(swigCPtr);
-          tinyWRAPPINVOKE.delete_SipMessage(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }
@@ -63,4 +61,14 @@ public class SipMessage : IDisposable {
     return ret;
   }
 
+  public uint getSipContentLength() {
+    uint ret = tinyWRAPPINVOKE.SipMessage_getSipContentLength(swigCPtr);
+    return ret;
+  }
+
+  public uint getSipContent(byte[] output, uint maxsize) {
+    uint ret = tinyWRAPPINVOKE.SipMessage_getSipContent(swigCPtr, output, maxsize);
+    return ret;
+  }
+
 }

trunk/bindings/csharp/SipSession.cs

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

trunk/bindings/csharp/SipUri.cs

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

trunk/bindings/csharp/SubscriptionEvent.cs

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

trunk/bindings/csharp/csharp.i

@@ -3,6 +3,15 @@
 */
 
 
+%define %cs_marshal_array(TYPE, CSTYPE)
+%typemap(ctype) TYPE[] "void*"
+%typemap(imtype,
+inattributes="[MarshalAs(UnmanagedType.LPArray)]") TYPE[] "CSTYPE[]"
+%typemap(cstype) TYPE[] "CSTYPE[]"
+%typemap(in) TYPE[] %{ $1 = (TYPE*)$input; %}
+%typemap(csin) TYPE[] "$csinput"
+%enddef
+
 // Mapping void* as byte[]
 %typemap(ctype) void * "void *"
 %typemap(imtype) void * "byte[]"

trunk/bindings/csharp/test/Program.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 
 namespace test
 {
@@ -25,9 +26,12 @@ namespace test
         {
             Boolean success;
 
+            String s = "mamadou";
+            byte[] b = Encoding.UTF8.GetBytes(s);
+
             /* Create callbacks */
             sipCallback = new MySipCallback();
-            sipDebugCallback = new MySipDebugCallback();
+            //sipDebugCallback = new MySipDebugCallback();
 
             /* Create and configure the IMS/LTE stack */
             sipStack = new SipStack(sipCallback, String.Format("sip:{0}", REALM), String.Format("{0}@{1}", USER, REALM), String.Format("sip:{0}@{1}", USER, REALM));
@@ -53,6 +57,8 @@ namespace test
             regSession.setExpires(35);
             regSession.Register();
 
+            Thread.Sleep(2000);
+
             /* Send SUBSCRIBE(reg) */
             subSession = new SubscriptionSession(sipStack);
             subSession.addHeader("Event", "reg");
@@ -60,13 +66,7 @@ namespace test
             subSession.addHeader("Allow-Events", "refer, presence, presence.winfo, xcap-diff, conference");
             subSession.setExpires(35);
 
-            //while (true){
+            subSession.Subscribe();
-            //    byte[] bytes = Encoding.UTF8.GetBytes("Salut comment tu vas?");
-                //subSession.setPayload(bytes, (uint)bytes.Length);
-            //}
-
-
-            //subSession.Subscribe();
 
             Console.Read();
 
@@ -165,7 +165,16 @@ namespace test
             {
                 case tsip_subscribe_event_type_t.tsip_ao_subscribe:
                 case tsip_subscribe_event_type_t.tsip_ao_unsubscribe:
+                    break;
+
                 case tsip_subscribe_event_type_t.tsip_i_notify:
+                    uint content_len = message.getSipContentLength();
+                    if (content_len>0)
+                    {
+                        byte[] content = new byte[content_len];
+                        uint read = message.getSipContent(content, (uint)content.Length);
+                        Console.WriteLine("Notify Content ==> {0}", Encoding.UTF8.GetString(content, 0, (int)read));
+                    }
                     break;
             }
 
@@ -174,5 +183,41 @@ namespace test
             return 0;
         }
 
+
+
+       const String PUBLISH_PAYLOAD = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+"<presence xmlns:cp=\"urn:ietf:params:xml:ns:pidf:cipid\" xmlns:caps=\"urn:ietf:params:xml:ns:pidf:caps\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:pdm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:p=\"urn:ietf:params:xml:ns:pidf-diff\" xmlns:op=\"urn:oma:xml:prs:pidf:oma-pres\" entity=\"sip:bob@ims.inexbee.com\" xmlns=\"urn:ietf:params:xml:ns:pidf\">" +
+  "<pdm:person id=\"RPVRYNJH\">" +
+    "<op:overriding-willingness>" +
+      "<op:basic>open</op:basic>" +
+    "</op:overriding-willingness>" +
+    "<rpid:activities>" +
+      "<rpid:busy />" +
+    "</rpid:activities>" +
+    "<rpid:mood>" +
+      "<rpid:guilty />" +
+    "</rpid:mood>" +
+    "<cp:homepage>http://doubango.org</cp:homepage>" +
+    "<pdm:note>Come share with me RCS Experience</pdm:note>" +
+  "</pdm:person>" +
+  "<pdm:device id=\"d0001\">" +
+    "<status>" +
+      "<basic>open</basic>" +
+    "</status>" +
+    "<caps:devcaps>" +
+      "<caps:mobility>" +
+        "<caps:supported>" +
+          "<caps:fixed />" +
+        "</caps:supported>" +
+      "</caps:mobility>" +
+    "</caps:devcaps>" +
+    "<op:network-availability>" +
+      "<op:network id=\"IMS\">" +
+        "<op:active />" +
+      "</op:network>" +
+    "</op:network-availability>" +
+    "<pdm:deviceID>urn:uuid:3ca50bcb-7a67-44f1-afd0-994a55f930f4</pdm:deviceID>" +
+  "</pdm:device>" +
+"</presence>";
     }
 }

trunk/bindings/csharp/test/test.csproj

@@ -45,6 +45,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\PublicationEvent.cs">
+      <Link>PublicationEvent.cs</Link>
+    </Compile>
+    <Compile Include="..\PublicationSession.cs">
+      <Link>PublicationSession.cs</Link>
+    </Compile>
     <Compile Include="..\RegistrationEvent.cs">
       <Link>RegistrationEvent.cs</Link>
     </Compile>
@@ -87,6 +93,9 @@
     <Compile Include="..\tsip_event_type_t.cs">
       <Link>tsip_event_type_t.cs</Link>
     </Compile>
+    <Compile Include="..\tsip_publish_event_type_t.cs">
+      <Link>tsip_publish_event_type_t.cs</Link>
+    </Compile>
     <Compile Include="..\tsip_register_event_type_t.cs">
       <Link>tsip_register_event_type_t.cs</Link>
     </Compile>

trunk/bindings/csharp/tinyWRAP.cs

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

trunk/bindings/csharp/tinyWRAP.vcproj

@@ -177,6 +177,14 @@
 				RelativePath="..\_common\MessagingEvent.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\_common\PublicationEvent.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\PublicationSession.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\_common\RegistrationEvent.cxx"
 				>
@@ -247,6 +255,14 @@
 				RelativePath="..\_common\MessagingEvent.h"
 				>
 			</File>
+			<File
+				RelativePath="..\_common\PublicationEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\PublicationSession.h"
+				>
+			</File>
 			<File
 				RelativePath="..\_common\RegistrationEvent.h"
 				>

trunk/bindings/csharp/tinyWRAPPINVOKE.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -214,6 +214,12 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_SipMessage_getSipHeaderParamValue__SWIG_1")]
   public static extern string SipMessage_getSipHeaderParamValue__SWIG_1(HandleRef jarg1, string jarg2, string jarg3);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SipMessage_getSipContentLength")]
+  public static extern uint SipMessage_getSipContentLength(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SipMessage_getSipContent")]
+  public static extern uint SipMessage_getSipContent(HandleRef jarg1, byte[] jarg2, uint jarg3);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_new_SipEvent")]
   public static extern IntPtr new_SipEvent();
 

trunk/bindings/csharp/tinyWRAP_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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
+ *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
+ *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
+ * ----------------------------------------------------------------------------- */
-
+
-/* template workaround for compilers that cannot correctly implement the C++ standard */
+/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
+# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* 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 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
+# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
+# endif
-#endif
+#endif
-
+
-/* inline attribute */
+/* inline attribute */
-#ifndef SWIGINLINE
+#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
+#   define SWIGINLINE inline
-# else
+# else
-#   define SWIGINLINE
+#   define SWIGINLINE
-# endif
+# endif
-#endif
+#endif
-
+
-/* attribute recognised by some compilers to avoid 'unused' warnings */
+/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
+#ifndef SWIGUNUSED
-# if defined(__GNUC__)
+# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
-#   else
+#   else
-#     define SWIGUNUSED
+#     define SWIGUNUSED
-#   endif
+#   endif
-# elif defined(__ICC)
+# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
-# else
+# else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED 
-# endif
+# endif
-#endif
+#endif
-
+
-#ifndef SWIG_MSC_UNSUPPRESS_4505
+#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
+# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif 
-#endif
+#endif
-
+
-#ifndef SWIGUNUSEDPARM
+#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
+# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
+#   define SWIGUNUSEDPARM(p)
-# else
+# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
-# endif
+# endif
-#endif
+#endif
-
+
-/* internal SWIG method */
+/* internal SWIG method */
-#ifndef SWIGINTERN
+#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
+# define SWIGINTERN static SWIGUNUSED
-#endif
+#endif
-
+
-/* internal inline SWIG method */
+/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
+#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
+#endif
-
+
-/* exporting methods */
+/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
+#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
-#  endif
+#  endif
-#endif
+#endif
-
+
-#ifndef SWIGEXPORT
+#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
+#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
+#     define SWIGEXPORT
-#   else
+#   else
-#     define SWIGEXPORT __declspec(dllexport)
+#     define SWIGEXPORT __declspec(dllexport)
-#   endif
+#   endif
-# else
+# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
+#   else
-#     define SWIGEXPORT
+#     define SWIGEXPORT
-#   endif
+#   endif
-# endif
+# endif
-#endif
+#endif
-
+
-/* calling conventions for Windows */
+/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
+#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
+#   define SWIGSTDCALL __stdcall
-# else
+# else
-#   define SWIGSTDCALL
+#   define SWIGSTDCALL
-# endif 
+# endif 
-#endif
+#endif
-
+
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
+# define _CRT_SECURE_NO_DEPRECATE
-#endif
+#endif
-
+
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+/* 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)
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
+# define _SCL_SECURE_NO_DEPRECATE
-#endif
+#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,56 @@ 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
+ * 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.
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
+ *
- * director.swg
+ * director.swg
- *
+ *
- * This file contains support for director classes so that C# proxy 
+ * This file contains support for director classes so that C# proxy 
- * methods can be called from C++.
+ * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
+ * ----------------------------------------------------------------------------- */
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-
+
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-#include <iostream>
+#include <iostream>
-#endif
+#endif
-#include <string>
+#include <string>
-
+
-namespace Swig {
+namespace Swig {
-  /* Director base class - not currently used in C# directors */
+  /* Director base class - not currently used in C# directors */
-  class Director {
+  class Director {
-  };
+  };
-
+
-  /* Base class for director exceptions */
+  /* Base class for director exceptions */
-  class DirectorException {
+  class DirectorException {
-  protected:
+  protected:
-    std::string swig_msg;
+    std::string swig_msg;
-
+
-  public:
+  public:
-    DirectorException(const char* msg) : swig_msg(msg) {
+    DirectorException(const char* msg) : swig_msg(msg) {
-    }
+    }
-    DirectorException(const std::string &msg) : swig_msg(msg) {
+    DirectorException(const std::string &msg) : swig_msg(msg) {
-    }
+    }
-    const std::string& what() const {
+    const std::string& what() const {
-      return swig_msg;
+      return swig_msg;
-    }
+    }
-    virtual ~DirectorException() {
+    virtual ~DirectorException() {
-    }
+    }
-  };
+  };
-
+
-  /* Pure virtual method exception */
+  /* Pure virtual method exception */
-  class DirectorPureVirtualException : public Swig::DirectorException {
+  class DirectorPureVirtualException : public Swig::DirectorException {
-  public:
+  public:
-    DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
+    DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
-    }
+    }
-  };
+  };
-}
+}
-
+
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-
+
-
+
 
 #include "SipUri.h"
 #include "SipMessage.h"
@@ -636,6 +636,34 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SipMessage_getSipHeaderParamValue__SWIG_1(v
 }
 
 
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_SipMessage_getSipContentLength(void * jarg1) {
+  unsigned int jresult ;
+  SipMessage *arg1 = (SipMessage *) 0 ;
+  unsigned int result;
+  
+  arg1 = (SipMessage *)jarg1; 
+  result = (unsigned int)(arg1)->getSipContentLength();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_SipMessage_getSipContent(void * jarg1, void * jarg2, unsigned int jarg3) {
+  unsigned int jresult ;
+  SipMessage *arg1 = (SipMessage *) 0 ;
+  void *arg2 = (void *) 0 ;
+  unsigned int arg3 ;
+  unsigned int result;
+  
+  arg1 = (SipMessage *)jarg1; 
+  arg2 = jarg2; 
+  arg3 = (unsigned int)jarg3; 
+  result = (unsigned int)(arg1)->getSipContent(arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_SipEvent() {
   void * jresult ;
   SipEvent *result = 0 ;

trunk/bindings/csharp/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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

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.40
+ * Version 1.3.39
  *
  * 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.40
+ * Version 1.3.39
  *
  * 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.40
+ * Version 1.3.39
  *
  * 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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/PublicationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationSession(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SafeObject {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_SafeObject(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipCallback {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipCallback(swigCPtr);
-        tinyWRAPJNI.delete_SipCallback(swigCPtr);
-      }
-      swigCPtr = 0;
     }
+    swigCPtr = 0;
   }
 
   protected void swigDirectorDisconnect() {

trunk/bindings/java/SipDebugCallback.java

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

trunk/bindings/java/SipEvent.java

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

trunk/bindings/java/SipMessage.java

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

trunk/bindings/java/SipSession.java

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

trunk/bindings/java/SipStack.java

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

trunk/bindings/java/SipUri.java

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

trunk/bindings/java/SubscriptionEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SubscriptionEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SubscriptionSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
-        tinyWRAPJNI.delete_SubscriptionSession(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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationSession(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SafeObject {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_SafeObject(swigCPtr);
-        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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipCallback {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
+    if(swigCPtr != 0 && swigCMemOwn) {
-      if (swigCMemOwn) {
+      swigCMemOwn = false;
-        swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipCallback(swigCPtr);
-        tinyWRAPJNI.delete_SipCallback(swigCPtr);
-      }
-      swigCPtr = 0;
     }
+    swigCPtr = 0;
   }
 
   protected void swigDirectorDisconnect() {

trunk/bindings/java/android/SipDebugCallback.java

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

trunk/bindings/java/android/SipEvent.java

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

trunk/bindings/java/android/SipMessage.java

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

trunk/bindings/java/android/SipSession.java

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

trunk/bindings/java/android/SipStack.java

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

trunk/bindings/java/android/SipUri.java

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

trunk/bindings/java/android/SubscriptionEvent.java

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

trunk/bindings/java/android/tinyWRAP.java

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

trunk/bindings/java/android/tinyWRAPJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19,6 +19,8 @@ class tinyWRAPJNI {
   public final static native String SipMessage_getSipHeaderValue__SWIG_1(long jarg1, SipMessage jarg1_, String jarg2);
   public final static native String SipMessage_getSipHeaderParamValue__SWIG_0(long jarg1, SipMessage jarg1_, String jarg2, String jarg3, long jarg4);
   public final static native String SipMessage_getSipHeaderParamValue__SWIG_1(long jarg1, SipMessage jarg1_, String jarg2, String jarg3);
+  public final static native long SipMessage_getSipContentLength(long jarg1, SipMessage jarg1_);
+  public final static native long SipMessage_getSipContent(long jarg1, SipMessage jarg1_, byte[] jarg2, long jarg3);
   public final static native long new_SipEvent();
   public final static native void delete_SipEvent(long jarg1);
   public final static native short SipEvent_getCode(long jarg1, SipEvent jarg1_);

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.40
+ * Version 1.3.39
  * 
  * 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,8 +193,7 @@ 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)
@@ -825,7 +824,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;
@@ -848,7 +847,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;
@@ -879,7 +878,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);
   return jresult;
@@ -908,13 +907,50 @@ 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);
   return jresult;
 }
 
 
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1getSipContentLength(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  SipMessage *arg1 = (SipMessage *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(SipMessage **)&jarg1; 
+  result = (unsigned int)(arg1)->getSipContentLength();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1getSipContent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) {
+  jlong jresult = 0 ;
+  SipMessage *arg1 = (SipMessage *) 0 ;
+  void *arg2 = (void *) 0 ;
+  unsigned int arg3 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(SipMessage **)&jarg1; 
+  
+  arg2 = jarg2;
+  //arg2 = "mamadou";
+  
+  arg3 = (unsigned int)jarg3; 
+  result = (unsigned int)(arg1)->getSipContent(arg2,arg3);
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_new_1SipEvent(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   SipEvent *result = 0 ;
@@ -962,7 +998,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;
 }
 
@@ -1284,7 +1320,7 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1Publicati
 }
 
 
-SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1Publish(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, void * jarg2, jlong jarg3) {
+SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1Publish(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) {
   jboolean jresult = 0 ;
   PublicationSession *arg1 = (PublicationSession *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -1295,7 +1331,10 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSe
   (void)jcls;
   (void)jarg1_;
   arg1 = *(PublicationSession **)&jarg1; 
-  arg2 = jarg2; 
+  
+  arg2 = jarg2;
+  //arg2 = "mamadou";
+  
   arg3 = (unsigned int)jarg3; 
   result = (bool)(arg1)->Publish((void const *)arg2,arg3);
   jresult = (jboolean)result; 

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.40
+ * Version 1.3.39
  * 
  * 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

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.40
+ * Version 1.3.39
  *
  * 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.40
+ * Version 1.3.39
  *
  * 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.40
+ * Version 1.3.39
  *
  * 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.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

trunk/bindings/java/java.i

@@ -7,15 +7,21 @@
 %javaconst(1);
 
 
-// Mapping void* as byte[]
+//================== Mapping void* as byte[]
-%typemap(jni) void * "void *"
+%typemap(jni) void * "jbyteArray"
 %typemap(jtype) void * "byte[]"
 %typemap(jstype) void * "byte[]"
 %typemap(javain) void * "$javainput"
 %typemap(javaout) void * { return $jnicall; }
-%typemap(in) void * %{ $1 = $input; %}
+
+// (From Java to C)
+%typemap(in) void * %{ 
+	$1 = $input;
+	//$1 = "mamadou";
+%}
+
 %typemap(out) void * %{ $result = $1; %}
 %typemap(javadirectorin) void * "$jniinput"
-
+//==================
 
 %include ../_common/tinyWRAP.i

trunk/bindings/java/tinyWRAP.java

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

trunk/bindings/java/tinyWRAP.sln

@@ -0,0 +1,284 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyWRAP", "tinyWRAP.vcproj", "{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyNET", "..\..\tinyNET\tinyNET.vcproj", "{7522A458-92F4-4259-B906-E84C2A65D9F1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyHTTP", "..\..\tinyHTTP\tinyHTTP.vcproj", "{B3E45009-C7C3-4090-837C-2D30C9058443}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinySIP", "..\..\tinySIP\tinySIP.vcproj", "{4CE20732-9978-4A88-B586-CFEFCB63E82D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinySDP", "..\..\tinySDP\tinySDP.vcproj", "{E45DB518-6562-4033-80E8-60030F0B169F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyMEDIA", "..\..\tinyMEDIA\tinyMEDIA.vcproj", "{52814B0D-7DCA-45B8-9A16-8B147040D619}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyIPSec", "..\..\tinyIPSec\tinyIPSec.vcproj", "{002FF064-588F-402E-A096-C8D033F49F40}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinySAK", "..\..\tinySAK\tinySAK.vcproj", "{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+		Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		Static_Debug|Any CPU = Static_Debug|Any CPU
+		Static_Debug|Mixed Platforms = Static_Debug|Mixed Platforms
+		Static_Debug|Win32 = Static_Debug|Win32
+		Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		Static_Release|Any CPU = Static_Release|Any CPU
+		Static_Release|Mixed Platforms = Static_Release|Mixed Platforms
+		Static_Release|Win32 = Static_Release|Win32
+		Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Debug|Win32.Build.0 = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Release|Any CPU.ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Release|Win32.ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Release|Win32.Build.0 = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Debug|Any CPU.ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Release|Any CPU.ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Release|Mixed Platforms.Build.0 = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Release|Win32.Build.0 = Release|Win32
+		{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Win32.Build.0 = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Win32.ActiveCfg = Release|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Win32.Build.0 = Release|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Win32.Build.0 = Release|Win32
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{7522A458-92F4-4259-B906-E84C2A65D9F1}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Win32.Build.0 = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Win32.ActiveCfg = Release|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Win32.Build.0 = Release|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Win32.Build.0 = Release|Win32
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{B3E45009-C7C3-4090-837C-2D30C9058443}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Win32.Build.0 = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Win32.ActiveCfg = Release|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Win32.Build.0 = Release|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Win32.Build.0 = Release|Win32
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4CE20732-9978-4A88-B586-CFEFCB63E82D}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Debug|Win32.Build.0 = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Release|Any CPU.ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Release|Win32.ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Release|Win32.Build.0 = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Release|Any CPU.ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Release|Mixed Platforms.Build.0 = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Release|Win32.Build.0 = Release|Win32
+		{E45DB518-6562-4033-80E8-60030F0B169F}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Debug|Win32.ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Debug|Win32.Build.0 = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Release|Any CPU.ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Release|Win32.ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Release|Win32.Build.0 = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Debug|Any CPU.ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Release|Any CPU.ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Release|Mixed Platforms.Build.0 = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Release|Win32.Build.0 = Release|Win32
+		{52814B0D-7DCA-45B8-9A16-8B147040D619}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Debug|Win32.ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Debug|Win32.Build.0 = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Release|Any CPU.ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Release|Win32.ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Release|Win32.Build.0 = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Debug|Any CPU.ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Release|Any CPU.ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Release|Mixed Platforms.Build.0 = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Release|Win32.Build.0 = Release|Win32
+		{002FF064-588F-402E-A096-C8D033F49F40}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Win32.Build.0 = Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Win32.ActiveCfg = Release|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Win32.Build.0 = Release|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Any CPU.ActiveCfg = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Mixed Platforms.ActiveCfg = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Mixed Platforms.Build.0 = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Mixed Platforms.Deploy.0 = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Win32.ActiveCfg = Static_Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Win32.Build.0 = Static_Debug|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Any CPU.ActiveCfg = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Mixed Platforms.ActiveCfg = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Mixed Platforms.Build.0 = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Mixed Platforms.Deploy.0 = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Win32.ActiveCfg = Static_Release|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Win32.Build.0 = Static_Release|Win32
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

trunk/bindings/java/tinyWRAP.vcproj

@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="tinyWRAP"
+	ProjectGUID="{6B60DF14-D5D7-4654-B8F9-1CBC8892CFC8}"
+	RootNamespace="tinyWRAP"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;;..\_common;..\.;..\..\thirdparties\win32\include;..\..\tinySAK\src;..\..\tinyNET\src;..\..\tinyHTTP\include;..\..\tinySIP\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TINYWRAP_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				WarnAsError="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\tinySAK.lib $(OutDir)\tinySIP.lib $(OutDir)\tinyNET.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TINYWRAP_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="source"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\_common\MessagingEvent.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\PublicationEvent.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\PublicationSession.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\RegistrationEvent.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\RegistrationSession.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SafeObject.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipCallback.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipDebug.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipEvent.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipMessage.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipSession.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipStack.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipUri.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SubscriptionEvent.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SubscriptionSession.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\tinyWRAP_wrap.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\XcapStack.cxx"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\_common\Common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\MessagingEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\PublicationEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\PublicationSession.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\RegistrationEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\RegistrationSession.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SafeObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipCallback.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipDebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipMessage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipSession.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipStack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SipUri.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SubscriptionEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\SubscriptionSession.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tinyWRAP_wrap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\XcapStack.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="interfaces"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\_common\SipStack.i"
+					>
+				</File>
+				<File
+					RelativePath="..\_common\tinyWRAP.i"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="languages"
+				>
+				<File
+					RelativePath=".\csharp.i"
+					>
+				</File>
+				<File
+					RelativePath="..\java\java.i"
+					>
+				</File>
+				<File
+					RelativePath="..\perl\perl.i"
+					>
+				</File>
+				<File
+					RelativePath="..\python\python.i"
+					>
+				</File>
+				<File
+					RelativePath="..\ruby\ruby.i"
+					>
+				</File>
+				<File
+					RelativePath="..\_common\XcapStack.i"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

trunk/bindings/java/tinyWRAPJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19,6 +19,8 @@ class tinyWRAPJNI {
   public final static native String SipMessage_getSipHeaderValue__SWIG_1(long jarg1, SipMessage jarg1_, String jarg2);
   public final static native String SipMessage_getSipHeaderParamValue__SWIG_0(long jarg1, SipMessage jarg1_, String jarg2, String jarg3, long jarg4);
   public final static native String SipMessage_getSipHeaderParamValue__SWIG_1(long jarg1, SipMessage jarg1_, String jarg2, String jarg3);
+  public final static native long SipMessage_getSipContentLength(long jarg1, SipMessage jarg1_);
+  public final static native long SipMessage_getSipContent(long jarg1, SipMessage jarg1_, byte[] jarg2, long jarg3);
   public final static native long new_SipEvent();
   public final static native void delete_SipEvent(long jarg1);
   public final static native short SipEvent_getCode(long jarg1, SipEvent jarg1_);

trunk/bindings/java/tinyWRAP_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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
+ *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
+ *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
+ * ----------------------------------------------------------------------------- */
-
+
-/* template workaround for compilers that cannot correctly implement the C++ standard */
+/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
+# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* 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 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
+# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
+# endif
-#endif
+#endif
-
+
-/* inline attribute */
+/* inline attribute */
-#ifndef SWIGINLINE
+#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
+#   define SWIGINLINE inline
-# else
+# else
-#   define SWIGINLINE
+#   define SWIGINLINE
-# endif
+# endif
-#endif
+#endif
-
+
-/* attribute recognised by some compilers to avoid 'unused' warnings */
+/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
+#ifndef SWIGUNUSED
-# if defined(__GNUC__)
+# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
-#   else
+#   else
-#     define SWIGUNUSED
+#     define SWIGUNUSED
-#   endif
+#   endif
-# elif defined(__ICC)
+# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
-# else
+# else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED 
-# endif
+# endif
-#endif
+#endif
-
+
-#ifndef SWIG_MSC_UNSUPPRESS_4505
+#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
+# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif 
-#endif
+#endif
-
+
-#ifndef SWIGUNUSEDPARM
+#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
+# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
+#   define SWIGUNUSEDPARM(p)
-# else
+# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
-# endif
+# endif
-#endif
+#endif
-
+
-/* internal SWIG method */
+/* internal SWIG method */
-#ifndef SWIGINTERN
+#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
+# define SWIGINTERN static SWIGUNUSED
-#endif
+#endif
-
+
-/* internal inline SWIG method */
+/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
+#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
+#endif
-
+
-/* exporting methods */
+/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
+#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
-#  endif
+#  endif
-#endif
+#endif
-
+
-#ifndef SWIGEXPORT
+#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
+#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
+#     define SWIGEXPORT
-#   else
+#   else
-#     define SWIGEXPORT __declspec(dllexport)
+#     define SWIGEXPORT __declspec(dllexport)
-#   endif
+#   endif
-# else
+# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
+#   else
-#     define SWIGEXPORT
+#     define SWIGEXPORT
-#   endif
+#   endif
-# endif
+# endif
-#endif
+#endif
-
+
-/* calling conventions for Windows */
+/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
+#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
+#   define SWIGSTDCALL __stdcall
-# else
+# else
-#   define SWIGSTDCALL
+#   define SWIGSTDCALL
-# endif 
+# endif 
-#endif
+#endif
-
+
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
+# define _CRT_SECURE_NO_DEPRECATE
-#endif
+#endif
-
+
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+/* 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)
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
+# define _SCL_SECURE_NO_DEPRECATE
-#endif
+#endif
-
+
 
 
 /* Fix for jlong on some versions of gcc on Windows */
@@ -193,8 +193,7 @@ 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)
@@ -211,197 +210,197 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
 
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
 
-/* -----------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
+ * 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.
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
+ *
- * director.swg
+ * director.swg
- *
+ *
- * This file contains support for director classes that proxy
+ * This file contains support for director classes that proxy
- * method calls from C++ to Java extensions.
+ * method calls from C++ to Java extensions.
- * ----------------------------------------------------------------------------- */
+ * ----------------------------------------------------------------------------- */
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-
+
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-#include <iostream>
+#include <iostream>
-#endif
+#endif
-
+
-namespace Swig {
+namespace Swig {
-  /* Java object wrapper */
+  /* Java object wrapper */
-  class JObjectWrapper {
+  class JObjectWrapper {
-  public:
+  public:
-    JObjectWrapper() : jthis_(NULL), weak_global_(true) {
+    JObjectWrapper() : jthis_(NULL), weak_global_(true) {
-    }
+    }
-
+
-    ~JObjectWrapper() {
+    ~JObjectWrapper() {
-      jthis_ = NULL;
+      jthis_ = NULL;
-      weak_global_ = true;
+      weak_global_ = true;
-    }
+    }
-
+
-    bool set(JNIEnv *jenv, jobject jobj, bool mem_own, bool weak_global) {
+    bool set(JNIEnv *jenv, jobject jobj, bool mem_own, bool weak_global) {
-      if (!jthis_) {
+      if (!jthis_) {
-        weak_global_ = weak_global;
+        weak_global_ = weak_global;
-        if (jobj)
+        if (jobj)
-          jthis_ = ((weak_global_ || !mem_own) ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj));
+          jthis_ = ((weak_global_ || !mem_own) ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj));
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> " << jthis_ << std::endl;
+        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> " << jthis_ << std::endl;
-#endif
+#endif
-        return true;
+        return true;
-      } else {
+      } else {
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> already set" << std::endl;
+        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> already set" << std::endl;
-#endif
+#endif
-        return false;
+        return false;
-      }
+      }
-    }
+    }
-
+
-    jobject get(JNIEnv *jenv) const {
+    jobject get(JNIEnv *jenv) const {
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-      std::cout << "JObjectWrapper::get(";
+      std::cout << "JObjectWrapper::get(";
-      if (jthis_)
+      if (jthis_)
-        std::cout << jthis_;
+        std::cout << jthis_;
-      else
+      else
-        std::cout << "null";
+        std::cout << "null";
-      std::cout << ") -> return new local ref" << std::endl;
+      std::cout << ") -> return new local ref" << std::endl;
-#endif
+#endif
-      return (jthis_ ? jenv->NewLocalRef(jthis_) : jthis_);
+      return (jthis_ ? jenv->NewLocalRef(jthis_) : jthis_);
-    }
+    }
-
+
-    void release(JNIEnv *jenv) {
+    void release(JNIEnv *jenv) {
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-      std::cout << "JObjectWrapper::release(" << jthis_ << "): " << (weak_global_ ? "weak global ref" : "global ref") << std::endl;
+      std::cout << "JObjectWrapper::release(" << jthis_ << "): " << (weak_global_ ? "weak global ref" : "global ref") << std::endl;
-#endif
+#endif
-      if (jthis_) {
+      if (jthis_) {
-        if (weak_global_) {
+        if (weak_global_) {
-          if (jenv->IsSameObject(jthis_, NULL) == JNI_FALSE)
+          if (jenv->IsSameObject(jthis_, NULL) == JNI_FALSE)
-            jenv->DeleteWeakGlobalRef((jweak)jthis_);
+            jenv->DeleteWeakGlobalRef((jweak)jthis_);
-        } else
+        } else
-          jenv->DeleteGlobalRef(jthis_);
+          jenv->DeleteGlobalRef(jthis_);
-      }
+      }
-
+
-      jthis_ = NULL;
+      jthis_ = NULL;
-      weak_global_ = true;
+      weak_global_ = true;
-    }
+    }
-
+
-    jobject peek() {
+    jobject peek() {
-      return jthis_;
+      return jthis_;
-    }
+    }
-
+
-    /* Java proxy releases ownership of C++ object, C++ object is now
+    /* Java proxy releases ownership of C++ object, C++ object is now
-       responsible for destruction (creates NewGlobalRef to pin Java
+       responsible for destruction (creates NewGlobalRef to pin Java
-       proxy) */
+       proxy) */
-    void java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
+    void java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
-      if (take_or_release) {  /* Java takes ownership of C++ object's lifetime. */
+      if (take_or_release) {  /* Java takes ownership of C++ object's lifetime. */
-        if (!weak_global_) {
+        if (!weak_global_) {
-          jenv->DeleteGlobalRef(jthis_);
+          jenv->DeleteGlobalRef(jthis_);
-          jthis_ = jenv->NewWeakGlobalRef(jself);
+          jthis_ = jenv->NewWeakGlobalRef(jself);
-          weak_global_ = true;
+          weak_global_ = true;
-        }
+        }
-      } else { /* Java releases ownership of C++ object's lifetime */
+      } else { /* Java releases ownership of C++ object's lifetime */
-        if (weak_global_) {
+        if (weak_global_) {
-          jenv->DeleteWeakGlobalRef((jweak)jthis_);
+          jenv->DeleteWeakGlobalRef((jweak)jthis_);
-          jthis_ = jenv->NewGlobalRef(jself);
+          jthis_ = jenv->NewGlobalRef(jself);
-          weak_global_ = false;
+          weak_global_ = false;
-        }
+        }
-      }
+      }
-    }
+    }
-
+
-  private:
+  private:
-    /* pointer to Java object */
+    /* pointer to Java object */
-    jobject jthis_;
+    jobject jthis_;
-    /* Local or global reference flag */
+    /* Local or global reference flag */
-    bool weak_global_;
+    bool weak_global_;
-  };
+  };
-
+
-  /* director base class */
+  /* director base class */
-  class Director {
+  class Director {
-    /* pointer to Java virtual machine */
+    /* pointer to Java virtual machine */
-    JavaVM *swig_jvm_;
+    JavaVM *swig_jvm_;
-
+
-  protected:
+  protected:
-#if defined (_MSC_VER) && (_MSC_VER<1300)
+#if defined (_MSC_VER) && (_MSC_VER<1300)
-    class JNIEnvWrapper;
+    class JNIEnvWrapper;
-    friend class JNIEnvWrapper;
+    friend class JNIEnvWrapper;
-#endif
+#endif
-    /* Utility class for managing the JNI environment */
+    /* Utility class for managing the JNI environment */
-    class JNIEnvWrapper {
+    class JNIEnvWrapper {
-      const Director *director_;
+      const Director *director_;
-      JNIEnv *jenv_;
+      JNIEnv *jenv_;
-    public:
+    public:
-      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0) {
+      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0) {
-#if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON)
+#if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON)
-        // Attach a daemon thread to the JVM. Useful when the JVM should not wait for 
+        // Attach a daemon thread to the JVM. Useful when the JVM should not wait for 
-        // the thread to exit upon shutdown. Only for jdk-1.4 and later.
+        // the thread to exit upon shutdown. Only for jdk-1.4 and later.
-        director_->swig_jvm_->AttachCurrentThreadAsDaemon((void **) &jenv_, NULL);
+        director_->swig_jvm_->AttachCurrentThreadAsDaemon((void **) &jenv_, NULL);
-#else
+#else
-        director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL);
+        director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL);
-#endif
+#endif
-      }
+      }
-      ~JNIEnvWrapper() {
+      ~JNIEnvWrapper() {
-#if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
+#if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
-        // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
+        // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
-        // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
+        // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
-        director_->swig_jvm_->DetachCurrentThread();
+        director_->swig_jvm_->DetachCurrentThread();
-#endif
+#endif
-      }
+      }
-      JNIEnv *getJNIEnv() const {
+      JNIEnv *getJNIEnv() const {
-        return jenv_;
+        return jenv_;
-      }
+      }
-    };
+    };
-
+
-    /* Java object wrapper */
+    /* Java object wrapper */
-    JObjectWrapper swig_self_;
+    JObjectWrapper swig_self_;
-
+
-    /* Disconnect director from Java object */
+    /* Disconnect director from Java object */
-    void swig_disconnect_director_self(const char *disconn_method) {
+    void swig_disconnect_director_self(const char *disconn_method) {
-      JNIEnvWrapper jnienv(this) ;
+      JNIEnvWrapper jnienv(this) ;
-      JNIEnv *jenv = jnienv.getJNIEnv() ;
+      JNIEnv *jenv = jnienv.getJNIEnv() ;
-      jobject jobj = swig_self_.peek();
+      jobject jobj = swig_self_.peek();
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-      std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
+      std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
-#endif
+#endif
-      if (jobj && jenv->IsSameObject(jobj, NULL) == JNI_FALSE) {
+      if (jobj && jenv->IsSameObject(jobj, NULL) == JNI_FALSE) {
-        jmethodID disconn_meth = jenv->GetMethodID(jenv->GetObjectClass(jobj), disconn_method, "()V");
+        jmethodID disconn_meth = jenv->GetMethodID(jenv->GetObjectClass(jobj), disconn_method, "()V");
-        if (disconn_meth) {
+        if (disconn_meth) {
-#if defined(DEBUG_DIRECTOR_OWNED)
+#if defined(DEBUG_DIRECTOR_OWNED)
-          std::cout << "Swig::Director::disconnect_director_self upcall to " << disconn_method << std::endl;
+          std::cout << "Swig::Director::disconnect_director_self upcall to " << disconn_method << std::endl;
-#endif
+#endif
-          jenv->CallVoidMethod(jobj, disconn_meth);
+          jenv->CallVoidMethod(jobj, disconn_meth);
-        }
+        }
-      }
+      }
-    }
+    }
-
+
-  public:
+  public:
-    Director(JNIEnv *jenv) : swig_jvm_((JavaVM *) NULL), swig_self_() {
+    Director(JNIEnv *jenv) : swig_jvm_((JavaVM *) NULL), swig_self_() {
-      /* Acquire the Java VM pointer */
+      /* Acquire the Java VM pointer */
-      jenv->GetJavaVM(&swig_jvm_);
+      jenv->GetJavaVM(&swig_jvm_);
-    }
+    }
-
+
-    virtual ~Director() {
+    virtual ~Director() {
-      JNIEnvWrapper jnienv(this) ;
+      JNIEnvWrapper jnienv(this) ;
-      JNIEnv *jenv = jnienv.getJNIEnv() ;
+      JNIEnv *jenv = jnienv.getJNIEnv() ;
-      swig_self_.release(jenv);
+      swig_self_.release(jenv);
-    }
+    }
-
+
-    bool swig_set_self(JNIEnv *jenv, jobject jself, bool mem_own, bool weak_global) {
+    bool swig_set_self(JNIEnv *jenv, jobject jself, bool mem_own, bool weak_global) {
-      return swig_self_.set(jenv, jself, mem_own, weak_global);
+      return swig_self_.set(jenv, jself, mem_own, weak_global);
-    }
+    }
-
+
-    jobject swig_get_self(JNIEnv *jenv) const {
+    jobject swig_get_self(JNIEnv *jenv) const {
-      return swig_self_.get(jenv);
+      return swig_self_.get(jenv);
-    }
+    }
-
+
-    // Change C++ object's ownership, relative to Java
+    // Change C++ object's ownership, relative to Java
-    void swig_java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
+    void swig_java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
-      swig_self_.java_change_ownership(jenv, jself, take_or_release);
+      swig_self_.java_change_ownership(jenv, jself, take_or_release);
-    }
+    }
-  };
+  };
-}
+}
-
+
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-
+
-
+
 namespace Swig {
   static jclass jclass_tinyWRAPJNI = NULL;
   static jmethodID director_methids[7];
@@ -825,7 +824,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;
@@ -848,7 +847,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;
@@ -879,7 +878,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);
   return jresult;
@@ -908,13 +907,50 @@ 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);
   return jresult;
 }
 
 
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1getSipContentLength(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  SipMessage *arg1 = (SipMessage *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(SipMessage **)&jarg1; 
+  result = (unsigned int)(arg1)->getSipContentLength();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipMessage_1getSipContent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) {
+  jlong jresult = 0 ;
+  SipMessage *arg1 = (SipMessage *) 0 ;
+  void *arg2 = (void *) 0 ;
+  unsigned int arg3 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(SipMessage **)&jarg1; 
+  
+  arg2 = jarg2;
+  //arg2 = "mamadou";
+  
+  arg3 = (unsigned int)jarg3; 
+  result = (unsigned int)(arg1)->getSipContent(arg2,arg3);
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_new_1SipEvent(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   SipEvent *result = 0 ;
@@ -962,7 +998,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;
 }
 
@@ -1284,7 +1320,7 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1Publicati
 }
 
 
-SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1Publish(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, void * jarg2, jlong jarg3) {
+SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1Publish(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) {
   jboolean jresult = 0 ;
   PublicationSession *arg1 = (PublicationSession *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -1295,7 +1331,10 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSe
   (void)jcls;
   (void)jarg1_;
   arg1 = *(PublicationSession **)&jarg1; 
-  arg2 = jarg2; 
+  
+  arg2 = jarg2;
+  //arg2 = "mamadou";
+  
   arg3 = (unsigned int)jarg3; 
   result = (bool)(arg1)->Publish((void const *)arg2,arg3);
   jresult = (jboolean)result; 

trunk/bindings/java/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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

trunk/bindings/java/tsip_event_type_t.java

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

trunk/bindings/java/tsip_publish_event_type_t.java

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

trunk/bindings/java/tsip_register_event_type_t.java

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

trunk/bindings/java/tsip_subscribe_event_type_t.java

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

trunk/bindings/perl/tinyWRAP.pm

@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.40
+# Version 1.3.39
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
@@ -114,6 +114,8 @@ sub DESTROY {
 
 *getSipHeaderValue = *tinyWRAPc::SipMessage_getSipHeaderValue;
 *getSipHeaderParamValue = *tinyWRAPc::SipMessage_getSipHeaderParamValue;
+*getSipContentLength = *tinyWRAPc::SipMessage_getSipContentLength;
+*getSipContent = *tinyWRAPc::SipMessage_getSipContent;
 sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);

trunk/bindings/python/tinyWRAP.py

@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.40
+# Version 1.3.39
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
@@ -10,18 +10,12 @@ if version_info >= (2,6,0):
     def swig_import_helper():
         from os.path import dirname
         import imp
-        fp = None
         try:
             fp, pathname, description = imp.find_module('_tinyWRAP', [dirname(__file__)])
-        except ImportError:
+            _mod = imp.load_module('_tinyWRAP', fp, pathname, description)
-            import _tinyWRAP
+        finally:
-            return _tinyWRAP
+            if fp is not None: fp.close()
-        if fp is not None:
+        return _mod
-            try:
-                _mod = imp.load_module('_tinyWRAP', fp, pathname, description)
-            finally:
-                fp.close()
-            return _mod
     _tinyWRAP = swig_import_helper()
     del swig_import_helper
 else:
@@ -103,6 +97,8 @@ class SipMessage(_object):
     __del__ = lambda self : None;
     def getSipHeaderValue(self, *args): return _tinyWRAP.SipMessage_getSipHeaderValue(self, *args)
     def getSipHeaderParamValue(self, *args): return _tinyWRAP.SipMessage_getSipHeaderParamValue(self, *args)
+    def getSipContentLength(self): return _tinyWRAP.SipMessage_getSipContentLength(self)
+    def getSipContent(self, *args): return _tinyWRAP.SipMessage_getSipContent(self, *args)
 SipMessage_swigregister = _tinyWRAP.SipMessage_swigregister
 SipMessage_swigregister(SipMessage)
 

trunk/bindings/python/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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

trunk/bindings/vs_2005/csharp/test/Form1.cs

@@ -42,7 +42,7 @@ namespace test
     "<rpid:mood>" +
       "<rpid:guilty />" +
     "</rpid:mood>" +
-    "<cp:homepage>http://www.mercuro.net</cp:homepage>" +
+    "<cp:homepage>http://doubango.org</cp:homepage>" +
     "<pdm:note>Come share with me RCS Experience</pdm:note>" +
   "</pdm:person>" +
   "<pdm:device id=\"d0001\">" +
@@ -126,7 +126,7 @@ namespace test
                 this.pubSession = new PublicationSession(stack);
                 this.pubSession.addHeader("Content-Type", "application/pidf+xml");
                 this.pubSession.addHeader("Event", "presence");
-                this.regSession.setExpires(30);
+                this.pubSession.setExpires(30);
 
                 byte[] payload = Encoding.UTF8.GetBytes(PUBLISH_PAYLOAD);
                 this.pubSession.Publish(payload, (uint)payload.Length);

trunk/tinySIP/include/tinysip/tsip_message.h

@@ -69,12 +69,13 @@ TSIP_BEGIN_DECLS
 #define TSIP_REQUEST_METHOD(self)			 ((self)->line.request.method)
 #define TSIP_REQUEST_URI(self)				 ((self)->line.request.uri)
 
-#define TSIP_MESSAGE_CSEQ_METHOD(self)		((self)->CSeq ? (self)->CSeq->method : tsk_null)
+#define TSIP_MESSAGE_CSEQ_METHOD(self)			((self)->CSeq ? (self)->CSeq->method : tsk_null)
-#define TSIP_MESSAGE_HAS_CONTENT(self)		((self) && (self)->Content && (self)->Content->data)
+#define TSIP_MESSAGE_HAS_CONTENT(self)			((self) && (self)->Content && (self)->Content->data)
-#define TSIP_MESSAGE_CONTENT_LENGTH(self)	(uint32_t)(((self) && (self)->Content_Length) ? (self)->Content_Length->length : 0)
+#define TSIP_MESSAGE_CONTENT_LENGTH(self)		(uint32_t)(((self) && (self)->Content_Length) ? (self)->Content_Length->length : 0)
-#define TSIP_MESSAGE_CONTENT_DATA(self)		(TSIP_MESSAGE_HAS_CONTENT(self) ? (self)->Content->data : tsk_null)
+#define TSIP_MESSAGE_CONTENT_DATA(self)			(TSIP_MESSAGE_HAS_CONTENT(self) ? (self)->Content->data : tsk_null)
-#define TSIP_MESSAGE_CONTENT(self)			(TSIP_MESSAGE_HAS_CONTENT(self) ? (self)->Content : tsk_null)
+#define TSIP_MESSAGE_CONTENT_DATA_LENGTH(self)	(TSIP_MESSAGE_HAS_CONTENT(self) ? (self)->Content->size : 0)
-#define TSIP_MESSAGE_CONTENT_TYPE(self)		(((self) && (self)->Content_Type) ? (self)->Content_Type->type : tsk_null)
+#define TSIP_MESSAGE_CONTENT(self)				(TSIP_MESSAGE_HAS_CONTENT(self) ? (self)->Content : tsk_null)
+#define TSIP_MESSAGE_CONTENT_TYPE(self)			(((self) && (self)->Content_Type) ? (self)->Content_Type->type : tsk_null)
 
 #define TSIP_REQUEST_IS_ACK(self)			((self) &&((self)->line.request.request_type==tsip_ACK))
 #define TSIP_REQUEST_IS_BYE(self)			((self) &&((self)->line.request.request_type==tsip_BYE))