Changeset 1052 for pjproject/trunk/pjlib-util/src/pjlib-util/stun_session.c

Timestamp:

Mar 9, 2007 11:25:11 PM (17 years ago)

Author:

bennylp

Message:

Today's work on TURN server. All looks to be implemented

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/stun_session.c (modified) (9 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_session.c

@@ -114 +114 @@
 
 static pj_status_t create_tdata(pj_stun_session *sess,
-                                void *user_data,
                                 pj_stun_tx_data **p_tdata)
 {
@@ -128 +127 @@
     tdata->pool = pool;
     tdata->sess = sess;
-    tdata->user_data = user_data;
 
     *p_tdata = tdata;
@@ -137 +135 @@
 static pj_status_t create_request_tdata(pj_stun_session *sess,
                                         unsigned msg_type,
-                                        void *user_data,
                                         pj_stun_tx_data **p_tdata)
 {
@@ -143 +140 @@
     pj_stun_tx_data *tdata;
 
-    status = create_tdata(sess, user_data, &tdata);
+    status = create_tdata(sess, &tdata);
     if (status != PJ_SUCCESS)
         return status;
@@ -406 +403 @@
 
 
-PJ_DEF(pj_status_t) pj_stun_session_create_bind_req(pj_stun_session *sess,
-                                                    pj_stun_tx_data **p_tdata)
+PJ_DEF(pj_status_t) pj_stun_session_create_req(pj_stun_session *sess,
+                                               int method,
+                                               pj_stun_tx_data **p_tdata)
 {
     pj_stun_tx_data *tdata = NULL;
@@ -414 +412 @@
     PJ_ASSERT_RETURN(sess && p_tdata, PJ_EINVAL);
 
-    status = create_request_tdata(sess, PJ_STUN_BINDING_REQUEST, NULL, 
-                                  &tdata);
+    status = create_request_tdata(sess, method, &tdata);
     if (status != PJ_SUCCESS)
         return status;
@@ -423 +420 @@
 }
 
-PJ_DEF(pj_status_t) pj_stun_session_create_allocate_req(pj_stun_session *sess,
-                                                        pj_stun_tx_data **p_tdata)
-{
-    PJ_UNUSED_ARG(sess);
-    PJ_UNUSED_ARG(p_tdata);
-    PJ_ASSERT_RETURN(PJ_FALSE, PJ_ENOTSUP);
-}
-
-
-PJ_DEF(pj_status_t) 
-pj_stun_session_create_set_active_destination_req(pj_stun_session *sess,
-                                                  pj_stun_tx_data **p_tdata)
-{
-    PJ_UNUSED_ARG(sess);
-    PJ_UNUSED_ARG(p_tdata);
-    PJ_ASSERT_RETURN(PJ_FALSE, PJ_ENOTSUP);
-}
-
-PJ_DEF(pj_status_t) pj_stun_session_create_connect_req( pj_stun_session *sess,
-                                                        pj_stun_tx_data **p_tdata)
-{
-    PJ_UNUSED_ARG(sess);
-    PJ_UNUSED_ARG(p_tdata);
-    PJ_ASSERT_RETURN(PJ_FALSE, PJ_ENOTSUP);
-}
-
-PJ_DEF(pj_status_t) 
-pj_stun_session_create_connection_status_ind(pj_stun_session *sess,
-                                             pj_stun_tx_data **p_tdata)
-{
-    PJ_UNUSED_ARG(sess);
-    PJ_UNUSED_ARG(p_tdata);
-    PJ_ASSERT_RETURN(PJ_FALSE, PJ_ENOTSUP);
-}
-
-PJ_DEF(pj_status_t) pj_stun_session_create_send_ind( pj_stun_session *sess,
-                                                     pj_stun_tx_data **p_tdata)
-{
-    PJ_UNUSED_ARG(sess);
-    PJ_UNUSED_ARG(p_tdata);
-    PJ_ASSERT_RETURN(PJ_FALSE, PJ_ENOTSUP);
-}
-
-PJ_DEF(pj_status_t) pj_stun_session_create_data_ind( pj_stun_session *sess,
-                                                     pj_stun_tx_data **p_tdata)
-{
-    PJ_UNUSED_ARG(sess);
-    PJ_UNUSED_ARG(p_tdata);
-    PJ_ASSERT_RETURN(PJ_FALSE, PJ_ENOTSUP);
-}
-
+PJ_DEF(pj_status_t) pj_stun_session_create_ind(pj_stun_session *sess,
+                                               int msg_type,
+                                               pj_stun_tx_data **p_tdata)
+{
+    pj_stun_tx_data *tdata = NULL;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(sess && p_tdata, PJ_EINVAL);
+
+    status = create_tdata(sess, &tdata);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Create STUN message */
+    msg_type |= PJ_STUN_INDICATION_BIT;
+    status = pj_stun_msg_create(tdata->pool, msg_type,  PJ_STUN_MAGIC, 
+                                NULL, &tdata->msg);
+    if (status != PJ_SUCCESS) {
+        pj_pool_release(tdata->pool);
+        return status;
+    }
+
+    *p_tdata = tdata;
+    return PJ_SUCCESS;
+}
 
 /*
@@ -487 +458 @@
     pj_stun_tx_data *tdata = NULL;
 
-    status = create_tdata(sess, NULL, &tdata);
+    status = create_tdata(sess, &tdata);
     if (status != PJ_SUCCESS)
         return status;
@@ -811 +782 @@
 
         status = pj_stun_msg_create_response(tmp_pool, msg, 
-                                             PJ_STUN_STATUS_BAD_REQUEST, NULL,
+                                             PJ_STUN_SC_BAD_REQUEST, NULL,
                                              &response);
         if (status == PJ_SUCCESS && response) {