git:master: modules_s: migrated append_branch in cpl-c, exec, and registrar modules - sr-dev

8 Dec 2012

Module: sip-router
Branch: master
Commit: 181561c7dc50c0c4e6ac84b53b33d8a5bc6dd053
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=181561c7...
Author: Juha Heinanen jh@tutpro.com
Committer: Juha Heinanen jh@tutpro.com
Date:   Sat Dec  8 16:09:40 2012 +0200
modules_s: migrated append_branch in cpl-c, exec, and registrar modules
---
modules_s/cpl-c/cpl_sig.c    |    2 +-
 modules_s/registrar/lookup.c |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules_s/cpl-c/cpl_sig.c b/modules_s/cpl-c/cpl_sig.c
index 00b0a32..9b5fe50 100644
--- a/modules_s/cpl-c/cpl_sig.c
+++ b/modules_s/cpl-c/cpl_sig.c
@@ -84,7 +84,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs,
    	DBG("DEBUG:cpl_c:cpl_proxy_to_loc_set: appending branch "
    		"<%.*s>\n",(*locs)->addr.uri.len,(*locs)->addr.uri.s);
    	if(append_branch(msg, &(*locs)->addr.uri,
-							0, 0, Q_UNSPECIFIED, 0,  0)==-1){
+				 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0)==-1){
    		LOG(L_ERR,"ERROR:cpl_c:cpl_proxy_to_loc_set: failed when "
    			"appending branch <%s>\n",(*locs)->addr.uri.s);
    		goto error;
diff --git a/modules_s/registrar/lookup.c b/modules_s/registrar/lookup.c
index 61e97fa..18b2ecc 100644
--- a/modules_s/registrar/lookup.c
+++ b/modules_s/registrar/lookup.c
@@ -165,7 +165,8 @@ skip_rewrite_uri:
    				LOG(L_ERR, "ERROR: lookup(): branch: out of memory\n");
    				goto cont; /* try to continue */
    			}
-				if (append_branch(_m, &new_uri, 0, 0, ptr->q, 0, 0) == -1) {
+				if (append_branch(_m, &new_uri, 0, 0, ptr->q,
+						  0, 0, 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;
@@ -174,8 +175,10 @@ skip_rewrite_uri:
    			}
    			pkg_free(new_uri.s); /* append_branch doesn't free it */
    		}else{
-				if (append_branch(_m, &ptr->c, &ptr->received, 0 /* path */,
-									ptr->q, 0 /* brflags*/, ptr->sock) == -1) {
+				if (append_branch(_m, &ptr->c, &ptr->received,
+						  0 /* path */,
+						  ptr->q, 0 /* brflags*/,
+						  ptr->sock, 0, 0) == -1) {
    				LOG(L_ERR, "lookup(): Error while appending a branch\n");
    				goto skip; /* Return OK here so the function succeeds */
    			}
@@ -326,7 +329,8 @@ skip_rewrite_uri:
    				ERR("branch: out of memory\n");
    				goto cont; /* try to continue */
    			}
-				if (append_branch(msg, &new_uri, 0, 0, ptr->q, 0, 0) == -1) {
+				if (append_branch(msg, &new_uri, 0, 0, ptr->q,
+						  0, 0, 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 +339,10 @@ skip_rewrite_uri:
    			}
    			pkg_free(new_uri.s); /* append_branch doesn't free it */
    		} else {
-				if (append_branch(msg, &ptr->c, &ptr->received, 0 /* path */,
-									 ptr->q, 0, ptr->sock) == -1) {
+				if (append_branch(msg, &ptr->c, &ptr->received,
+						  0 /* path */,
+						  ptr->q, 0, ptr->sock,
+						  0, 0) == -1) {
    				ERR("Error while appending a branch\n");
    				goto skip; /* Return OK here so the function succeeds */
    			}

    