Changeset 1093 for pjproject/trunk

Timestamp:

Mar 21, 2007 10:05:58 PM (18 years ago)

Author:

bennylp

Message:

Added pjnath-test

Location:

pjproject/trunk/pjnath

Files:

• build/pjnath.dsp (modified) (2 diffs)
• build/pjnath.dsw (modified) (1 diff)
• build/pjnath_test.dsp (added)
• include/pjnath.h (modified) (1 diff)
• include/pjnath/ice.h (modified) (6 diffs)
• include/pjnath/ice_mt.h (added)
• src/pjnath-test (added)
• src/pjnath-test/ice.c (added)
• src/pjnath-test/main.c (added)
• src/pjnath-test/stun.c (added)
• src/pjnath-test/test.c (added)
• src/pjnath-test/test.h (added)
• src/pjnath/ice.c (modified) (10 diffs)
• src/pjnath/ice_mt.c (added)
• src/pjnath/stun_msg.c (modified) (1 diff)

pjproject/trunk/pjnath/build/pjnath.dsp

@@ -96 +96 @@
 # Begin Source File
 
+SOURCE=..\src\pjnath\ice_mt.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjnath\stun_auth.c
 # End Source File
@@ -129 +133 @@
 
 SOURCE=..\include\pjnath\ice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjnath\ice_mt.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjnath/build/pjnath.dsw

@@ -36 +36 @@
 Package=<4>
 {{{
+}}}
+
+###############################################################################
+
+Project: "pjnath_test"=.\pjnath_test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name pjlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjlib_util
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjnath
+    End Project Dependency
 }}}
 

pjproject/trunk/pjnath/include/pjnath.h

@@ -20 +20 @@
 #include <pjnath/config.h>
 #include <pjnath/errno.h>
+#include <pjnath/ice.h>
+#include <pjnath/ice_mt.h>
 #include <pjnath/stun_auth.h>
 #include <pjnath/stun_config.h>

pjproject/trunk/pjnath/include/pjnath/ice.h

@@ -21 +21 @@
 
 /**
- * @file ice_sock.h
- * @brief ICE socket.
+ * @file ice.h
+ * @brief ICE.
  */
 #include <pjnath/types.h>
@@ -29 +29 @@
 #include <pj/timer.h>
 
+/**
+ * @defgroup PJNATH_ICE Interactive Connectivity Establishment (ICE)
+ * @brief Interactive Connectivity Establishment (ICE)
+ * @ingroup PJNATH
+ */
+
 
 PJ_BEGIN_DECL
 
 
-/* **************************************************************************/
-/**
- * @defgroup PJNATH_ICE_SOCK ICE Socket
- * @brief High level ICE socket abstraction.
- * @ingroup PJNATH
+/**
+ * @defgroup PJNATH_ICE_STREAM Transport Independent ICE Media Stream
+ * @brief Transport Independent ICE Media Stream
+ * @ingroup PJNATH_ICE
  * @{
  */
@@ -166 +171 @@
 
     pj_pool_t           *pool;
+    void                *user_data;
     pj_mutex_t          *mutex;
-    int                  af;
-    int                  sock_type;
     pj_ice_role          role;
     pj_bool_t            is_complete;
@@ -177 +181 @@
 
     /* STUN credentials */
+    pj_str_t             tx_ufrag;
     pj_str_t             tx_uname;
     pj_str_t             tx_pass;
+    pj_str_t             rx_ufrag;
     pj_str_t             rx_uname;
     pj_str_t             rx_pass;
@@ -207 +213 @@
                                    pj_ice_role role,
                                    const pj_ice_cb *cb,
-                                   int af,
-                                   int sock_type,
                                    pj_ice **p_ice);
 PJ_DECL(pj_status_t) pj_ice_destroy(pj_ice *ice);
@@ -215 +219 @@
                                      const pj_sockaddr_t *local_addr,
                                      unsigned addr_len);
-PJ_DECL(pj_status_t) pj_ice_add_sock_comp(pj_ice *ice,
-                                          unsigned comp_id,
-                                          pj_sock_t sock);
 PJ_DECL(pj_status_t) pj_ice_set_credentials(pj_ice *ice,
                                             const pj_str_t *local_ufrag,

pjproject/trunk/pjnath/src/pjnath/ice.c

@@ -137 +137 @@
                                   pj_ice_role role,
                                   const pj_ice_cb *cb,
-                                  int af,
-                                  int sock_type,
                                   pj_ice **p_ice)
 {
@@ -147 +145 @@
 
     PJ_ASSERT_RETURN(stun_cfg && cb && p_ice, PJ_EINVAL);
-    PJ_ASSERT_RETURN(sock_type==PJ_SOCK_DGRAM || sock_type==PJ_SOCK_STREAM,
-                     PJ_EINVAL);
 
     if (!name)
@@ -156 +152 @@
     ice = PJ_POOL_ZALLOC_T(pool, pj_ice);
     ice->pool = pool;
-    ice->af = af;
-    ice->sock_type = sock_type;
     ice->role = role;
 
@@ -436 +430 @@
 
     pj_strdup(ice->pool, &ice->tx_uname, &username);
+    pj_strdup(ice->pool, &ice->tx_ufrag, remote_ufrag);
     pj_strdup(ice->pool, &ice->tx_pass, remote_pass);
 
@@ -443 +438 @@
 
     pj_strdup(ice->pool, &ice->rx_uname, &username);
+    pj_strdup(ice->pool, &ice->rx_ufrag, local_ufrag);
     pj_strdup(ice->pool, &ice->rx_pass, local_pass);
 
@@ -482 +478 @@
     char tmp[128];
 
-    PJ_ASSERT_RETURN(ice && comp_id && type && local_pref &&
+    PJ_ASSERT_RETURN(ice && comp_id && local_pref &&
                      foundation && addr && base_addr && addr_len,
                      PJ_EINVAL);
@@ -704 +700 @@
     for (i=0; i<clist->count; ++i) {
         const pj_ice_check *c = &clist->checks[i];
-        LOG((ice->obj_name, " %d: %s (prio=%u, state=%s)",
+        LOG((ice->obj_name, " %d: %s (prio=0x%"PJ_INT64_FMT"x, state=%s)",
              i, dump_check(buffer, sizeof(buffer), c),
              c->prio, check_state_name[c->state]));
@@ -1102 +1098 @@
     lcand = check->lcand;
     rcand = check->rcand;
-    comp = &ice->comp[lcand->comp_id];
+    comp = find_comp(ice, lcand->comp_id);
 
     LOG((ice->obj_name, 
@@ -1734 +1730 @@
     pj_status_t status = PJ_SUCCESS;
     pj_ice_comp *comp;
-    pj_bool_t is_stun;
+    pj_status_t stun_status;
 
     PJ_ASSERT_RETURN(ice, PJ_EINVAL);
@@ -1746 +1742 @@
     }
 
-    is_stun = pj_stun_msg_check(pkt, pkt_size, PJ_STUN_IS_DATAGRAM);
-    if (is_stun) {
+    stun_status = pj_stun_msg_check(pkt, pkt_size, PJ_STUN_IS_DATAGRAM);
+    if (stun_status == PJ_SUCCESS) {
         status = pj_stun_session_on_rx_pkt(comp->stun_sess, pkt, pkt_size,
                                            PJ_STUN_IS_DATAGRAM,

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

@@ -482 +482 @@
               PJ_STUN_ATTR_END_EXTENDED_ATTR-PJ_STUN_ATTR_START_EXTENDED_ATTR);
 
-    if (attr_type < PJ_STUN_ATTR_START_EXTENDED_ATTR)
+    if (attr_type < PJ_STUN_ATTR_END_MANDATORY_ATTR)
         desc = &mandatory_attr_desc[attr_type];
     else if (attr_type >= PJ_STUN_ATTR_START_EXTENDED_ATTR &&