Changeset 1655

Timestamp:

Jan 2, 2008 8:27:03 AM (16 years ago)

Author:

bennylp

Message:

Related to ticket #437: optimize the stack usage of pjsua-lib

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_acc.c (modified) (6 diffs)
• pjsua_call.c (modified) (1 diff)
• pjsua_media.c (modified) (7 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -865 +865 @@
     pjsua_acc *acc;
     pj_str_t contact;
-    char contact_buf[1024];
     pj_pool_t *pool;
     pj_status_t status;
@@ -894 +893 @@
     }
 
-    pool = pj_pool_create_on_buf(NULL, contact_buf, sizeof(contact_buf));
+    pool = pjsua_pool_create("tmpregc", 512, 512);
     status = pjsua_acc_create_uac_contact( pool, &contact,
                                            acc_id, &acc->cfg.reg_uri);
@@ -902 +901 @@
                      status);
         pjsip_regc_destroy(acc->regc);
+        pj_pool_release(pool);
         acc->regc = NULL;
         return status;
@@ -917 +917 @@
                      status);
         pjsip_regc_destroy(acc->regc);
+        pj_pool_release(pool);
         acc->regc = NULL;
         return status;
@@ -953 +954 @@
         pjsip_generic_string_hdr *h;
 
-        pool = pj_pool_create_on_buf(NULL, contact_buf, sizeof(contact_buf));
         pj_list_init(&hdr_list);
 
@@ -962 +962 @@
         pjsip_regc_add_headers(acc->regc, &hdr_list);
     }
+
+    pj_pool_release(pool);
 
     return PJ_SUCCESS;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1501 +1501 @@
     pjsua_call *dest_call;
     pjsip_dialog *dest_dlg;
-    char str_dest_buf[512];
+    char str_dest_buf[PJSIP_MAX_URL_SIZE*2];
     pj_str_t str_dest;
     int len;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -221 +221 @@
     pj_sockaddr_in mapped_addr[2];
     pj_status_t status = PJ_SUCCESS;
-    char addr_buf[80];
+    char addr_buf[PJ_INET6_ADDRSTRLEN+2];
     pj_sock_t sock[2];
 
@@ -625 +625 @@
         pjmedia_ice_cb ice_cb;
         int next_port;
+        char name[32];
 #if PJMEDIA_ADVERTISE_RTCP
         enum { COMP_CNT=2 };
@@ -634 +635 @@
         ice_cb.on_ice_complete = &on_ice_complete;
 
-        status = pjmedia_ice_create(pjsua_var.med_endpt, NULL, COMP_CNT,
+        pj_ansi_snprintf(name, sizeof(name), "icetp%02d", i);
+                         
+        status = pjmedia_ice_create(pjsua_var.med_endpt, name, COMP_CNT,
                                     &pjsua_var.stun_cfg, &ice_cb,
                                     &pjsua_var.calls[i].med_tp);
@@ -891 +894 @@
     pjmedia_stream_info *si = NULL;
     pjmedia_port *media_port;
-    pj_str_t port_name;
-    char tmp[PJSIP_MAX_URL_SIZE];
     pj_status_t status;
 
@@ -953 +954 @@
 
     } else {
-
         /* Start ICE */
         if (pjsua_var.media_cfg.enable_ice) {
@@ -1013 +1013 @@
          * Add the call to conference bridge.
          */
-        port_name.ptr = tmp;
-        port_name.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
-                                         call->inv->dlg->remote.info->uri,
-                                         tmp, sizeof(tmp));
-        if (port_name.slen < 1) {
-            port_name = pj_str("call");
-        }
-        status = pjmedia_conf_add_port( pjsua_var.mconf, call->inv->pool,
-                                        media_port, 
-                                        &port_name,
-                                        (unsigned*)&call->conf_slot);
-        if (status != PJ_SUCCESS) {
-            return status;
+        {
+            char tmp[PJSIP_MAX_URL_SIZE];
+            pj_str_t port_name;
+
+            port_name.ptr = tmp;
+            port_name.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
+                                             call->inv->dlg->remote.info->uri,
+                                             tmp, sizeof(tmp));
+            if (port_name.slen < 1) {
+                port_name = pj_str("call");
+            }
+            status = pjmedia_conf_add_port( pjsua_var.mconf, call->inv->pool,
+                                            media_port, 
+                                            &port_name,
+                                            (unsigned*)&call->conf_slot);
+            if (status != PJ_SUCCESS) {
+                return status;
+            }
         }
 
@@ -1090 +1095 @@
 PJ_DEF(unsigned) pjsua_conf_get_active_ports(void)
 {
-    unsigned ports[256];
+    unsigned ports[PJSUA_MAX_CONF_PORTS];
     unsigned count = PJ_ARRAY_SIZE(ports);
     pj_status_t status;