Changeset 5557 for pjproject

Timestamp:

Feb 20, 2017 1:23:54 AM (8 years ago)

Author:

ming

Message:

Closed #1997: Add setting to retry timer upon transport disconnection failure (503)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip-ua/sip_timer.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -1243 +1243 @@
 
 /**
+ * Default delay for retrying session refresh request upon
+ * receiving transport error (503). Set it to -1 to end the session
+ * immediately instead.
+ *
+ * Default: 10 seconds
+ */
+#ifndef PJSIP_SESS_TIMER_RETRY_DELAY
+#   define PJSIP_SESS_TIMER_RETRY_DELAY         10
+#endif
+
+
+/**
  * Specify whether the client publication session should queue the
  * PUBLISH request should there be another PUBLISH transaction still

pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

@@ -971 +971 @@
 
             PJ_LOG(3, (inv->pool->obj_name, 
-                        "Receive error %d for refresh request %.*s/cseq=%d, "
-                        "stopping session now", st_code, 
-                        event->body.tsx_state.tsx->method.name.slen,
+                        "Receive error %d for refresh request %.*s/cseq=%d",
+                        st_code, event->body.tsx_state.tsx->method.name.slen,
                         event->body.tsx_state.tsx->method.name.ptr,
                         event->body.tsx_state.tsx->cseq));
 
-            status = pjsip_inv_end_session(inv, 
+            if (st_code == 503 && PJSIP_SESS_TIMER_RETRY_DELAY >= 0) {
+                /* Retry the refresh after some delay */
+                pj_time_val delay = {PJSIP_SESS_TIMER_RETRY_DELAY, 0};
+
+                PJ_LOG(3, (inv->pool->obj_name, "Scheduling to retry refresh "
+                           "request after %d second(s)", delay.sec));
+
+                inv->timer->timer.id = 1;
+                pjsip_endpt_schedule_timer(inv->dlg->endpt,
+                                           &inv->timer->timer, &delay);
+            } else {
+                PJ_LOG(3, (inv->pool->obj_name, "Ending session now"));
+
+                status = pjsip_inv_end_session(inv, 
                                     event->body.tsx_state.tsx->status_code, 
                                     pjsip_get_status_text(st_code), 
                                     &bye);
 
-            if (status == PJ_SUCCESS && bye)
-                status = pjsip_inv_send_msg(inv, bye);
-
+                if (status == PJ_SUCCESS && bye)
+                    status = pjsip_inv_send_msg(inv, bye);
+            }
         }
     }