Changeset 3385 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Dec 2, 2010 11:21:01 AM (14 years ago)

Author:

bennylp

Message:

Misc (re #1151): respond incoming re-INVITE with 491 instead of 500 if we are waiting for response for our outgoing re-INVITE. If we are currently processing another incoming re-INVITE, then respond with 500, as it is now

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

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

@@ -34 +34 @@
 #include <pj/os.h>
 #include <pj/log.h>
+#include <pj/rand.h>
 
 /* 
@@ -3917 +3918 @@
             /* Check if we have INVITE pending. */
             if (inv->invite_tsx && inv->invite_tsx!=tsx) {
+                int code;
                 pj_str_t reason;
 
                 reason = pj_str("Another INVITE transaction in progress");
 
+                if (inv->invite_tsx->role == PJSIP_ROLE_UAC)
+                    code = 491;
+                else
+                    code = 500;
+
                 /* Can not receive re-INVITE while another one is pending. */
-                status = pjsip_dlg_create_response( inv->dlg, rdata, 500, 
+                status = pjsip_dlg_create_response( inv->dlg, rdata, code,
                                                     &reason, &tdata);
                 if (status != PJ_SUCCESS)
                     return;
+
+                if (code == 500) {
+                    /* MUST include Retry-After header with random value
+                     * between 0-10.
+                     */
+                    pjsip_retry_after_hdr *ra_hdr;
+                    int val = (pj_rand() % 10);
+
+                    ra_hdr = pjsip_retry_after_hdr_create(tdata->pool, val);
+                    pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)ra_hdr);
+                }
 
                 status = pjsip_dlg_send_response( inv->dlg, tsx, tdata);