Changeset 1093 for pjproject/trunk/pjnath/include/pjnath/ice.h

Timestamp:

Mar 21, 2007 10:05:58 PM (17 years ago)

Author:

bennylp

Message:

Added pjnath-test

File:

• pjproject/trunk/pjnath/include/pjnath/ice.h (modified) (6 diffs)

pjproject/trunk/pjnath/include/pjnath/ice.h

@@ -21 +21 @@
 
 /**
- * @file ice_sock.h
- * @brief ICE socket.
+ * @file ice.h
+ * @brief ICE.
  */
 #include <pjnath/types.h>
@@ -29 +29 @@
 #include <pj/timer.h>
 
+/**
+ * @defgroup PJNATH_ICE Interactive Connectivity Establishment (ICE)
+ * @brief Interactive Connectivity Establishment (ICE)
+ * @ingroup PJNATH
+ */
+
 
 PJ_BEGIN_DECL
 
 
-/* **************************************************************************/
-/**
- * @defgroup PJNATH_ICE_SOCK ICE Socket
- * @brief High level ICE socket abstraction.
- * @ingroup PJNATH
+/**
+ * @defgroup PJNATH_ICE_STREAM Transport Independent ICE Media Stream
+ * @brief Transport Independent ICE Media Stream
+ * @ingroup PJNATH_ICE
  * @{
  */
@@ -166 +171 @@
 
     pj_pool_t           *pool;
+    void                *user_data;
     pj_mutex_t          *mutex;
-    int                  af;
-    int                  sock_type;
     pj_ice_role          role;
     pj_bool_t            is_complete;
@@ -177 +181 @@
 
     /* STUN credentials */
+    pj_str_t             tx_ufrag;
     pj_str_t             tx_uname;
     pj_str_t             tx_pass;
+    pj_str_t             rx_ufrag;
     pj_str_t             rx_uname;
     pj_str_t             rx_pass;
@@ -207 +213 @@
                                    pj_ice_role role,
                                    const pj_ice_cb *cb,
-                                   int af,
-                                   int sock_type,
                                    pj_ice **p_ice);
 PJ_DECL(pj_status_t) pj_ice_destroy(pj_ice *ice);
@@ -215 +219 @@
                                      const pj_sockaddr_t *local_addr,
                                      unsigned addr_len);
-PJ_DECL(pj_status_t) pj_ice_add_sock_comp(pj_ice *ice,
-                                          unsigned comp_id,
-                                          pj_sock_t sock);
 PJ_DECL(pj_status_t) pj_ice_set_credentials(pj_ice *ice,
                                             const pj_str_t *local_ufrag,