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

Timestamp:

Mar 20, 2007 10:36:54 PM (17 years ago)

Author:

bennylp

Message:

Today's work

File:

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

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

@@ -28 +28 @@
 #include <pjlib-util/resolver.h>
 #include <pj/sock.h>
+#include <pj/timer.h>
+
 
 PJ_BEGIN_DECL
@@ -68 +70 @@
 #define PJ_ICE_MAX_COMP     8
 #define PJ_ICE_MAX_CHECKS   32
+#define PJ_ICE_TA_VAL       20
 
 /**
@@ -74 +77 @@
 typedef struct pj_ice_comp
 {
-    unsigned        comp_id;
-    pj_sock_t       sock;
+    unsigned         comp_id;
+    pj_sock_t        sock;
+    pj_stun_session *stun_sess;
+    pj_sockaddr      local_addr;
 } pj_ice_comp;
 
@@ -105 +110 @@
 typedef struct pj_ice_check
 {
-    unsigned            cand_id;
-    pj_uint32_t         comp_id;
-    pj_str_t            foundation;
-
-    pj_uint64_t         check_prio;
-    pj_ice_check_state  check_state;
-
-    pj_ice_cand_type    rem_type;
-    pj_str_t            rem_foundation;
-    pj_uint32_t         rem_prio;
-    pj_sockaddr         rem_addr;
-    pj_sockaddr         rem_base_addr;
+    pj_ice_cand         *lcand;
+    pj_ice_cand         *rcand;
+
+    pj_uint64_t          prio;
+    pj_ice_check_state   state;
+    pj_bool_t            nominated;
+    pj_status_t          err_code;
 } pj_ice_check;
 
@@ -132 +132 @@
     unsigned                 count;
     pj_ice_check             checks[PJ_ICE_MAX_CHECKS];
+    pj_timer_entry           timer;
 } pj_ice_checklist;
 
@@ -176 +177 @@
     pj_ice_role          role;
     pj_ice_state         state;
-
     pj_ice_cb            cb;
+
+    pj_stun_config       stun_cfg;
 
     /* STUN credentials */
@@ -206 +208 @@
     pj_bool_t            relay_enabled;
     pj_sockaddr          stun_srv;
-
-    /* STUN sessions */
-    pj_stun_session     *tx_sess;
-    pj_stun_session     *rx_sess;
 };
 
 
-PJ_DECL(pj_status_t) pj_ice_create(pj_stun_config *cfg,
+PJ_DECL(pj_status_t) pj_ice_create(pj_stun_config *stun_cfg,
                                    const char *name,
                                    pj_ice_role role,
@@ -257 +255 @@
 PJ_DECL(unsigned) pj_ice_get_cand_cnt(pj_ice *ice);
 PJ_DECL(pj_status_t) pj_ice_enum_cands(pj_ice *ice,
-                                       unsigned sort_by,
                                        unsigned *p_count,
                                        unsigned cand_ids[]);
-PJ_DECL(unsigned) pj_ice_get_default_cand(pj_ice *ice,
-                                          int *cand_id);
+PJ_DECL(pj_status_t) pj_ice_get_default_cand(pj_ice *ice,
+                                             unsigned comp_id,
+                                             int *cand_id);
 PJ_DECL(pj_status_t) pj_ice_get_cand(pj_ice *ice,
                                      unsigned cand_id,
@@ -267 +265 @@
 
 PJ_DECL(pj_status_t) pj_ice_create_check_list(pj_ice *ice,
-                                              pj_bool_t is_remote_offer,
                                               unsigned rem_cand_cnt,
                                               const pj_ice_cand rem_cand[]);