Module: sip-router Branch: pd/outbound Commit: a16fb22d12696f707839f7b97da471d02121e228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a16fb22d...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Thu Mar 14 23:34:34 2013 +0000

modules/pv: updated use of get_branch() and next_branch() to cope with additional argument

---

modules/pv/pv_branch.c | 2 +- modules/pv/pv_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index 2abd639..9ae5be3 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -48,7 +48,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); }

- uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket); + uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, 0);

/* branch(count) doesn't need a valid branch, everything else does */ if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index a7e8c33..99ae3d2 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1358,7 +1358,7 @@ int pv_get_branch(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res);

- branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0); if (!branch.s) { return pv_get_null(msg, param, res); } @@ -1387,7 +1387,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param,

cnt = s.len = 0;

- while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0))) + while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0))) { cnt++; s.len += uri.len; @@ -1411,7 +1411,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, i = 0; p = pv_local_buf;

- while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0))) + while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0))) { if (i) {