[sr-dev] git:andrei/path: tm: updated to the new append_branch() & next_branch()

[Andrei Pelinescu-Onciul]

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

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Fri Sep  4 15:19:27 2009 +0200

tm: updated to the new append_branch() & next_branch()

---

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

diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c
index bb0cf61..eb332d3 100644
--- a/modules/tm/t_fwd.c
+++ b/modules/tm/t_fwd.c
@@ -1013,7 +1013,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg ,
 	int success_branch;
 	int try_new;
 	int lock_replies;
-	str dst_uri;
+	str dst_uri, path;
 	struct socket_info* si, *backup_si;
 	flag_t backup_bflags = 0;
 	flag_t bflags = 0;
@@ -1083,10 +1083,10 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg ,
 	} else try_new=0;
 
 	init_branch_iterator();
-	while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri.s, &dst_uri.len, &si))) {
+	while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path,
+										&bflags, &si))) {
 		try_new++;
 		p_msg->force_send_socket = si;
-		getbflagsval(get_branch_iterator(), &bflags);
 		setbflagsval(0, bflags);
 
 		branch_ret=add_uac( t, p_msg, &current_uri, 
diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c
index e372d04..9fa0dcf 100644
--- a/modules/tm/t_serial.c
+++ b/modules/tm/t_serial.c
@@ -448,7 +448,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value)
 				return -1;
 			}
 
-			if (km_append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) {
+			if (append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) {
 				LM_ERR("appending branch failed\n");
 				destroy_avp(avp);
 				return -1;
@@ -488,8 +488,8 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value)
 				destroy_avp(avp);
 				return -1;
 			}
-	    
-			if (km_append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) {
+	
+			if (append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) {
 				LM_ERR("appending branch failed\n");
 				destroy_avp(avp);
 				return -1;