Changeset 1053 for pjproject/trunk/pjlib-util/src/pjstun-srv-test/turn_usage.c

Timestamp:

Mar 10, 2007 11:19:11 AM (18 years ago)

Author:

bennylp

Message:

Started working on sample TURN client

File:

• pjproject/trunk/pjlib-util/src/pjstun-srv-test/turn_usage.c (modified) (14 diffs)

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

@@ -90 +90 @@
     pj_stun_session     *session;
     pj_mutex_t          *mutex;
+
+    /* Socket and socket address of the allocated port */
     int                  sock_type;
-
-    /* Socket and socket address of the allocated port */
     pj_sock_t            sock;
     pj_ioqueue_key_t    *key;
@@ -504 +504 @@
                                     pj_uint32_t hval);
 
+static const char *get_tp_type(int type)
+{
+    if (type==0)
+        return "udp";
+    else if (type==1)
+        return "tcp";
+    else
+        return "???";
+}
+
 
 /*
@@ -576 +586 @@
         const pj_sockaddr_in *a4 = (const pj_sockaddr_in *)src_addr;
         pj_ansi_snprintf(client->obj_name, sizeof(client->obj_name),
-                         "%s:%d",
+                         "%s:%s:%d",
+                         get_tp_type(tu->type),
                          pj_inet_ntoa(a4->sin_addr),
                          (int)pj_ntohs(a4->sin_port));
@@ -586 +597 @@
     sess_cb.on_send_msg = &client_sess_on_send_msg;
     sess_cb.on_rx_request = &client_sess_on_rx_request;
-    status = pj_stun_session_create(tu->endpt, "turnc%p", &sess_cb, PJ_FALSE,
+    status = pj_stun_session_create(tu->endpt, client->obj_name, 
+                                    &sess_cb, PJ_FALSE,
                                     &client->session);
     if (status != PJ_SUCCESS) {
@@ -599 +611 @@
 
     /* Mutex */
-    status = pj_mutex_create_recursive(client->pool, pool->obj_name, 
+    status = pj_mutex_create_recursive(client->pool, pool->obj_name,
                                        &client->mutex);
     if (status != PJ_SUCCESS) {
@@ -693 +705 @@
 {
     pj_ioqueue_callback client_ioq_cb;
+    int addrlen;
     pj_status_t status;
+
+    /* Update address */
+    addrlen = sizeof(pj_sockaddr_in);
+    status = pj_sock_getsockname(client->sock, &client->client_addr, 
+                                 &addrlen);
+    if (status != PJ_SUCCESS) {
+        pj_sock_close(client->sock);
+        client->sock = PJ_INVALID_SOCKET;
+        return status;
+    }
 
     /* Register to ioqueue */
@@ -715 +738 @@
     client_on_read_complete(client->key, &client->pkt_read_key, 0);
 
+    PJ_LOG(4,(THIS_FILE, "TURN client %s: relay allocated on %s:%s:%d",
+              client->obj_name,
+              get_tp_type(client->sock_type),
+              pj_inet_ntoa(client->client_addr.sin_addr),
+              (int)pj_ntohs(client->client_addr.sin_port)));
+
     return PJ_SUCCESS;
 }
@@ -735 +764 @@
     }
 
-    PJ_LOG(4,(THIS_FILE, "TURN client %s: relay allocation %s:%d destroyed",
+    PJ_LOG(4,(THIS_FILE, "TURN client %s: relay allocation %s:%s:%d destroyed",
               client->obj_name,
+              get_tp_type(client->sock_type),
               pj_inet_ntoa(client->client_addr.sin_addr),
               (int)pj_ntohs(client->client_addr.sin_port)));
@@ -772 +802 @@
 
     PJ_LOG(4,(THIS_FILE, "TURN client %s: peer %s:%s:%d added",
-              client->obj_name, "udp", pj_inet_ntoa(peer_addr->sin_addr),
+              client->obj_name, get_tp_type(client->sock_type), 
+              pj_inet_ntoa(peer_addr->sin_addr),
               (int)pj_ntohs(peer_addr->sin_port)));
 
@@ -825 +856 @@
     pj_sockaddr_in req_addr;
     int addr_len;
-    unsigned rpp_bits;
+    unsigned req_bw, rpp_bits;
     pj_time_val timeout;
     pj_status_t status;
@@ -849 +880 @@
         return PJ_SUCCESS;
     } else if (a_bw) {
-        client->bw_kbps = a_bw->value;
+        client->bw_kbps = req_bw = a_bw->value;
     } else {
+        req_bw = 0;
         client->bw_kbps = client->tu->max_bw_kbps;
     }
@@ -900 +932 @@
 
         PJ_LOG(4,(THIS_FILE, "TURN client %s: received initial Allocate "
-                             "request, requested type:addr:port=%d:%s:%d, rpp "
-                             "bits=%d",
-                  client->obj_name, client->sock_type,
+                             "request, requested type:addr:port=%s:%s:%d, rpp "
+                             "bits=%d, bw=%dkbps, lifetime=%d",
+                  client->obj_name, get_tp_type(client->sock_type),
                   pj_inet_ntoa(req_addr.sin_addr), pj_ntohs(req_addr.sin_port),
-                  rpp_bits));
+                  rpp_bits, client->bw_kbps, client->lifetime));
 
         status = tu_alloc_port(client->tu, client->sock_type, rpp_bits, 
@@ -931 +963 @@
         /* Otherwise check if the port parameter stays the same */
         /* TODO */
-        PJ_LOG(4,(THIS_FILE, "TURN client %s: received Allocate refresh",
-                  client->obj_name));
+        PJ_LOG(4,(THIS_FILE, "TURN client %s: received Allocate refresh, "
+                             "lifetime=%d",
+                  client->obj_name, client->lifetime));
     }
 
@@ -970 +1003 @@
 
     PJ_LOG(4,(THIS_FILE, "TURN client %s: relay allocated or refreshed, "
-                         "internal address is %s:%d",
+                         "internal address is %s:%s:%d",
                          client->obj_name,
+                         get_tp_type(client->sock_type),
                          pj_inet_ntoa(req_addr.sin_addr),
                          (int)pj_ntohs(req_addr.sin_port)));