Changeset 5558 for pjproject

Timestamp:

Feb 20, 2017 1:29:21 AM (8 years ago)

Author:

ming

Message:

Closed #1998: Add API pjsip_evsub_set_uas_timeout()

Location:

pjproject/trunk/pjsip

Files:

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

pjproject/trunk/pjsip/include/pjsip-simple/evsub.h

@@ -512 +512 @@
 
 
+/**
+ * Sets, resets, or cancels the UAS subscription timeout.
+ * If there is an existing timer, it is cancelled before any
+ * other action. A timeout of 0 is ignored except that any
+ * existing timer is cancelled.
+ *
+ * @param sub           The server subscription instance.
+ * @param seconds       The new timeout.
+ */
+PJ_DEF(void) pjsip_evsub_uas_set_timeout(pjsip_evsub *sub,
+                                         pj_uint32_t seconds);
+
 
 PJ_END_DECL

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

@@ -510 +510 @@
     }
 
-    if (timer_id != TIMER_TYPE_NONE) {
+    if (timer_id != TIMER_TYPE_NONE && seconds > 0) {
         pj_time_val timeout;
 
-        PJ_ASSERT_ON_FAIL(seconds > 0, return);
         PJ_ASSERT_ON_FAIL(timer_id>TIMER_TYPE_NONE && timer_id<TIMER_TYPE_MAX,
                           return);
@@ -527 +526 @@
                   timer_names[sub->timer.id], timeout.sec));
     }
+}
+
+
+/*
+ * Set event subscription UAS timout.
+ */
+PJ_DEF(void) pjsip_evsub_uas_set_timeout(pjsip_evsub *sub, pj_uint32_t seconds)
+{
+    set_timer(sub, TIMER_TYPE_UAS_TIMEOUT, (pj_int32_t)seconds);
 }
 

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

@@ -180 +180 @@
     if (hdr->retry_after >= 0) {
         pj_memcpy(p, ";retry-after=", 13);
-        p += 9;
+        p += 13;
         printed = pj_utoa(hdr->retry_after, p);
         p += printed;