Changeset 1101 for pjproject/trunk/pjnath/src/pjnath/ice_stream_transport.c

Timestamp:

Mar 24, 2007 1:00:30 PM (17 years ago)

Author:

bennylp

Message:

ICE (work in progress): implement error codes

File:

• pjproject/trunk/pjnath/src/pjnath/ice_stream_transport.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_stream_transport.c

@@ -365 +365 @@
 
     /* Component ID must be valid */
-    PJ_ASSERT_RETURN(comp_id <= PJ_ICE_MAX_COMP, PJ_EICEINCOMPID);
+    PJ_ASSERT_RETURN(comp_id <= PJ_ICE_MAX_COMP, PJNATH_EICEINCOMPID);
 
     /* First component ID must be 1, second must be 2, etc., and 
@@ -371 +371 @@
      */
     PJ_ASSERT_RETURN(ice_st->comps[comp_id-1] == ice_st->comp_cnt, 
-                     PJ_EICEINCOMPID);
+                     PJNATH_EICEINCOMPID);
 
     /* All in order, add the component. */
@@ -408 +408 @@
 
     /* Check that component ID present */
-    PJ_ASSERT_RETURN(comp_id <= ice_st->comp_cnt, PJ_EICEINCOMPID);
+    PJ_ASSERT_RETURN(comp_id <= ice_st->comp_cnt, PJNATH_EICEINCOMPID);
 
     /* Can't add new interface while ICE is running */
@@ -579 +579 @@
     /* Create! */
     status = pj_ice_create(&ice_st->stun_cfg, ice_st->obj_name, role, 
-                           &ice_cb, local_ufrag, local_passwd, &ice_st->ice);
+                           ice_st->comp_cnt, &ice_cb, 
+                           local_ufrag, local_passwd, &ice_st->ice);
     if (status != PJ_SUCCESS)
         return status;
@@ -585 +586 @@
     /* Associate user data */
     ice_st->ice->user_data = (void*)ice_st;
-
-    /* Add components */
-    for (i=0; i<ice_st->comp_cnt; ++i) {
-        status = pj_ice_add_comp(ice_st->ice, ice_st->comps[i]);
-        if (status != PJ_SUCCESS)
-            goto on_error;
-    }
 
     /* Add candidates */
@@ -627 +621 @@
     unsigned i, cnt;
     pj_ice_cand *pcand;
-    pj_status_t status;
 
     PJ_ASSERT_RETURN(ice_st && count && cand, PJ_EINVAL);
     PJ_ASSERT_RETURN(ice_st->ice, PJ_EINVALIDOP);
 
-    cnt = pj_ice_get_cand_cnt(ice_st->ice);
+    cnt = ice_st->ice->lcand_cnt;
     cnt = (cnt > *count) ? *count : cnt;
     *count = 0;
 
     for (i=0; i<cnt; ++i) {
-        status = pj_ice_get_cand(ice_st->ice, i, &pcand);
-        if (status != PJ_SUCCESS)
-            return status;
-
+        pcand = &ice_st->ice->lcand[i];
         pj_memcpy(&cand[i], pcand, sizeof(pj_ice_cand));
     }
@@ -689 +679 @@
 {
     if (!ice_st->ice)
-        return PJ_ENOICE;
+        return PJNATH_ENOICE;
 
     return pj_ice_send_data(ice_st->ice, comp_id, data, data_len);
@@ -753 +743 @@
     }
     if (is == NULL) {
-        return PJ_EICEINCANDID;
+        return PJNATH_EICEINCANDID;
     }