Changeset 2732 for pjproject/trunk

Timestamp:

Jun 2, 2009 8:17:56 AM (15 years ago)

Author:

bennylp

Message:

Ticket #870: Changed the mapping of host resolution failure to SIP status code 502 from 503 (thanks Robert Cichielo for the report)

• also fixed client registration to use the reason phrase of the transaction rather than to retrieve the default reason phrase for the status code

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-ua/sip_reg.c (modified) (1 diff)
• pjsip/sip_transaction.c (modified) (3 diffs)

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

@@ -1057 +1057 @@
         call_callback(regc, PJ_SUCCESS, tsx->status_code, 
                       (rdata ? &rdata->msg_info.msg->line.status.reason 
-                        : pjsip_get_status_text(tsx->status_code)),
+                        : &tsx->status_text),
                       rdata, expiration, 
                       contact_cnt, contact);

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -24 +24 @@
 #include <pjsip/sip_errno.h>
 #include <pjsip/sip_event.h>
+#include <pjlib-util/errno.h>
 #include <pj/hash.h>
 #include <pj/pool.h>
@@ -1692 +1693 @@
         if (!*cont) {
             char errmsg[PJ_ERR_MSG_SIZE];
+            pjsip_status_code sc;
             pj_str_t err;
 
@@ -1709 +1711 @@
             tsx->transport_flag |= TSX_HAS_RESOLVED_SERVER;
 
+            /* Server resolution error is now mapped to 502 instead of 503,
+             * since with 503 normally client should try again.
+             * See http://trac.pjsip.org/repos/ticket/870
+             */
+            if (-sent==PJ_ERESOLVE || -sent==PJLIB_UTIL_EDNS_NXDOMAIN)
+                sc = PJSIP_SC_BAD_GATEWAY;
+            else
+                sc = PJSIP_SC_TSX_TRANSPORT_ERROR;
+
             /* Terminate transaction, if it's not already terminated. */
-            tsx_set_status_code(tsx, PJSIP_SC_TSX_TRANSPORT_ERROR, &err);
+            tsx_set_status_code(tsx, sc, &err);
             if (tsx->state != PJSIP_TSX_STATE_TERMINATED &&
                 tsx->state != PJSIP_TSX_STATE_DESTROYED)