Changeset 1275 for pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c

Timestamp:

May 15, 2007 10:42:56 AM (17 years ago)

Author:

bennylp

Message:

Fixed several STUN bugs: USERNAME, REALM etc are not allowed in the response, retransmission timer calculation bug, etc.

File:

• pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c

@@ -79 +79 @@
     pj_stun_session     *default_session;
     pj_hash_table_t     *client_htable;
+    pj_stun_auth_cred   *cred;
 
     unsigned             max_bw_kbps;
@@ -222 +223 @@
     }
 
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) pj_stun_turn_usage_set_credential(pj_stun_usage *turn,
+                                                      const pj_stun_auth_cred *c)
+{
+    struct turn_usage *tu;
+    tu = (struct turn_usage*) pj_stun_usage_get_user_data(turn);
+
+    tu->cred = PJ_POOL_ZALLOC_T(tu->pool, pj_stun_auth_cred);
+    pj_stun_auth_cred_dup(tu->pool, tu->cred, c);
+    pj_stun_session_set_credential(tu->default_session, tu->cred);
     return PJ_SUCCESS;
 }
@@ -442 +456 @@
     } else if (msg->hdr.type != PJ_STUN_ALLOCATE_REQUEST) {
         if (PJ_STUN_IS_REQUEST(msg->hdr.type)) {
-            status = pj_stun_session_create_response(sess, msg, 
-                                                     PJ_STUN_SC_NO_BINDING,
-                                                     NULL, &tdata);
+            status = pj_stun_session_create_res(sess, msg, 
+                                                PJ_STUN_SC_NO_BINDING,
+                                                NULL, &tdata);
             if (status==PJ_SUCCESS) {
                 status = pj_stun_session_send_msg(sess, PJ_FALSE, 
@@ -631 +645 @@
     }
 
+    if (tu->cred)
+        pj_stun_session_set_credential(client->session, tu->cred);
+
     sd = PJ_POOL_ZALLOC_T(pool, struct session_data);
     sd->tu = tu;
@@ -864 +881 @@
         pj_cstr(&err_msg, custom_msg), p_err_msg = &err_msg;
     
-    status = pj_stun_session_create_response(client->session, msg, 
-                                             err_code, p_err_msg, 
-                                             &response);
+    status = pj_stun_session_create_res(client->session, msg, 
+                                        err_code, p_err_msg, 
+                                        &response);
     if (status == PJ_SUCCESS)
         status = pj_stun_session_send_msg(client->session, PJ_TRUE,
@@ -1015 +1032 @@
 
     /* Done successfully, create and send success response */
-    status = pj_stun_session_create_response(client->session, msg, 
-                                             0, NULL, &response);
+    status = pj_stun_session_create_res(client->session, msg, 
+                                        0, NULL, &response);
     if (status != PJ_SUCCESS) {
         return status;
@@ -1063 +1080 @@
 
     /* Create response */
-    status = pj_stun_session_create_response(session, msg, 0, NULL, 
-                                             &tdata);
+    status = pj_stun_session_create_res(session, msg, 0, NULL, 
+                                        &tdata);
     if (status != PJ_SUCCESS)
         return status;