Changeset 3068 for pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

Timestamp:

Jan 21, 2010 10:04:26 AM (14 years ago)

Author:

bennylp

Message:

Ticket #1029: Fix support for multiple (event) subscriptions in a single dialog (thanks Wang Eric for the report)

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -736 +736 @@
 
 
-    /* Create subcription list: */
-
-    dlgsub_head = PJ_POOL_ALLOC_T(sub->pool, struct dlgsub);
-    dlgsub = PJ_POOL_ALLOC_T(sub->pool, struct dlgsub);
-    dlgsub->sub = sub;
-
-    pj_list_init(dlgsub_head);
-    pj_list_push_back(dlgsub_head, dlgsub);
-
-
-    /* Register as dialog usage: */
-
-    status = pjsip_dlg_add_usage(dlg, &mod_evsub.mod, dlgsub_head);
-    if (status != PJ_SUCCESS) {
-        pjsip_dlg_dec_lock(dlg);
-        return status;
-    }
-
+    /* Check if another subscription has been registered to the dialog. In
+     * that case, just add ourselves to the subscription list, otherwise
+     * create and register a new subscription list.
+     */
+    if (pjsip_dlg_has_usage(dlg, &mod_evsub.mod)) {
+        dlgsub_head = (struct dlgsub*) dlg->mod_data[mod_evsub.mod.id];
+        dlgsub = PJ_POOL_ALLOC_T(sub->pool, struct dlgsub);
+        dlgsub->sub = sub;
+        pj_list_push_back(dlgsub_head, dlgsub);
+    } else {
+        dlgsub_head = PJ_POOL_ALLOC_T(sub->pool, struct dlgsub);
+        dlgsub = PJ_POOL_ALLOC_T(sub->pool, struct dlgsub);
+        dlgsub->sub = sub;
+
+        pj_list_init(dlgsub_head);
+        pj_list_push_back(dlgsub_head, dlgsub);
+
+
+        /* Register as dialog usage: */
+
+        status = pjsip_dlg_add_usage(dlg, &mod_evsub.mod, dlgsub_head);
+        if (status != PJ_SUCCESS) {
+            pjsip_dlg_dec_lock(dlg);
+            return status;
+        }
+    }
 
     PJ_LOG(5,(sub->obj_name, "%s subscription created, using dialog %s",