Changeset 1926 for pjproject/branches/projects/ice-turn07/pjnath/include/pjnath/ice_session.h

Timestamp:

Apr 14, 2008 1:48:39 AM (16 years ago)

Author:

bennylp

Message:

More ticket #485: huge changeset to integrate TURN with ICE and PJSUA-LIB/pjsua. Still experimental

File:

• pjproject/branches/projects/ice-turn07/pjnath/include/pjnath/ice_session.h (modified) (4 diffs)

pjproject/branches/projects/ice-turn07/pjnath/include/pjnath/ice_session.h

@@ -431 +431 @@
      * @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.
@@ -437 +438 @@
      */
     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,
@@ -798 +800 @@
  * @param ice           The ICE session.
  * @param comp_id       Component ID.
+ * @param cand_id       The candidate ID where this packet was received
+ *                      from. This parameter will be returned back to
+ *                      application in \a on_tx_pkt() callback, and
+ *                      application may use it to determine whether to
+ *                      send outgoing packet using local socket or with
+ *                      the TURN relay. The ICE session will not use
+ *                      this information to determine the local candidate
+ *                      for this packet.
  * @param pkt           Incoming packet.
  * @param pkt_size      Size of incoming packet.
@@ -807 +817 @@
 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,