Changeset 1916 for pjproject/trunk/pjnath/src/pjnath-test/sess_auth.c

Timestamp:

Apr 9, 2008 1:34:49 PM (17 years ago)

Author:

bennylp

Message:

More ticket #485: removed pjstun-srv-test project and fixed build errors with gcc

File:

• pjproject/trunk/pjnath/src/pjnath-test/sess_auth.c (modified) (11 diffs)

pjproject/trunk/pjnath/src/pjnath-test/sess_auth.c

@@ -56 +56 @@
 
 static pj_status_t server_send_msg(pj_stun_session *sess,
+                                   void *token,
                                    const void *pkt,
                                    pj_size_t pkt_size,
@@ -64 +65 @@
 
     PJ_UNUSED_ARG(sess);
+    PJ_UNUSED_ARG(token);
 
     return pj_sock_sendto(server->sock, pkt, &len, 0, dst_addr, addr_len);
@@ -72 +74 @@
                                         unsigned pkt_len,
                                         const pj_stun_rx_data *rdata,
+                                        void *token,
                                         const pj_sockaddr_t *src_addr,
                                         unsigned src_addr_len)
@@ -77 +80 @@
     PJ_UNUSED_ARG(pkt);
     PJ_UNUSED_ARG(pkt_len);
-
-    return pj_stun_session_respond(sess, rdata, 0, NULL, PJ_TRUE, 
+    PJ_UNUSED_ARG(token);
+
+    return pj_stun_session_respond(sess, rdata, 0, NULL, NULL, PJ_TRUE, 
                                    src_addr, src_addr_len);
 }
@@ -192 +196 @@
             pj_stun_session_on_rx_pkt(server->sess, pkt, len, 
                                       PJ_STUN_CHECK_PACKET | PJ_STUN_IS_DATAGRAM,
-                                      NULL, &src_addr, src_addr_len);
+                                      NULL, NULL, &src_addr, src_addr_len);
         }
     }
@@ -328 +332 @@
 
 static pj_status_t client_send_msg(pj_stun_session *sess,
+                                   void *token,
                                    const void *pkt,
                                    pj_size_t pkt_size,
@@ -336 +341 @@
 
     PJ_UNUSED_ARG(sess);
+    PJ_UNUSED_ARG(token);
 
     return pj_sock_sendto(client->sock, pkt, &len, 0, dst_addr, addr_len);
@@ -343 +349 @@
 static void client_on_request_complete( pj_stun_session *sess,
                                         pj_status_t status,
+                                        void *token,
                                         pj_stun_tx_data *tdata,
                                         const pj_stun_msg *response,
@@ -349 +356 @@
 {
     PJ_UNUSED_ARG(sess);
+    PJ_UNUSED_ARG(token);
     PJ_UNUSED_ARG(tdata);
     PJ_UNUSED_ARG(src_addr);
@@ -401 +409 @@
             pj_stun_session_on_rx_pkt(client->sess, pkt, len, 
                                       PJ_STUN_CHECK_PACKET | PJ_STUN_IS_DATAGRAM,
-                                      NULL, &src_addr, src_addr_len);
+                                      NULL, NULL, &src_addr, src_addr_len);
         }
  
@@ -554 +562 @@
 
     /* Send the request */
-    status = pj_stun_session_send_msg(client->sess, PJ_FALSE, &server->addr,
+    status = pj_stun_session_send_msg(client->sess, NULL, PJ_FALSE, PJ_TRUE, &server->addr,
                                       pj_sockaddr_get_len(&server->addr), tdata);
     if (status != PJ_SUCCESS) {