[sr-dev] git:master: kamailio.cfg: use route(RELAY) instead of t_relay()

[Daniel-Constantin Mierla]

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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Mon Jan 28 16:54:44 2013 +0100

kamailio.cfg: use route(RELAY) instead of t_relay()

- coherent exit from config when sending out

---

 etc/kamailio.cfg |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
index a7ed0e3..0c90f5d 100644
--- a/etc/kamailio.cfg
+++ b/etc/kamailio.cfg
@@ -463,8 +463,9 @@ request_route {
 	# CANCEL processing
 	if (is_method("CANCEL"))
 	{
-		if (t_check_trans())
-			t_relay();
+		if (t_check_trans()) {
+			route(RELAY);
+		}
 		exit;
 	}
 
@@ -513,8 +514,6 @@ request_route {
 
 	# user location service
 	route(LOCATION);
-
-	route(RELAY);
 }
 
 
@@ -604,7 +603,7 @@ route[WITHINDLG] {
 					# no loose-route, but stateful ACK;
 					# must be an ACK after a 487
 					# or e.g. 404 from upstream server
-					t_relay();
+					route(RELAY);
 					exit;
 				} else {
 					# ACK without matching transaction ... ignore and discard
@@ -671,6 +670,9 @@ route[LOCATION] {
 	{
 		setflag(FLT_ACCMISSED);
 	}
+
+	route(RELAY);
+	exit;
 }
 
 # Presence server route