Changeset 1852 for pjproject/trunk/pjnath/src/pjturn-srv/listener_udp.c

Timestamp:

Mar 9, 2008 12:55:00 PM (16 years ago)

Author:

bennylp

Message:

More work for ticket #485: updated pjnath with TURN-07 and added authentication in the server

File:

• pjproject/trunk/pjnath/src/pjturn-srv/listener_udp.c (modified) (14 diffs)

pjproject/trunk/pjnath/src/pjturn-srv/listener_udp.c

@@ -22 +22 @@
 {
     pj_ioqueue_op_key_t op_key;
-    pjturn_pkt          pkt;
+    pj_turn_pkt         pkt;
 };
 
 struct udp_listener
 {
-    pjturn_listener          base;
+    pj_turn_listener         base;
     pj_ioqueue_key_t        *key;
     unsigned                 read_cnt;
@@ -34 +34 @@
 
 
-static pj_status_t udp_sendto(pjturn_listener *listener,
+static pj_status_t udp_sendto(pj_turn_listener *listener,
                               const void *packet,
                               pj_size_t size,
@@ -40 +40 @@
                               const pj_sockaddr_t *addr,
                               int addr_len);
-static pj_status_t udp_destroy(pjturn_listener *udp);
+static pj_status_t udp_destroy(pj_turn_listener *udp);
 static void on_read_complete(pj_ioqueue_key_t *key, 
                              pj_ioqueue_op_key_t *op_key, 
@@ -49 +49 @@
  * Create a new listener on the specified port.
  */
-PJ_DEF(pj_status_t) pjturn_listener_create_udp( pjturn_srv *srv,
+PJ_DEF(pj_status_t) pj_turn_listener_create_udp( pj_turn_srv *srv,
                                                 int af,
                                                 const pj_str_t *bound_addr,
@@ -55 +55 @@
                                                 unsigned concurrency_cnt,
                                                 unsigned flags,
-                                                pjturn_listener **p_listener)
+                                                pj_turn_listener **p_listener)
 {
     pj_pool_t *pool;
@@ -64 +64 @@
 
     /* Create structure */
-    pool = pj_pool_create(srv->core.pf, "udplis%p", 1000, 1000, NULL);
+    pool = pj_pool_create(srv->core.pf, "udp%p", 1000, 1000, NULL);
     udp = PJ_POOL_ZALLOC_T(pool, struct udp_listener);
     udp->base.pool = pool;
+    udp->base.obj_name = pool->obj_name;
     udp->base.server = srv;
-    udp->base.tp_type = PJTURN_TP_UDP;
+    udp->base.tp_type = PJ_TURN_TP_UDP;
     udp->base.sock = PJ_INVALID_SOCKET;
     udp->base.sendto = &udp_sendto;
@@ -86 +87 @@
         goto on_error;
     
+    /* Create info */
+    pj_ansi_strcpy(udp->base.info, "UDP:");
+    pj_sockaddr_print(&udp->base.addr, udp->base.info+4, 
+                      sizeof(udp->base.info)-4, 3);
+
     /* Bind socket */
     status = pj_sock_bind(udp->base.sock, &udp->base.addr, 
@@ -105 +111 @@
     for (i=0; i<concurrency_cnt; ++i) {
         pj_pool_t *rpool = pj_pool_create(srv->core.pf, "rop%p", 
-                                          1000, 1000, NULL);
+                                          sizeof(struct read_op)+1000, 
+                                          1000, NULL);
 
         udp->read_op[i] = PJ_POOL_ZALLOC_T(rpool, struct read_op);
@@ -114 +121 @@
 
     /* Done */
+    PJ_LOG(4,(udp->base.obj_name, "Listener %s created", udp->base.info));
+
     *p_listener = &udp->base;
     return PJ_SUCCESS;
@@ -127 +136 @@
  * Destroy listener.
  */
-static pj_status_t udp_destroy(pjturn_listener *listener)
+static pj_status_t udp_destroy(pj_turn_listener *listener)
 {
     struct udp_listener *udp = (struct udp_listener *)listener;
@@ -150 +159 @@
 
     if (udp->base.pool) {
-        pj_pool_release(udp->base.pool);
+        pj_pool_t *pool = udp->base.pool;
+
+        PJ_LOG(4,(udp->base.obj_name, "Listener %s destroyed", 
+                  udp->base.info));
+
         udp->base.pool = NULL;
+        pj_pool_release(pool);
     }
     return PJ_SUCCESS;
@@ -159 +173 @@
  * Callback to send packet.
  */
-static pj_status_t udp_sendto(pjturn_listener *listener,
+static pj_status_t udp_sendto(pj_turn_listener *listener,
                               const void *packet,
                               pj_size_t size,
@@ -167 +181 @@
 {
     pj_ssize_t len = size;
-    return pj_sock_sendto(listener->sock, packet, &len, flag, addr,
-                          pj_sockaddr_get_len(addr));
+    return pj_sock_sendto(listener->sock, packet, &len, flag, addr, addr_len);
 }
 
@@ -192 +205 @@
             pj_gettimeofday(&read_op->pkt.rx_time);
 
-            pjturn_srv_on_rx_pkt(udp->base.server, &read_op->pkt);
+            pj_turn_srv_on_rx_pkt(udp->base.server, &read_op->pkt);
         }