Changeset 1926 for pjproject/branches/projects/ice-turn07/pjnath/src/pjnath/turn_session.c

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/src/pjnath/turn_session.c (modified) (8 diffs)

pjproject/branches/projects/ice-turn07/pjnath/src/pjnath/turn_session.c

@@ -67 +67 @@
     pj_turn_session_cb   cb;
     void                *user_data;
+    pj_stun_config       stun_cfg;
 
     pj_lock_t           *lock;
@@ -177 +178 @@
  * Create TURN client session.
  */
-PJ_DEF(pj_status_t) pj_turn_session_create( pj_stun_config *cfg,
+PJ_DEF(pj_status_t) pj_turn_session_create( const pj_stun_config *cfg,
                                             const char *name,
                                             int af,
@@ -212 +213 @@
     sess->next_ch = PJ_TURN_CHANNEL_MIN;
 
+    /* Copy STUN session */
+    pj_memcpy(&sess->stun_cfg, cfg, sizeof(pj_stun_config));
+
     /* Copy callback */
     pj_memcpy(&sess->cb, cb, sizeof(*cb));
@@ -234 +238 @@
     stun_cb.on_request_complete = &stun_on_request_complete;
     stun_cb.on_rx_indication = &stun_on_rx_indication;
-    status = pj_stun_session_create(cfg, sess->obj_name, &stun_cb, PJ_FALSE,
-                                    &sess->stun);
+    status = pj_stun_session_create(&sess->stun_cfg, sess->obj_name, &stun_cb,
+                                    PJ_FALSE, &sess->stun);
     if (status != PJ_SUCCESS) {
         do_destroy(sess);
@@ -850 +854 @@
  */
 PJ_DEF(pj_status_t) pj_turn_session_on_rx_pkt(pj_turn_session *sess,
-                                              const pj_uint8_t *pkt,
+                                              void *pkt,
                                               unsigned pkt_len,
                                               pj_bool_t is_datagram)
@@ -865 +869 @@
 
     /* Quickly check if this is STUN message */
-    is_stun = ((pkt[0] & 0xC0) == 0);
+    is_stun = ((((pj_uint8_t*)pkt)[0] & 0xC0) == 0);
 
     if (is_stun) {
@@ -871 +875 @@
         unsigned options;
 
-        options = PJ_STUN_CHECK_PACKET;
+        options = PJ_STUN_CHECK_PACKET | PJ_STUN_NO_FINGERPRINT_CHECK;
         if (is_datagram)
             options |= PJ_STUN_IS_DATAGRAM;
@@ -906 +910 @@
 
         /* Notify application */
-        (*sess->cb.on_rx_data)(sess, pkt+sizeof(cd), cd.length,
-                               &peer->addr,
+        (*sess->cb.on_rx_data)(sess, ((pj_uint8_t*)pkt)+sizeof(cd), 
+                               cd.length, &peer->addr,
                                pj_sockaddr_get_len(&peer->addr));