Changeset 1049 for pjproject

Timestamp:

Mar 8, 2007 6:58:04 PM (18 years ago)

Author:

bennylp

Message:

A really initial implementation on STUN server

Location:

pjproject/trunk/pjlib-util

Files:

• build/pjstun_srv_test.dsp (modified) (1 diff)
• include/pjlib-util/stun_msg.h (modified) (6 diffs)
• src/pjlib-util/stun_msg.c (modified) (1 diff)
• src/pjlib-util/stun_msg_dump.c (modified) (2 diffs)
• src/pjlib-util/stun_session.c (modified) (2 diffs)
• src/pjstun-srv-test/bind_usage.c (modified) (10 diffs)
• src/pjstun-srv-test/main.c (modified) (6 diffs)
• src/pjstun-srv-test/server.c (modified) (2 diffs)
• src/pjstun-srv-test/server.h (modified) (2 diffs)
• src/pjstun-srv-test/turn_usage.c (added)
• src/pjstun-srv-test/usage.c (modified) (4 diffs)

pjproject/trunk/pjlib-util/build/pjstun_srv_test.dsp

@@ -100 +100 @@
 # Begin Source File
 
+SOURCE="..\src\pjstun-srv-test\turn_usage.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\pjstun-srv-test\usage.c"
 # End Source File

pjproject/trunk/pjlib-util/include/pjlib-util/stun_msg.h

@@ -339 +339 @@
     PJ_STUN_ATTR_REALM              = 0x0014,/**< REALM attribute.          */
     PJ_STUN_ATTR_NONCE              = 0x0015,/**< NONCE attribute.          */
-    PJ_STUN_ATTR_RELAY_ADDRESS      = 0x0016,/**< RELAY-ADDRESS attribute.  */
-    PJ_STUN_ATTR_REQUESTED_ADDR_TYPE= 0x0017,/**< REQUESTED-ADDRESS-TYPE    */
-    PJ_STUN_ATTR_REQUESTED_PORT_PROPS=0x0018,/**< REQUESTED-PORT-PROPS      */
-    PJ_STUN_ATTR_REQUESTED_TRANSPORT= 0x0019,/**< REQUESTED-TRANSPORT       */
-    PJ_STUN_ATTR_XOR_MAPPED_ADDRESS = 0x0020,/**< XOR-MAPPED-ADDRESS        */
+    PJ_STUN_ATTR_RELAY_ADDR         = 0x0016,/**< RELAY-ADDRESS attribute.  */
+    PJ_STUN_ATTR_REQ_ADDR_TYPE      = 0x0017,/**< REQUESTED-ADDRESS-TYPE    */
+    PJ_STUN_ATTR_REQ_PORT_PROPS     = 0x0018,/**< REQUESTED-PORT-PROPS      */
+    PJ_STUN_ATTR_REQ_TRANSPORT      = 0x0019,/**< REQUESTED-TRANSPORT       */
+    PJ_STUN_ATTR_XOR_MAPPED_ADDR    = 0x0020,/**< XOR-MAPPED-ADDRESS        */
     PJ_STUN_ATTR_TIMER_VAL          = 0x0021,/**< TIMER-VAL attribute.      */
-    PJ_STUN_ATTR_REQUESTED_IP       = 0x0022,/**< REQUESTED-IP attribute    */
+    PJ_STUN_ATTR_REQ_IP             = 0x0022,/**< REQUESTED-IP attribute    */
     PJ_STUN_ATTR_XOR_REFLECTED_FROM = 0x0023,/**< XOR-REFLECTED-FROM        */
     PJ_STUN_ATTR_PRIORITY           = 0x0024,/**< PRIORITY                  */
@@ -391 +391 @@
     PJ_STUN_STATUS_CONNECTION_FAILURE       = 446,  /**< Connection Failure */
     PJ_STUN_STATUS_CONNECTION_TIMEOUT       = 447,  /**< Connection Timeout */
+    PJ_STUN_STATUS_ALLOCATION_QUOTA_REACHED = 486,  /**< Allocation Quota Reached (TURN) */
     PJ_STUN_STATUS_SERVER_ERROR             = 500,  /**< Server Error       */
+    PJ_STUN_STATUS_INSUFFICIENT_CAPACITY    = 507,  /**< Insufficient Capacity (TURN) */
     PJ_STUN_STATUS_GLOBAL_FAILURE           = 600   /**< Global Failure     */
 } pj_stun_status;
@@ -934 +936 @@
  \endverbatim
  */
-typedef struct pj_stun_uint_attr pj_stun_requested_addr_type;
+typedef struct pj_stun_uint_attr pj_stun_req_addr_type;
 
 /**
@@ -954 +956 @@
  \endverbatim  
  */
-typedef struct pj_stun_uint_attr pj_stun_requested_port_props_attr;
+typedef struct pj_stun_uint_attr pj_stun_req_port_props_attr;
 
 
@@ -963 +965 @@
  * unsigned integer.  Its values are: 0x0000 for UDP and 0x0000 for TCP.
  */
-typedef struct pj_stun_uint_attr pj_stun_requested_transport_attr;
+typedef struct pj_stun_uint_attr pj_stun_req_transport_attr;
 
 
@@ -971 +973 @@
  * specific IP address be allocated to it.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_requested_ip_attr;
+typedef struct pj_stun_ip_addr_attr pj_stun_req_ip_attr;
 
 /**

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

@@ -72 +72 @@
     { PJ_STUN_STATUS_CONNECTION_FAILURE,    "Connection Failure"},
     { PJ_STUN_STATUS_CONNECTION_TIMEOUT,    "Connection Timeout"},
+    { PJ_STUN_STATUS_ALLOCATION_QUOTA_REACHED, "Allocation Quota Reached"},
     { PJ_STUN_STATUS_SERVER_ERROR,          "Server Error"},
+    { PJ_STUN_STATUS_INSUFFICIENT_CAPACITY, "Insufficient Capacity"},
     { PJ_STUN_STATUS_GLOBAL_FAILURE,        "Global Failure"}
 };

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

@@ -70 +70 @@
     case PJ_STUN_ATTR_REFLECTED_FROM:
     case PJ_STUN_ATTR_REMOTE_ADDRESS:
-    case PJ_STUN_ATTR_RELAY_ADDRESS:
-    case PJ_STUN_ATTR_XOR_MAPPED_ADDRESS:
-    case PJ_STUN_ATTR_REQUESTED_IP:
+    case PJ_STUN_ATTR_RELAY_ADDR:
+    case PJ_STUN_ATTR_XOR_MAPPED_ADDR:
+    case PJ_STUN_ATTR_REQ_IP:
     case PJ_STUN_ATTR_XOR_REFLECTED_FROM:
     case PJ_STUN_ATTR_XOR_INTERNAL_ADDR:
@@ -100 +100 @@
     case PJ_STUN_ATTR_LIFETIME:
     case PJ_STUN_ATTR_BANDWIDTH:
-    case PJ_STUN_ATTR_REQUESTED_ADDR_TYPE:
-    case PJ_STUN_ATTR_REQUESTED_PORT_PROPS:
-    case PJ_STUN_ATTR_REQUESTED_TRANSPORT:
+    case PJ_STUN_ATTR_REQ_ADDR_TYPE:
+    case PJ_STUN_ATTR_REQ_PORT_PROPS:
+    case PJ_STUN_ATTR_REQ_TRANSPORT:
     case PJ_STUN_ATTR_TIMER_VAL:
     case PJ_STUN_ATTR_PRIORITY:

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

@@ -177 +177 @@
                              &tdata->res_timer);
         tdata->res_timer.id = PJ_FALSE;
+        pj_list_erase(tdata);
     }
     pj_pool_release(tdata->pool);
@@ -348 +349 @@
 {
     PJ_ASSERT_RETURN(sess, PJ_EINVAL);
+
+    pj_mutex_lock(sess->mutex);
+    while (!pj_list_empty(&sess->pending_request_list)) {
+        pj_stun_tx_data *tdata = sess->pending_request_list.next;
+        destroy_tdata(tdata);
+    }
+    while (!pj_list_empty(&sess->cached_response_list)) {
+        pj_stun_tx_data *tdata = sess->cached_response_list.next;
+        destroy_tdata(tdata);
+    }
+    pj_mutex_unlock(sess->mutex);
 
     pj_mutex_destroy(sess->mutex);

pjproject/trunk/pjlib-util/src/pjstun-srv-test/bind_usage.c

@@ -26 +26 @@
                              const pj_sockaddr_t *src_addr,
                              unsigned src_addr_len);
+static void usage_on_destroy(pj_stun_usage *usage);
 static pj_status_t sess_on_send_msg(pj_stun_session *sess,
                                     const void *pkt,
@@ -38 +39 @@
                                       unsigned src_addr_len);
 
+struct bind_usage
+{
+    pj_pool_t       *pool;
+    pj_stun_usage   *usage;
+    pj_stun_session *session;
+};
+
+
 PJ_DEF(pj_status_t) pj_stun_bind_usage_create(pj_stun_server *srv,
                                               const pj_str_t *ip_addr,
@@ -43 +52 @@
                                               pj_stun_usage **p_bu)
 {
+    pj_pool_t *pool;
+    struct bind_usage *bu;
     pj_stun_server_info *si;
-    pj_stun_session *session;
-    pj_stun_usage *usage;
     pj_stun_usage_cb usage_cb;
     pj_stun_session_cb sess_cb;
@@ -53 +62 @@
     si = pj_stun_server_get_info(srv);
 
+    pool = pj_pool_create(si->pf, "bind%p", 128, 128, NULL);
+    bu = PJ_POOL_ZALLOC_T(pool, struct bind_usage);
+    bu->pool = pool;
+
     status = pj_sockaddr_in_init(&local_addr, ip_addr, (pj_uint16_t)port);
     if (status != PJ_SUCCESS)
@@ -59 +72 @@
     pj_bzero(&usage_cb, sizeof(usage_cb));
     usage_cb.on_rx_data = &usage_on_rx_data;
+    usage_cb.on_destroy = &usage_on_destroy;
 
     status = pj_stun_usage_create(srv, "bind%p", &usage_cb,
                                   PJ_AF_INET, PJ_SOCK_DGRAM, 0,
                                   &local_addr, sizeof(local_addr),
-                                  &usage);
-    if (status != PJ_SUCCESS)
-        return status;
+                                  &bu->usage);
+    if (status != PJ_SUCCESS) {
+        pj_pool_release(pool);
+        return status;
+    }
 
     pj_bzero(&sess_cb, sizeof(sess_cb));
@@ -71 +87 @@
     sess_cb.on_rx_request = &sess_on_rx_request;
     status = pj_stun_session_create(si->endpt, "bind%p", &sess_cb, PJ_FALSE,
-                                    &session);
-    if (status != PJ_SUCCESS) {
-        pj_stun_usage_destroy(usage);
-        return status;
-    }
-
-    pj_stun_usage_set_user_data(usage, session);
-    pj_stun_session_set_user_data(session, usage);
-
-    *p_bu = usage;
+                                    &bu->session);
+    if (status != PJ_SUCCESS) {
+        pj_stun_usage_destroy(bu->usage);
+        return status;
+    }
+
+    pj_stun_usage_set_user_data(bu->usage, bu);
+    pj_stun_session_set_user_data(bu->session, bu);
+
+    if (p_bu)
+        *p_bu = bu->usage;
 
     return PJ_SUCCESS;
@@ -92 +109 @@
                              unsigned src_addr_len)
 {
+    struct bind_usage *bu;
     pj_stun_session *session;
     pj_status_t status;
 
-    session = (pj_stun_session*) pj_stun_usage_get_user_data(usage);
+    bu = (struct bind_usage*) pj_stun_usage_get_user_data(usage);
+    session = bu->session;
 
     /* Handle packet to session */
@@ -114 +133 @@
                                     unsigned addr_len)
 {
+    struct bind_usage *bu;
     pj_stun_usage *usage;
 
-    usage = pj_stun_session_get_user_data(sess);
+    bu = (struct bind_usage*) pj_stun_session_get_user_data(sess);
+    usage = bu->usage;
 
     return pj_stun_usage_sendto(usage, pkt, pkt_size, 0,
@@ -156 +177 @@
         status = 
             pj_stun_msg_add_ip_addr_attr(tdata->pool, tdata->msg,
-                                         PJ_STUN_ATTR_XOR_MAPPED_ADDRESS,
+                                         PJ_STUN_ATTR_XOR_MAPPED_ADDR,
                                          PJ_TRUE,
                                          src_addr, src_addr_len);
@@ -173 +194 @@
 }
 
+static void usage_on_destroy(pj_stun_usage *usage)
+{
+    struct bind_usage *bu;
+
+    bu = (struct bind_usage*) pj_stun_usage_get_user_data(usage);
+    if (bu==NULL)
+        return;
+
+    pj_stun_session_destroy(bu->session);
+    pj_pool_release(bu->pool);
+}

pjproject/trunk/pjlib-util/src/pjstun-srv-test/main.c

@@ -18 +18 @@
  */
 #include "server.h"
+
+#define THIS_FILE       "main.c"
 
 struct options
@@ -42 +44 @@
 
 
-static void server_main(void)
+static void server_main(pj_stun_server *srv)
 {
     int quit = 0;
@@ -50 +52 @@
 
         printf("Menu:\n"
+               "  d     Dump status\n"
                "  q     Quit\n"
                "Choice:");
 
         fgets(line, sizeof(line), stdin);
-        if (line[0] == 'q')
+        if (line[0] == 'q') {
             quit = 1;
+        } else if (line[0] == 'd') {
+            pj_stun_server_info *si = pj_stun_server_get_info(srv);
+            pj_pool_factory_dump(si->pf, PJ_TRUE);
+        }
     }
 }
@@ -72 +79 @@
     pj_caching_pool cp;
     pj_stun_server *srv;
-    pj_stun_usage *bu;
     pj_status_t status;
 
@@ -117 +123 @@
     }
 
-    status = pj_stun_bind_usage_create(srv, NULL, 3478, &bu);
+    status = pj_stun_bind_usage_create(srv, NULL, 3478, NULL);
     if (status != PJ_SUCCESS) {
         pj_stun_perror(THIS_FILE, "Unable to create bind usage", status);
@@ -123 +129 @@
     }
 
-    server_main();
+    server_main(srv);
 
-    pj_stun_usage_destroy(bu);
     pj_stun_server_destroy(srv);
     pj_pool_factory_dump(&cp.factory, PJ_TRUE);

pjproject/trunk/pjlib-util/src/pjstun-srv-test/server.c

@@ -30 +30 @@
     pj_bool_t            thread_quit_flag;
     pj_thread_t        **threads;
+
+    unsigned             usage_cnt;
+    pj_stun_usage       *usage[32];
 };
 
@@ -110 +113 @@
 
 
+pj_status_t pj_stun_server_register_usage(pj_stun_server *srv,
+                                          pj_stun_usage *usage)
+{
+    unsigned i;
+
+    for (i=0; i<PJ_ARRAY_SIZE(srv->usage); ++i) {
+        if (srv->usage[i] == usage)
+            return PJ_SUCCESS;
+    }
+
+    for (i=0; i<PJ_ARRAY_SIZE(srv->usage); ++i) {
+        if (srv->usage[i] == NULL)
+            break;
+    }
+
+    if (i == PJ_ARRAY_SIZE(srv->usage))
+        return PJ_ETOOMANY;
+
+    srv->usage[i] = usage;
+    ++srv->usage_cnt;
+
+    return PJ_SUCCESS;
+}
+
+pj_status_t pj_stun_server_unregister_usage(pj_stun_server *srv,
+                                            pj_stun_usage *usage)
+{
+    unsigned i;
+
+    for (i=0; i<PJ_ARRAY_SIZE(srv->usage); ++i) {
+        if (srv->usage[i] == usage)
+            break;
+    }
+
+    if (i != PJ_ARRAY_SIZE(srv->usage)) {
+        srv->usage[i] = NULL;
+        --srv->usage_cnt;
+        return PJ_SUCCESS;
+    }
+
+    return PJ_ENOTFOUND;
+}
+
+
 PJ_DEF(pj_status_t) pj_stun_server_destroy(pj_stun_server *srv)
 {
     unsigned i;
+
+    for (i=0; i<PJ_ARRAY_SIZE(srv->usage); ++i) {
+        if (!srv->usage[i])
+            continue;
+
+        pj_stun_usage_destroy(srv->usage[i]);
+        pj_stun_server_unregister_usage(srv, srv->usage[i]);
+    }
 
     srv->thread_quit_flag = PJ_TRUE;

pjproject/trunk/pjlib-util/src/pjstun-srv-test/server.h

@@ -48 +48 @@
                        const pj_sockaddr_t *src_addr,
                        unsigned src_addr_len);
+    void (*on_destroy)(pj_stun_usage *usage);
 } pj_stun_usage_cb;
 
@@ -118 +119 @@
 
 
+
+pj_status_t pj_stun_server_register_usage(pj_stun_server *srv,
+                                          pj_stun_usage *usage);
+pj_status_t pj_stun_server_unregister_usage(pj_stun_server *srv,
+                                            pj_stun_usage *usage);
+
+
 #endif  /* __STUN_SERVER_H__ */
 

pjproject/trunk/pjlib-util/src/pjstun-srv-test/usage.c

@@ -31 +31 @@
 {
     pj_pool_t           *pool;
+    pj_stun_server      *srv;
     pj_mutex_t          *mutex;
     pj_stun_usage_cb     cb;
@@ -76 +77 @@
     usage = PJ_POOL_ZALLOC_T(pool, pj_stun_usage);
     usage->pool = pool;
+    usage->srv = srv;
 
     status = pj_mutex_create_simple(pool, name, &usage->mutex);
@@ -130 +132 @@
     }
 
+    pj_stun_server_register_usage(srv, usage);
+
     *p_usage = usage;
     return PJ_SUCCESS;
@@ -144 +148 @@
 PJ_DEF(pj_status_t) pj_stun_usage_destroy(pj_stun_usage *usage)
 {
+    pj_stun_server_unregister_usage(usage->srv, usage);
+    if (usage->cb.on_destroy)
+        (*usage->cb.on_destroy)(usage);
+
     if (usage->key) {
         pj_ioqueue_unregister(usage->key);