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

Timestamp:

Apr 9, 2008 9:38:12 AM (16 years ago)

Author:

bennylp

Message:

More ticket #485: huge changeset to support TURN TCP. Please see ticket #485 for the details

File:

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

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

@@ -18 +18 @@
  */
 #include "turn.h"
+#include <pj/compat/socket.h>
 
 struct read_op
@@ -28 +29 @@
 {
     pj_turn_listener         base;
+
     pj_ioqueue_key_t        *key;
     unsigned                 read_cnt;
     struct read_op          **read_op;  /* Array of read_op's   */
+
+    pj_turn_transport        tp;        /* Transport instance */
 };
 
 
-static pj_status_t udp_sendto(pj_turn_listener *listener,
+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, 
+                             pj_ssize_t bytes_read);
+
+static pj_status_t udp_sendto(pj_turn_transport *tp,
                               const void *packet,
                               pj_size_t size,
@@ -40 +49 @@
                               const pj_sockaddr_t *addr,
                               int addr_len);
-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, 
-                             pj_ssize_t bytes_read);
+static void udp_add_ref(pj_turn_transport *tp,
+                        pj_turn_allocation *alloc);
+static void udp_dec_ref(pj_turn_transport *tp,
+                        pj_turn_allocation *alloc);
 
 
@@ -71 +80 @@
     udp->base.tp_type = PJ_TURN_TP_UDP;
     udp->base.sock = PJ_INVALID_SOCKET;
-    udp->base.sendto = &udp_sendto;
     udp->base.destroy = &udp_destroy;
     udp->read_cnt = concurrency_cnt;
     udp->base.flags = flags;
+
+    udp->tp.obj_name = udp->base.obj_name;
+    udp->tp.info = udp->base.info;
+    udp->tp.listener = &udp->base;
+    udp->tp.sendto = &udp_sendto;
+    udp->tp.add_ref = &udp_add_ref;
+    udp->tp.dec_ref = &udp_dec_ref;
 
     /* Create socket */
@@ -173 +188 @@
  * Callback to send packet.
  */
-static pj_status_t udp_sendto(pj_turn_listener *listener,
+static pj_status_t udp_sendto(pj_turn_transport *tp,
                               const void *packet,
                               pj_size_t size,
@@ -181 +196 @@
 {
     pj_ssize_t len = size;
-    return pj_sock_sendto(listener->sock, packet, &len, flag, addr, addr_len);
-}
+    return pj_sock_sendto(tp->listener->sock, packet, &len, flag, addr, addr_len);
+}
+
+
+static void udp_add_ref(pj_turn_transport *tp,
+                        pj_turn_allocation *alloc)
+{
+    /* Do nothing */
+    PJ_UNUSED_ARG(tp);
+    PJ_UNUSED_ARG(alloc);
+}
+
+static void udp_dec_ref(pj_turn_transport *tp,
+                        pj_turn_allocation *alloc)
+{
+    /* Do nothing */
+    PJ_UNUSED_ARG(tp);
+    PJ_UNUSED_ARG(alloc);
+}
+
 
 /*
@@ -212 +245 @@
         pj_pool_reset(rpool);
         read_op->pkt.pool = rpool;
-        read_op->pkt.listener = &udp->base;
+        read_op->pkt.transport = &udp->tp;
         read_op->pkt.src.tp_type = udp->base.tp_type;
 
@@ -228 +261 @@
             bytes_read = -status;
 
-    } while (status != PJ_EPENDING && status != PJ_ECANCELLED);
-}
-
+    } while (status != PJ_EPENDING && status != PJ_ECANCELLED &&
+             status != PJ_STATUS_FROM_OS(PJ_BLOCKING_ERROR_VAL));
+}
+