Changeset 712

Timestamp:

Sep 13, 2006 10:45:38 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug in event subscription: for event subscriptions established by non-SUBSCRIBE method (such as REFER), the method to refresh/unsubscribe subscription would still be SUBSCRIBE, not the initial method to establish subscription. There's no known ill effect of this bug (that I know of), but it's still important that this one has been fixed.

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (6 diffs)

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

@@ -591 +591 @@
 
             PJ_LOG(5,(sub->obj_name, "Refreshing subscription."));
-            status = pjsip_evsub_initiate(sub, &sub->method, 
+            status = pjsip_evsub_initiate(sub, NULL, 
                                           sub->expires->ivalue,
                                           &tdata);
@@ -633 +633 @@
                      "send non-2xx response for previous NOTIFY). "
                      "Unsubscribing.."));
-            status = pjsip_evsub_initiate( sub, &sub->method, 0, &tdata);
+            status = pjsip_evsub_initiate( sub, NULL, 0, &tdata);
             if (status == PJ_SUCCESS)
                 pjsip_evsub_send_request(sub, tdata);
@@ -1364 +1364 @@
     if (tsx->role == PJSIP_ROLE_UAC &&
         tsx->state == PJSIP_TSX_STATE_CALLING &&
-        pjsip_method_cmp(&tsx->method, &sub->method) == 0) 
+        (pjsip_method_cmp(&tsx->method, &sub->method) == 0  ||
+         pjsip_method_cmp(&tsx->method, &pjsip_subscribe_method) == 0))
     {
 
@@ -1371 +1372 @@
         {
             PJ_LOG(4,(sub->obj_name, 
-                      "Cancelling pending %.*s request",
-                      (int)sub->method.name.slen, sub->method.name.ptr));
+                      "Cancelling pending subscription request"));
 
             /* By convention, we use 490 (Request Updated) status code.
@@ -1471 +1471 @@
 {
 
-    if (pjsip_method_cmp(&tsx->method, &sub->method)==0) {
+    if (pjsip_method_cmp(&tsx->method, &sub->method)==0 || 
+        pjsip_method_cmp(&tsx->method, &pjsip_subscribe_method)==0) 
+    {
 
         /* Received response to outgoing request that establishes/refresh
@@ -1765 +1767 @@
 {
 
-    if (pjsip_method_cmp(&tsx->method, &sub->method) == 0) {
+    if (pjsip_method_cmp(&tsx->method, &sub->method) == 0 ||
+        pjsip_method_cmp(&tsx->method, &pjsip_subscribe_method) == 0) 
+    {
         
         /*