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

Timestamp:

Mar 21, 2007 1:24:02 PM (17 years ago)

Author:

bennylp

Message:

ICE complete, ready for testing

File:

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

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

@@ -26 +26 @@
 #include <pjnath/types.h>
 #include <pjnath/stun_session.h>
-#include <pjlib-util/resolver.h>
 #include <pj/sock.h>
 #include <pj/timer.h>
@@ -48 +47 @@
 {
     PJ_ICE_CAND_TYPE_HOST,
-    PJ_ICE_CAND_TYPE_MAPPED,
-    PJ_ICE_CAND_TYPE_PEER_MAPPED,
+    PJ_ICE_CAND_TYPE_SRFLX,
+    PJ_ICE_CAND_TYPE_PRFLX,
     PJ_ICE_CAND_TYPE_RELAYED
 } pj_ice_cand_type;
@@ -59 +58 @@
 {
     PJ_ICE_HOST_PREF        = 126,
-    PJ_ICE_MAPPED_PREF      = 100,
-    PJ_ICE_PEER_MAPPED_PREF = 110,
+    PJ_ICE_SRFLX_PREF       = 100,
+    PJ_ICE_PRFLX_PREF       = 110,
     PJ_ICE_RELAYED_PREF     = 0
 };
@@ -78 +77 @@
 {
     unsigned         comp_id;
-    pj_sock_t        sock;
     pj_stun_session *stun_sess;
     pj_sockaddr      local_addr;
+    int              nominated_check_id;
 } pj_ice_comp;
 
@@ -141 +140 @@
 typedef struct pj_ice_cb
 {
-    pj_status_t (*on_send_pkt)(pj_ice *ice, 
-                               const void *pkt, pj_size_t size,
-                               const pj_sockaddr_t *dst_addr,
-                               unsigned addr_len);
+    void        (*on_ice_complete)(pj_ice *ice, pj_status_t status);
+    pj_status_t (*on_tx_pkt)(pj_ice *ice, unsigned comp_id,
+                             const void *pkt, pj_size_t size,
+                             const pj_sockaddr_t *dst_addr,
+                             unsigned dst_addr_len);
+    pj_status_t (*on_rx_data)(pj_ice *ice, unsigned comp_id,
+                              void *pkt, pj_size_t size,
+                              const pj_sockaddr_t *src_addr,
+                              unsigned src_addr_len);
 } pj_ice_cb;
 
@@ -166 +170 @@
     int                  sock_type;
     pj_ice_role          role;
+    pj_bool_t            is_complete;
+    pj_status_t          ice_status;
     pj_ice_cb            cb;
 
@@ -194 +200 @@
     unsigned             valid_cnt;
     unsigned             valid_list[PJ_ICE_MAX_CHECKS];
-
-    /* STUN servers */
-    pj_dns_resolver     *resv;
-    pj_dns_async_query  *resv_q;
-    pj_bool_t            relay_enabled;
-    pj_sockaddr          stun_srv;
 };
 
@@ -211 +211 @@
                                    pj_ice **p_ice);
 PJ_DECL(pj_status_t) pj_ice_destroy(pj_ice *ice);
-PJ_DECL(pj_status_t) pj_ice_set_srv(pj_ice *ice,
-                                    pj_bool_t enable_relay,
-                                    pj_dns_resolver *resolver,
-                                    const pj_str_t *domain);
-PJ_DECL(pj_status_t) pj_ice_set_srv_addr(pj_ice *ice,
-                                         pj_bool_t enable_relay,
-                                         const pj_sockaddr_t *srv_addr,
-                                         unsigned addr_len);
 PJ_DECL(pj_status_t) pj_ice_add_comp(pj_ice *ice,
                                      unsigned comp_id,
@@ -231 +223 @@
                                             const pj_str_t *remote_ufrag,
                                             const pj_str_t *remote_pass);
-PJ_DECL(pj_status_t) pj_ice_start_gather(pj_ice *ice,
-                                         unsigned flags);
-
 PJ_DECL(pj_status_t) pj_ice_add_cand(pj_ice *ice,
                                      unsigned comp_id,
@@ -259 +248 @@
                                               unsigned rem_cand_cnt,
                                               const pj_ice_cand rem_cand[]);
-
 PJ_DECL(pj_status_t) pj_ice_start_check(pj_ice *ice);
 
+PJ_DECL(pj_status_t) pj_ice_send_data(pj_ice *ice,
+                                      unsigned comp_id,
+                                      const void *data,
+                                      pj_size_t data_len);
+PJ_DECL(pj_status_t) pj_ice_on_rx_pkt(pj_ice *ice,
+                                      unsigned comp_id,
+                                      void *pkt,
+                                      pj_size_t pkt_size,
+                                      const pj_sockaddr_t *src_addr,
+                                      int src_addr_len);
+
+
 
 /**