Changeset 1106 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Mar 26, 2007 1:25:07 PM (17 years ago)

Author:

bennylp

Message:

ICE: implement RTCP component and cancelling check in progress

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (5 diffs)

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

@@ -154 +154 @@
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
-    unsigned comp_id;
     pj_status_t status;
 
@@ -161 +160 @@
         return status;
 
-    status = pj_ice_st_create_comp(tp_ice->ice_st, 1, options, start_addr, 
-                                   &comp_id);
+    status = pj_ice_st_create_comp(tp_ice->ice_st, 1, options, start_addr);
     if (status != PJ_SUCCESS)
         return status;
@@ -168 +166 @@
     if (tp_ice->ice_st->comp_cnt > 1) {
         pj_sockaddr_in addr;
+        pj_uint16_t port;
 
         pj_memcpy(&addr, &tp_ice->ice_st->comp[0]->local_addr.ipv4,
@@ -176 +175 @@
             addr.sin_addr.s_addr = 0;
 
-        addr.sin_port = (pj_uint16_t)(pj_ntohs(addr.sin_port)+1);
-        status = pj_ice_st_create_comp(tp_ice->ice_st, 2, options, 
-                                       &addr, &comp_id);
+        port = pj_ntohs(addr.sin_port);
+        ++port;
+        addr.sin_port = pj_htons(port);
+        status = pj_ice_st_create_comp(tp_ice->ice_st, 2, options, &addr);
         if (status != PJ_SUCCESS)
             return status;
@@ -482 +482 @@
         pj_assert(comp->default_cand >= 0);
         info->rtp_sock = comp->sock;
-        pj_memcpy(&info->rtp_addr_name, 
+        pj_memcpy(&info->rtcp_addr_name, 
                   &comp->cand_list[comp->default_cand].addr,
                   sizeof(pj_sockaddr_in));