Changeset 1101 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.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/pjmedia/src/pjmedia/transport_ice.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -198 +198 @@
 
     /* Add all candidates (to media level) */
-    cand_cnt = pj_ice_get_cand_cnt(tp_ice->ice_st->ice);
+    cand_cnt = tp_ice->ice_st->ice->lcand_cnt;
     for (i=0; i<cand_cnt; ++i) {
         pj_ice_cand *cand;
@@ -204 +204 @@
         int len;
 
-        pj_ice_get_cand(tp_ice->ice_st->ice, i, &cand);
+        cand = &tp_ice->ice_st->ice->lcand[i];
 
         len = pj_ansi_snprintf( buffer, MAXLEN,
@@ -266 +266 @@
     char *token, *host;
     pj_str_t s;
-    pj_status_t status = PJ_EICEINCANDSDP;
+    pj_status_t status = PJNATH_EICEINCANDSDP;
 
     pj_bzero(cand, sizeof(*cand));
@@ -342 +342 @@
 on_return:
     return status;
+}
+
+static void set_no_ice(struct transport_ice *tp_ice)
+{
+    PJ_LOG(4,(tp_ice->ice_st->obj_name, 
+              "Remote does not support ICE, disabling local ICE"));
+    pjmedia_ice_stop_ice(&tp_ice->base);
 }
 
@@ -359 +366 @@
     attr = pjmedia_sdp_attr_find2(rem_sdp->attr_count, rem_sdp->attr,
                                   "ice-ufrag", NULL);
-    if (attr == NULL)
-        return PJ_EICEMISSINGSDP;
+    if (attr == NULL) {
+        set_no_ice(tp_ice);
+        return PJ_SUCCESS;
+    }
     uname = attr->value;
 
@@ -366 +375 @@
     attr = pjmedia_sdp_attr_find2(rem_sdp->attr_count, rem_sdp->attr,
                                   "ice-pwd", NULL);
-    if (attr == NULL)
-        return PJ_EICEMISSINGSDP;
+    if (attr == NULL) {
+        set_no_ice(tp_ice);
+        return PJ_SUCCESS;
+    }
     pass = attr->value;
 
@@ -547 +558 @@
     PJ_TIME_VAL_SUB(end_ice, tp_ice->start_ice);
 
-    check = &ice_st->ice->clist.checks[ice_st->ice->valid_list[0]];
+    check = &ice_st->ice->valid_list.checks[0];
     
     lcand = check->lcand;