Changeset 3377

Timestamp:

Dec 1, 2010 8:53:52 AM (14 years ago)

Author:

nanang

Message:

Misc (re #1151): fixed pjsua_acc_config_dup(), some fields, i.e: contact_params, contact_uri_params, and auth_pref, were not duplicated properly (thanks Roman Grachev for the report and the patch).

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_auth.h (modified) (1 diff)
• src/pjsip/sip_auth_client.c (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)

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

@@ -207 +207 @@
 
 /**
+ * Duplicate a client authentication preference setting.
+ *
+ * @param pool      The memory pool.
+ * @param dst       Destination client authentication preference.
+ * @param src       Source client authentication preference.
+ */
+PJ_DECL(void) pjsip_auth_clt_pref_dup(pj_pool_t *pool,
+                                      pjsip_auth_clt_pref *dst,
+                                      const pjsip_auth_clt_pref *src);
+
+
+/**
  * This structure describes client authentication sessions. It keeps
  * all the information needed to authorize the client against all downstream 

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

@@ -109 +109 @@
 on_return:
     return result;
+}
+
+PJ_DEF(void) pjsip_auth_clt_pref_dup( pj_pool_t *pool,
+                                      pjsip_auth_clt_pref *dst,
+                                      const pjsip_auth_clt_pref *src)
+{
+    pj_memcpy(dst, src, sizeof(pjsip_auth_clt_pref));
+    pj_strdup_with_null(pool, &dst->algorithm, &src->algorithm);
 }
 

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

@@ -87 +87 @@
     pj_strdup_with_null(pool, &dst->reg_uri, &src->reg_uri);
     pj_strdup_with_null(pool, &dst->force_contact, &src->force_contact);
+    pj_strdup_with_null(pool, &dst->contact_params, &src->contact_params);
+    pj_strdup_with_null(pool, &dst->contact_uri_params,
+                        &src->contact_uri_params);
     pj_strdup_with_null(pool, &dst->pidf_tuple_id, &src->pidf_tuple_id);
-    pj_strdup_with_null(pool, &dst->rfc5626_instance_id, &src->rfc5626_instance_id);
+    pj_strdup_with_null(pool, &dst->rfc5626_instance_id,
+                        &src->rfc5626_instance_id);
     pj_strdup_with_null(pool, &dst->rfc5626_reg_id, &src->rfc5626_reg_id);
 
@@ -112 +116 @@
         }
     }
+
+    pjsip_auth_clt_pref_dup(pool, &dst->auth_pref, &src->auth_pref);
 
     dst->ka_interval = src->ka_interval;