Changeset 1656 for pjproject

Timestamp:

Jan 2, 2008 8:28:33 AM (17 years ago)

Author:

bennylp

Message:

Related to ticket #437: reduce the stack usage of ICE media transport

File:

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

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

@@ -94 +94 @@
     &pjmedia_ice_destroy
 };
+
+static const pj_str_t STR_CANDIDATE = {"candidate", 9};
+static const pj_str_t STR_ICE_LITE = {"ice-lite", 8};
+static const pj_str_t STR_ICE_MISMATCH = {"ice-mismatch", 12};
 
 
@@ -468 +472 @@
     const pjmedia_sdp_attr *attr;
     unsigned i, cand_cnt;
-    pj_ice_sess_cand cand[PJ_ICE_MAX_CAND];
+    pj_ice_sess_cand *cand;
     const pjmedia_sdp_media *sdp_med;
     pj_bool_t remote_is_lite = PJ_FALSE;
@@ -475 +479 @@
     pj_sockaddr conn_addr;
     pj_bool_t conn_found_in_candidate = PJ_FALSE;
-    const pj_str_t STR_CANDIDATE = {"candidate", 9};
-    const pj_str_t STR_ICE_LITE = {"ice-lite", 8};
-    const pj_str_t STR_ICE_MISMATCH = {"ice-mismatch", 12};
     pj_str_t uname, pass;
     pj_status_t status;
@@ -530 +531 @@
     pass = attr->value;
 
+    /* Allocate candidate array */
+    cand = (pj_ice_sess_cand*)
+           pj_pool_calloc(pool, PJ_ICE_MAX_CAND, sizeof(pj_ice_sess_cand));
+
     /* Get all candidates in the media */
     cand_cnt = 0;
-    for (i=0; i<sdp_med->attr_count; ++i) {
+    for (i=0; i<sdp_med->attr_count && cand_cnt < PJ_ICE_MAX_CAND; ++i) {
         pjmedia_sdp_attr *attr;