Changeset 5336

Timestamp:

Jun 7, 2016 10:07:57 AM (8 years ago)

Author:

riza

Message:

Re #1929: Avoid memory pool growing when doing re-Registration.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_auth.h (modified) (1 diff)
• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip-ua/sip_reg.c (modified) (2 diffs)
• src/pjsip/sip_auth_client.c (modified) (13 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_auth.h

@@ -167 +167 @@
     PJ_DECL_LIST_MEMBER(struct pjsip_cached_auth);
 
+    pj_pool_t                   *pool;      /**< Pool for cached auth       */
     pj_str_t                     realm;     /**< Realm.                     */
     pj_bool_t                    is_proxy;  /**< Server type (401/407)      */

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -1123 +1123 @@
 #endif
 
+/**
+ * Maximum size of pool allowed for auth client session in pjsip_regc.
+ * After the size exceeds because of Digest authentication processing,
+ * the pool is reset.
+ *
+ * Default is 20 kB
+ */
+#ifndef PJSIP_AUTH_CACHED_POOL_MAX_SIZE
+#   define PJSIP_AUTH_CACHED_POOL_MAX_SIZE      (20 * 1024)
+#endif
 
 /*****************************************************************************

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -177 +177 @@
         pj_lock_release(regc->lock);
     } else {
+        pjsip_cached_auth *auth = NULL;
         pjsip_tpselector_dec_ref(&regc->tp_sel);
         if (regc->last_transport) {
@@ -190 +191 @@
         pj_lock_destroy(regc->lock);
         regc->lock = NULL;
+
+        auth = regc->auth_sess.cached_auth.next;
+        while (auth != &regc->auth_sess.cached_auth) {
+            pjsip_endpt_release_pool(regc->endpt, auth->pool);
+            auth = auth->next;
+        }
+
         pjsip_endpt_release_pool(regc->endpt, regc->pool);
     }

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -358 +358 @@
  * Update authentication session with a challenge.
  */
-static void update_digest_session( pj_pool_t *ses_pool,
-                                   pjsip_cached_auth *cached_auth,
+static void update_digest_session( pjsip_cached_auth *cached_auth,
                                    const pjsip_www_authenticate_hdr *hdr )
 {
@@ -366 +365 @@
         if (!cached_auth->last_chal || pj_stricmp2(&hdr->scheme, "digest")) {
             cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
-                                     pjsip_hdr_clone(ses_pool, hdr);
+                                     pjsip_hdr_clone(cached_auth->pool, hdr);
         } else {
             /* Only update if the new challenge is "significantly different"
@@ -383 +382 @@
             {
                 cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
-                                         pjsip_hdr_clone(ses_pool, hdr);
+                                       pjsip_hdr_clone(cached_auth->pool, hdr);
             }
         }
@@ -394 +393 @@
         /* Save the whole challenge */
         cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
-                                 pjsip_hdr_clone(ses_pool, hdr);
+                                 pjsip_hdr_clone(cached_auth->pool, hdr);
 
         /* Create cnonce */
-        pj_create_unique_string( ses_pool, &cached_auth->cnonce );
+        pj_create_unique_string( cached_auth->pool, &cached_auth->cnonce );
 
         /* Initialize nonce-count */
@@ -407 +406 @@
         */
         if (cached_auth->realm.slen == 0) {
-            pj_strdup(ses_pool, &cached_auth->realm,
+            pj_strdup(cached_auth->pool, &cached_auth->realm,
                       &hdr->challenge.digest.realm);
         }
@@ -420 +419 @@
         } else {
             /* Server gives new nonce. */
-            pj_strdup(ses_pool, &cached_auth->last_chal->challenge.digest.nonce,
+            pj_strdup(cached_auth->pool, 
+                      &cached_auth->last_chal->challenge.digest.nonce,
                       &hdr->challenge.digest.nonce);
             /* Has the opaque changed? */
@@ -426 +426 @@
                           &hdr->challenge.digest.opaque))
             {
-                pj_strdup(ses_pool,
+                pj_strdup(cached_auth->pool,
                           &cached_auth->last_chal->challenge.digest.opaque,
                           &hdr->challenge.digest.opaque);
@@ -692 +692 @@
         {
             if (cached_auth) {
-                update_digest_session( sess_pool, cached_auth, hdr );
+                update_digest_session( cached_auth, hdr );
 
                 cnonce = &cached_auth->cnonce;
@@ -961 +961 @@
 }
 
+
+static void recreate_cached_auth_pool( pjsip_endpoint *endpt, 
+                                       pjsip_cached_auth *auth )
+{
+    pj_pool_t *auth_pool = pjsip_endpt_create_pool(endpt, "regc_auth%p", 1024, 
+                                                   1024);
+
+    if (auth->realm.slen) {
+        pj_str_t realm;
+        pj_strdup(auth_pool, &realm, &auth->realm);
+        pj_strassign(&auth->realm, &realm);
+    }
+
+    if (auth->cnonce.slen) {
+        pj_str_t cnonce;
+        pj_strdup(auth_pool, &cnonce, &auth->cnonce);
+        pj_strassign(&auth->cnonce, &cnonce);
+    }
+
+    if (auth->last_chal) {
+        auth->last_chal = (pjsip_www_authenticate_hdr*)
+                          pjsip_hdr_clone(auth_pool, auth->last_chal);
+    }
+
+    pjsip_endpt_release_pool(endpt, auth->pool);
+    auth->pool = auth_pool;
+}
 
 /* Process authorization challenge */
@@ -1127 +1154 @@
             break;
 
-        hchal = (const pjsip_www_authenticate_hdr*) hdr;
+        hchal = (const pjsip_www_authenticate_hdr*)hdr;
         ++chal_cnt;
 
@@ -1133 +1160 @@
          * if not present.
          */
-        cached_auth = find_cached_auth(sess, &hchal->challenge.common.realm );
+        cached_auth = find_cached_auth(sess, &hchal->challenge.common.realm);
         if (!cached_auth) {
-            cached_auth = PJ_POOL_ZALLOC_T( sess->pool, pjsip_cached_auth);
-            pj_strdup( sess->pool, &cached_auth->realm, &hchal->challenge.common.realm);
+            cached_auth = PJ_POOL_ZALLOC_T(sess->pool, pjsip_cached_auth);
+            cached_auth->pool = pjsip_endpt_create_pool(sess->endpt,
+                                                        "regc_auth%p",
+                                                        1024,
+                                                        1024);
+            pj_strdup(cached_auth->pool, &cached_auth->realm,
+                      &hchal->challenge.common.realm);
             cached_auth->is_proxy = (hchal->type == PJSIP_H_PROXY_AUTHENTICATE);
 #           if (PJSIP_AUTH_HEADER_CACHING)
@@ -1143 +1175 @@
             }
 #           endif
-            pj_list_insert_before( &sess->cached_auth, cached_auth );
+            pj_list_insert_before(&sess->cached_auth, cached_auth);
         }
 
@@ -1149 +1181 @@
          * authorization session.
          */
-        status = process_auth( tdata->pool, hchal, tdata->msg->line.req.uri,
-                               tdata, sess, cached_auth, &hauth);
+        status = process_auth(tdata->pool, hchal, tdata->msg->line.req.uri,
+                              tdata, sess, cached_auth, &hauth);
         if (status != PJ_SUCCESS)
             return status;
+
+        if (pj_pool_get_used_size(cached_auth->pool) >
+            PJSIP_AUTH_CACHED_POOL_MAX_SIZE) 
+        {
+            recreate_cached_auth_pool(sess->endpt, cached_auth);
+        }       
 
         /* Add to the message. */