Changeset 2960 for pjproject/trunk

Timestamp:

Oct 21, 2009 3:03:06 AM (15 years ago)

Author:

bennylp

Message:

More #937 (presence):

• added protection to not resubscribe immediately if initial SUBSCRIBE is responded with 481 for some reason

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -3038 +3038 @@
 
 /**
- * This specifies how long the library should retry resending SUBSCRIBE
- * if the previous SUBSCRIBE failed. This also controls the duration 
- * before failed PUBLISH request will be retried.
+ * This specifies how long the library should wait before retrying failed
+ * SUBSCRIBE request, and there is no rule to automatically resubscribe 
+ * (for example, no "retry-after" parameter in Subscription-State header).
+ *
+ * This also controls the duration  before failed PUBLISH request will be
+ * retried.
  *
  * Default: 300 seconds

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

@@ -1468 +1468 @@
                          * immediately.
                          */
-                        resub_delay = 500;
+                        /* But this must only happen when the 481 is received
+                         * on subscription refresh request. We MUST NOT try to
+                         * resubscribe automatically if the 481 is received
+                         * on the initial SUBSCRIBE (if server returns this
+                         * response for some reason).
+                         */
+                        if (buddy->dlg->remote.contact)
+                            resub_delay = 500;
                         break;
                     }
@@ -1531 +1538 @@
 
             buddy_resubscribe(buddy, PJ_TRUE, resub_delay);
-                                  
+
         } else {
+            /* This will clear the last termination code/reason */
             buddy->term_code = 0;
             buddy->term_reason.slen = 0;