git:andrei/path: registrar(s): updated to the new append_branch() - sr-dev

8 Sep 2009

Module: sip-router
Branch: andrei/path
Commit: d9ebb640e2d659aa5d76809b18c9b1241f69525c
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9ebb640...
Author: Andrei Pelinescu-Onciul andrei@iptel.org
Committer: Andrei Pelinescu-Onciul andrei@iptel.org
Date:   Fri Sep  4 15:23:44 2009 +0200
registrar(s): updated to the new append_branch()
---
modules_s/registrar/lookup.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules_s/registrar/lookup.c b/modules_s/registrar/lookup.c
index 45fc577..6363518 100644
--- a/modules_s/registrar/lookup.c
+++ b/modules_s/registrar/lookup.c
@@ -164,7 +164,7 @@ skip_rewrite_uri:
    				LOG(L_ERR, "ERROR: lookup(): branch: out of memory\n");
    				goto cont; /* try to continue */
    			}
-				if (append_branch(_m, new_uri.s, new_uri.len, 0, 0, ptr->q, 0) == -1) {
+				if (append_branch(_m, &new_uri, 0, 0, ptr->q, 0, 0) == -1) {
    				LOG(L_ERR, "lookup(): Error while appending a branch\n");
    				pkg_free(new_uri.s);
    				if (ser_error==E_TOO_MANY_BRANCHES) goto skip;
@@ -173,8 +173,8 @@ skip_rewrite_uri:
    			}
    			pkg_free(new_uri.s); /* append_branch doesn't free it */
    		}else{
-				if (append_branch(_m, ptr->c.s, ptr->c.len, ptr->received.s,
-							ptr->received.len, ptr->q, ptr->sock) == -1) {
+				if (append_branch(_m, &ptr->c, &ptr->received, 0 /* path */,
+									ptr->q, 0 /* brflags*/, ptr->sock) == -1) {
    				LOG(L_ERR, "lookup(): Error while appending a branch\n");
    				goto skip; /* Return OK here so the function succeeds */
    			}
@@ -326,7 +326,7 @@ skip_rewrite_uri:
    				ERR("branch: out of memory\n");
    				goto cont; /* try to continue */
    			}
-				if (append_branch(msg, new_uri.s, new_uri.len, 0, 0, ptr->q, 0) == -1) {
+				if (append_branch(msg, &new_uri, 0, 0, ptr->q, 0, 0) == -1) {
    				ERR("Error while appending a branch\n");
    				pkg_free(new_uri.s);
    				if (ser_error == E_TOO_MANY_BRANCHES) goto skip;
@@ -335,8 +335,8 @@ skip_rewrite_uri:
    			}
    			pkg_free(new_uri.s); /* append_branch doesn't free it */
    		} else {
-				if (append_branch(msg, ptr->c.s, ptr->c.len, ptr->received.s,
-							ptr->received.len, ptr->q, ptr->sock) == -1) {
+				if (append_branch(msg, &ptr->c, &ptr->received, 0 /* path */,
+									 ptr->q, 0, ptr->sock) == -1) {
    				ERR("Error while appending a branch\n");
    				goto skip; /* Return OK here so the function succeeds */
    			}

    