Changeset 1080

Timestamp:

Mar 18, 2007 5:39:27 PM (17 years ago)

Author:

bennylp

Message:

Changed pj_sockaddr structure and added pjnath project for ICE/STUN stuffs

Location:

pjproject/trunk

Files:

• pjlib/include/pj/errno.h (modified) (1 diff)
• pjlib/include/pj/sock.h (modified) (2 diffs)
• pjmedia/build/wince-evc4/pjmedia_wince.vcp (modified) (1 diff)
• pjnath/build/pjnath.dsp (added)
• pjnath/build/pjnath.dsw (modified) (4 diffs)
• pjnath/include/pjnath.h (added)
• pjnath/include/pjnath/config.h (added)
• pjnath/include/pjnath/errno.h (added)
• pjnath/include/pjnath/ice.h (added)
• pjnath/include/pjnath/stun_auth.h (modified) (4 diffs)
• pjnath/include/pjnath/stun_doc.h (modified) (5 diffs)
• pjnath/include/pjnath/stun_endpoint.h (modified) (6 diffs)
• pjnath/include/pjnath/stun_msg.h (modified) (5 diffs)
• pjnath/include/pjnath/stun_session.h (modified) (5 diffs)
• pjnath/include/pjnath/stun_transaction.h (modified) (6 diffs)
• pjnath/include/pjnath/turn_client.h (modified) (4 diffs)
• pjnath/include/pjnath/types.h (added)
• pjnath/src/pjnath/errno.c (added)
• pjnath/src/pjnath/ice.c (added)
• pjnath/src/pjnath/stun_auth.c (modified) (10 diffs)
• pjnath/src/pjnath/stun_endpoint.c (modified) (4 diffs)
• pjnath/src/pjnath/stun_msg.c (modified) (27 diffs)
• pjnath/src/pjnath/stun_msg_dump.c (modified) (2 diffs)
• pjnath/src/pjnath/stun_session.c (modified) (11 diffs)
• pjnath/src/pjnath/stun_transaction.c (modified) (12 diffs)
• pjnath/src/pjstun-client/client_main.c (modified) (1 diff)
• pjnath/src/pjstun-srv-test/bind_usage.c (modified) (1 diff)
• pjnath/src/pjstun-srv-test/server.c (modified) (2 diffs)
• pjnath/src/pjstun-srv-test/server.h (modified) (2 diffs)
• pjnath/src/pjstun-srv-test/turn_usage.c (modified) (5 diffs)
• pjsip/src/pjsip/sip_transport.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/errno.h

@@ -342 +342 @@
  *  - PJSIP_SIMPLE_ERRNO_START  (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*2)
  *  - PJLIB_UTIL_ERRNO_START    (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*3)
+ *  - PJNATH_ERRNO_START        (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*4)
  */
 

pjproject/trunk/pjlib/include/pj/sock.h

@@ -175 +175 @@
  */
 #define PJ_INVALID_SOCKET   (-1)
-
-/**
- * Structure describing a generic socket address.
- * If PJ_SOCKADDR_HAS_LEN is not zero, then sa_zero_len member is added
- * to this struct. As far the application is concerned, the value of
- * this member will always be zero. Internally, PJLIB may modify the value
- * before calling OS socket API, and reset the value back to zero before
- * returning the struct to application.
- */
-typedef struct pj_sockaddr
-{
-#if defined(PJ_SOCKADDR_HAS_LEN) && PJ_SOCKADDR_HAS_LEN!=0
-    pj_uint8_t  sa_zero_len;
-    pj_uint8_t  sa_family;
-#else
-    pj_uint16_t sa_family;      /**< Common data: address family.   */
-#endif
-    char        sa_data[14];    /**< Address data.                  */
-} pj_sockaddr;
-
 
 #undef s_addr
@@ -277 +257 @@
 
 
+/**
+ * This structure describes common attributes found in transport addresses.
+ * If PJ_SOCKADDR_HAS_LEN is not zero, then sa_zero_len member is added
+ * to this struct. As far the application is concerned, the value of
+ * this member will always be zero. Internally, PJLIB may modify the value
+ * before calling OS socket API, and reset the value back to zero before
+ * returning the struct to application.
+ */
+typedef struct pj_addr_hdr
+{
+#if defined(PJ_SOCKADDR_HAS_LEN) && PJ_SOCKADDR_HAS_LEN!=0
+    pj_uint8_t  sa_zero_len;
+    pj_uint8_t  sa_family;
+#else
+    pj_uint16_t sa_family;      /**< Common data: address family.   */
+#endif
+} pj_addr_hdr;
+
+
+/**
+ * This union describes a generic socket address.
+ */
+typedef union pj_sockaddr
+{
+    pj_addr_hdr     addr;       /**< Generic transport address.     */
+    pj_sockaddr_in  ipv4;       /**< IPv4 transport address.        */
+    pj_sockaddr_in6 ipv6;       /**< IPv6 transport address.        */
+} pj_sockaddr;
+
+
 /*****************************************************************************
  *

pjproject/trunk/pjmedia/build/wince-evc4/pjmedia_wince.vcp

@@ -77 +77 @@
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output/pjmedia_emulatorDbg"
-# PROP Intermediate_Dir "output/pjmedia_emulatorDbg"
+# PROP Output_Dir "./output/pjmedia_emulatorDbg"
+# PROP Intermediate_Dir "./output/pjmedia_emulatorDbg"
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"

pjproject/trunk/pjnath/build/pjnath.dsw

@@ -16 +16 @@
 ###############################################################################
 
-Project: "pjlib_test"=..\..\pjlib\build\pjlib_test.dsp - Package Owner=<4>
+Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -28 +28 @@
 ###############################################################################
 
-Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4>
+Project: "pjnath"=.\pjnath.dsp - Package Owner=<4>
 
 Package=<5>
@@ -54 +54 @@
     Project_Dep_Name pjlib_util
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjnath
+    End Project Dependency
 }}}
 
@@ -72 +75 @@
     Project_Dep_Name pjlib_util
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjnath
+    End Project Dependency
 }}}
 

pjproject/trunk/pjnath/include/pjnath/stun_auth.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJLIB_UTIL_STUN_AUTH_H__
-#define __PJLIB_UTIL_STUN_AUTH_H__
+#ifndef __PJNATH_STUN_AUTH_H__
+#define __PJNATH_STUN_AUTH_H__
 
 /**
@@ -25 +25 @@
  */
 
-#include <pjlib-util/stun_msg.h>
+#include <pjnath/stun_msg.h>
 
 
@@ -33 +33 @@
 /* **************************************************************************/
 /**
- * @defgroup PJLIB_UTIL_STUN_AUTH STUN Authentication
- * @ingroup PJLIB_UTIL_STUN
+ * @defgroup PJNATH_STUN_AUTH STUN Authentication
+ * @ingroup PJNATH_STUN
  * @{
  */
@@ -272 +272 @@
 
 
-#endif  /* __PJLIB_UTIL_STUN_AUTH_H__ */
-
+#endif  /* __PJNATH_STUN_AUTH_H__ */
+

pjproject/trunk/pjnath/include/pjnath/stun_doc.h

@@ -25 +25 @@
 
 /**
- * @defgroup PJLIB_UTIL_STUN STUN and TURN
- * @ingroup PJLIB_UTIL
+ * @defgroup PJNATH_STUN STUN and TURN
+ * @ingroup PJNATH
 
  This is the implementation of STUN/TURN in PJLIB-UTIL library.
@@ -55 +55 @@
  @subsection stun_msg_sec Messaging and Parsing
 
- The lowest layer of the STUN implementation is the @ref PJLIB_UTIL_STUN_MSG
+ The lowest layer of the STUN implementation is the @ref PJNATH_STUN_MSG
  component. This part is responsible for encoding and decoding STUN messages.
 
@@ -66 +66 @@
  @subsection stun_endpt_sec Endpoint
 
- The @ref PJLIB_UTIL_STUN_ENDPOINT is used by the library to put together
+ The @ref PJNATH_STUN_ENDPOINT is used by the library to put together
  common settings for all STUN objects. For example, the STUN endpoint has a
  reference of timer heap to poll all STUN timers, reference to ioqueue to
@@ -75 +75 @@
  @subsection stun_clt_tsx_sec Client Transaction
 
- The @ref PJLIB_UTIL_STUN_TRANSACTION is used to manage outgoing STUN request,
+ The @ref PJNATH_STUN_TRANSACTION is used to manage outgoing STUN request,
  for example to retransmit the request and to notify application about the
  completion of the request.
 
- The @ref PJLIB_UTIL_STUN_TRANSACTION does not use any networking operations,
+ The @ref PJNATH_STUN_TRANSACTION does not use any networking operations,
  but instead application must supply the transaction with a callback to
  be used by the transaction to send outgoing requests. This way the STUN
@@ -89 +89 @@
  @subsection stun_srv_sec Server Components
 
- The @ref PJLIB_UTIL_STUN_SERVER is used for:
+ The @ref PJNATH_STUN_SERVER is used for:
  - implementing STUN servers, and/or
  - implementing server side STUN handling (for example for ICE).

pjproject/trunk/pjnath/include/pjnath/stun_endpoint.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJLIB_UTIL_STUN_ENDPOINT_H__
-#define __PJLIB_UTIL_STUN_ENDPOINT_H__
+#ifndef __PJNATH_STUN_CONFIG_H__
+#define __PJNATH_STUN_CONFIG_H__
 
 /**
- * @file stun_endpoint.h
+ * @file stun_config.h
  * @brief STUN endpoint.
  */
 
-#include <pjlib-util/stun_msg.h>
+#include <pjnath/stun_msg.h>
 
 
@@ -33 +33 @@
 /* **************************************************************************/
 /**
- * @defgroup PJLIB_UTIL_STUN_ENDPOINT STUN Endpoint
+ * @defgroup PJNATH_STUN_ENDPOINT STUN Endpoint
  * @brief Management of incoming and outgoing STUN transactions.
- * @ingroup PJLIB_UTIL_STUN
+ * @ingroup PJNATH_STUN
  * @{
  */
@@ -44 +44 @@
  * can send or receive STUN messages.
  */
-typedef struct pj_stun_endpoint
+typedef struct pj_stun_config
 {
     /**
@@ -87 +87 @@
     unsigned             res_cache_msec;
 
-} pj_stun_endpoint;
+} pj_stun_config;
 
 
@@ -94 +94 @@
  * Create a STUN endpoint instance.
  */
-PJ_DECL(pj_status_t) pj_stun_endpoint_create(pj_pool_factory *factory,
-                                             unsigned options,
-                                             pj_ioqueue_t *ioqueue,
-                                             pj_timer_heap_t *timer_heap,
-                                             pj_stun_endpoint **p_endpt);
+PJ_DECL(pj_status_t) pj_stun_config_create(pj_pool_factory *factory,
+                                           unsigned options,
+                                           pj_ioqueue_t *ioqueue,
+                                           pj_timer_heap_t *timer_heap,
+                                           pj_stun_config **p_endpt);
 
 /**
  * Destroy STUN endpoint instance.
  */
-PJ_DECL(pj_status_t) pj_stun_endpoint_destroy(pj_stun_endpoint *endpt);
+PJ_DECL(pj_status_t) pj_stun_config_destroy(pj_stun_config *endpt);
 
 
@@ -114 +114 @@
 
 
-#endif  /* __PJLIB_UTIL_STUN_ENDPOINT_H__ */
+#endif  /* __PJNATH_STUN_CONFIG_H__ */
 

pjproject/trunk/pjnath/include/pjnath/stun_msg.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJLIB_UTIL_STUN_MSG_H__
-#define __PJLIB_UTIL_STUN_MSG_H__
+#ifndef __PJNATH_STUN_MSG_H__
+#define __PJNATH_STUN_MSG_H__
 
 /**
@@ -25 +25 @@
  */
 
-#include <pjlib-util/types.h>
+#include <pjnath/types.h>
 #include <pj/sock.h>
 
@@ -34 +34 @@
 /* **************************************************************************/
 /**
- * @defgroup PJLIB_UTIL_STUN_MSG STUN Message Representation and Parsing
+ * @defgroup PJNATH_STUN_MSG STUN Message Representation and Parsing
  * @brief Low-level representation and parsing of STUN messages.
- * @ingroup PJLIB_UTIL_STUN
+ * @ingroup PJNATH_STUN
  * @{
  */
@@ -530 +530 @@
 
     /**
-     * The socket address (as a union)
-     */
-    union {
-        pj_sockaddr         addr;   /**< Generic socket address.    */
-        pj_sockaddr_in      ipv4;   /**< IPv4 socket address.       */
-        pj_sockaddr_in6     ipv6;   /**< IPv6 socket address.       */
-    } addr;
+     * The socket address
+     */
+    pj_sockaddr         sockaddr;
 
 } pj_stun_sockaddr_attr;
@@ -1536 +1532 @@
 
 
-#endif  /* __PJLIB_UTIL_STUN_MSG_H__ */
-
+#endif  /* __PJNATH_STUN_MSG_H__ */
+

pjproject/trunk/pjnath/include/pjnath/stun_session.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJLIB_UTIL_STUN_SESSION_H__
-#define __PJLIB_UTIL_STUN_SESSION_H__
-
-#include <pjlib-util/stun_msg.h>
-#include <pjlib-util/stun_auth.h>
-#include <pjlib-util/stun_endpoint.h>
-#include <pjlib-util/stun_transaction.h>
+#ifndef __PJNATH_STUN_SESSION_H__
+#define __PJNATH_STUN_SESSION_H__
+
+#include <pjnath/stun_msg.h>
+#include <pjnath/stun_auth.h>
+#include <pjnath/stun_endpoint.h>
+#include <pjnath/stun_transaction.h>
 #include <pj/list.h>
 #include <pj/timer.h>
@@ -32 +32 @@
 /* **************************************************************************/
 /**
- * @defgroup PJLIB_UTIL_STUN_SESSION STUN Client/Server Session
+ * @defgroup PJNATH_STUN_SESSION STUN Client/Server Session
  * @brief STUN client and server session
- * @ingroup PJLIB_UTIL_STUN
+ * @ingroup PJNATH_STUN
  * @{
  */
@@ -157 +157 @@
  * Create a STUN session.
  *
- * @param endpt         The STUN endpoint, to be used to register timers etc.
+ * @param cfg           The STUN endpoint, to be used to register timers etc.
  * @param name          Optional name to be associated with this instance. The
  *                      name will be used for example for logging purpose.
@@ -166 +166 @@
  * @return          PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pj_stun_session_create(pj_stun_endpoint *endpt,
+PJ_DECL(pj_status_t) pj_stun_session_create(pj_stun_config *cfg,
                                             const char *name,
                                             const pj_stun_session_cb *cb,
@@ -369 +369 @@
 PJ_END_DECL
 
-#endif  /* __PJLIB_UTIL_STUN_SESSION_H__ */
-
+#endif  /* __PJNATH_STUN_SESSION_H__ */
+

pjproject/trunk/pjnath/include/pjnath/stun_transaction.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJLIB_UTIL_STUN_TRANSACTION_H__
-#define __PJLIB_UTIL_STUN_TRANSACTION_H__
+#ifndef __PJNATH_STUN_TRANSACTION_H__
+#define __PJNATH_STUN_TRANSACTION_H__
 
 /**
@@ -25 +25 @@
  */
 
-#include <pjlib-util/stun_msg.h>
-#include <pjlib-util/stun_endpoint.h>
+#include <pjnath/stun_msg.h>
+#include <pjnath/stun_endpoint.h>
 
 
@@ -34 +34 @@
 /* **************************************************************************/
 /**
- * @defgroup PJLIB_UTIL_STUN_TRANSACTION STUN Client Transaction
+ * @defgroup PJNATH_STUN_TRANSACTION STUN Client Transaction
  * @brief STUN client transaction
- * @ingroup PJLIB_UTIL_STUN
+ * @ingroup PJNATH_STUN
  * @{
  *
- The @ref PJLIB_UTIL_STUN_TRANSACTION is used to manage outgoing STUN request,
+ The @ref PJNATH_STUN_TRANSACTION is used to manage outgoing STUN request,
  for example to retransmit the request and to notify application about the
  completion of the request.
 
- The @ref PJLIB_UTIL_STUN_TRANSACTION does not use any networking operations,
+ The @ref PJNATH_STUN_TRANSACTION does not use any networking operations,
  but instead application must supply the transaction with a callback to
  be used by the transaction to send outgoing requests. This way the STUN
@@ -101 +101 @@
  * the request, if necessary.
  *
- * @param endpt         The STUN endpoint, which will be used to retrieve
+ * @param cfg           The STUN endpoint, which will be used to retrieve
  *                      various settings for the transaction.
  * @param pool          Pool to be used to allocate memory from.
@@ -111 +111 @@
  * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pj_stun_client_tsx_create( pj_stun_endpoint *endpt,
+PJ_DECL(pj_status_t) pj_stun_client_tsx_create( pj_stun_config *cfg,
                                                 pj_pool_t *pool,
                                                 const pj_stun_tsx_cb *cb,
@@ -214 +214 @@
 
 
-#endif  /* __PJLIB_UTIL_STUN_TRANSACTION_H__ */
-
+#endif  /* __PJNATH_STUN_TRANSACTION_H__ */
+

pjproject/trunk/pjnath/include/pjnath/turn_client.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJLIB_UTIL_TURN_CLIENT_H__
-#define __PJLIB_UTIL_TURN_CLIENT_H__
+#ifndef __PJNATH_TURN_CLIENT_H__
+#define __PJNATH_TURN_CLIENT_H__
 
 /**
@@ -25 +25 @@
  */
 
-#include <pjlib-util/stun_msg.h>
+#include <pjnath/stun_msg.h>
 
 
@@ -32 +32 @@
 
 /**
- * @defgroup PJLIB_UTIL_TURN_CLIENT TURN Client Session
+ * @defgroup PJNATH_TURN_CLIENT TURN Client Session
  * @brief Management of STUN/TURN client session
- * @ingroup PJLIB_UTIL_STUN
+ * @ingroup PJNATH_STUN
  * @{
  */
@@ -129 +129 @@
 
 
-#endif  /* __PJLIB_UTIL_TURN_CLIENT_H__ */
+#endif  /* __PJNATH_TURN_CLIENT_H__ */
 

pjproject/trunk/pjnath/src/pjnath/stun_auth.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_auth.h>
-#include <pjlib-util/errno.h>
+#include <pjnath/stun_auth.h>
+#include <pjnath/errno.h>
 #include <pjlib-util/hmac_sha1.h>
 #include <pjlib-util/sha1.h>
@@ -160 +160 @@
                              &realm, &nonce, p_response);
         }
-        return PJLIB_UTIL_ESTUNMSGINT;
+        return PJNATH_ESTUNMSGINT;
     }
 
@@ -171 +171 @@
                              &realm, &nonce, p_response);
         }
-        return PJLIB_UTIL_ESTUNNOUSERNAME;
+        return PJNATH_ESTUNNOUSERNAME;
     }
 
@@ -202 +202 @@
                              &realm, &nonce, p_response);
         }
-        return PJLIB_UTIL_ESTUNUSERNAME;
+        return PJNATH_ESTUNUSERNAME;
     }
 
@@ -217 +217 @@
                              &realm, &nonce, p_response);
         }
-        return PJLIB_UTIL_ESTUNNOREALM;
+        return PJNATH_ESTUNNOREALM;
 
     } else if (realm.slen != 0 && arealm != NULL) {
@@ -228 +228 @@
                                  NULL, &realm, &nonce, p_response);
             }
-            return PJLIB_UTIL_ESTUNNONCE;
+            return PJNATH_ESTUNNONCE;
         }
 
@@ -238 +238 @@
                                  NULL, &realm, &nonce, p_response);
             }
-            return PJLIB_UTIL_ESTUNNOREALM;
+            return PJNATH_ESTUNNOREALM;
         }
 
@@ -261 +261 @@
                                  NULL, &realm, &nonce, p_response);
             }
-            return PJLIB_UTIL_ESTUNNONCE;
+            return PJNATH_ESTUNNONCE;
         }
     }
@@ -287 +287 @@
                                  NULL, &realm, &nonce, p_response);
             }
-            return PJLIB_UTIL_ESTUNNONCE;
+            return PJNATH_ESTUNNONCE;
         }
     }
@@ -332 +332 @@
                              NULL, &realm, &nonce, p_response);
         }
-        return PJLIB_UTIL_ESTUNMSGINT;
+        return PJNATH_ESTUNMSGINT;
     }
 

pjproject/trunk/pjnath/src/pjnath/stun_endpoint.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_endpoint.h>
-#include <pjlib-util/errno.h>
+#include <pjnath/stun_endpoint.h>
+#include <pjnath/errno.h>
 #include <pj/assert.h>
 #include <pj/pool.h>
@@ -26 +26 @@
  * Create a STUN endpoint instance.
  */
-PJ_DEF(pj_status_t) pj_stun_endpoint_create( pj_pool_factory *factory,
-                                             unsigned options,
-                                             pj_ioqueue_t *ioqueue,
-                                             pj_timer_heap_t *timer_heap,
-                                             pj_stun_endpoint **p_endpt)
+PJ_DEF(pj_status_t) pj_stun_config_create( pj_pool_factory *factory,
+                                           unsigned options,
+                                           pj_ioqueue_t *ioqueue,
+                                           pj_timer_heap_t *timer_heap,
+                                           pj_stun_config **p_endpt)
 {
     pj_pool_t *pool;
-    pj_stun_endpoint *endpt;
+    pj_stun_config *endpt;
 
     PJ_ASSERT_RETURN(factory && p_endpt, PJ_EINVAL);
@@ -41 +41 @@
         return PJ_ENOMEM;
     
-    endpt = PJ_POOL_ZALLOC_T(pool, pj_stun_endpoint);
+    endpt = PJ_POOL_ZALLOC_T(pool, pj_stun_config);
     endpt->pool = pool;
     endpt->pf = factory;
@@ -59 +59 @@
  * Destroy STUN endpoint instance.
  */
-PJ_DEF(pj_status_t) pj_stun_endpoint_destroy(pj_stun_endpoint *endpt)
+PJ_DEF(pj_status_t) pj_stun_config_destroy(pj_stun_config *endpt)
 {
     PJ_ASSERT_RETURN(endpt, PJ_EINVAL);

pjproject/trunk/pjnath/src/pjnath/stun_msg.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_msg.h>
+#include <pjnath/stun_msg.h>
+#include <pjnath/errno.h>
 #include <pjlib-util/crc32.h>
-#include <pjlib-util/errno.h>
 #include <pjlib-util/hmac_sha1.h>
 #include <pjlib-util/md5.h>
@@ -559 +559 @@
     INIT_ATTR(attr, attr_type, STUN_GENERIC_IP_ADDR_LEN);
 
-    pj_memcpy(&attr->addr, addr, addr_len);
+    pj_memcpy(&attr->sockaddr, addr, addr_len);
     attr->xor_ed = xor_ed;
 
@@ -607 +607 @@
     /* Check that the attribute length is valid */
     if (attr->hdr.length != STUN_GENERIC_IP_ADDR_LEN)
-        return PJLIB_UTIL_ESTUNINATTRLEN;
+        return PJNATH_ESTUNINATTRLEN;
 
     /* Check address family */
@@ -614 +614 @@
     /* Check address family is valid (only supports ipv4 for now) */
     if (val != 1)
-        return PJLIB_UTIL_ESTUNIPV6NOTSUPP;
+        return PJNATH_ESTUNIPV6NOTSUPP;
 
     /* Get port and address */
-    pj_sockaddr_in_init(&attr->addr.ipv4, NULL, 0);
-    pj_memcpy(&attr->addr.ipv4.sin_port, buf+ATTR_HDR_LEN+2, 2);
-    pj_memcpy(&attr->addr.ipv4.sin_addr, buf+ATTR_HDR_LEN+4, 4);
+    pj_sockaddr_in_init(&attr->sockaddr.ipv4, NULL, 0);
+    pj_memcpy(&attr->sockaddr.ipv4.sin_port, buf+ATTR_HDR_LEN+2, 2);
+    pj_memcpy(&attr->sockaddr.ipv4.sin_addr, buf+ATTR_HDR_LEN+4, 4);
 
     /* Done */
@@ -645 +645 @@
     /* Check that the attribute length is valid */
     if (attr->hdr.length != STUN_GENERIC_IP_ADDR_LEN)
-        return PJLIB_UTIL_ESTUNINATTRLEN;
+        return PJNATH_ESTUNINATTRLEN;
 
     /* Check address family */
@@ -652 +652 @@
     /* Check address family is valid (only supports ipv4 for now) */
     if (val != 1)
-        return PJLIB_UTIL_ESTUNIPV6NOTSUPP;
+        return PJNATH_ESTUNIPV6NOTSUPP;
 
     /* Get port and address */
-    pj_sockaddr_in_init(&attr->addr.ipv4, NULL, 0);
-    pj_memcpy(&attr->addr.ipv4.sin_port, buf+ATTR_HDR_LEN+2, 2);
-    pj_memcpy(&attr->addr.ipv4.sin_addr, buf+ATTR_HDR_LEN+4, 4);
-
-    attr->addr.ipv4.sin_port ^= 0x2112;
-    attr->addr.ipv4.sin_addr.s_addr ^= pj_htonl(0x2112A442);
+    pj_sockaddr_in_init(&attr->sockaddr.ipv4, NULL, 0);
+    pj_memcpy(&attr->sockaddr.ipv4.sin_port, buf+ATTR_HDR_LEN+2, 2);
+    pj_memcpy(&attr->sockaddr.ipv4.sin_addr, buf+ATTR_HDR_LEN+4, 4);
+
+    attr->sockaddr.ipv4.sin_port ^= pj_htons(0x2112);
+    attr->sockaddr.ipv4.sin_addr.s_addr ^= pj_htonl(0x2112A442);
 
     /* Done */
@@ -694 +694 @@
 
     /* Family (IPv4 only for now) */
-    PJ_ASSERT_RETURN(ca->addr.addr.sa_family == PJ_AF_INET, PJ_EINVAL);
+    PJ_ASSERT_RETURN(ca->sockaddr.addr.sa_family == PJ_AF_INET, PJ_EINVAL);
     *buf++ = 1;
 
@@ -701 +701 @@
         pj_uint16_t port;
 
-        addr = ca->addr.ipv4.sin_addr.s_addr;
-        port = ca->addr.ipv4.sin_port;
-
-        port ^= 0x2112;
+        addr = ca->sockaddr.ipv4.sin_addr.s_addr;
+        port = ca->sockaddr.ipv4.sin_port;
+
+        port ^= pj_htons(0x2112);
         addr ^= pj_htonl(0x2112A442);
 
@@ -717 +717 @@
     } else {
         /* Port */
-        pj_memcpy(buf, &ca->addr.ipv4.sin_port, 2);
+        pj_memcpy(buf, &ca->sockaddr.ipv4.sin_port, 2);
         buf += 2;
 
         /* Address */
-        pj_memcpy(buf, &ca->addr.ipv4.sin_addr, 4);
+        pj_memcpy(buf, &ca->sockaddr.ipv4.sin_addr, 4);
         buf += 4;
     }
@@ -893 +893 @@
     /* Check that the attribute length is valid */
     if (attr->hdr.length != ATTR_HDR_LEN)
-        return PJLIB_UTIL_ESTUNINATTRLEN;
+        return PJNATH_ESTUNINATTRLEN;
 
     /* Done */
@@ -993 +993 @@
     /* Check that the attribute length is valid */
     if (attr->hdr.length != STUN_UINT_LEN)
-        return PJLIB_UTIL_ESTUNINATTRLEN;
+        return PJNATH_ESTUNINATTRLEN;
 
     /* Done */
@@ -1089 +1089 @@
     /* Check that the attribute length is valid */
     if (attr->hdr.length != STUN_MSG_INTEGRITY_LEN)
-        return PJLIB_UTIL_ESTUNINATTRLEN;
+        return PJNATH_ESTUNINATTRLEN;
 
     /* Done */
@@ -1564 +1564 @@
 
     if (pdu_len < sizeof(pj_stun_msg_hdr))
-        return PJLIB_UTIL_ESTUNINMSGLEN;
+        return PJNATH_ESTUNINMSGLEN;
 
     /* First byte of STUN message is always 0x00 or 0x01. */
     if (*pdu != 0x00 && *pdu != 0x01)
-        return PJLIB_UTIL_ESTUNINMSGTYPE;
+        return PJNATH_ESTUNINMSGTYPE;
 
     /* Check the PDU length */
@@ -1575 +1575 @@
         ((options & PJ_STUN_IS_DATAGRAM) && msg_len + 20 != pdu_len))
     {
-        return PJLIB_UTIL_ESTUNINMSGLEN;
+        return PJNATH_ESTUNINMSGLEN;
     }
 
@@ -1590 +1590 @@
 
             if (attr_len != 4)
-                return PJLIB_UTIL_ESTUNINATTRLEN;
+                return PJNATH_ESTUNINATTRLEN;
 
             crc = pj_crc32_calc(pdu, msg_len + 20);
@@ -1596 +1596 @@
 
             if (crc != fingerprint)
-                return PJLIB_UTIL_ESTUNFINGERPRINT;
+                return PJNATH_ESTUNFINGERPRINT;
         }
     }
@@ -1619 +1619 @@
 
     PJ_ASSERT_RETURN(PJ_STUN_IS_REQUEST(msg_type), 
-                     PJLIB_UTIL_ESTUNINMSGTYPE);
+                     PJNATH_ESTUNINMSGTYPE);
 
     /* Create response or error response */
@@ -1729 +1729 @@
                                             &err_msg, p_response);
             }
-            return PJLIB_UTIL_ESTUNINATTRLEN;
+            return PJNATH_ESTUNINATTRLEN;
         }
 
@@ -1758 +1758 @@
                 }
 
-                return PJLIB_UTIL_ESTUNUNKNOWNATTR;
+                return PJNATH_ESTUNUNKNOWNATTR;
             }
 
@@ -1806 +1806 @@
                                                     NULL, p_response);
                     }
-                    return PJLIB_UTIL_ESTUNDUPATTR;
+                    return PJNATH_ESTUNDUPATTR;
                 }
                 has_msg_int = PJ_TRUE;
@@ -1820 +1820 @@
                                                     NULL, p_response);
                     }
-                    return PJLIB_UTIL_ESTUNDUPATTR;
+                    return PJNATH_ESTUNDUPATTR;
                 }
                 has_fingerprint = PJ_TRUE;
@@ -1834 +1834 @@
                                                     NULL, p_response);
                     }
-                    return has_fingerprint ? PJLIB_UTIL_ESTUNFINGERPOS :
-                                             PJLIB_UTIL_ESTUNMSGINTPOS;
+                    return has_fingerprint ? PJNATH_ESTUNFINGERPOS :
+                                             PJNATH_ESTUNMSGINTPOS;
                 }
             }
@@ -1849 +1849 @@
                                                 &e, p_response);
                 }
-                return PJLIB_UTIL_ESTUNTOOMANYATTR;
+                return PJNATH_ESTUNTOOMANYATTR;
             }
 
@@ -2028 +2028 @@
 
         /* There mustn't any attribute after FINGERPRINT */
-        PJ_ASSERT_RETURN(afingerprint == NULL, PJLIB_UTIL_ESTUNFINGERPOS);
+        PJ_ASSERT_RETURN(afingerprint == NULL, PJNATH_ESTUNFINGERPOS);
 
         if (attr_hdr->type == PJ_STUN_ATTR_MESSAGE_INTEGRITY) {
             /* There mustn't be MESSAGE-INTEGRITY before */
             PJ_ASSERT_RETURN(amsgint == NULL, 
-                             PJLIB_UTIL_ESTUNMSGINTPOS);
+                             PJNATH_ESTUNMSGINTPOS);
             amsgint = (pj_stun_msgint_attr*) attr_hdr;
 
@@ -2071 +2071 @@
             /* Should not happen for message generated by us */
             pj_assert(PJ_FALSE);
-            return PJLIB_UTIL_ESTUNMSGINTPOS;
+            return PJNATH_ESTUNMSGINTPOS;
 
         } else if (i == msg->attr_count-2)  {
@@ -2077 +2077 @@
                 /* Should not happen for message generated by us */
                 pj_assert(PJ_FALSE);
-                return PJLIB_UTIL_ESTUNMSGINTPOS;
+                return PJNATH_ESTUNMSGINTPOS;
             } else {
                 afingerprint = (pj_stun_fingerprint_attr*) msg->attr[i+1];
@@ -2087 +2087 @@
             /* Should not happen for message generated by us */
             pj_assert(PJ_FALSE);
-            return PJLIB_UTIL_ESTUNNOUSERNAME;
+            return PJNATH_ESTUNNOUSERNAME;
         }
 

pjproject/trunk/pjnath/src/pjnath/stun_msg_dump.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_msg.h>
-#include <pjlib-util/errno.h>
+#include <pjnath/stun_msg.h>
+#include <pjnath/errno.h>
 #include <pj/assert.h>
 #include <pj/string.h>
@@ -81 +81 @@
             attr = (const pj_stun_sockaddr_attr*)ahdr;
 
-            if (attr->addr.addr.sa_family == PJ_AF_INET) {
+            if (attr->sockaddr.addr.sa_family == PJ_AF_INET) {
                 len = pj_ansi_snprintf(p, end-p,
                                        ", IPv4 addr=%s:%d\n",
-                                       pj_inet_ntoa(attr->addr.ipv4.sin_addr),
-                                       pj_ntohs(attr->addr.ipv4.sin_port));
-
-            } else if (attr->addr.addr.sa_family == PJ_AF_INET6) {
+                                       pj_inet_ntoa(attr->sockaddr.ipv4.sin_addr),
+                                       pj_ntohs(attr->sockaddr.ipv4.sin_port));
+
+            } else if (attr->sockaddr.addr.sa_family == PJ_AF_INET6) {
                 len = pj_ansi_snprintf(p, end-p,
                                        ", IPv6 addr present\n");

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_session.h>
+#include <pjnath/stun_session.h>
 #include <pjlib.h>
 
 struct pj_stun_session
 {
-    pj_stun_endpoint    *endpt;
+    pj_stun_config      *cfg;
     pj_pool_t           *pool;
     pj_mutex_t          *mutex;
@@ -120 +120 @@
 
     /* Create pool and initialize basic tdata attributes */
-    pool = pj_pool_create(sess->endpt->pf, "tdata%p", 
+    pool = pj_pool_create(sess->cfg->pf, "tdata%p", 
                           TDATA_POOL_SIZE, TDATA_POOL_INC, NULL);
     PJ_ASSERT_RETURN(pool, PJ_ENOMEM);
@@ -171 +171 @@
     }
     if (tdata->res_timer.id != PJ_FALSE) {
-        pj_timer_heap_cancel(tdata->sess->endpt->timer_heap, 
+        pj_timer_heap_cancel(tdata->sess->cfg->timer_heap, 
                              &tdata->res_timer);
         tdata->res_timer.id = PJ_FALSE;
@@ -224 +224 @@
 
     /* The server SHOULD include a SERVER attribute in all responses */
-    if (PJ_STUN_IS_RESPONSE(msg->hdr.type) ||
-        PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type)) 
+    if (sess->srv_name.slen && (PJ_STUN_IS_RESPONSE(msg->hdr.type) ||
+                                PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type))) 
     {
         pj_stun_msg_add_string_attr(pool, msg, PJ_STUN_ATTR_SERVER,
@@ -301 +301 @@
 /* **************************************************************************/
 
-PJ_DEF(pj_status_t) pj_stun_session_create( pj_stun_endpoint *endpt,
+PJ_DEF(pj_status_t) pj_stun_session_create( pj_stun_config *cfg,
                                             const char *name,
                                             const pj_stun_session_cb *cb,
@@ -311 +311 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(endpt && cb && p_sess, PJ_EINVAL);
+    PJ_ASSERT_RETURN(cfg && cb && p_sess, PJ_EINVAL);
 
     if (name==NULL)
         name = "sess%p";
 
-    pool = pj_pool_create(endpt->pf, name, 4000, 4000, NULL);
+    pool = pj_pool_create(cfg->pf, name, 4000, 4000, NULL);
     PJ_ASSERT_RETURN(pool, PJ_ENOMEM);
 
     sess = PJ_POOL_ZALLOC_T(pool, pj_stun_session);
-    sess->endpt = endpt;
+    sess->cfg = cfg;
     sess->pool = pool;
     pj_memcpy(&sess->cb, cb, sizeof(*cb));
@@ -384 +384 @@
                                                     const pj_str_t *srv_name)
 {
-    PJ_ASSERT_RETURN(sess && srv_name, PJ_EINVAL);
-    pj_strdup(sess->pool, &sess->srv_name, srv_name);
+    PJ_ASSERT_RETURN(sess, PJ_EINVAL);
+    if (srv_name)
+        pj_strdup(sess->pool, &sess->srv_name, srv_name);
+    else
+        sess->srv_name.slen = 0;
     return PJ_SUCCESS;
 }
@@ -490 +493 @@
     char buf[512];
     
-    if (dst->sa_family == PJ_AF_INET) {
-        const pj_sockaddr_in *dst4 = (const pj_sockaddr_in*)dst;
-        dst_name = pj_inet_ntoa(dst4->sin_addr);
-        dst_port = pj_ntohs(dst4->sin_port);
-    } else if (dst->sa_family == PJ_AF_INET6) {
-        const pj_sockaddr_in6 *dst6 = (const pj_sockaddr_in6*)dst;
+    if (dst->addr.sa_family == PJ_AF_INET) {
+        dst_name = pj_inet_ntoa(dst->ipv4.sin_addr);
+        dst_port = pj_ntohs(dst->ipv4.sin_port);
+    } else if (dst->addr.sa_family == PJ_AF_INET6) {
         dst_name = "IPv6";
-        dst_port = pj_ntohs(dst6->sin6_port);
+        dst_port = pj_ntohs(dst->ipv6.sin6_port);
     } else {
         LOG_ERR_(sess, "Invalid address family", PJ_EINVAL);
@@ -559 +560 @@
 
         /* Create STUN client transaction */
-        status = pj_stun_client_tsx_create(sess->endpt, tdata->pool, 
+        status = pj_stun_client_tsx_create(sess->cfg, tdata->pool, 
                                            &tsx_cb, &tdata->client_tsx);
         PJ_ASSERT_RETURN(status==PJ_SUCCESS, status);
@@ -593 +594 @@
                                 &on_cache_timeout);
 
-            timeout.sec = sess->endpt->res_cache_msec / 1000;
-            timeout.msec = sess->endpt->res_cache_msec % 1000;
-
-            status = pj_timer_heap_schedule(sess->endpt->timer_heap, 
+            timeout.sec = sess->cfg->res_cache_msec / 1000;
+            timeout.msec = sess->cfg->res_cache_msec % 1000;
+
+            status = pj_timer_heap_schedule(sess->cfg->timer_heap, 
                                             &tdata->res_timer,
                                             &timeout);
@@ -830 +831 @@
     PJ_ASSERT_RETURN(sess && packet && pkt_size, PJ_EINVAL);
 
-    tmp_pool = pj_pool_create(sess->endpt->pf, "tmpstun", 1024, 1024, NULL);
+    tmp_pool = pj_pool_create(sess->cfg->pf, "tmpstun", 1024, 1024, NULL);
     if (!tmp_pool)
         return PJ_ENOMEM;

pjproject/trunk/pjnath/src/pjnath/stun_transaction.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_transaction.h>
-#include <pjlib-util/errno.h>
+#include <pjnath/stun_transaction.h>
+#include <pjnath/errno.h>
 #include <pj/assert.h>
 #include <pj/log.h>
@@ -32 +32 @@
 {
     char                 obj_name[PJ_MAX_OBJ_NAME];
-    pj_stun_endpoint    *endpt;
+    pj_stun_config      *cfg;
     pj_stun_tsx_cb       cb;
     void                *user_data;
@@ -64 +64 @@
  * Create a STUN client transaction.
  */
-PJ_DEF(pj_status_t) pj_stun_client_tsx_create(pj_stun_endpoint *endpt,
+PJ_DEF(pj_status_t) pj_stun_client_tsx_create(pj_stun_config *cfg,
                                               pj_pool_t *pool,
                                               const pj_stun_tsx_cb *cb,
@@ -71 +71 @@
     pj_stun_client_tsx *tsx;
 
-    PJ_ASSERT_RETURN(endpt && cb && p_tsx, PJ_EINVAL);
+    PJ_ASSERT_RETURN(cfg && cb && p_tsx, PJ_EINVAL);
     PJ_ASSERT_RETURN(cb->on_send_msg, PJ_EINVAL);
 
     tsx = PJ_POOL_ZALLOC_T(pool, pj_stun_client_tsx);
-    tsx->endpt = endpt;
+    tsx->cfg = cfg;
     pj_memcpy(&tsx->cb, cb, sizeof(*cb));
 
@@ -98 +98 @@
 
     if (tsx->timer.id != 0) {
-        pj_timer_heap_cancel(tsx->endpt->timer_heap, &tsx->timer);
+        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
         tsx->timer.id = 0;
     }
@@ -150 +150 @@
         if (tsx->transmit_count == 0) {
             tsx->retransmit_time.sec = 0;
-            tsx->retransmit_time.msec = tsx->endpt->rto_msec;
+            tsx->retransmit_time.msec = tsx->cfg->rto_msec;
 
         } else if (tsx->transmit_count < PJ_STUN_MAX_RETRANSMIT_COUNT-1) {
@@ -169 +169 @@
          * cancel transmission).
          */;
-        status = pj_timer_heap_schedule(tsx->endpt->timer_heap, &tsx->timer,
+        status = pj_timer_heap_schedule(tsx->cfg->timer_heap, &tsx->timer,
                                         &tsx->retransmit_time);
         if (status != PJ_SUCCESS) {
@@ -183 +183 @@
     if (status != PJ_SUCCESS) {
         if (tsx->timer.id != 0) {
-            pj_timer_heap_cancel(tsx->endpt->timer_heap, &tsx->timer);
+            pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
             tsx->timer.id = 0;
         }
@@ -236 +236 @@
         tsx->complete = PJ_TRUE;
         if (tsx->cb.on_complete) {
-            tsx->cb.on_complete(tsx, PJLIB_UTIL_ESTUNNOTRESPOND, NULL);
+            tsx->cb.on_complete(tsx, PJNATH_ESTUNNOTRESPOND, NULL);
         }
         return;
@@ -269 +269 @@
         PJ_LOG(4,(tsx->obj_name, 
                   "STUN rx_msg() error: not response message"));
-        return PJLIB_UTIL_ESTUNNOTRESPONSE;
+        return PJNATH_ESTUNNOTRESPONSE;
     }
 
@@ -277 +277 @@
      */
     if (tsx->timer.id) {
-        pj_timer_heap_cancel(tsx->endpt->timer_heap, &tsx->timer);
+        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
         tsx->timer.id = 0;
     }
@@ -301 +301 @@
         status = PJ_SUCCESS;
     } else {
-        status = PJLIB_UTIL_ESTUNTSXFAILED;
+        status = PJNATH_ESTUNTSXFAILED;
     }
 

pjproject/trunk/pjnath/src/pjstun-client/client_main.c

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

pjproject/trunk/pjnath/src/pjstun-srv-test/bind_usage.c

@@ -86 +86 @@
     sess_cb.on_send_msg = &sess_on_send_msg;
     sess_cb.on_rx_request = &sess_on_rx_request;
-    status = pj_stun_session_create(si->endpt, "bind%p", &sess_cb, PJ_FALSE,
+    status = pj_stun_session_create(si->cfg, "bind%p", &sess_cb, PJ_FALSE,
                                     &bu->session);
     if (status != PJ_SUCCESS) {

pjproject/trunk/pjnath/src/pjstun-srv-test/server.c

@@ -84 +84 @@
         goto on_error;
 
-    status = pj_stun_endpoint_create(srv->si.pf, 0, srv->si.ioqueue, 
-                                     srv->si.timer_heap, &srv->si.endpt);
+    status = pj_stun_config_create(srv->si.pf, 0, srv->si.ioqueue, 
+                                     srv->si.timer_heap, &srv->si.cfg);
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -175 +175 @@
     }
 
-    pj_stun_endpoint_destroy(srv->si.endpt);
+    pj_stun_config_destroy(srv->si.cfg);
     pj_timer_heap_destroy(srv->si.timer_heap);
     pj_ioqueue_destroy(srv->si.ioqueue);

pjproject/trunk/pjnath/src/pjstun-srv-test/server.h

@@ -20 +20 @@
 #define __STUN_SERVER_H__
 
+#include <pjnath.h>
 #include <pjlib-util.h>
 #include <pjlib.h>
@@ -31 +32 @@
 {
     pj_pool_factory     *pf;
-    pj_stun_endpoint    *endpt;
+    pj_stun_config      *cfg;
     pj_ioqueue_t        *ioqueue;
     pj_timer_heap_t     *timer_heap;

pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c

@@ -70 +70 @@
 {
     pj_pool_factory     *pf;
-    pj_stun_endpoint    *endpt;
+    pj_stun_config      *cfg;
     pj_ioqueue_t        *ioqueue;
     pj_timer_heap_t     *timer_heap;
@@ -166 +166 @@
     tu->type = type;
     tu->pf = si->pf;
-    tu->endpt = si->endpt;
+    tu->cfg = si->cfg;
     tu->ioqueue = si->ioqueue;
     tu->timer_heap = si->timer_heap;
@@ -198 +198 @@
     sess_cb.on_send_msg = &tu_sess_on_send_msg;
     sess_cb.on_rx_request = &tu_sess_on_rx_request;
-    status = pj_stun_session_create(si->endpt, "turns%p", &sess_cb, PJ_FALSE,
+    status = pj_stun_session_create(si->cfg, "turns%p", &sess_cb, PJ_FALSE,
                                     &tu->default_session);
     if (status != PJ_SUCCESS) {
@@ -208 +208 @@
     sd->tu = tu;
     pj_stun_session_set_user_data(tu->default_session, sd);
+
+    pj_stun_session_set_server_name(tu->default_session, NULL);
 
     /* Create mutex */
@@ -621 +623 @@
     sess_cb.on_rx_request = &client_sess_on_rx_msg;
     sess_cb.on_rx_indication = &client_sess_on_rx_msg;
-    status = pj_stun_session_create(tu->endpt, client->obj_name, 
+    status = pj_stun_session_create(tu->cfg, client->obj_name, 
                                     &sess_cb, PJ_FALSE,
                                     &client->session);

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -568 +568 @@
     pj_memcpy(&tdata->tp_info.dst_addr, addr, addr_len);
     tdata->tp_info.dst_addr_len = addr_len;
-    if (((pj_sockaddr*)addr)->sa_family == PJ_AF_INET) {
+    if (((pj_sockaddr*)addr)->addr.sa_family == PJ_AF_INET) {
         const char *str_addr;
         str_addr = pj_inet_ntoa(((pj_sockaddr_in*)addr)->sin_addr);
@@ -1362 +1362 @@
              */
             else if ((flag & PJSIP_TRANSPORT_DATAGRAM) && 
-                     (remote_addr->sa_family == PJ_AF_INET)) 
+                     (remote_addr->addr.sa_family == PJ_AF_INET)) 
             {
                 pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.addr;

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -787 +787 @@
 
     /* Check that address is a sockaddr_in */
-    PJ_ASSERT_RETURN(rem_addr->sa_family == PJ_AF_INET &&
+    PJ_ASSERT_RETURN(rem_addr->addr.sa_family == PJ_AF_INET &&
                      addr_len == sizeof(pj_sockaddr_in), PJ_EINVAL);
 

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -470 +470 @@
 
     /* Remote address is left zero (except the family) */
-    tp->base.key.rem_addr.sa_family = PJ_AF_INET;
+    tp->base.key.rem_addr.addr.sa_family = PJ_AF_INET;
 
     /* Type name. */