Changeset 1141 for pjproject/trunk/pjnath/src/pjnath/stun_session.c

Timestamp:

Apr 3, 2007 7:15:10 PM (17 years ago)

Author:

bennylp

Message:

Added ICE-CONTROLLED and ICE-CONTROLLING attribute, handle ICE 487 error, and add response source address checking

File:

• pjproject/trunk/pjnath/src/pjnath/stun_session.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -52 +52 @@
 static void stun_tsx_on_complete(pj_stun_client_tsx *tsx,
                                  pj_status_t status, 
-                                 const pj_stun_msg *response);
+                                 const pj_stun_msg *response,
+                                 const pj_sockaddr_t *src_addr,
+                                 unsigned src_addr_len);
 static pj_status_t stun_tsx_on_send_msg(pj_stun_client_tsx *tsx,
                                         const void *stun_pkt,
@@ -326 +328 @@
 static void stun_tsx_on_complete(pj_stun_client_tsx *tsx,
                                  pj_status_t status, 
-                                 const pj_stun_msg *response)
+                                 const pj_stun_msg *response,
+                                 const pj_sockaddr_t *src_addr,
+                                 unsigned src_addr_len)
 {
     pj_stun_tx_data *tdata;
@@ -334 +338 @@
     if (tdata->sess->cb.on_request_complete) {
         (*tdata->sess->cb.on_request_complete)(tdata->sess, status, tdata, 
-                                               response);
+                                               response, 
+                                               src_addr, src_addr_len);
     }
 }
@@ -697 +702 @@
 
     if (notify) {
-        (sess->cb.on_request_complete)(sess, notify_status, tdata, NULL);
+        (sess->cb.on_request_complete)(sess, notify_status, tdata, NULL,
+                                       NULL, 0);
     }
 
@@ -776 +782 @@
 /* Handle incoming response */
 static pj_status_t on_incoming_response(pj_stun_session *sess,
-                                        pj_stun_msg *msg)
+                                        pj_stun_msg *msg,
+                                        const pj_sockaddr_t *src_addr,
+                                        unsigned src_addr_len)
 {
     pj_stun_tx_data *tdata;
@@ -793 +801 @@
      * and this will call the session callback too.
      */
-    status = pj_stun_client_tsx_on_rx_msg(tdata->client_tsx, msg);
+    status = pj_stun_client_tsx_on_rx_msg(tdata->client_tsx, msg, 
+                                          src_addr, src_addr_len);
     if (status != PJ_SUCCESS) {
         return status;
@@ -959 +968 @@
         PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type))
     {
-        status = on_incoming_response(sess, msg);
+        status = on_incoming_response(sess, msg, src_addr, src_addr_len);
 
     } else if (PJ_STUN_IS_REQUEST(msg->hdr.type)) {