sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:master: modules/rr: only use flow-token for routing if it doesn' t point to the source of the request
by Peter Dunkley 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 874669f483e1efba032bd695eb6cee4275673874 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=874669f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 15:43:02 2013 +0000 modules/rr: only use flow-token for routing if it doesn't point to the source of the request --- modules/rr/loose.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index b7fa243..268522c 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -513,12 +513,15 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, ret = rr_obb.decode_flow_token(&rcv, flow_token); if (ret == -2) { - LM_INFO("no flow token found - outbound not in use\n"); + LM_DBG("no flow token found - outbound not in use\n"); return 0; } else if (ret == -1) { LM_ERR("failed to decode flow token\n"); return -1; - } else { + } else if (!ip_addr_cmp(&rcv.src_ip, &_m->rcv.src_ip) + || rcv.src_port != _m->rcv.src_port) { + LM_DBG("\"incoming\" request found. Using flow-token for" + "routing\n"); /* First, force the local socket */ si = find_si(&rcv.dst_ip, rcv.dst_port, rcv.proto); @@ -546,9 +549,9 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, rcv.src_ip.af == AF_INET6 ? "]" : "", rcv.src_port, get_proto_name(rcv.proto)); - - return 1; } + + return 1; } /*!

1 0

git:hpw/branch_failure_route: modules/xprint: Updated to use the new get_branch()/next_branch() functions
by Hugh Waite 27 Mar '13

27 Mar '13

Module: sip-router Branch: hpw/branch_failure_route Commit: 5d1a3b87fde83455f63075d8fdf39b7b99d4053c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d1a3b8… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Mar 27 14:25:32 2013 +0000 modules/xprint: Updated to use the new get_branch()/next_branch() functions --- modules/xprint/xp_lib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/xprint/xp_lib.c b/modules/xprint/xp_lib.c index c653177..7dd9c99 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); + branch.s = next_branch(&branch.len, &q, 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))) + while ((uri.s = next_branch(&uri.len, &q, 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))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) { if (i) {

1 0

git:hpw/branch_failure_route: modules/tm: Enable retrieving of branch instance id from uac structure
by Hugh Waite 27 Mar '13

27 Mar '13

Module: sip-router Branch: hpw/branch_failure_route Commit: 2f85ac8828b2d336069c618ef4d209d61809c19f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f85ac8… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Mar 27 14:36:59 2013 +0000 modules/tm: Enable retrieving of branch instance id from uac structure - Add instance to uac structure and populate when uac created - Add get_this_branch_instance function to retrieve instance in a branch failure route --- modules/tm/h_table.h | 5 +-- modules/tm/t_fwd.c | 80 +++++++++++++++++++++++++++++++++++++++++------- modules/tm/t_lookup.c | 1 - modules/tm/t_reply.c | 37 ++++++++++++++++++----- modules/tm/t_reply.h | 4 +- modules/tm/t_serial.c | 24 +++++++++++---- modules/tm/tm.c | 2 - modules/tm/tm_load.h | 1 - 8 files changed, 118 insertions(+), 36 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2f8…

1 0

git:hpw/branch_failure_route: modules/pv: Updated to use the new get_branch ()/next_branch() functions
by Hugh Waite 27 Mar '13

27 Mar '13

Module: sip-router Branch: hpw/branch_failure_route Commit: a1e0c05e953140b026325117c3d8ace5a2ccf900 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1e0c05… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Mar 27 11:53:18 2013 +0000 modules/pv: Updated to use the new get_branch()/next_branch() functions - New instance parameter is currently not used --- 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 b292e31..791bb5a 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -49,7 +49,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, &ruid); + uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid, 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 36dfbba..66ab63e 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, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 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, 0))) + while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 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, 0))) + while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0, 0))) { if (i) {

1 0

git:hpw/branch_failure_route: modules/domain: Updated to use the new get_branch()/next_branch() functions
by Hugh Waite 27 Mar '13

27 Mar '13

Module: sip-router Branch: hpw/branch_failure_route Commit: 58c9ba973415caf2a39c0c6fefbd66986d475a89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58c9ba9… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Mar 27 11:46:45 2013 +0000 modules/domain: Updated to use the new get_branch()/next_branch() functions --- modules/domain/domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/domain/domain.c b/modules/domain/domain.c index cacca0c..60915bf 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); + branch.s = get_branch(0, &branch.len, &q, 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");

1 0

git:hpw/branch_failure_route: modules/permissions: Updated to use the new get_branch()/next_branch() functions
by Hugh Waite 27 Mar '13

27 Mar '13

Module: sip-router Branch: hpw/branch_failure_route Commit: 691ebf0178aa25b5ef19eb6a220d335be3900a3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=691ebf0… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Mar 27 11:52:15 2013 +0000 modules/permissions: Updated to use the new get_branch()/next_branch() functions --- modules/permissions/permissions.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index 3e8d179..f9115e8 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 ; + for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0))!=0 ; br_idx++ ) { uri_str = get_plain_uri(&branch); if (!uri_str) {

1 0

git:hpw/branch_failure_route: core: Update get_branch() to return instance from appended branches
by Hugh Waite 27 Mar '13

27 Mar '13

Module: sip-router Branch: hpw/branch_failure_route Commit: 42a1548a57ec8e3a8779f1644347340c25aa1bdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42a1548… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Mar 27 11:44:08 2013 +0000 core: Update get_branch() to return instance from appended branches - get_branch() and next_branch() updated - modified select_core.c to use new function definition --- dset.c | 18 +++++++++++++----- dset.h | 4 ++-- select_core.c | 6 +++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dset.c b/dset.c index 5421d0a..296f7c4 100644 --- a/dset.c +++ b/dset.c @@ -216,7 +216,7 @@ void set_branch_iterator(int n) char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int *flags, struct socket_info** force_socket, - str *ruid) + str *ruid, str *instance) { if (i < nr_branches) { *len = branches[i].len; @@ -237,6 +237,10 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, ruid->len = branches[i].ruid_len; ruid->s = (ruid->len)?branches[i].ruid:0; } + if (instance) { + instance->len = branches[i].instance_len; + instance->s = (instance->len)?branches[i].instance:0; + } return branches[i].uri; } else { *len = 0; @@ -257,6 +261,10 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, ruid->s = 0; ruid->len = 0; } + if (instance) { + instance->s = 0; + instance->len = 0; + } return 0; } } @@ -268,12 +276,12 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int* flags, struct socket_info** force_socket, - str* ruid) + str* ruid, str *instance) { char* ret; ret=get_branch(branch_iterator, len, q, dst_uri, path, flags, - force_socket, ruid); + force_socket, ruid, instance); if (likely(ret)) branch_iterator++; return ret; @@ -442,7 +450,7 @@ char* print_dset(struct sip_msg* msg, int* len) crt_branch = get_branch_iterator(); init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0))) { + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) { cnt++; *len += uri.len; if (q != Q_UNSPECIFIED) { @@ -483,7 +491,7 @@ char* print_dset(struct sip_msg* msg, int* len) } init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0))) { + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) { if (i) { memcpy(p, CONTACT_DELIM, CONTACT_DELIM_LEN); p += CONTACT_DELIM_LEN; diff --git a/dset.h b/dset.h index 2eca07f..3741fcb 100644 --- a/dset.h +++ b/dset.h @@ -140,12 +140,12 @@ void set_branch_iterator(int n); */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int* flags, struct socket_info** force_socket, - str *ruid); + str *ruid, str *instance); char* get_branch( unsigned int i, int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int *flags, struct socket_info** force_socket, - str* ruid); + str* ruid, str *instance); /*! \brief * Empty the array of branches diff --git a/select_core.c b/select_core.c index 68fa5ba..130a9fd 100644 --- a/select_core.c +++ b/select_core.c @@ -1621,7 +1621,7 @@ int select_branch_uri(str* res, select_t* s, struct sip_msg* msg) { char *c; init_branch_iterator(); len = 0; - while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0))) { + while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0))) { if (s->params[SEL_POS].v.i & SEL_BRANCH_DST_URI) { l = dst_uri.len; @@ -1645,7 +1645,7 @@ int select_branch_uri(str* res, select_t* s, struct sip_msg* msg) { init_branch_iterator(); res->len = 0; n = 0; - while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0))) { + while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0))) { if (s->params[SEL_POS].v.i & SEL_BRANCH_DST_URI) { l = dst_uri.len; c = dst_uri.s; @@ -1687,7 +1687,7 @@ int select_branch_uri(str* res, select_t* s, struct sip_msg* msg) { if (n < 0 || n >= nr_branches) return -1; init_branch_iterator(); - for (; (c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0)) && n; n--); + for (; (c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0)) && n; n--); if (!c) return 1; if (s->params[SEL_POS].v.i & SEL_BRANCH_DST_URI) {

1 0

git:master: cnxcc: added new module for credit control
by Carlos Ruiz Diaz 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 96596e282af0a967c93e162169c6729d183557b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96596e2… Author: Carlos Ruiz Díaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Díaz <carlos.ruizdiaz(a)gmail.com> Date: Tue Mar 26 00:58:28 2013 -0300 cnxcc: added new module for credit control --- modules/cnxcc/Makefile | 17 + modules/cnxcc/README | 270 ++++++ modules/cnxcc/cnxcc.c | 63 ++ modules/cnxcc/cnxcc.h | 39 + modules/cnxcc/cnxcc_check.c | 176 ++++ modules/cnxcc/cnxcc_check.h | 16 + modules/cnxcc/cnxcc_mod.c | 1526 ++++++++++++++++++++++++++++++ modules/cnxcc/cnxcc_mod.h | 156 +++ modules/cnxcc/cnxcc_rpc.c | 269 ++++++ modules/cnxcc/cnxcc_rpc.h | 16 + modules/cnxcc/cnxcc_sip_msg_faker.c | 71 ++ modules/cnxcc/cnxcc_sip_msg_faker.h | 29 + modules/cnxcc/doc/Makefile | 4 + modules/cnxcc/doc/cnxcc.xml | 36 + modules/cnxcc/doc/cnxcc_admin.xml | 299 ++++++ modules/cnxcc/example/kamailio-cnxcc.cfg | 983 +++++++++++++++++++ 16 files changed, 3970 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=965…

3 3

git:master: pkg/kamailio/(centos|fedora): Updated . spec after addition of cnxcc module
by Peter Dunkley 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 800d56979226ad80e045fb316e19fb3b77ce7f57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=800d569… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 13:59:44 2013 +0000 pkg/kamailio/(centos|fedora): Updated .spec after addition of cnxcc module --- pkg/kamailio/fedora/17/kamailio.spec | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 4e0a158..0cf4442 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -518,6 +518,7 @@ fi %doc %{_docdir}/kamailio/modules/README.cfg_db %doc %{_docdir}/kamailio/modules/README.cfg_rpc %doc %{_docdir}/kamailio/modules/README.cfgutils +%doc %{_docdir}/kamailio/modules/README.cnxcc %doc %{_docdir}/kamailio/modules/README.corex %doc %{_docdir}/kamailio/modules/README.counters %doc %{_docdir}/kamailio/modules/README.ctl @@ -657,6 +658,7 @@ fi %{_libdir}/kamailio/modules/cfg_db.so %{_libdir}/kamailio/modules/cfg_rpc.so %{_libdir}/kamailio/modules/cfgutils.so +%{_libdir}/kamailio/modules/cnxcc.so %{_libdir}/kamailio/modules/corex.so %{_libdir}/kamailio/modules/counters.so %{_libdir}/kamailio/modules/ctl.so @@ -1088,6 +1090,8 @@ fi %changelog +* Wed Mar 27 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - Added cnxcc module to .spec * Thu Mar 7 2013 Peter Dunkley <peter(a)dunkley.me.uk> - Added build requirement for docbook2X for Fedora builds * Wed Mar 6 2013 Peter Dunkley <peter(a)dunkley.me.uk>

1 0

git:master: Makefile.groups: cnxcc module added to extra list
by Daniel-Constantin Mierla 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 94272bdb6ce2a15ba2e165eef59561c2d2992a5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94272bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 27 13:39:28 2013 +0100 Makefile.groups: cnxcc module added to extra list --- Makefile.groups | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index 161e3e0..c113982 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -16,9 +16,9 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ textopsx tm tmx topoh xlog # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb qos \ - sca seas sms sst timer tmrec uac_redirect xhttp xhttp_rpc \ - xprint +mod_list_extra=avp auth_diameter call_control cnxcc dmq domainpolicy msrp pdb \ + qos sca seas sms sst timer tmrec uac_redirect xhttp \ + xhttp_rpc xprint # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013