Changeset 1854 for pjproject/trunk

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath.h (modified) (1 diff)
• include/pjnath/turn_session.h (added)
• src/pjnath/turn_session.c (added)
• src/pjturn-srv/allocation.c (modified) (4 diffs)
• src/pjturn-srv/main.c (modified) (1 diff)
• src/pjturn-srv/turn.h (modified) (1 diff)

pjproject/trunk/pjnath/include/pjnath.h

@@ -28 +28 @@
 #include <pjnath/stun_session.h>
 #include <pjnath/stun_transaction.h>
+#include <pjnath/turn_session.h>
 #include <pjnath/types.h>
 

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));

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

@@ +1 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2003-2007 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
 #include "turn.h"
 

pjproject/trunk/pjnath/src/pjturn-srv/turn.h

@@ -31 +31 @@
 
 
-#define PJ_TURN_INVALID_CHANNEL     0xFFFF
 #define PJ_TURN_INVALID_LIS_ID      ((unsigned)-1)
-#define PJ_TURN_NO_TIMEOUT          ((long)0x7FFFFFFF)
-#define PJ_TURN_MAX_PKT_LEN         3000
-#define PJ_TURN_PERM_TIMEOUT        300
-#define PJ_TURN_CHANNEL_TIMEOUT     600
-
-/** Transport types */
-enum {
-    PJ_TURN_TP_UDP = 16,            /**< UDP.   */
-    PJ_TURN_TP_TCP = 6      /**< TCP.   */
-};
 
 /**