Changeset 500 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Jun 13, 2006 10:21:23 PM (18 years ago)

Author:

bennylp

Message:

Added status_text and cause_text in dialog and transaction to capture the real status text in the final response (instead of just the code)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (13 diffs)

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

@@ -1327 +1327 @@
 
 /*
+ * Set transaction status code and reason.
+ */
+static tsx_set_status_code(pjsip_transaction *tsx,
+                           int code, const pj_str_t *reason)
+{
+    tsx->status_code = code;
+    if (reason)
+        pj_strdup(tsx->pool, &tsx->status_text, reason);
+    else
+        tsx->status_text = *pjsip_get_status_text(code);
+}
+
+
+/*
  * Forcely terminate transaction.
  */
@@ -1342 +1356 @@
 
     lock_tsx(tsx, &lck);
-    tsx->status_code = code;
+    tsx_set_status_code(tsx, code, NULL);
     tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, PJSIP_EVENT_USER, NULL);
     unlock_tsx(tsx, &lck);
@@ -1492 +1506 @@
         if (!*cont) {
             char errmsg[PJ_ERR_MSG_SIZE];
+            pj_str_t err;
 
             tsx->transport_err = -sent;
+
+            err =pj_strerror(-sent, errmsg, sizeof(errmsg));
 
             PJ_LOG(4,(tsx->obj_name, 
                       "Failed to send %s! err=%d (%s)",
                       pjsip_tx_data_get_info(send_state->tdata), -sent,
-                      pj_strerror(-sent, errmsg, sizeof(errmsg)).ptr));
+                      errmsg));
 
             /* Clear pending transport flag. */
@@ -1507 +1524 @@
 
             /* Terminate transaction, if it's not already terminated. */
-            tsx->status_code = PJSIP_SC_TSX_TRANSPORT_ERROR;
+            tsx_set_status_code(tsx, PJSIP_SC_TSX_TRANSPORT_ERROR, &err);
             if (tsx->state != PJSIP_TSX_STATE_TERMINATED &&
                 tsx->state != PJSIP_TSX_STATE_DESTROYED)
@@ -1538 +1555 @@
         struct tsx_lock_data lck;
         char errmsg[PJ_ERR_MSG_SIZE];
+        pj_str_t err;
 
         tsx->transport_err = -sent;
 
+        err = pj_strerror(-sent, errmsg, sizeof(errmsg));
+
         PJ_LOG(4,(tsx->obj_name, "Transport failed to send %s! Err=%d (%s)",
-                  pjsip_tx_data_get_info(tdata), -sent,
-                  pj_strerror(-sent, errmsg, sizeof(errmsg)).ptr));
+                  pjsip_tx_data_get_info(tdata), -sent, errmsg));
 
         lock_tsx(tsx, &lck);
@@ -1552 +1571 @@
 
         /* Terminate transaction. */
-        tsx->status_code = PJSIP_SC_TSX_TRANSPORT_ERROR;
+        tsx_set_status_code(tsx, PJSIP_SC_TSX_TRANSPORT_ERROR, &err);
         tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, 
                        PJSIP_EVENT_TRANSPORT_ERROR, tdata );
@@ -1622 +1641 @@
         
         char errmsg[PJ_ERR_MSG_SIZE];
+        pj_str_t err;
 
         if (status == PJ_SUCCESS) {
@@ -1631 +1651 @@
          * Treat this as permanent transport error.
          */
+        err = pj_strerror(status, errmsg, sizeof(errmsg));
+
         PJ_LOG(4,(tsx->obj_name, 
                   "Transport error, terminating transaction. "
                   "Err=%d (%s)",
-                  status, 
-                  pj_strerror(status, errmsg, sizeof(errmsg)).ptr));
-
-        tsx->status_code = PJSIP_SC_TSX_TRANSPORT_ERROR;
+                  status, errmsg));
+
+        tsx_set_status_code(tsx, PJSIP_SC_TSX_TRANSPORT_ERROR, &err);
         tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, 
                        PJSIP_EVENT_TRANSPORT_ERROR, NULL );
@@ -1860 +1881 @@
 
         /* Set status code */
-        tsx->status_code = PJSIP_SC_TSX_TIMEOUT;
+        tsx_set_status_code(tsx, PJSIP_SC_TSX_TIMEOUT, NULL);
 
         /* Inform TU. */
@@ -2002 +2023 @@
 
         /* Update last status */
-        tsx->status_code = msg->line.status.code;
+        tsx_set_status_code(tsx, msg->line.status.code, 
+                            &msg->line.status.reason);
 
         /* Discard the saved last response (it will be updated later as
@@ -2164 +2186 @@
         pj_assert(!"Should not happen(?)");
 
-        tsx->status_code = PJSIP_SC_TSX_TIMEOUT;
+        tsx_set_status_code(tsx, PJSIP_SC_TSX_TIMEOUT, NULL);
 
         tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, 
@@ -2211 +2233 @@
         }
 
-        tsx->status_code = msg->line.status.code;
+        tsx_set_status_code(tsx, msg->line.status.code, 
+                            &msg->line.status.reason);
+
     } else {
-        tsx->status_code = PJSIP_SC_TSX_TIMEOUT;
+        tsx_set_status_code(tsx, PJSIP_SC_TSX_TIMEOUT, NULL);
     }
 
@@ -2441 +2465 @@
                  */
 
-                tsx->status_code = PJSIP_SC_TSX_TIMEOUT;
+                tsx_set_status_code(tsx, PJSIP_SC_TSX_TIMEOUT, NULL);
 
                 tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED,