[sr-dev] git:master: tm: return current branch id if sending fails and tm_failure_exec_mode=1

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 59c4a6550862ed7c3e8c63a3a5d5c1dcd404bd6d
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59c4a6550862ed7c3e8c63a3a5d5c1dcd404bd6d

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Sat May 25 21:28:33 2013 +0200

tm: return current branch id if sending fails and tm_failure_exec_mode=1

- reported by Juha Heinanen

---

 modules/tm/t_fwd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c
index 6ac7bd8..86c5daa 100644
--- a/modules/tm/t_fwd.c
+++ b/modules/tm/t_fwd.c
@@ -1592,7 +1592,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg ,
 				"failed\n", branch);
 		if (proxy) { proxy->errors++; proxy->ok=0; }
 		if(tm_failure_exec_mode==1) {
-			LOG(L_ERR, "putting branch %d on hold \n", branch);
+			LM_DBG("putting branch %d on hold \n", branch);
 			/* put on retransmission timer,
 			 * but set proto to NONE, so actually it is not trying to resend */
 			uac->request.dst.proto = PROTO_NONE;
@@ -1604,7 +1604,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg ,
 					&uac->request);
 				return -2;
 			}
-			return ret;
+			return branch;
 		}
 		return -2;
 	} else {