Changeset 3068 for pjproject/trunk

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_dialog.h (modified) (1 diff)
• src/pjsip-simple/evsub.c (modified) (1 diff)
• src/pjsip/sip_dialog.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_dialog.h

@@ -373 +373 @@
 
 /**
+ * Check if the specified module has been registered as usage to the dialog.
+ *
+ * @param dlg               The dialog.
+ * @param module            The module.
+ *
+ * @return                  PJ_TRUE if the specified module is currently
+ *                          registered as a usage to the dialog.
+ */
+PJ_DECL(pj_bool_t) pjsip_dlg_has_usage(pjsip_dialog *dlg,
+                                          pjsip_module *module);
+
+/**
  * Attach module specific data to the dialog. Application can also set 
  * the value directly by accessing dlg->mod_data[module_id].

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",

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -892 +892 @@
 
     return PJ_SUCCESS;
+}
+
+/*
+ * Check if the module is registered as a usage
+ */
+PJ_DEF(pj_bool_t) pjsip_dlg_has_usage( pjsip_dialog *dlg,
+                                          pjsip_module *mod)
+{
+    unsigned index;
+    pj_bool_t found = PJ_FALSE;
+
+    pjsip_dlg_inc_lock(dlg);
+    for (index=0; index<dlg->usage_cnt; ++index) {
+        if (dlg->usage[index] == mod) {
+            found = PJ_TRUE;
+            break;
+        }
+    }
+    pjsip_dlg_dec_lock(dlg);
+
+    return found;
 }