Changeset 1093 for pjproject/trunk/pjnath/src/pjnath/ice.c

Timestamp:

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

Author:

bennylp

Message:

Added pjnath-test

File:

• pjproject/trunk/pjnath/src/pjnath/ice.c (modified) (10 diffs)

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,