diff options
| author | pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2010-01-07 02:10:02 +0000 |
|---|---|---|
| committer | pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2010-01-07 02:10:02 +0000 |
| commit | ffc65c1f90f685e98f2f6d0a5d72c661b69cb3df (patch) | |
| tree | a5f1a1c12b58531eb3310a316fd00aace6ee8419 /Protocols/SIP/lib/pjsip/pjnath | |
| parent | 82516d84cc393f79eb620cb6300d320084a8272c (diff) | |
sip: 0.1.1.0
+ Build with vc6
* Fix for wrong voice service version
git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@207 c086bb3d-8645-0410-b8da-73a8550f86e7
Diffstat (limited to 'Protocols/SIP/lib/pjsip/pjnath')
| -rw-r--r-- | Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h | 13 | ||||
| -rw-r--r-- | Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h index 6788796..e1cc6ec 100644 --- a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h +++ b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h @@ -1,4 +1,4 @@ -/* $Id: ice_strans.h 2966 2009-10-25 09:02:07Z bennylp $ */
+/* $Id: ice_strans.h 3028 2009-12-08 13:11:25Z bennylp $ */
/*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -622,6 +622,17 @@ PJ_DECL(pj_status_t) pj_ice_strans_get_ufrag_pwd(pj_ice_strans *ice_st, /**
+ * Get the number of local candidates for the specified component ID.
+ *
+ * @param ice_st The ICE stream transport.
+ * @param comp_id Component ID.
+ *
+ * @return The number of candidates.
+ */
+PJ_DECL(unsigned) pj_ice_strans_get_cands_count(pj_ice_strans *ice_st,
+ unsigned comp_id);
+
+/**
* Enumerate the local candidates for the specified component.
*
* @param ice_st The ICE stream transport.
diff --git a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h index a23aac2..21b45c2 100644 --- a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h +++ b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h @@ -1,4 +1,4 @@ -/* $Id: turn_session.h 2642 2009-04-22 17:20:24Z bennylp $ */
+/* $Id: turn_session.h 3028 2009-12-08 13:11:25Z bennylp $ */
/*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -455,11 +455,19 @@ PJ_DECL(pj_status_t) pj_turn_session_shutdown(pj_turn_session *sess); * be notified about the client destruction.
*
* @param sess The TURN client session.
+ * @param last_err Optional error code to be set to the session,
+ * which would be returned back in the \a info
+ * parameter of #pj_turn_session_get_info(). If
+ * this argument value is PJ_SUCCESS, the error
+ * code will not be set. If the session already
+ * has an error code set, this function will not
+ * overwrite that error code either.
*
* @return PJ_SUCCESS if the operation has been successful,
* or the appropriate error code on failure.
*/
-PJ_DECL(pj_status_t) pj_turn_session_destroy(pj_turn_session *sess);
+PJ_DECL(pj_status_t) pj_turn_session_destroy(pj_turn_session *sess,
+ pj_status_t last_err);
/**
|