Changeset 913

Timestamp:

Jan 29, 2007 4:25:23 AM (17 years ago)

Author:

bennylp

Message:

Initial addition of the new STUN framework files

Location:

pjproject/branches/iceproject

Files:

• pjlib-util/build/pjlib_util.dsp (modified) (2 diffs)
• pjlib-util/include/pjlib-util.h (modified) (1 diff)
• pjlib-util/include/pjlib-util/errno.h (modified) (1 diff)
• pjlib-util/include/pjlib-util/stun_endpoint.h (added)
• pjlib-util/include/pjlib-util/stun_msg.h (added)
• pjlib-util/include/pjlib-util/stun_simple.h (moved) (moved from pjproject/branches/iceproject/pjlib-util/include/pjlib-util/stun.h)
• pjlib-util/include/pjlib-util/stun_transaction.h (added)
• pjlib-util/src/pjlib-util/stun_endpoint.c (added)
• pjlib-util/src/pjlib-util/stun_msg.c (added)
• pjlib-util/src/pjlib-util/stun_simple.c (moved) (moved from pjproject/branches/iceproject/pjlib-util/src/pjlib-util/stun.c) (1 diff)
• pjlib-util/src/pjlib-util/stun_simple_client.c (moved) (moved from pjproject/branches/iceproject/pjlib-util/src/pjlib-util/stun_client.c) (1 diff)
• pjlib-util/src/pjlib-util/stun_transaction.c (added)
• pjlib/include/pj/pool.h (modified) (3 diffs)

pjproject/branches/iceproject/pjlib-util/build/pjlib_util.dsp

@@ -130 +130 @@
 # Begin Source File
 
-SOURCE="..\src\pjlib-util\stun.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\pjlib-util\stun_client.c"
+SOURCE="..\src\pjlib-util\stun_endpoint.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_msg.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_simple.c"
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_simple_client.c"
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_transaction.c"
 # End Source File
 # Begin Source File
@@ -194 +208 @@
 # Begin Source File
 
-SOURCE="..\include\pjlib-util\stun.h"
+SOURCE="..\include\pjlib-util\stun_endpoint.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_msg.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_simple.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_transaction.h"
 # End Source File
 # Begin Source File

pjproject/branches/iceproject/pjlib-util/include/pjlib-util.h

@@ -31 +31 @@
 #include <pjlib-util/resolver.h>
 #include <pjlib-util/scanner.h>
-#include <pjlib-util/stun.h>
+//#include <pjlib-util/stun.h>
 #include <pjlib-util/xml.h>
 

pjproject/branches/iceproject/pjlib-util/include/pjlib-util/errno.h

@@ -94 +94 @@
  */
 #define PJLIB_UTIL_ESTUNSYMMETRIC   (PJLIB_UTIL_ERRNO_START+11) /* 320011 */
-
+/**
+ * @hideinitializer
+ * Invalid STUN attribute
+ */
+#define PJLIB_UTIL_ESTUNINATTR      (PJLIB_UTIL_ERRNO_START+12) /* 320012 */
+/**
+ * @hideinitializer
+ * Too many STUN attributes.
+ */
+#define PJLIB_UTIL_ESTUNTOOMANYATTR (PJLIB_UTIL_ERRNO_START+13) /* 320013 */
+/**
+ * @hideinitializer
+ * Unknown STUN attribute.
+ */
+#define PJLIB_UTIL_ESTUNUNKNOWNATTR (PJLIB_UTIL_ERRNO_START+14) /* 320014 */
+/**
+ * @hideinitializer
+ * Expecting STUN response message.
+ */
+#define PJLIB_UTIL_ESTUNNOTRESPONSE (PJLIB_UTIL_ERRNO_START+15) /* 320015 */
+/**
+ * @hideinitializer
+ * Transaction ID mismatch.
+ */
+#define PJLIB_UTIL_ESTUNINVALIDID   (PJLIB_UTIL_ERRNO_START+16) /* 320016 */
+
+
+#define PJ_STATUS_FROM_STUN_CODE(code)  -1
 
 

pjproject/branches/iceproject/pjlib-util/src/pjlib-util/stun_simple.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun.h>
+#include <pjlib-util/stun_simple.h>
 #include <pjlib-util/errno.h>
 #include <pj/pool.h>

pjproject/branches/iceproject/pjlib-util/src/pjlib-util/stun_simple_client.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun.h>
+#include <pjlib-util/stun_simple.h>
 #include <pjlib-util/errno.h>
 #include <pj/os.h>

pjproject/branches/iceproject/pjlib/include/pj/pool.h

@@ -442 +442 @@
  *
  * @return pointer to the allocated memory.
+ *
+ * @see PJ_POOL_ALLOC_TYPE
  */
 PJ_IDECL(void*) pj_pool_alloc( pj_pool_t *pool, pj_size_t size);
@@ -461 +463 @@
 
 /**
- * @def pj_pool_zalloc(pj_pool_t *pool, pj_size_t size)
  * Allocate storage from the pool and initialize it to zero.
  *
@@ -468 +469 @@
  *
  * @return          Pointer to the allocated memory.
- */
-#define pj_pool_zalloc(pool, size)  pj_pool_calloc(pool, 1, size)
+ *
+ * @see PJ_POOL_ZALLOC_TYPE
+ */
+PJ_INLINE(void*) pj_pool_zalloc(pj_pool_t *pool, pj_size_t size)
+{
+    return pj_pool_calloc(pool, 1, size);
+}
+
+
+/**
+ * This macro allocates memory from the pool and returns the instance of
+ * the specified type. It provides a stricker type safety than pj_pool_alloc()
+ * since the return value of this macro will be type-casted to the specified
+ * type.
+ *
+ * @param pool      The pool
+ * @param type      The type of object to be allocated
+ *
+ * @return          Memory buffer of the specified type.
+ */
+#define PJ_POOL_ALLOC_TYPE(pool,type) \
+            ((type*)pj_pool_alloc(pool, sizeof(type)))
+
+/**
+ * This macro allocates memory from the pool, zeroes the buffer, and 
+ * returns the instance of the specified type. It provides a stricker type 
+ * safety than pj_pool_zalloc() since the return value of this macro will be 
+ * type-casted to the specified type.
+ *
+ * @param pool      The pool
+ * @param type      The type of object to be allocated
+ *
+ * @return          Memory buffer of the specified type.
+ */
+#define PJ_POOL_ZALLOC_TYPE(pool,type) \
+            ((type*)pj_pool_zalloc(pool, sizeof(type)))
+