[SR-Dev] git:master: tm: TMCB_RESPONSE_OUT (callback) minor fix

[Andrei Pelinescu-Onciul]

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

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Fri Apr 24 09:55:01 2009 +0200

tm: TMCB_RESPONSE_OUT (callback) minor fix

- for local generated reply (via t_reply*()) call the
  TMCB_RESPONSE_OUT callback only if the send was successful
  (this brings it in-line with the proxied reply behaviour).

Reported-by: Daniel-Constantin Mierla <miconda at gmail.com>

---

 modules/tm/t_reply.c |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c
index a8d1ec3..5cb731f 100644
--- a/modules/tm/t_reply.c
+++ b/modules/tm/t_reply.c
@@ -563,17 +563,10 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
 	/* do UAC cleanup procedures in case we generated
 	   a final answer whereas there are pending UACs */
 	if (code>=200) {
-		if ( is_local(trans) ) {
-			DBG("DEBUG: local transaction completed from _reply\n");
-			if ( unlikely(has_tran_tmcbs(trans, TMCB_LOCAL_COMPLETED)) )
-				run_trans_callbacks( TMCB_LOCAL_COMPLETED, trans,
-					0, FAKED_REPLY, code);
-		} else {
-			if ( unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) )
-				run_trans_callbacks( TMCB_RESPONSE_OUT, trans,
-					trans->uas.request, FAKED_REPLY, code);
-		}
-
+		if (unlikely(is_local(trans) && 
+					has_tran_tmcbs(trans, TMCB_LOCAL_COMPLETED) ))
+			run_trans_callbacks(TMCB_LOCAL_COMPLETED, trans,
+									0, FAKED_REPLY, code);
 		cleanup_uac_timers( trans );
 		if (is_invite(trans)) 
 			cancel_uacs( trans, cancel_bitmap, F_CANCEL_B_KILL );
@@ -594,17 +587,20 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
 	if (!trans->uas.response.dst.send_sock) {
 		LOG(L_ERR, "ERROR: _reply_light: no resolved dst to send reply to\n");
 	} else {
+		if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){
+			if (unlikely(code>=200 && !is_local(trans) &&
+						has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) )
+				run_trans_callbacks(TMCB_RESPONSE_OUT, trans,
+									trans->uas.request, FAKED_REPLY, code);
 #ifdef TMCB_ONSEND
-		if (SEND_PR_BUFFER( rb, buf, len )>=0)
 			if (unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_SENT))){
 				INIT_TMCB_ONSEND_PARAMS(onsend_params, 0, 0, rb, &rb->dst, 
 								buf, len, TMCB_LOCAL_F, rb->branch, code);
 				run_onsend_callbacks2(TMCB_RESPONSE_SENT, trans,
 										&onsend_params);
 			}
-#else
-		SEND_PR_BUFFER( rb, buf, len );
-#endif
+#endif /* TMCB_ONSEND */
+		}
 		DBG("DEBUG: reply sent out. buf=%p: %.9s..., shmem=%p: %.9s\n",
 			buf, buf, rb->buffer, rb->buffer );
 	}