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

Timestamp:

Mar 22, 2007 9:00:53 PM (17 years ago)

Author:

bennylp

Message:

Final ICE stream transport

File:

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

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

@@ -82 +82 @@
 {
     unsigned         comp_id;
-    pj_stun_session *stun_sess;
-    pj_sockaddr      local_addr;
     int              nominated_check_id;
 } pj_ice_comp;
@@ -100 +98 @@
     pj_sockaddr          base_addr;
     pj_sockaddr          srv_addr;
+    pj_stun_session     *stun_sess;
 } pj_ice_cand;
 
@@ -146 +145 @@
 {
     void        (*on_ice_complete)(pj_ice *ice, pj_status_t status);
-    pj_status_t (*on_tx_pkt)(pj_ice *ice, unsigned comp_id,
+    pj_status_t (*on_tx_pkt)(pj_ice *ice, unsigned comp_id, 
+                             unsigned cand_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        (*on_rx_data)(pj_ice *ice, unsigned comp_id,
+                              unsigned cand_id,
                               void *pkt, pj_size_t size,
                               const pj_sockaddr_t *src_addr,
@@ -213 +214 @@
                                    pj_ice_role role,
                                    const pj_ice_cb *cb,
+                                   const pj_str_t *local_ufrag,
+                                   const pj_str_t *local_passwd,
                                    pj_ice **p_ice);
 PJ_DECL(pj_status_t) pj_ice_destroy(pj_ice *ice);
-PJ_DECL(pj_status_t) pj_ice_add_comp(pj_ice *ice,
-                                     unsigned comp_id,
-                                     const pj_sockaddr_t *local_addr,
-                                     unsigned addr_len);
-PJ_DECL(pj_status_t) pj_ice_set_credentials(pj_ice *ice,
-                                            const pj_str_t *local_ufrag,
-                                            const pj_str_t *local_pass,
-                                            const pj_str_t *remote_ufrag,
-                                            const pj_str_t *remote_pass);
+PJ_DECL(pj_status_t) pj_ice_add_comp(pj_ice *ice, unsigned comp_id);
 PJ_DECL(pj_status_t) pj_ice_add_cand(pj_ice *ice,
                                      unsigned comp_id,
@@ -247 +242 @@
 
 PJ_DECL(pj_status_t) pj_ice_create_check_list(pj_ice *ice,
+                                              const pj_str_t *rem_ufrag,
+                                              const pj_str_t *rem_passwd,
                                               unsigned rem_cand_cnt,
                                               const pj_ice_cand rem_cand[]);
@@ -257 +254 @@
 PJ_DECL(pj_status_t) pj_ice_on_rx_pkt(pj_ice *ice,
                                       unsigned comp_id,
+                                      unsigned cand_id,
                                       void *pkt,
                                       pj_size_t pkt_size,