Changeset 195 for pjproject/trunk

Timestamp:

Feb 19, 2006 1:34:57 AM (19 years ago)

Author:

bennylp

Message:

Return correct error when sending message failed

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transaction.h (modified) (2 diffs)
• src/pjsip/sip_transaction.c (modified) (7 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transaction.h

@@ -99 +99 @@
     pjsip_response_addr         res_addr;       /**< Response address.      */
     unsigned                    transport_flag; /**< Miscelaneous flag.     */
+    pj_status_t                 transport_err;  /**< Internal error code.   */
 
     /*
@@ -281 +282 @@
 
 /*
+ * Dump transaction layer.
+ */
+PJ_DECL(void) pjsip_tsx_layer_dump(void);
+
+/*
  * Get the string name for the state.
  */

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

@@ -419 +419 @@
     PJ_ASSERT_RETURN(mod_tsx_layer.endpt==NULL, PJ_EINVALIDOP);
 
-    PJ_LOG(5,(THIS_FILE, "Initializing transaction layer module"));
-
     /* Initialize TLS ID for transaction lock. */
     status = pj_thread_local_alloc(&pjsip_tsx_lock_tls_id);
@@ -468 +466 @@
         return status;
     }
-
-    PJ_LOG(4,(THIS_FILE, "Transaction layer module initialized"));
 
     return PJ_SUCCESS;
@@ -763 +759 @@
 }
 
+
+/*
+ * Dump transaction layer.
+ */
+PJ_DEF(void) pjsip_tsx_layer_dump(void)
+{
+#if PJ_LOG_MAX_LEVEL >= 3
+    pj_hash_iterator_t itbuf, *it;
+
+    /* Lock mutex. */
+    pj_mutex_lock(mod_tsx_layer.mutex);
+
+    PJ_LOG(3, (THIS_FILE, "Dumping transaction table:"));
+
+    it = pj_hash_first(mod_tsx_layer.htable, &itbuf);
+    if (it == NULL) {
+        PJ_LOG(3, (THIS_FILE, " - none - "));
+    } else {
+        while (it != NULL) {
+            pjsip_transaction *tsx = pj_hash_this( mod_tsx_layer.htable, it);
+
+            PJ_LOG(3, (THIS_FILE, " %s %s|%d|%s",
+                       tsx->obj_name,
+                       (tsx->last_tx? pjsip_tx_data_get_info(tsx->last_tx): "none"),
+                       tsx->status_code,
+                       pjsip_tsx_state_str(tsx->state)));
+
+            it = pj_hash_next(mod_tsx_layer.htable, it);
+        }
+    }
+
+    /* Unlock mutex. */
+    pj_mutex_unlock(mod_tsx_layer.mutex);
+#endif
+}
 
 /*****************************************************************************
@@ -1447 +1478 @@
             char errmsg[PJ_ERR_MSG_SIZE];
 
+            tsx->transport_err = -sent;
+
             PJ_LOG(4,(tsx->obj_name, 
                       "Failed to send %s! err=%d (%s)",
@@ -1490 +1523 @@
         struct tsx_lock_data lck;
         char errmsg[PJ_ERR_MSG_SIZE];
+
+        tsx->transport_err = -sent;
 
         PJ_LOG(4,(tsx->obj_name, "Transport failed to send %s! Err=%d (%s)",
@@ -1612 +1647 @@
         /* Check if transaction is terminated. */
         if (status==PJ_SUCCESS && tsx->state == PJSIP_TSX_STATE_TERMINATED)
-            status = PJSIP_ETSXDESTROYED;
+            status = tsx->transport_err;
 
     } else {
@@ -1627 +1662 @@
         /* Check if transaction is terminated. */
         if (status==PJ_SUCCESS && tsx->state == PJSIP_TSX_STATE_TERMINATED)
-            status = PJSIP_ETSXDESTROYED;
+            status = tsx->transport_err;
 
     }