Changeset 1140 for pjproject/trunk/pjnath/include/pjnath/ice_session.h

Timestamp:

Apr 3, 2007 6:01:27 PM (17 years ago)

Author:

bennylp

Message:

Fixed misc bugs with ICE: (1) moved STUN session from candidate to component since it causes STUN response to wrong session, and (2) keep-alive transaction timed-out when ICE is active

File:

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

pjproject/trunk/pjnath/include/pjnath/ice_session.h

@@ -120 +120 @@
      */
     pj_ice_sess_check   *valid_check;
+
+    /**
+     * The STUN session to be used to send and receive STUN messages for this
+     * component.
+     */
+    pj_stun_session     *stun_sess;
 
 } pj_ice_sess_comp;
@@ -188 +194 @@
     pj_sockaddr          rel_addr;
 
-    /**
-     * The STUN session to be used to send and receive STUN messages for this
-     * candidate.
-     */
-    pj_stun_session     *stun_sess;
-
 } pj_ice_sess_cand;
 
@@ -367 +367 @@
      * @param ice           The ICE session.
      * @param comp_id       ICE component ID.
-     * @param cand_id       ICE candidate ID.
      * @param pkt           The STUN packet.
      * @param size          The size of the packet.
@@ -374 +373 @@
      */
     pj_status_t (*on_tx_pkt)(pj_ice_sess *ice, unsigned comp_id, 
-                             unsigned cand_id,
                              const void *pkt, pj_size_t size,
                              const pj_sockaddr_t *dst_addr,
@@ -696 +694 @@
  * @param ice           The ICE session.
  * @param comp_id       Component ID.
- * @param cand_id       Candidate ID.
  * @param pkt           Incoming packet.
  * @param pkt_size      Size of incoming packet.
@@ -706 +703 @@
 PJ_DECL(pj_status_t) pj_ice_sess_on_rx_pkt(pj_ice_sess *ice,
                                            unsigned comp_id,
-                                           unsigned cand_id,
                                            void *pkt,
                                            pj_size_t pkt_size,