Changeset 1854 for pjproject/trunk/pjnath/src/pjturn-srv/allocation.c

Timestamp:

Mar 9, 2008 11:52:48 PM (16 years ago)

Author:

bennylp

Message:

More ticket #485: initial (incomplete) work on TURN client session library

File:

• pjproject/trunk/pjnath/src/pjturn-srv/allocation.c (modified) (4 diffs)

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

@@ -39 +39 @@
 #define MAX_LIFETIME            600
 #define DEF_LIFETIME            300
-
-
-
-/* ChannelData header */
-typedef struct channel_data_hdr
-{
-    pj_uint16_t ch_number;
-    pj_uint16_t length;
-} channel_data_hdr;
 
 
@@ -913 +904 @@
          * This is not a STUN packet, must be ChannelData packet.
          */
-        channel_data_hdr *cd = (channel_data_hdr*)pkt->pkt;
+        pj_turn_channel_data *cd = (pj_turn_channel_data*)pkt->pkt;
         pj_turn_permission *perm;
         pj_ssize_t len;
+
+        pj_assert(sizeof(*cd)==4);
 
         /* For UDP check the packet length */
@@ -979 +972 @@
     if (perm->channel != PJ_TURN_INVALID_CHANNEL) {
         /* Send ChannelData */
-        channel_data_hdr *cd = (channel_data_hdr*)rel->tp.tx_pkt;
+        pj_turn_channel_data *cd = (pj_turn_channel_data*)rel->tp.tx_pkt;
 
         if (len > PJ_TURN_MAX_PKT_LEN) {
@@ -995 +988 @@
 
         /* Copy data */
-        pj_memcpy(rel->tp.rx_pkt+sizeof(channel_data_hdr), pkt, len);
+        pj_memcpy(rel->tp.rx_pkt+sizeof(pj_turn_channel_data), pkt, len);
 
         /* Send to client */
         pj_turn_listener_sendto(alloc->listener, rel->tp.tx_pkt,
-                               len+sizeof(channel_data_hdr), 0,
+                               len+sizeof(pj_turn_channel_data), 0,
                                &alloc->hkey.clt_addr,
                                pj_sockaddr_get_len(&alloc->hkey.clt_addr));