sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: sl: lookup event route for local response at startup
by Daniel-Constantin Mierla 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: 16f87ae1b1f78938ed56a7c9a336a2853022b86c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16f87ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 13:39:15 2013 +0200 sl: lookup event route for local response at startup - group lookup of sl event routes in one function --- modules/sl/sl.c | 6 +----- modules/sl/… [View More]sl_funcs.c | 22 +++++++++++++++++++--- modules/sl/sl_funcs.h | 2 ++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 87449fd..ab5e737 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -78,8 +78,6 @@ MODULE_VERSION static int default_code = 500; static str default_reason = STR_STATIC_INIT("Internal Server Error"); -int _sl_filtered_ack_route = -1; /* default disabled */ - static int sl_bind_tm = 1; static struct tm_binds tmb; @@ -176,9 +174,7 @@ static int mod_init(void) } } - _sl_filtered_ack_route=route_lookup(&event_rt, "sl:filtered-ack"); - if (_sl_filtered_ack_route>=0 && event_rt.rlist[_sl_filtered_ack_route]==0) - _sl_filtered_ack_route=-1; /* disable */ + sl_lookup_event_routes(); return 0; } diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index 388f79c..c9c870c 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -75,7 +75,24 @@ static char *tag_suffix; we do not filter */ static unsigned int *sl_timeout; -extern int _sl_filtered_ack_route; +static int _sl_filtered_ack_route = -1; /* default disabled */ + +static int _sl_evrt_local_response = -1; /* default disabled */ + +/*! + * lookup sl event routes + */ +void sl_lookup_event_routes(void) +{ + _sl_filtered_ack_route=route_lookup(&event_rt, "sl:filtered-ack"); + if (_sl_filtered_ack_route>=0 && event_rt.rlist[_sl_filtered_ack_route]==0) + _sl_filtered_ack_route=-1; /* disable */ + + _sl_evrt_local_response = route_lookup(&event_rt, "sl:local-response"); + if (_sl_evrt_local_response>=0 + && event_rt.rlist[_sl_evrt_local_response]!=NULL) + _sl_evrt_local_response = -1; +} /*! * init sl internal structures @@ -207,8 +224,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) ret = msg_send(&dst, buf.s, buf.len); mhomed=backup_mhomed; - rt = route_lookup(&event_rt, "sl:local-response"); - if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) + if (unlikely(_sl_evrt_local_response >= 0)) { if (likely(build_sip_msg_from_buf(&pmsg, buf.s, buf.len, inc_msg_no()) == 0)) diff --git a/modules/sl/sl_funcs.h b/modules/sl/sl_funcs.h index 772f106..4654d80 100644 --- a/modules/sl/sl_funcs.h +++ b/modules/sl/sl_funcs.h @@ -48,4 +48,6 @@ int sl_reply_error(struct sip_msg *msg); int sl_get_reply_totag(struct sip_msg *msg, str *totag); +void sl_lookup_event_routes(void); + #endif [View Less]

1 0

git:master: Makefile.defs: version set to 4.1.0-dev9
by Daniel-Constantin Mierla 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: f8697d13be92a79bdfcfd6a824d5e312f7b0d9e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8697d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 11:20:42 2013 +0200 Makefile.defs: version set to 4.1.0-dev9 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs … [View More]

1 0

git:master: registrar: note about empty value for received_param
by Daniel-Constantin Mierla 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: e35fe9c6095361414565b1099dea1ad5950fb38d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e35fe9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 11:18:09 2013 +0200 registrar: note about empty value for received_param --- modules/registrar/README | 3 ++- modules/registrar/doc/registrar_admin.xml | 3 ++-… [View More]

1 0

git:master: registrar: if rcv_parm value is empty, don' t add received to contacts in 200ok reply
by Daniel-Constantin Mierla 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: 2f213e313a86e16665f6d0acfec959bf23f72b7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f213e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 11:15:16 2013 +0200 registrar: if rcv_parm value is empty, don't add received to contacts in 200ok reply - otherwise results in malformed value --- modules/registrar/reply.c | 4 +… [View More]

1 0

[tracker] Comment added: avpops: use xavp semantic on second parameter
by sip-router 20 Sep '13

20 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#346 - avpops: use xavp semantic on second parameter User who did this - Daniel-Constantin Mierla (miconda) ---------- Don't forget to add to the docs in avps for affected functions that they support xavp as well. So far it was mainly about avps supported as parameters. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346#… [View More]

1 0

[tracker] Task closed: avpops: use xavp semantic on second parameter
by sip-router 20 Sep '13

20 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#346 - avpops: use xavp semantic on second parameter User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive … [View More]

1 0

git:master: registrar: list of allowed route blocks updated for save()
by Daniel-Constantin Mierla 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: 664b2f30de6518636085d676a32247c7d46bd2da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=664b2f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 11:09:15 2013 +0200 registrar: list of allowed route blocks updated for save() --- modules/registrar/README | 3 ++- modules/registrar/doc/registrar_admin.xml | … [View More]

1 0

git:master: registrar: relax usage of save() for failure route
by Daniel-Constantin Mierla 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: e2376e34fbabd929d0736bddb8e82ceb25cc3738 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2376e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 11:07:31 2013 +0200 registrar: relax usage of save() for failure route --- modules/registrar/reg_mod.c | 6 +++--- modules/registrar/save.c | 3 ++- 2 files changed, 5 … [View More]

1 0

git:master: avpops: allow xavp semantics on second parameter
by Victor Seva 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: 0968ce561b3bb8ea2ad2c7c53c03091e8518a6fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0968ce5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Sep 20 11:08:52 2013 +0200 avpops: allow xavp semantics on second parameter --- modules/avpops/avpops_impl.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 … [View More]insertions(+), 0 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 65a5239..4fa2a53 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -45,6 +45,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_uri.h" #include "../../mem/mem.h" +#include "../../xavp.h" #include "avpops_impl.h" #include "avpops_db.h" @@ -1051,6 +1052,86 @@ error: return -1; } +int get_xavp(struct sip_msg *msg, pv_xavp_name_t *xname, + sr_xavp_t **avp, int *flag) +{ + int idxf = 0; + int idx = 0; + int count; + + if(xname==NULL) + { + LM_ERR("bad parameters\n"); + return -1; + } + + if(xname->index.type==PVT_EXTRA) + { + /* get the index */ + if(pv_get_spec_index(msg, &xname->index.pvp, &idx, &idxf)!=0) + { + LM_ERR("invalid index\n"); + return -1; + } + LM_DBG("key1 idx:%d idxf:%d\n", idx, idxf); + if(idxf==PV_IDX_ALL) + LM_ERR("idx:* at first key not implemented. Using idx:0\n"); + } + /* fix the index */ + if(idx<0) + { + count = xavp_count(&xname->name, NULL); + idx = count + idx; + } + *avp = xavp_get_by_index(&xname->name, idx, NULL); + if(*avp==NULL) + return -1; + if(xname->next==NULL) + return 0; + + idx = 0; + idxf = 0; + if(xname->next->index.type==PVT_EXTRA) + { + /* get the index */ + if(pv_get_spec_index(msg, &xname->next->index.pvp, &idx, &idxf)!=0) + { + LM_ERR("invalid index\n"); + return -1; + } + LM_DBG("key2 idx:%d idxf:%d\n", idx, idxf); + *flag=idxf; + } + /* fix the index */ + if(idx<0) + { + count = xavp_count(&xname->next->name, &(*avp)->val.v.xavp); + idx = count + idx; + } + *avp = xavp_get_by_index(&xname->next->name, idx, &(*avp)->val.v.xavp); + if(*avp==NULL) + return -1; + return 1; +} + +int check_xavp_param(struct sip_msg* msg, pv_spec_p spec, sr_xavp_t **xavp, + int *flag) +{ + int res; + pv_xavp_name_t *xname = (pv_xavp_name_t*)spec->pvp.pvn.u.dname; + res = get_xavp(msg, xname, xavp, flag); + if(res<=0) + { + if(res==0) + LM_ERR("xavp has to have key2\n"); + LM_DBG("no dst xavp found\n"); + goto error; + } + return 1; +error: + return -1; +} + int ops_check_avp( struct sip_msg* msg, struct fis_param* src, struct fis_param* val) { @@ -1071,6 +1152,8 @@ int ops_check_avp( struct sip_msg* msg, struct fis_param* src, char backup; regex_t re_temp; regex_t *re; + sr_xavp_t *xavp2 = NULL; + int xavp_flags=0; /* look if the required avp(s) is/are present */ if(src->u.sval->type==PVT_AVP) @@ -1138,6 +1221,30 @@ cycle1: goto error; } check_flags = avp2->flags; + } + else if(val->u.sval->type==PVT_XAVP) + { + avp2 = 0; + if(xavp2==NULL) + { + if(check_xavp_param(msg, val->u.sval, &xavp2, &xavp_flags)<0) + { + goto error; + } + } + if(xavp2->val.type!=SR_XTYPE_INT&&xavp2->val.type!=SR_XTYPE_STR) + { + LM_ERR("cannot dst value is not INT or STR\n"); + goto error; + } + check_flags = 0; + if(xavp2->val.type==SR_XTYPE_INT) + { + check_val.n = xavp2->val.v.i; + } else { + check_flags = AVP_VAL_STR; + check_val.s = xavp2->val.v.s; + } } else { avp2 = 0; if(pv_get_spec_value(msg, val->u.sval, &xvalue)!=0) @@ -1308,6 +1415,11 @@ next: { check_flags = avp2->flags; goto cycle2; + } else if ((xavp2!=NULL) && (xavp_flags&PV_IDX_ALL) + && (xavp2=xavp_get_next(xavp2))!=NULL) + { + LM_DBG("xavp->next\n"); + goto cycle1; /* cycle for the first value -> next avp */ } else { if(avp1 && val->ops&AVPOPS_FLAG_ALL) [View Less]

1 0

git:master: pv: Move pv_xavp_name_t declaration to core pvar.h
by Victor Seva 20 Sep '13

20 Sep '13

Module: sip-router Branch: master Commit: df472fa9bdaa1a796dd220c99a64b1539c8854b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df472fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Sep 20 11:07:14 2013 +0200 pv: Move pv_xavp_name_t declaration to core pvar.h --- modules/pv/pv_xavp.h | 6 ------ pvar.h | 10 ++++++++++ 2 files changed, 10 … [View More]

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013