17 May
2013
17 May
'13
7:19 p.m.
Module: sip-router
Branch: master
Commit: 1b0ad814aec79a44b865ad2d3552c4693fe2ea6d
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b0ad81…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Sat May 18 00:18:43 2013 +0100
modules/{various}: updated because there is now an extra parameter on the append_branch()
function
---
modules/alias_db/alookup.c | 2 +-
modules/avpops/avpops_impl.c | 4 ++--
modules/corex/corex_lib.c | 2 +-
modules/cpl-c/cpl_sig.c | 2 +-
modules/dialplan/dialplan.c | 2 +-
modules/domain/domain.c | 2 +-
modules/enum/enum.c | 4 ++--
modules/exec/exec.c | 2 +-
modules/ims_icscf/scscf_list.c | 2 +-
modules/ims_isc/isc.c | 2 +-
modules/permissions/permissions.c | 2 +-
modules/xprint/xp_lib.c | 6 +++---
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/modules/alias_db/alookup.c b/modules/alias_db/alookup.c
index aa25212..4437549 100644
--- a/modules/alias_db/alookup.c
+++ b/modules/alias_db/alookup.c
@@ -202,7 +202,7 @@ int alias_db_lookup(struct sip_msg* _msg, str table_s)
} else {
user_s.s = useruri_buf;
if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0,
- 0, 0, 0) == -1)
+ 0, 0, 0, 0) == -1)
{
LM_ERR("error while appending branches\n");
goto err_server;
diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c
index 890fc14..81a8053 100644
--- a/modules/avpops/avpops_impl.c
+++ b/modules/avpops/avpops_impl.c
@@ -999,7 +999,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst,
/* if is not the first modification, push the current uri as
* branch */
if (append_branch( msg, 0, 0, 0, Q_UNSPECIFIED,
- 0, 0, 0, 0, 0) != 1)
+ 0, 0, 0, 0, 0, 0) != 1)
{
LM_ERR("append_branch action failed\n");
goto error;
@@ -1026,7 +1026,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst,
ruri_mark_new(); /* re-use uri for serial forking */
} else if (dst->opd&AVPOPS_USE_BRANCH) {
if (append_branch( msg, &val, 0, 0, Q_UNSPECIFIED, 0,
- msg->force_send_socket, 0, 0, 0) != 1)
+ msg->force_send_socket, 0, 0, 0, 0) != 1)
{
LM_ERR("append_branch action failed\n");
goto error;
diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c
index bd81f3b..9d926c2 100644
--- a/modules/corex/corex_lib.c
+++ b/modules/corex/corex_lib.c
@@ -71,7 +71,7 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq)
getbflagsval(0, &branch_flags);
ret = append_branch(msg, (uri.len>0)?&uri:0, &msg->dst_uri,
&msg->path_vec, q, branch_flags,
- msg->force_send_socket, 0, 0, 0);
+ msg->force_send_socket, 0, 0, 0, 0);
if(uri.len<=0)
diff --git a/modules/cpl-c/cpl_sig.c b/modules/cpl-c/cpl_sig.c
index 34f61ac..630dc43 100644
--- a/modules/cpl-c/cpl_sig.c
+++ b/modules/cpl-c/cpl_sig.c
@@ -92,7 +92,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs,
(*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags);
if(append_branch(msg, &(*locs)->addr.uri,
&(*locs)->addr.received, 0,
- Q_UNSPECIFIED, bflags, 0, 0, 0, 0)==-1){
+ Q_UNSPECIFIED, bflags, 0, 0, 0, 0, 0)==-1){
LM_ERR("failed when appending branch <%s>\n",
(*locs)->addr.uri.s);
goto error;
diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c
index d416d2f..8a3a136 100644
--- a/modules/dialplan/dialplan.c
+++ b/modules/dialplan/dialplan.c
@@ -295,7 +295,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t
* dest,
if(is_route_type(FAILURE_ROUTE)
&& (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) {
- if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0) != 1) {
+ if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) != 1) {
LM_ERR("append_branch action failed\n");
return -1;
}
diff --git a/modules/domain/domain.c b/modules/domain/domain.c
index 60915bf..1134941 100644
--- a/modules/domain/domain.c
+++ b/modules/domain/domain.c
@@ -142,7 +142,7 @@ int is_uri_host_local(struct sip_msg* _msg, char* _s1, char* _s2)
}
return hash_table_lookup(&(_msg->parsed_uri.host), &did, &attrs);
} else if (is_route_type(FAILURE_ROUTE)) {
- branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0);
+ branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0, 0);
if (branch.s) {
if (parse_uri(branch.s, branch.len, &puri) < 0) {
LM_ERR("error while parsing branch URI\n");
diff --git a/modules/enum/enum.c b/modules/enum/enum.c
index 166be63..177669a 100644
--- a/modules/enum/enum.c
+++ b/modules/enum/enum.c
@@ -687,7 +687,7 @@ int do_query(struct sip_msg* _msg, char *user, char *name, str
*service) {
q = q - 10;
curr_prio = priority;
}
- if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0) == -1) {
+ if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0) == -1) {
goto done;
}
}
@@ -1137,7 +1137,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix,
q = q - 10;
curr_prio = priority;
}
- if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0)
+ if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0)
== -1) {
goto done;
}
diff --git a/modules/exec/exec.c b/modules/exec/exec.c
index ab8d1e6..9e2e464 100644
--- a/modules/exec/exec.c
+++ b/modules/exec/exec.c
@@ -168,7 +168,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int
param_len) {
}
} else {
if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0,
- 0, 0, 0) == -1) {
+ 0, 0, 0, 0) == -1) {
LM_ERR("append_branch failed; too many or too long URIs?\n");
goto error02;
}
diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c
index 320bf64..c65a963 100644
--- a/modules/ims_icscf/scscf_list.c
+++ b/modules/ims_icscf/scscf_list.c
@@ -384,7 +384,7 @@ int I_scscf_select(struct sip_msg* msg, char* str1, char* str2) {
} else {
/* subsequent */
req = msg;
- append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0);
+ append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0);
result = CSCF_RETURN_TRUE;
}
} else {
diff --git a/modules/ims_isc/isc.c b/modules/ims_isc/isc.c
index 7593703..ea9428e 100644
--- a/modules/ims_isc/isc.c
+++ b/modules/ims_isc/isc.c
@@ -76,7 +76,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) {
/* append branch if last trigger failed */
if (is_route_type(FAILURE_ROUTE))
- append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0,
Q_UNSPECIFIED, 0, 0, 0, 0, 0);
+ append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0,
Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0);
// Determines the tm transaction identifiers.
// If no transaction, then creates one
diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c
index f9115e8..d48f9e2 100644
--- a/modules/permissions/permissions.c
+++ b/modules/permissions/permissions.c
@@ -406,7 +406,7 @@ static int check_routing(struct sip_msg* msg, int idx)
}
check_branches:
- for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0))!=0 ;
+ for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0,0))!=0 ;
br_idx++ ) {
uri_str = get_plain_uri(&branch);
if (!uri_str) {
diff --git a/modules/xprint/xp_lib.c b/modules/xprint/xp_lib.c
index 7dd9c99..91cf76a 100644
--- a/modules/xprint/xp_lib.c
+++ b/modules/xprint/xp_lib.c
@@ -700,7 +700,7 @@ static int xl_get_branch(struct sip_msg *msg, str *res, str *hp, int
hi, int hf)
init_branch_iterator();
- branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0);
+ branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0, 0);
if (!branch.s) {
return xl_get_null(msg, res, hp, hi, hf);
}
@@ -731,7 +731,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int
hi, int h
cnt = len = 0;
init_branch_iterator();
- while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0)))
+ while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0)))
{
cnt++;
len += uri.len;
@@ -756,7 +756,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int
hi, int h
p = local_buf;
init_branch_iterator();
- while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0)))
+ while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0)))
{
if (i)
{