diff --git a/branches/2.0/doubango/bindings/_common/SipSession.cxx b/branches/2.0/doubango/bindings/_common/SipSession.cxx index 17a53f4d..e992a756 100644 --- a/branches/2.0/doubango/bindings/_common/SipSession.cxx +++ b/branches/2.0/doubango/bindings/_common/SipSession.cxx @@ -575,13 +575,14 @@ MessagingSession::~MessagingSession() { } -bool MessagingSession::send(const void* payload, unsigned len) +bool MessagingSession::send(const void* payload, unsigned len, ActionConfig* config/*=tsk_null*/) { - TSK_DEBUG_INFO("MessagingSession::Send()"); int ret; + const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null; if(payload && len){ ret = tsip_action_MESSAGE(this->handle, TSIP_ACTION_SET_PAYLOAD(payload, len), + TSIP_ACTION_SET_CONFIG(action_cfg), TSIP_ACTION_SET_NULL()); } else{ @@ -591,15 +592,19 @@ bool MessagingSession::send(const void* payload, unsigned len) return (ret == 0); } -bool MessagingSession::accept() +bool MessagingSession::accept(ActionConfig* config/*=tsk_null*/) { + const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null; return (tsip_action_ACCEPT(this->handle, + TSIP_ACTION_SET_CONFIG(action_cfg), TSIP_ACTION_SET_NULL()) == 0); } -bool MessagingSession::reject() +bool MessagingSession::reject(ActionConfig* config/*=tsk_null*/) { + const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null; return (tsip_action_REJECT(this->handle, + TSIP_ACTION_SET_CONFIG(action_cfg), TSIP_ACTION_SET_NULL()) == 0); } @@ -656,9 +661,10 @@ PublicationSession::~PublicationSession() { } -bool PublicationSession::publish(const void* payload, unsigned len) +bool PublicationSession::publish(const void* payload, unsigned len, ActionConfig* config/*=tsk_null*/) { int ret; + const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null; if(payload && len){ ret = tsip_action_PUBLISH(this->handle, TSIP_ACTION_SET_PAYLOAD(payload, len), @@ -666,14 +672,17 @@ bool PublicationSession::publish(const void* payload, unsigned len) } else{ ret = tsip_action_PUBLISH(this->handle, + TSIP_ACTION_SET_CONFIG(action_cfg), TSIP_ACTION_SET_NULL()); } return (ret == 0); } -bool PublicationSession::unPublish() +bool PublicationSession::unPublish(ActionConfig* config/*=tsk_null*/) { + const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null; return (tsip_action_UNPUBLISH(this->handle, + TSIP_ACTION_SET_CONFIG(action_cfg), TSIP_ACTION_SET_NULL()) == 0); } diff --git a/branches/2.0/doubango/bindings/_common/SipSession.h b/branches/2.0/doubango/bindings/_common/SipSession.h index f92e40b4..f49a84ea 100644 --- a/branches/2.0/doubango/bindings/_common/SipSession.h +++ b/branches/2.0/doubango/bindings/_common/SipSession.h @@ -150,9 +150,9 @@ public: /* ctor() and dtor() */ virtual ~MessagingSession(); public: /* Public functions */ - bool send(const void* payload, unsigned len); - bool accept(); - bool reject(); + bool send(const void* payload, unsigned len, ActionConfig* config=tsk_null); + bool accept(ActionConfig* config=tsk_null); + bool reject(ActionConfig* config=tsk_null); }; /* ======================== OptionsSession ========================*/ @@ -181,8 +181,8 @@ public: /* ctor() and dtor() */ virtual ~PublicationSession(); public: /* Public functions */ - bool publish(const void* payload, unsigned len); - bool unPublish(); + bool publish(const void* payload, unsigned len, ActionConfig* config=tsk_null); + bool unPublish(ActionConfig* config=tsk_null); }; diff --git a/branches/2.0/doubango/bindings/csharp/MessagingSession.cs b/branches/2.0/doubango/bindings/csharp/MessagingSession.cs index 9fea23ff..45df9c5d 100644 --- a/branches/2.0/doubango/bindings/csharp/MessagingSession.cs +++ b/branches/2.0/doubango/bindings/csharp/MessagingSession.cs @@ -43,18 +43,33 @@ public class MessagingSession : SipSession { public MessagingSession(SipStack Stack) : this(tinyWRAPPINVOKE.new_MessagingSession(SipStack.getCPtr(Stack)), true) { } + public bool send(byte[] payload, uint len, ActionConfig config) { + bool ret = tinyWRAPPINVOKE.MessagingSession_send__SWIG_0(swigCPtr, payload, len, ActionConfig.getCPtr(config)); + return ret; + } + public bool send(byte[] payload, uint len) { - bool ret = tinyWRAPPINVOKE.MessagingSession_send(swigCPtr, payload, len); + bool ret = tinyWRAPPINVOKE.MessagingSession_send__SWIG_1(swigCPtr, payload, len); + return ret; + } + + public bool accept(ActionConfig config) { + bool ret = tinyWRAPPINVOKE.MessagingSession_accept__SWIG_0(swigCPtr, ActionConfig.getCPtr(config)); return ret; } public bool accept() { - bool ret = tinyWRAPPINVOKE.MessagingSession_accept(swigCPtr); + bool ret = tinyWRAPPINVOKE.MessagingSession_accept__SWIG_1(swigCPtr); + return ret; + } + + public bool reject(ActionConfig config) { + bool ret = tinyWRAPPINVOKE.MessagingSession_reject__SWIG_0(swigCPtr, ActionConfig.getCPtr(config)); return ret; } public bool reject() { - bool ret = tinyWRAPPINVOKE.MessagingSession_reject(swigCPtr); + bool ret = tinyWRAPPINVOKE.MessagingSession_reject__SWIG_1(swigCPtr); return ret; } diff --git a/branches/2.0/doubango/bindings/csharp/PublicationSession.cs b/branches/2.0/doubango/bindings/csharp/PublicationSession.cs index 5fe098ee..5d0657a9 100644 --- a/branches/2.0/doubango/bindings/csharp/PublicationSession.cs +++ b/branches/2.0/doubango/bindings/csharp/PublicationSession.cs @@ -43,13 +43,23 @@ public class PublicationSession : SipSession { public PublicationSession(SipStack Stack) : this(tinyWRAPPINVOKE.new_PublicationSession(SipStack.getCPtr(Stack)), true) { } + public bool publish(byte[] payload, uint len, ActionConfig config) { + bool ret = tinyWRAPPINVOKE.PublicationSession_publish__SWIG_0(swigCPtr, payload, len, ActionConfig.getCPtr(config)); + return ret; + } + public bool publish(byte[] payload, uint len) { - bool ret = tinyWRAPPINVOKE.PublicationSession_publish(swigCPtr, payload, len); + bool ret = tinyWRAPPINVOKE.PublicationSession_publish__SWIG_1(swigCPtr, payload, len); + return ret; + } + + public bool unPublish(ActionConfig config) { + bool ret = tinyWRAPPINVOKE.PublicationSession_unPublish__SWIG_0(swigCPtr, ActionConfig.getCPtr(config)); return ret; } public bool unPublish() { - bool ret = tinyWRAPPINVOKE.PublicationSession_unPublish(swigCPtr); + bool ret = tinyWRAPPINVOKE.PublicationSession_unPublish__SWIG_1(swigCPtr); return ret; } diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs b/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs index e424f70e..064abbca 100644 --- a/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs +++ b/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs @@ -639,14 +639,23 @@ class tinyWRAPPINVOKE { [DllImport("tinyWRAP", EntryPoint="CSharp_delete_MessagingSession")] public static extern void delete_MessagingSession(HandleRef jarg1); - [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_send")] - public static extern bool MessagingSession_send(HandleRef jarg1, byte[] jarg2, uint jarg3); + [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_send__SWIG_0")] + public static extern bool MessagingSession_send__SWIG_0(HandleRef jarg1, byte[] jarg2, uint jarg3, HandleRef jarg4); - [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_accept")] - public static extern bool MessagingSession_accept(HandleRef jarg1); + [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_send__SWIG_1")] + public static extern bool MessagingSession_send__SWIG_1(HandleRef jarg1, byte[] jarg2, uint jarg3); - [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_reject")] - public static extern bool MessagingSession_reject(HandleRef jarg1); + [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_accept__SWIG_0")] + public static extern bool MessagingSession_accept__SWIG_0(HandleRef jarg1, HandleRef jarg2); + + [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_accept__SWIG_1")] + public static extern bool MessagingSession_accept__SWIG_1(HandleRef jarg1); + + [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_reject__SWIG_0")] + public static extern bool MessagingSession_reject__SWIG_0(HandleRef jarg1, HandleRef jarg2); + + [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_reject__SWIG_1")] + public static extern bool MessagingSession_reject__SWIG_1(HandleRef jarg1); [DllImport("tinyWRAP", EntryPoint="CSharp_new_OptionsSession")] public static extern IntPtr new_OptionsSession(HandleRef jarg1); @@ -678,11 +687,17 @@ class tinyWRAPPINVOKE { [DllImport("tinyWRAP", EntryPoint="CSharp_delete_PublicationSession")] public static extern void delete_PublicationSession(HandleRef jarg1); - [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_publish")] - public static extern bool PublicationSession_publish(HandleRef jarg1, byte[] jarg2, uint jarg3); + [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_publish__SWIG_0")] + public static extern bool PublicationSession_publish__SWIG_0(HandleRef jarg1, byte[] jarg2, uint jarg3, HandleRef jarg4); - [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_unPublish")] - public static extern bool PublicationSession_unPublish(HandleRef jarg1); + [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_publish__SWIG_1")] + public static extern bool PublicationSession_publish__SWIG_1(HandleRef jarg1, byte[] jarg2, uint jarg3); + + [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_unPublish__SWIG_0")] + public static extern bool PublicationSession_unPublish__SWIG_0(HandleRef jarg1, HandleRef jarg2); + + [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_unPublish__SWIG_1")] + public static extern bool PublicationSession_unPublish__SWIG_1(HandleRef jarg1); [DllImport("tinyWRAP", EntryPoint="CSharp_new_RegistrationSession")] public static extern IntPtr new_RegistrationSession(HandleRef jarg1); diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx index 35c54681..e24897db 100644 --- a/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx +++ b/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx @@ -3016,7 +3016,25 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_MessagingSession(void * jarg1) { } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_send(void * jarg1, void * jarg2, unsigned int jarg3) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_send__SWIG_0(void * jarg1, void * jarg2, unsigned int jarg3, void * jarg4) { + unsigned int jresult ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + bool result; + + arg1 = (MessagingSession *)jarg1; + arg2 = jarg2; + arg3 = (unsigned int)jarg3; + arg4 = (ActionConfig *)jarg4; + result = (bool)(arg1)->send((void const *)arg2,arg3,arg4); + jresult = result; + return jresult; +} + + +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_send__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3) { unsigned int jresult ; MessagingSession *arg1 = (MessagingSession *) 0 ; void *arg2 = (void *) 0 ; @@ -3032,7 +3050,21 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_send(void * jarg1, v } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_accept(void * jarg1) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_accept__SWIG_0(void * jarg1, void * jarg2) { + unsigned int jresult ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + arg1 = (MessagingSession *)jarg1; + arg2 = (ActionConfig *)jarg2; + result = (bool)(arg1)->accept(arg2); + jresult = result; + return jresult; +} + + +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_accept__SWIG_1(void * jarg1) { unsigned int jresult ; MessagingSession *arg1 = (MessagingSession *) 0 ; bool result; @@ -3044,7 +3076,21 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_accept(void * jarg1) } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_reject(void * jarg1) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_reject__SWIG_0(void * jarg1, void * jarg2) { + unsigned int jresult ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + arg1 = (MessagingSession *)jarg1; + arg2 = (ActionConfig *)jarg2; + result = (bool)(arg1)->reject(arg2); + jresult = result; + return jresult; +} + + +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_MessagingSession_reject__SWIG_1(void * jarg1) { unsigned int jresult ; MessagingSession *arg1 = (MessagingSession *) 0 ; bool result; @@ -3174,7 +3220,25 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_PublicationSession(void * jarg1) { } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_publish(void * jarg1, void * jarg2, unsigned int jarg3) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_publish__SWIG_0(void * jarg1, void * jarg2, unsigned int jarg3, void * jarg4) { + unsigned int jresult ; + PublicationSession *arg1 = (PublicationSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + bool result; + + arg1 = (PublicationSession *)jarg1; + arg2 = jarg2; + arg3 = (unsigned int)jarg3; + arg4 = (ActionConfig *)jarg4; + result = (bool)(arg1)->publish((void const *)arg2,arg3,arg4); + jresult = result; + return jresult; +} + + +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_publish__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3) { unsigned int jresult ; PublicationSession *arg1 = (PublicationSession *) 0 ; void *arg2 = (void *) 0 ; @@ -3190,7 +3254,21 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_publish(void * jar } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_unPublish(void * jarg1) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_unPublish__SWIG_0(void * jarg1, void * jarg2) { + unsigned int jresult ; + PublicationSession *arg1 = (PublicationSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + arg1 = (PublicationSession *)jarg1; + arg2 = (ActionConfig *)jarg2; + result = (bool)(arg1)->unPublish(arg2); + jresult = result; + return jresult; +} + + +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_PublicationSession_unPublish__SWIG_1(void * jarg1) { unsigned int jresult ; PublicationSession *arg1 = (PublicationSession *) 0 ; bool result; diff --git a/branches/2.0/doubango/bindings/java/MessagingSession.java b/branches/2.0/doubango/bindings/java/MessagingSession.java index 43a652cb..bfc5dafb 100644 --- a/branches/2.0/doubango/bindings/java/MessagingSession.java +++ b/branches/2.0/doubango/bindings/java/MessagingSession.java @@ -39,16 +39,28 @@ public class MessagingSession extends SipSession { this(tinyWRAPJNI.new_MessagingSession(SipStack.getCPtr(Stack), Stack), true); } + public boolean send(java.nio.ByteBuffer payload, long len, ActionConfig config) { + return tinyWRAPJNI.MessagingSession_send__SWIG_0(swigCPtr, this, payload, len, ActionConfig.getCPtr(config), config); + } + public boolean send(java.nio.ByteBuffer payload, long len) { - return tinyWRAPJNI.MessagingSession_send(swigCPtr, this, payload, len); + return tinyWRAPJNI.MessagingSession_send__SWIG_1(swigCPtr, this, payload, len); + } + + public boolean accept(ActionConfig config) { + return tinyWRAPJNI.MessagingSession_accept__SWIG_0(swigCPtr, this, ActionConfig.getCPtr(config), config); } public boolean accept() { - return tinyWRAPJNI.MessagingSession_accept(swigCPtr, this); + return tinyWRAPJNI.MessagingSession_accept__SWIG_1(swigCPtr, this); + } + + public boolean reject(ActionConfig config) { + return tinyWRAPJNI.MessagingSession_reject__SWIG_0(swigCPtr, this, ActionConfig.getCPtr(config), config); } public boolean reject() { - return tinyWRAPJNI.MessagingSession_reject(swigCPtr, this); + return tinyWRAPJNI.MessagingSession_reject__SWIG_1(swigCPtr, this); } } diff --git a/branches/2.0/doubango/bindings/java/PublicationSession.java b/branches/2.0/doubango/bindings/java/PublicationSession.java index 8fe3f089..dc30950c 100644 --- a/branches/2.0/doubango/bindings/java/PublicationSession.java +++ b/branches/2.0/doubango/bindings/java/PublicationSession.java @@ -47,12 +47,20 @@ public class PublicationSession extends SipSession { this(tinyWRAPJNI.new_PublicationSession(SipStack.getCPtr(Stack), Stack), true); } + public boolean publish(java.nio.ByteBuffer payload, long len, ActionConfig config) { + return tinyWRAPJNI.PublicationSession_publish__SWIG_0(swigCPtr, this, payload, len, ActionConfig.getCPtr(config), config); + } + public boolean publish(java.nio.ByteBuffer payload, long len) { - return tinyWRAPJNI.PublicationSession_publish(swigCPtr, this, payload, len); + return tinyWRAPJNI.PublicationSession_publish__SWIG_1(swigCPtr, this, payload, len); + } + + public boolean unPublish(ActionConfig config) { + return tinyWRAPJNI.PublicationSession_unPublish__SWIG_0(swigCPtr, this, ActionConfig.getCPtr(config), config); } public boolean unPublish() { - return tinyWRAPJNI.PublicationSession_unPublish(swigCPtr, this); + return tinyWRAPJNI.PublicationSession_unPublish__SWIG_1(swigCPtr, this); } } diff --git a/branches/2.0/doubango/bindings/java/android/MessagingSession.java b/branches/2.0/doubango/bindings/java/android/MessagingSession.java index 43a652cb..bfc5dafb 100644 --- a/branches/2.0/doubango/bindings/java/android/MessagingSession.java +++ b/branches/2.0/doubango/bindings/java/android/MessagingSession.java @@ -39,16 +39,28 @@ public class MessagingSession extends SipSession { this(tinyWRAPJNI.new_MessagingSession(SipStack.getCPtr(Stack), Stack), true); } + public boolean send(java.nio.ByteBuffer payload, long len, ActionConfig config) { + return tinyWRAPJNI.MessagingSession_send__SWIG_0(swigCPtr, this, payload, len, ActionConfig.getCPtr(config), config); + } + public boolean send(java.nio.ByteBuffer payload, long len) { - return tinyWRAPJNI.MessagingSession_send(swigCPtr, this, payload, len); + return tinyWRAPJNI.MessagingSession_send__SWIG_1(swigCPtr, this, payload, len); + } + + public boolean accept(ActionConfig config) { + return tinyWRAPJNI.MessagingSession_accept__SWIG_0(swigCPtr, this, ActionConfig.getCPtr(config), config); } public boolean accept() { - return tinyWRAPJNI.MessagingSession_accept(swigCPtr, this); + return tinyWRAPJNI.MessagingSession_accept__SWIG_1(swigCPtr, this); + } + + public boolean reject(ActionConfig config) { + return tinyWRAPJNI.MessagingSession_reject__SWIG_0(swigCPtr, this, ActionConfig.getCPtr(config), config); } public boolean reject() { - return tinyWRAPJNI.MessagingSession_reject(swigCPtr, this); + return tinyWRAPJNI.MessagingSession_reject__SWIG_1(swigCPtr, this); } } diff --git a/branches/2.0/doubango/bindings/java/android/PublicationSession.java b/branches/2.0/doubango/bindings/java/android/PublicationSession.java index 8fe3f089..dc30950c 100644 --- a/branches/2.0/doubango/bindings/java/android/PublicationSession.java +++ b/branches/2.0/doubango/bindings/java/android/PublicationSession.java @@ -47,12 +47,20 @@ public class PublicationSession extends SipSession { this(tinyWRAPJNI.new_PublicationSession(SipStack.getCPtr(Stack), Stack), true); } + public boolean publish(java.nio.ByteBuffer payload, long len, ActionConfig config) { + return tinyWRAPJNI.PublicationSession_publish__SWIG_0(swigCPtr, this, payload, len, ActionConfig.getCPtr(config), config); + } + public boolean publish(java.nio.ByteBuffer payload, long len) { - return tinyWRAPJNI.PublicationSession_publish(swigCPtr, this, payload, len); + return tinyWRAPJNI.PublicationSession_publish__SWIG_1(swigCPtr, this, payload, len); + } + + public boolean unPublish(ActionConfig config) { + return tinyWRAPJNI.PublicationSession_unPublish__SWIG_0(swigCPtr, this, ActionConfig.getCPtr(config), config); } public boolean unPublish() { - return tinyWRAPJNI.PublicationSession_unPublish(swigCPtr, this); + return tinyWRAPJNI.PublicationSession_unPublish__SWIG_1(swigCPtr, this); } } diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java b/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java index a8fdd5d7..b4ec9fba 100644 --- a/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java +++ b/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java @@ -160,9 +160,12 @@ public class tinyWRAPJNI { public final static native boolean MsrpSession_sendFile__SWIG_1(long jarg1, MsrpSession jarg1_); public final static native long new_MessagingSession(long jarg1, SipStack jarg1_); public final static native void delete_MessagingSession(long jarg1); - public final static native boolean MessagingSession_send(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); - public final static native boolean MessagingSession_accept(long jarg1, MessagingSession jarg1_); - public final static native boolean MessagingSession_reject(long jarg1, MessagingSession jarg1_); + public final static native boolean MessagingSession_send__SWIG_0(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3, long jarg4, ActionConfig jarg4_); + public final static native boolean MessagingSession_send__SWIG_1(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); + public final static native boolean MessagingSession_accept__SWIG_0(long jarg1, MessagingSession jarg1_, long jarg2, ActionConfig jarg2_); + public final static native boolean MessagingSession_accept__SWIG_1(long jarg1, MessagingSession jarg1_); + public final static native boolean MessagingSession_reject__SWIG_0(long jarg1, MessagingSession jarg1_, long jarg2, ActionConfig jarg2_); + public final static native boolean MessagingSession_reject__SWIG_1(long jarg1, MessagingSession jarg1_); public final static native long new_OptionsSession(long jarg1, SipStack jarg1_); public final static native void delete_OptionsSession(long jarg1); public final static native boolean OptionsSession_send__SWIG_0(long jarg1, OptionsSession jarg1_, long jarg2, ActionConfig jarg2_); @@ -173,8 +176,10 @@ public class tinyWRAPJNI { public final static native boolean OptionsSession_reject__SWIG_1(long jarg1, OptionsSession jarg1_); public final static native long new_PublicationSession(long jarg1, SipStack jarg1_); public final static native void delete_PublicationSession(long jarg1); - public final static native boolean PublicationSession_publish(long jarg1, PublicationSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); - public final static native boolean PublicationSession_unPublish(long jarg1, PublicationSession jarg1_); + public final static native boolean PublicationSession_publish__SWIG_0(long jarg1, PublicationSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3, long jarg4, ActionConfig jarg4_); + public final static native boolean PublicationSession_publish__SWIG_1(long jarg1, PublicationSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); + public final static native boolean PublicationSession_unPublish__SWIG_0(long jarg1, PublicationSession jarg1_, long jarg2, ActionConfig jarg2_); + public final static native boolean PublicationSession_unPublish__SWIG_1(long jarg1, PublicationSession jarg1_); public final static native long new_RegistrationSession(long jarg1, SipStack jarg1_); public final static native void delete_RegistrationSession(long jarg1); public final static native boolean RegistrationSession_register_(long jarg1, RegistrationSession jarg1_); diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx index 2d9618c8..52f807a8 100644 --- a/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx +++ b/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx @@ -4440,7 +4440,31 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1Messaging } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1send(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1send_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) { + jboolean jresult = 0 ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg4_; + arg1 = *(MessagingSession **)&jarg1; + + arg2 = jenv->GetDirectBufferAddress(jarg2); + + arg3 = (unsigned int)jarg3; + arg4 = *(ActionConfig **)&jarg4; + result = (bool)(arg1)->send((void const *)arg2,arg3,arg4); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1send_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) { jboolean jresult = 0 ; MessagingSession *arg1 = (MessagingSession *) 0 ; void *arg2 = (void *) 0 ; @@ -4461,7 +4485,25 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSess } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1accept(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1accept_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jboolean jresult = 0 ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(MessagingSession **)&jarg1; + arg2 = *(ActionConfig **)&jarg2; + result = (bool)(arg1)->accept(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1accept_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; MessagingSession *arg1 = (MessagingSession *) 0 ; bool result; @@ -4476,7 +4518,25 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSess } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1reject(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1reject_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jboolean jresult = 0 ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(MessagingSession **)&jarg1; + arg2 = *(ActionConfig **)&jarg2; + result = (bool)(arg1)->reject(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1reject_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; MessagingSession *arg1 = (MessagingSession *) 0 ; bool result; @@ -4640,7 +4700,31 @@ 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_, jbyteArray jarg2, jlong jarg3) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1publish_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) { + jboolean jresult = 0 ; + PublicationSession *arg1 = (PublicationSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg4_; + arg1 = *(PublicationSession **)&jarg1; + + arg2 = jenv->GetDirectBufferAddress(jarg2); + + arg3 = (unsigned int)jarg3; + arg4 = *(ActionConfig **)&jarg4; + result = (bool)(arg1)->publish((void const *)arg2,arg3,arg4); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1publish_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) { jboolean jresult = 0 ; PublicationSession *arg1 = (PublicationSession *) 0 ; void *arg2 = (void *) 0 ; @@ -4661,7 +4745,25 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSe } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1unPublish(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1unPublish_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jboolean jresult = 0 ; + PublicationSession *arg1 = (PublicationSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(PublicationSession **)&jarg1; + arg2 = *(ActionConfig **)&jarg2; + result = (bool)(arg1)->unPublish(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1unPublish_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; PublicationSession *arg1 = (PublicationSession *) 0 ; bool result; diff --git a/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java b/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java index a8fdd5d7..b4ec9fba 100644 --- a/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java +++ b/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java @@ -160,9 +160,12 @@ public class tinyWRAPJNI { public final static native boolean MsrpSession_sendFile__SWIG_1(long jarg1, MsrpSession jarg1_); public final static native long new_MessagingSession(long jarg1, SipStack jarg1_); public final static native void delete_MessagingSession(long jarg1); - public final static native boolean MessagingSession_send(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); - public final static native boolean MessagingSession_accept(long jarg1, MessagingSession jarg1_); - public final static native boolean MessagingSession_reject(long jarg1, MessagingSession jarg1_); + public final static native boolean MessagingSession_send__SWIG_0(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3, long jarg4, ActionConfig jarg4_); + public final static native boolean MessagingSession_send__SWIG_1(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); + public final static native boolean MessagingSession_accept__SWIG_0(long jarg1, MessagingSession jarg1_, long jarg2, ActionConfig jarg2_); + public final static native boolean MessagingSession_accept__SWIG_1(long jarg1, MessagingSession jarg1_); + public final static native boolean MessagingSession_reject__SWIG_0(long jarg1, MessagingSession jarg1_, long jarg2, ActionConfig jarg2_); + public final static native boolean MessagingSession_reject__SWIG_1(long jarg1, MessagingSession jarg1_); public final static native long new_OptionsSession(long jarg1, SipStack jarg1_); public final static native void delete_OptionsSession(long jarg1); public final static native boolean OptionsSession_send__SWIG_0(long jarg1, OptionsSession jarg1_, long jarg2, ActionConfig jarg2_); @@ -173,8 +176,10 @@ public class tinyWRAPJNI { public final static native boolean OptionsSession_reject__SWIG_1(long jarg1, OptionsSession jarg1_); public final static native long new_PublicationSession(long jarg1, SipStack jarg1_); public final static native void delete_PublicationSession(long jarg1); - public final static native boolean PublicationSession_publish(long jarg1, PublicationSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); - public final static native boolean PublicationSession_unPublish(long jarg1, PublicationSession jarg1_); + public final static native boolean PublicationSession_publish__SWIG_0(long jarg1, PublicationSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3, long jarg4, ActionConfig jarg4_); + public final static native boolean PublicationSession_publish__SWIG_1(long jarg1, PublicationSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3); + public final static native boolean PublicationSession_unPublish__SWIG_0(long jarg1, PublicationSession jarg1_, long jarg2, ActionConfig jarg2_); + public final static native boolean PublicationSession_unPublish__SWIG_1(long jarg1, PublicationSession jarg1_); public final static native long new_RegistrationSession(long jarg1, SipStack jarg1_); public final static native void delete_RegistrationSession(long jarg1); public final static native boolean RegistrationSession_register_(long jarg1, RegistrationSession jarg1_); diff --git a/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx index 1d0c0e5d..c85055a9 100644 --- a/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx +++ b/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx @@ -4440,7 +4440,31 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1Messaging } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1send(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1send_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) { + jboolean jresult = 0 ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg4_; + arg1 = *(MessagingSession **)&jarg1; + + arg2 = jenv->GetDirectBufferAddress(jarg2); + + arg3 = (unsigned int)jarg3; + arg4 = *(ActionConfig **)&jarg4; + result = (bool)(arg1)->send((void const *)arg2,arg3,arg4); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1send_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) { jboolean jresult = 0 ; MessagingSession *arg1 = (MessagingSession *) 0 ; void *arg2 = (void *) 0 ; @@ -4461,7 +4485,25 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSess } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1accept(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1accept_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jboolean jresult = 0 ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(MessagingSession **)&jarg1; + arg2 = *(ActionConfig **)&jarg2; + result = (bool)(arg1)->accept(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1accept_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; MessagingSession *arg1 = (MessagingSession *) 0 ; bool result; @@ -4476,7 +4518,25 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSess } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1reject(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1reject_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jboolean jresult = 0 ; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(MessagingSession **)&jarg1; + arg2 = *(ActionConfig **)&jarg2; + result = (bool)(arg1)->reject(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1reject_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; MessagingSession *arg1 = (MessagingSession *) 0 ; bool result; @@ -4640,7 +4700,31 @@ 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_, jbyteArray jarg2, jlong jarg3) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1publish_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) { + jboolean jresult = 0 ; + PublicationSession *arg1 = (PublicationSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg4_; + arg1 = *(PublicationSession **)&jarg1; + + arg2 = jenv->GetDirectBufferAddress(jarg2); + + arg3 = (unsigned int)jarg3; + arg4 = *(ActionConfig **)&jarg4; + result = (bool)(arg1)->publish((void const *)arg2,arg3,arg4); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1publish_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyteArray jarg2, jlong jarg3) { jboolean jresult = 0 ; PublicationSession *arg1 = (PublicationSession *) 0 ; void *arg2 = (void *) 0 ; @@ -4661,7 +4745,25 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSe } -SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1unPublish(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1unPublish_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jboolean jresult = 0 ; + PublicationSession *arg1 = (PublicationSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(PublicationSession **)&jarg1; + arg2 = *(ActionConfig **)&jarg2; + result = (bool)(arg1)->unPublish(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1unPublish_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; PublicationSession *arg1 = (PublicationSession *) 0 ; bool result; diff --git a/branches/2.0/doubango/bindings/perl/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/perl/tinyWRAP_wrap.cxx index 1ab700fe..1e76c99a 100644 --- a/branches/2.0/doubango/bindings/perl/tinyWRAP_wrap.cxx +++ b/branches/2.0/doubango/bindings/perl/tinyWRAP_wrap.cxx @@ -8804,7 +8804,63 @@ XS(_wrap_delete_MessagingSession) { } -XS(_wrap_MessagingSession_send) { +XS(_wrap_MessagingSession_send__SWIG_0) { + { + MessagingSession *arg1 = (MessagingSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + unsigned int val3 ; + int ecode3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + int argvi = 0; + bool result; + dXSARGS; + + if ((items < 4) || (items > 4)) { + SWIG_croak("Usage: MessagingSession_send(self,payload,len,config);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_MessagingSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MessagingSession_send" "', argument " "1"" of type '" "MessagingSession *""'"); + } + arg1 = reinterpret_cast< MessagingSession * >(argp1); + res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MessagingSession_send" "', argument " "2"" of type '" "void const *""'"); + } + ecode3 = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MessagingSession_send" "', argument " "3"" of type '" "unsigned int""'"); + } + arg3 = static_cast< unsigned int >(val3); + res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "MessagingSession_send" "', argument " "4"" of type '" "ActionConfig *""'"); + } + arg4 = reinterpret_cast< ActionConfig * >(argp4); + result = (bool)(arg1)->send((void const *)arg2,arg3,arg4); + ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ; + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_MessagingSession_send__SWIG_1) { { MessagingSession *arg1 = (MessagingSession *) 0 ; void *arg2 = (void *) 0 ; @@ -8850,7 +8906,154 @@ XS(_wrap_MessagingSession_send) { } -XS(_wrap_MessagingSession_accept) { +XS(_wrap_MessagingSession_send) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 3) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *ptr = 0; + int res = SWIG_ConvertPtr(ST(1), &ptr, 0, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + { + int res = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(2), NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 4) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *ptr = 0; + int res = SWIG_ConvertPtr(ST(1), &ptr, 0, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + { + int res = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(2), NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(3), &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_MessagingSession_send__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_MessagingSession_send__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'MessagingSession_send'"); + XSRETURN(0); +} + + +XS(_wrap_MessagingSession_accept__SWIG_0) { + { + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + bool result; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: MessagingSession_accept(self,config);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_MessagingSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MessagingSession_accept" "', argument " "1"" of type '" "MessagingSession *""'"); + } + arg1 = reinterpret_cast< MessagingSession * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MessagingSession_accept" "', argument " "2"" of type '" "ActionConfig *""'"); + } + arg2 = reinterpret_cast< ActionConfig * >(argp2); + result = (bool)(arg1)->accept(arg2); + ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_MessagingSession_accept__SWIG_1) { { MessagingSession *arg1 = (MessagingSession *) 0 ; void *argp1 = 0 ; @@ -8878,7 +9081,116 @@ XS(_wrap_MessagingSession_accept) { } -XS(_wrap_MessagingSession_reject) { +XS(_wrap_MessagingSession_accept) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 1) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 2) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(1), &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_MessagingSession_accept__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_MessagingSession_accept__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'MessagingSession_accept'"); + XSRETURN(0); +} + + +XS(_wrap_MessagingSession_reject__SWIG_0) { + { + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + bool result; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: MessagingSession_reject(self,config);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_MessagingSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MessagingSession_reject" "', argument " "1"" of type '" "MessagingSession *""'"); + } + arg1 = reinterpret_cast< MessagingSession * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MessagingSession_reject" "', argument " "2"" of type '" "ActionConfig *""'"); + } + arg2 = reinterpret_cast< ActionConfig * >(argp2); + result = (bool)(arg1)->reject(arg2); + ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_MessagingSession_reject__SWIG_1) { { MessagingSession *arg1 = (MessagingSession *) 0 ; void *argp1 = 0 ; @@ -8906,6 +9218,77 @@ XS(_wrap_MessagingSession_reject) { } +XS(_wrap_MessagingSession_reject) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 1) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 2) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(1), &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_MessagingSession_reject__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_MessagingSession_reject__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'MessagingSession_reject'"); + XSRETURN(0); +} + + XS(_wrap_new_OptionsSession) { { SipStack *arg1 = (SipStack *) 0 ; @@ -9427,7 +9810,63 @@ XS(_wrap_delete_PublicationSession) { } -XS(_wrap_PublicationSession_publish) { +XS(_wrap_PublicationSession_publish__SWIG_0) { + { + PublicationSession *arg1 = (PublicationSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + unsigned int val3 ; + int ecode3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + int argvi = 0; + bool result; + dXSARGS; + + if ((items < 4) || (items > 4)) { + SWIG_croak("Usage: PublicationSession_publish(self,payload,len,config);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_PublicationSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PublicationSession_publish" "', argument " "1"" of type '" "PublicationSession *""'"); + } + arg1 = reinterpret_cast< PublicationSession * >(argp1); + res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PublicationSession_publish" "', argument " "2"" of type '" "void const *""'"); + } + ecode3 = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PublicationSession_publish" "', argument " "3"" of type '" "unsigned int""'"); + } + arg3 = static_cast< unsigned int >(val3); + res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PublicationSession_publish" "', argument " "4"" of type '" "ActionConfig *""'"); + } + arg4 = reinterpret_cast< ActionConfig * >(argp4); + result = (bool)(arg1)->publish((void const *)arg2,arg3,arg4); + ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ; + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_PublicationSession_publish__SWIG_1) { { PublicationSession *arg1 = (PublicationSession *) 0 ; void *arg2 = (void *) 0 ; @@ -9473,7 +9912,154 @@ XS(_wrap_PublicationSession_publish) { } -XS(_wrap_PublicationSession_unPublish) { +XS(_wrap_PublicationSession_publish) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 3) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *ptr = 0; + int res = SWIG_ConvertPtr(ST(1), &ptr, 0, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + { + int res = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(2), NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 4) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *ptr = 0; + int res = SWIG_ConvertPtr(ST(1), &ptr, 0, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + { + int res = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(2), NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(3), &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_PublicationSession_publish__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_PublicationSession_publish__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'PublicationSession_publish'"); + XSRETURN(0); +} + + +XS(_wrap_PublicationSession_unPublish__SWIG_0) { + { + PublicationSession *arg1 = (PublicationSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + bool result; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: PublicationSession_unPublish(self,config);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_PublicationSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PublicationSession_unPublish" "', argument " "1"" of type '" "PublicationSession *""'"); + } + arg1 = reinterpret_cast< PublicationSession * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PublicationSession_unPublish" "', argument " "2"" of type '" "ActionConfig *""'"); + } + arg2 = reinterpret_cast< ActionConfig * >(argp2); + result = (bool)(arg1)->unPublish(arg2); + ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_PublicationSession_unPublish__SWIG_1) { { PublicationSession *arg1 = (PublicationSession *) 0 ; void *argp1 = 0 ; @@ -9501,6 +10087,77 @@ XS(_wrap_PublicationSession_unPublish) { } +XS(_wrap_PublicationSession_unPublish) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 1) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 2) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(1), &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_PublicationSession_unPublish__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_PublicationSession_unPublish__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'PublicationSession_unPublish'"); + XSRETURN(0); +} + + XS(_wrap_new_RegistrationSession) { { SipStack *arg1 = (SipStack *) 0 ; diff --git a/branches/2.0/doubango/bindings/python/tinyWRAP.py b/branches/2.0/doubango/bindings/python/tinyWRAP.py index e11a90e8..d729e08a 100644 --- a/branches/2.0/doubango/bindings/python/tinyWRAP.py +++ b/branches/2.0/doubango/bindings/python/tinyWRAP.py @@ -518,8 +518,8 @@ class MessagingSession(SipSession): __swig_destroy__ = _tinyWRAP.delete_MessagingSession __del__ = lambda self : None; def send(self, *args): return _tinyWRAP.MessagingSession_send(self, *args) - def accept(self): return _tinyWRAP.MessagingSession_accept(self) - def reject(self): return _tinyWRAP.MessagingSession_reject(self) + def accept(self, *args): return _tinyWRAP.MessagingSession_accept(self, *args) + def reject(self, *args): return _tinyWRAP.MessagingSession_reject(self, *args) MessagingSession_swigregister = _tinyWRAP.MessagingSession_swigregister MessagingSession_swigregister(MessagingSession) @@ -558,7 +558,7 @@ class PublicationSession(SipSession): __swig_destroy__ = _tinyWRAP.delete_PublicationSession __del__ = lambda self : None; def publish(self, *args): return _tinyWRAP.PublicationSession_publish(self, *args) - def unPublish(self): return _tinyWRAP.PublicationSession_unPublish(self) + def unPublish(self, *args): return _tinyWRAP.PublicationSession_unPublish(self, *args) PublicationSession_swigregister = _tinyWRAP.PublicationSession_swigregister PublicationSession_swigregister(PublicationSession) diff --git a/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx index 2f414a41..78aa053c 100644 --- a/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx +++ b/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx @@ -10402,7 +10402,54 @@ fail: } -SWIGINTERN PyObject *_wrap_MessagingSession_send(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_MessagingSession_send__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + MessagingSession *arg1 = (MessagingSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + unsigned int val3 ; + int ecode3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + bool result; + + if (!PyArg_ParseTuple(args,(char *)"OOOO:MessagingSession_send",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MessagingSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MessagingSession_send" "', argument " "1"" of type '" "MessagingSession *""'"); + } + arg1 = reinterpret_cast< MessagingSession * >(argp1); + res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MessagingSession_send" "', argument " "2"" of type '" "void const *""'"); + } + ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MessagingSession_send" "', argument " "3"" of type '" "unsigned int""'"); + } + arg3 = static_cast< unsigned int >(val3); + res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "MessagingSession_send" "', argument " "4"" of type '" "ActionConfig *""'"); + } + arg4 = reinterpret_cast< ActionConfig * >(argp4); + result = (bool)(arg1)->send((void const *)arg2,arg3,arg4); + resultobj = SWIG_From_bool(static_cast< bool >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MessagingSession_send__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; MessagingSession *arg1 = (MessagingSession *) 0 ; void *arg2 = (void *) 0 ; @@ -10440,7 +10487,103 @@ fail: } -SWIGINTERN PyObject *_wrap_MessagingSession_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_MessagingSession_send(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[5]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = (int)PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 4); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); + } + if (argc == 3) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *ptr = 0; + int res = SWIG_ConvertPtr(argv[1], &ptr, 0, 0); + _v = SWIG_CheckState(res); + if (_v) { + { + int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + return _wrap_MessagingSession_send__SWIG_1(self, args); + } + } + } + } + if (argc == 4) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *ptr = 0; + int res = SWIG_ConvertPtr(argv[1], &ptr, 0, 0); + _v = SWIG_CheckState(res); + if (_v) { + { + int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_MessagingSession_send__SWIG_0(self, args); + } + } + } + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MessagingSession_send'.\n" + " Possible C/C++ prototypes are:\n" + " send(MessagingSession *,void const *,unsigned int,ActionConfig *)\n" + " send(MessagingSession *,void const *,unsigned int)\n"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MessagingSession_accept__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + bool result; + + if (!PyArg_ParseTuple(args,(char *)"OO:MessagingSession_accept",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MessagingSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MessagingSession_accept" "', argument " "1"" of type '" "MessagingSession *""'"); + } + arg1 = reinterpret_cast< MessagingSession * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MessagingSession_accept" "', argument " "2"" of type '" "ActionConfig *""'"); + } + arg2 = reinterpret_cast< ActionConfig * >(argp2); + result = (bool)(arg1)->accept(arg2); + resultobj = SWIG_From_bool(static_cast< bool >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MessagingSession_accept__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; MessagingSession *arg1 = (MessagingSession *) 0 ; void *argp1 = 0 ; @@ -10462,7 +10605,81 @@ fail: } -SWIGINTERN PyObject *_wrap_MessagingSession_reject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_MessagingSession_accept(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = (int)PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); + } + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_MessagingSession_accept__SWIG_1(self, args); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_MessagingSession_accept__SWIG_0(self, args); + } + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MessagingSession_accept'.\n" + " Possible C/C++ prototypes are:\n" + " accept(MessagingSession *,ActionConfig *)\n" + " accept(MessagingSession *)\n"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MessagingSession_reject__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + MessagingSession *arg1 = (MessagingSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + bool result; + + if (!PyArg_ParseTuple(args,(char *)"OO:MessagingSession_reject",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MessagingSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MessagingSession_reject" "', argument " "1"" of type '" "MessagingSession *""'"); + } + arg1 = reinterpret_cast< MessagingSession * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MessagingSession_reject" "', argument " "2"" of type '" "ActionConfig *""'"); + } + arg2 = reinterpret_cast< ActionConfig * >(argp2); + result = (bool)(arg1)->reject(arg2); + resultobj = SWIG_From_bool(static_cast< bool >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MessagingSession_reject__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; MessagingSession *arg1 = (MessagingSession *) 0 ; void *argp1 = 0 ; @@ -10484,6 +10701,49 @@ fail: } +SWIGINTERN PyObject *_wrap_MessagingSession_reject(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = (int)PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); + } + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_MessagingSession_reject__SWIG_1(self, args); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MessagingSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_MessagingSession_reject__SWIG_0(self, args); + } + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MessagingSession_reject'.\n" + " Possible C/C++ prototypes are:\n" + " reject(MessagingSession *,ActionConfig *)\n" + " reject(MessagingSession *)\n"); + return NULL; +} + + SWIGINTERN PyObject *MessagingSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; @@ -10872,7 +11132,54 @@ fail: } -SWIGINTERN PyObject *_wrap_PublicationSession_publish(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_PublicationSession_publish__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PublicationSession *arg1 = (PublicationSession *) 0 ; + void *arg2 = (void *) 0 ; + unsigned int arg3 ; + ActionConfig *arg4 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + unsigned int val3 ; + int ecode3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + bool result; + + if (!PyArg_ParseTuple(args,(char *)"OOOO:PublicationSession_publish",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PublicationSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PublicationSession_publish" "', argument " "1"" of type '" "PublicationSession *""'"); + } + arg1 = reinterpret_cast< PublicationSession * >(argp1); + res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PublicationSession_publish" "', argument " "2"" of type '" "void const *""'"); + } + ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PublicationSession_publish" "', argument " "3"" of type '" "unsigned int""'"); + } + arg3 = static_cast< unsigned int >(val3); + res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PublicationSession_publish" "', argument " "4"" of type '" "ActionConfig *""'"); + } + arg4 = reinterpret_cast< ActionConfig * >(argp4); + result = (bool)(arg1)->publish((void const *)arg2,arg3,arg4); + resultobj = SWIG_From_bool(static_cast< bool >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PublicationSession_publish__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; PublicationSession *arg1 = (PublicationSession *) 0 ; void *arg2 = (void *) 0 ; @@ -10910,7 +11217,103 @@ fail: } -SWIGINTERN PyObject *_wrap_PublicationSession_unPublish(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_PublicationSession_publish(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[5]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = (int)PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 4); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); + } + if (argc == 3) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *ptr = 0; + int res = SWIG_ConvertPtr(argv[1], &ptr, 0, 0); + _v = SWIG_CheckState(res); + if (_v) { + { + int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + return _wrap_PublicationSession_publish__SWIG_1(self, args); + } + } + } + } + if (argc == 4) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *ptr = 0; + int res = SWIG_ConvertPtr(argv[1], &ptr, 0, 0); + _v = SWIG_CheckState(res); + if (_v) { + { + int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_PublicationSession_publish__SWIG_0(self, args); + } + } + } + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'PublicationSession_publish'.\n" + " Possible C/C++ prototypes are:\n" + " publish(PublicationSession *,void const *,unsigned int,ActionConfig *)\n" + " publish(PublicationSession *,void const *,unsigned int)\n"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PublicationSession_unPublish__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PublicationSession *arg1 = (PublicationSession *) 0 ; + ActionConfig *arg2 = (ActionConfig *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + bool result; + + if (!PyArg_ParseTuple(args,(char *)"OO:PublicationSession_unPublish",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PublicationSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PublicationSession_unPublish" "', argument " "1"" of type '" "PublicationSession *""'"); + } + arg1 = reinterpret_cast< PublicationSession * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ActionConfig, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PublicationSession_unPublish" "', argument " "2"" of type '" "ActionConfig *""'"); + } + arg2 = reinterpret_cast< ActionConfig * >(argp2); + result = (bool)(arg1)->unPublish(arg2); + resultobj = SWIG_From_bool(static_cast< bool >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PublicationSession_unPublish__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; PublicationSession *arg1 = (PublicationSession *) 0 ; void *argp1 = 0 ; @@ -10932,6 +11335,49 @@ fail: } +SWIGINTERN PyObject *_wrap_PublicationSession_unPublish(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = (int)PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); + } + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_PublicationSession_unPublish__SWIG_1(self, args); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_PublicationSession, 0); + _v = SWIG_CheckState(res); + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ActionConfig, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_PublicationSession_unPublish__SWIG_0(self, args); + } + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'PublicationSession_unPublish'.\n" + " Possible C/C++ prototypes are:\n" + " unPublish(PublicationSession *,ActionConfig *)\n" + " unPublish(PublicationSession *)\n"); + return NULL; +} + + SWIGINTERN PyObject *PublicationSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_rblock.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_rblock.h new file mode 100644 index 00000000..a2af8eaf --- /dev/null +++ b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_rblock.h @@ -0,0 +1,56 @@ +/* +* Copyright (C) 2010-2011 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ +#ifndef TINYRTP_RTCP_REPORT_RB_H +#define TINYRTP_RTCP_REPORT_RB_H + +#include "tinyrtp_config.h" + +#include "tsk_list.h" + +TRTP_BEGIN_DECLS + +// RFC 3550 6.4.1 SR: Sender Report RTCP Packet => Report block part +typedef struct trtp_rtcp_rblock_s +{ + TSK_DECLARE_OBJECT; + + uint32_t ssrc; /* data source being reported */ + unsigned int fraction:8; /* fraction lost since last SR/RR */ + int cumulative_no_lost:24; /* cumul. no. pkts lost (signed!) */ + uint32_t last_seq; /* extended last seq. no. received */ + uint32_t jitter; /* interarrival jitter */ + uint32_t lsr; /* last SR packet from this source */ + uint32_t dlsr; /* delay since last SR packet */ +} +trtp_rtcp_rblock_t; +#define TRTP_RTCP_RBLOCK(self) ((trtp_rtcp_rblock_t*)(self)) +TINYRTP_GEXTERN const tsk_object_def_t *trtp_rtcp_rblock_def_t; +typedef tsk_list_t trtp_rtcp_rblocks_L_t; /**< List of @ref trtp_rtcp_rblock_t elements */ + +trtp_rtcp_rblock_t* trtp_rtcp_rblock_create_null(); +trtp_rtcp_rblock_t* trtp_rtcp_rblock_deserialize(const void* data, tsk_size_t size); +int trtp_rtcp_rblock_deserialize_payload(trtp_rtcp_rblock_t* self, const void* payload, tsk_size_t size); +tsk_size_t trtp_rtcp_rblock_get_size(trtp_rtcp_rblock_t* self); + +TRTP_END_DECLS + +#endif /* TINYRTP_RTCP_REPORT_RB_H */ diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_rb.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_rb.h deleted file mode 100644 index d8042b43..00000000 --- a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_rb.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -* Copyright (C) 2010-2011 Mamadou Diop. -* -* Contact: Mamadou Diop -* -* This file is part of Open Source Doubango Framework. -* -* DOUBANGO is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* DOUBANGO is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with DOUBANGO. -* -*/ -#ifndef TINYRTP_RTCP_REPORT_RB_H -#define TINYRTP_RTCP_REPORT_RB_H - -#include "tinyrtp_config.h" - -TRTP_BEGIN_DECLS - - -TRTP_END_DECLS - -#endif /* TINYRTP_RTCP_REPORT_RB_H */ diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sdes.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sdes.h index 7c5626bb..adabfe4b 100644 --- a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sdes.h +++ b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sdes.h @@ -42,7 +42,7 @@ typedef tsk_list_t trtp_rtcp_report_sdess_L_t; /**< List of @ref trtp_rtcp_repor trtp_rtcp_report_sdes_t* trtp_rtcp_report_sdes_create_null(); trtp_rtcp_report_sdes_t* trtp_rtcp_report_sdes_deserialize(const void* data, tsk_size_t size); -int trtp_rtcp_report_sdes_parse_payload(trtp_rtcp_report_sdes_t* self, const void* payload, tsk_size_t size); +int trtp_rtcp_report_sdes_deserialize_payload(trtp_rtcp_report_sdes_t* self, const void* payload, tsk_size_t size); TRTP_END_DECLS diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_si.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_si.h deleted file mode 100644 index 07a3b5b5..00000000 --- a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_si.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -* Copyright (C) 2010-2011 Mamadou Diop. -* -* Contact: Mamadou Diop -* -* This file is part of Open Source Doubango Framework. -* -* DOUBANGO is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* DOUBANGO is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with DOUBANGO. -* -*/ -#ifndef TINYRTP_RTCP_REPORT_SI_H -#define TINYRTP_RTCP_REPORT_SI_H - -#include "tinyrtp_config.h" - -TRTP_BEGIN_DECLS - - -TRTP_END_DECLS - -#endif /* TINYRTP_RTCP_REPORT_SI_H */ diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sr.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sr.h index 22456c82..a27525b5 100644 --- a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sr.h +++ b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_report_sr.h @@ -25,6 +25,7 @@ #include "tinyrtp_config.h" #include "tinyrtp/rtcp/trtp_rtcp_packet.h" +#include "tinyrtp/rtcp/trtp_rtcp_rblock.h" TRTP_BEGIN_DECLS @@ -36,12 +37,22 @@ typedef struct trtp_rtcp_report_sr_s TRTP_DECLARE_RTCP_PACKET; uint32_t sender_ssrc; + struct{ + uint32_t ntp_msw; /**< NTP timestamp, most significant word */ + uint32_t ntp_lsw; /**< NTP timestamp, least significant word */ + uint32_t rtp_timestamp;/**< RTP timestamp */ + uint32_t sender_pcount; /**< sender's packet count */ + uint32_t sender_ocount; /**< sender's octet count */ + } sender_info; + trtp_rtcp_rblocks_L_t* rblocks; } trtp_rtcp_report_sr_t; TRTP_END_DECLS TINYRTP_API trtp_rtcp_report_sr_t* trtp_rtcp_report_sr_create_null(); +trtp_rtcp_report_sr_t* trtp_rtcp_report_sr_deserialize(const void* data, tsk_size_t size); +int trtp_rtcp_report_sr_deserialize_payload(trtp_rtcp_report_sr_t* self, const void* payload, tsk_size_t size); TINYRTP_GEXTERN const tsk_object_def_t *trtp_rtcp_report_sr_def_t; diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_packet.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_packet.c index 273673b4..931a717f 100644 --- a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_packet.c +++ b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_packet.c @@ -79,7 +79,7 @@ trtp_rtcp_packet_t* trtp_rtcp_packet_deserialize(const void* data, tsk_size_t si case trtp_rtcp_packet_type_sdes: if((packet = (trtp_rtcp_packet_t*)trtp_rtcp_report_sdes_create_null())){ packet->header = tsk_object_ref(header); - if(!(trtp_rtcp_report_sdes_parse_payload(TRTP_RTCP_REPORT_SDES(packet),(const void*)pdata,size))){ + if(!(trtp_rtcp_report_sdes_deserialize_payload(TRTP_RTCP_REPORT_SDES(packet),(const void*)pdata,size))){ TSK_DEBUG_ERROR("Failed to parse data"); goto bail; } diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_rblock.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_rblock.c new file mode 100644 index 00000000..c9b69ffb --- /dev/null +++ b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_rblock.c @@ -0,0 +1,126 @@ +/* +* Copyright (C) 2010-2011 Mamadou Diop. +* +* Contact: Mamadou Diop +* +* This file is part of Open Source Doubango Framework. +* +* DOUBANGO is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* DOUBANGO is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with DOUBANGO. +* +*/ +#include "tinyrtp/rtcp/trtp_rtcp_rblock.h" + +#include "tnet_endianness.h" +#include "tsk_debug.h" + +#define TRTP_RTCP_RBLOCK_SIZE 24 + +/* 6.4.1 SR: Sender Report RTCP Packet + + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +report | SSRC_1 (SSRC of first source) | +block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + 1 | fraction lost | cumulative number of packets lost | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | extended highest sequence number received | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | interarrival jitter | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | last SR (LSR) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | delay since last SR (DLSR) | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +*/ +trtp_rtcp_rblock_t* trtp_rtcp_rblock_create_null() +{ + return tsk_object_new(trtp_rtcp_rblock_def_t); +} + +trtp_rtcp_rblock_t* trtp_rtcp_rblock_deserialize(const void* data, tsk_size_t size) +{ + trtp_rtcp_rblock_t* block = tsk_null; + if(!data || !size){ + TSK_DEBUG_ERROR("Invalid parameter"); + return tsk_null; + } + if((block = trtp_rtcp_rblock_create_null())){ + if(trtp_rtcp_rblock_deserialize_payload(block, data, size)){ + TSK_DEBUG_ERROR("Failed to deserialize the payload"); + TSK_OBJECT_SAFE_FREE(block); + } + } + else{ + TSK_DEBUG_ERROR("Failed to create report block object"); + } + + return block; +} + +int trtp_rtcp_rblock_deserialize_payload(trtp_rtcp_rblock_t* self, const void* payload, tsk_size_t size) +{ + const uint8_t* pdata = (const uint8_t*)payload; + if(!self || !payload || !size){ + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + if(size < TRTP_RTCP_RBLOCK_SIZE){ + TSK_DEBUG_ERROR("%u is too short", size); + return -2; + } + self->ssrc = tnet_ntohl_2(pdata); + self->fraction = pdata[4]; + self->cumulative_no_lost = tnet_ntohl_2(&pdata[5]); + self->last_seq = tnet_ntohl_2(&pdata[8]); + self->jitter = tnet_ntohl_2(&pdata[12]); + self->lsr = tnet_ntohl_2(&pdata[16]); + self->dlsr = tnet_ntohl_2(&pdata[18]); + + return 0; +} + +tsk_size_t trtp_rtcp_rblock_get_size(trtp_rtcp_rblock_t* self) +{ + if(!self){ + TSK_DEBUG_ERROR("Invalid parameter"); + return 0; + } + return TRTP_RTCP_RBLOCK_SIZE; +} + +// +// Object definition +// +static tsk_object_t* trtp_rtcp_rblock_ctor(tsk_object_t * self, va_list * app) +{ + trtp_rtcp_rblock_t *block = self; + if(block){ + } + return self; +} +static tsk_object_t* trtp_rtcp_rblock_dtor(tsk_object_t * self) +{ + trtp_rtcp_rblock_t *block = self; + if(block){ + } + + return self; +} +static const tsk_object_def_t trtp_rtcp_rblock_def_s = +{ + sizeof(trtp_rtcp_rblock_t), + trtp_rtcp_rblock_ctor, + trtp_rtcp_rblock_dtor, + tsk_null, +}; +const tsk_object_def_t *trtp_rtcp_rblock_def_t = &trtp_rtcp_rblock_def_s; diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_rb.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_rb.c deleted file mode 100644 index afa946f1..00000000 --- a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_rb.c +++ /dev/null @@ -1,21 +0,0 @@ -/* -* Copyright (C) 2010-2011 Mamadou Diop. -* -* Contact: Mamadou Diop -* -* This file is part of Open Source Doubango Framework. -* -* DOUBANGO is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* DOUBANGO is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with DOUBANGO. -* -*/ \ No newline at end of file diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sdes.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sdes.c index 070221e2..0cb5f579 100644 --- a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sdes.c +++ b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sdes.c @@ -64,7 +64,8 @@ trtp_rtcp_report_sdes_t* trtp_rtcp_report_sdes_deserialize(const void* data, tsk return packet; } -int trtp_rtcp_report_sdes_parse_payload(trtp_rtcp_report_sdes_t* self, const void* payload, tsk_size_t size) +// @NotImplemented +int trtp_rtcp_report_sdes_deserialize_payload(trtp_rtcp_report_sdes_t* self, const void* payload, tsk_size_t size) { if(!self || !payload || !size){ TSK_DEBUG_ERROR("Invalid parameter"); diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_si.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_si.c deleted file mode 100644 index afa946f1..00000000 --- a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_si.c +++ /dev/null @@ -1,21 +0,0 @@ -/* -* Copyright (C) 2010-2011 Mamadou Diop. -* -* Contact: Mamadou Diop -* -* This file is part of Open Source Doubango Framework. -* -* DOUBANGO is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* DOUBANGO is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with DOUBANGO. -* -*/ \ No newline at end of file diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sr.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sr.c index 3e475389..a6bd1d2b 100644 --- a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sr.c +++ b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sr.c @@ -21,6 +21,37 @@ */ #include "tinyrtp/rtcp/trtp_rtcp_report_sr.h" +#include "tsk_debug.h" + +trtp_rtcp_report_sr_t* trtp_rtcp_report_sr_create_null() +{ + return tsk_object_new(trtp_rtcp_report_sr_def_t); +} + +// @NotImplemented +trtp_rtcp_report_sr_t* trtp_rtcp_report_sr_deserialize(const void* data, tsk_size_t size) +{ + trtp_rtcp_report_sr_t* packet = tsk_null; + if(!data || !size){ + TSK_DEBUG_ERROR("Invalid parameter"); + return tsk_null; + } + + TSK_DEBUG_ERROR("Not Implemented"); + return packet; +} + +// @NotImplemented +int trtp_rtcp_report_sr_deserialize_payload(trtp_rtcp_report_sr_t* self, const void* payload, tsk_size_t size) +{ + if(!self || !payload || !size){ + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + TSK_DEBUG_ERROR("Not Implemented"); + return 0; +} //================================================================================================= // RTCP Sender Report (SR) Packet object definition @@ -38,6 +69,7 @@ static tsk_object_t* trtp_rtcp_report_sr_dtor(tsk_object_t * self) trtp_rtcp_report_sr_t *packet = self; if(packet){ // deinit self + TSK_OBJECT_SAFE_FREE(packet->rblocks); // deinit base trtp_rtcp_packet_deinit(TRTP_RTCP_PACKET(packet)); } diff --git a/branches/2.0/doubango/tinyRTP/tinyRTP.vcproj b/branches/2.0/doubango/tinyRTP/tinyRTP.vcproj index 159f7bda..8364aa37 100644 --- a/branches/2.0/doubango/tinyRTP/tinyRTP.vcproj +++ b/branches/2.0/doubango/tinyRTP/tinyRTP.vcproj @@ -215,11 +215,11 @@ > - - @@ -309,11 +305,11 @@ > - - diff --git a/branches/2.0/doubango/tinySIP/src/tsip_message.c b/branches/2.0/doubango/tinySIP/src/tsip_message.c index 77e469fa..923f4520 100644 --- a/branches/2.0/doubango/tinySIP/src/tsip_message.c +++ b/branches/2.0/doubango/tinySIP/src/tsip_message.c @@ -449,8 +449,8 @@ tsip_request_t *tsip_request_new(const char* method, const tsip_uri_t *request_u if((request = tsip_request_create(method, request_uri))){ tsip_message_add_headers(request, - TSIP_HEADER_TO_VA_ARGS(tsk_null, to, tsk_null), - TSIP_HEADER_FROM_VA_ARGS(tsk_null, from, tsk_null), + TSIP_HEADER_TO_VA_ARGS(to?to->display_name:tsk_null, to, tsk_null), + TSIP_HEADER_FROM_VA_ARGS(from?from->display_name:tsk_null, from, tsk_null), TSIP_HEADER_CSEQ_VA_ARGS(cseq, method), TSIP_HEADER_CALL_ID_VA_ARGS(call_id), TSIP_HEADER_MAX_FORWARDS_VA_ARGS(TSIP_HEADER_MAX_FORWARDS_DEFAULT), diff --git a/branches/2.0/doubango/tinySIP/test/test_sipmessages.h b/branches/2.0/doubango/tinySIP/test/test_sipmessages.h index 6bed44a0..d42b330e 100644 --- a/branches/2.0/doubango/tinySIP/test/test_sipmessages.h +++ b/branches/2.0/doubango/tinySIP/test/test_sipmessages.h @@ -313,8 +313,8 @@ void test_responses() void test_messages() { //test_parser(); - //test_requests(); - test_responses(); + test_requests(); + //test_responses(); }