sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
249 discussions

git:master:6030a225: Makefile: don't create run_dir on install-utils
by Victor Seva 20 Apr '15

20 Apr '15

Module: kamailio Branch: master Commit: 6030a2256f29350021fc94fdcb41a2b8155ba715 URL: https://github.com/kamailio/kamailio/commit/6030a2256f29350021fc94fdcb41a2b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-20T12:33:06+02:00 Makefile: don't create run_dir on install-utils --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6030a2256f29350021fc94fdcb41a2b… Patch: https://github.com/kamailio/kamailio/commit/6030a2256f29350021fc94fdcb41a2b… --- diff --git a/Makefile b/Makefile index 8cacc7a..31fe195 100644 --- a/Makefile +++ b/Makefile @@ -795,7 +795,7 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc) install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man) -install-utils: utils $(bin_prefix)/$(bin_dir) $(run_prefix)/$(run_dir) +install-utils: utils $(bin_prefix)/$(bin_dir) @for r in $(C_INSTALL_BIN) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \

1 0

git:master:a03b03ac: Merge pull request #131 from linuxmaniac/vseva/make_no_rundir
by Victor Seva 20 Apr '15

20 Apr '15

Module: kamailio Branch: master Commit: a03b03acc8fae06d8827844f19230d6019746a98 URL: https://github.com/kamailio/kamailio/commit/a03b03acc8fae06d8827844f19230d6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-20T11:01:47+02:00 Merge pull request #131 from linuxmaniac/vseva/make_no_rundir Makefile: don't create run_dir on standard installation --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a03b03acc8fae06d8827844f19230d6… Patch: https://github.com/kamailio/kamailio/commit/a03b03acc8fae06d8827844f19230d6… --- diff --git a/Makefile b/Makefile index bcf39c1..8cacc7a 100644 --- a/Makefile +++ b/Makefile @@ -663,7 +663,7 @@ man: $(foreach mods,$(modules_dirs),$(mods)-man) mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ $(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \ $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \ - $(share_prefix)/$(share_dir) $(run_prefix)/$(run_dir) \ + $(share_prefix)/$(share_dir) \ $(foreach mods,$(modules_dirs),\ $(modules_prefix)/$(modules_dir)$(mods) \ $(doc_prefix)/$(doc_dir)$(mods) )

1 0

git:master:b10abbaa: Makefile: don't create run_dir on standard installation
by Victor Seva 20 Apr '15

20 Apr '15

Module: kamailio Branch: master Commit: b10abbaac7732fcd2dc605b8f3227399e9c06f97 URL: https://github.com/kamailio/kamailio/commit/b10abbaac7732fcd2dc605b8f322739… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-20T10:33:52+02:00 Makefile: don't create run_dir on standard installation --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b10abbaac7732fcd2dc605b8f322739… Patch: https://github.com/kamailio/kamailio/commit/b10abbaac7732fcd2dc605b8f322739… --- diff --git a/Makefile b/Makefile index bcf39c1..8cacc7a 100644 --- a/Makefile +++ b/Makefile @@ -663,7 +663,7 @@ man: $(foreach mods,$(modules_dirs),$(mods)-man) mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ $(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \ $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \ - $(share_prefix)/$(share_dir) $(run_prefix)/$(run_dir) \ + $(share_prefix)/$(share_dir) \ $(foreach mods,$(modules_dirs),\ $(modules_prefix)/$(modules_dir)$(mods) \ $(doc_prefix)/$(doc_dir)$(mods) )

1 0

[kamailio] Makefile: don't create run_dir on standard installation (#131)
by Victor Seva 20 Apr '15

20 Apr '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/131 -- Commit Summary -- * Makefile: don't create run_dir on standard installation -- File Changes -- M Makefile (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/131.patch https://github.com/kamailio/kamailio/pull/131.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/131

1 1

git:master:2b53f673: pv: new function xavp_params_explode(p, x)
by Daniel-Constantin Mierla 19 Apr '15

19 Apr '15

Module: kamailio Branch: master Commit: 2b53f673b5888cf8b88b858d8b9a1da57313217b URL: https://github.com/kamailio/kamailio/commit/2b53f673b5888cf8b88b858d8b9a1da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-19T00:09:37+02:00 pv: new function xavp_params_explode(p, x) - convert a string formatted as SIP params in xavp attributes - e.g., xavp_params_explode("a=b;c=d;e=d", "x") results in: $xavp(x=>a) = "b"; $xavp(x=>c) = "d"; $xavp(x=>e) = "f"; --- Modified: modules/pv/pv.c Modified: modules/pv/pv_xavp.c Modified: modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/2b53f673b5888cf8b88b858d8b9a1da… Patch: https://github.com/kamailio/kamailio/commit/2b53f673b5888cf8b88b858d8b9a1da… --- diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 2f99a53..d969adc 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -475,6 +475,7 @@ static int pv_unset(struct sip_msg* msg, char* pvid, char *foo); static int is_int(struct sip_msg* msg, char* pvar, char* s2); static int pv_typeof(sip_msg_t *msg, char *pv, char *t); static int pv_not_empty(sip_msg_t *msg, char *pv, char *s2); +static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname); static int pv_init_rpc(void); static cmd_export_t cmds[]={ @@ -494,6 +495,9 @@ static cmd_export_t cmds[]={ {"not_empty", (cmd_function)pv_not_empty, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, + {"xavp_params_explode", (cmd_function)w_xavp_params_explode, + 2, fixup_spve_spve, fixup_free_spve_spve, + ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -663,6 +667,29 @@ static int is_int(struct sip_msg* msg, char* pvar, char* s2) return -1; } +/** + * + */ +static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname) +{ + str sparams; + str sxname; + + if(fixup_get_svalue(msg, (gparam_t*)pparams, &sparams)!=0) { + LM_ERR("cannot get the params\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pxname, &sxname)!=0) { + LM_ERR("cannot get the xavp name\n"); + return -1; + } + + if(xavp_params_explode(&sparams, &sxname)<0) + return -1; + + return 1; +} + static const char* rpc_shv_set_doc[2] = { "Set a shared variable (args: name type value)", 0 diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index 1cf65c0..53fd99a 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -21,6 +21,7 @@ #include "../../dprint.h" #include "../../xavp.h" #include "../../pvapi.h" +#include "../../parser/parse_param.h" #include "pv_xavp.h" @@ -555,4 +556,61 @@ int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2) return 1; } +/** + * + */ +int xavp_params_explode(str *params, str *xname) +{ + param_t* params_list = NULL; + param_hooks_t phooks; + param_t *pit=NULL; + str s; + sr_xavp_t *xavp=NULL; + sr_xval_t xval; + + if(params==NULL || xname==NULL || params->s==NULL || xname->s==NULL + || params->len<=0 || xname->len<=0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + s.s = params->s; + s.len = params->len; + if(s.s[s.len-1]==';') + s.len--; + if (parse_params(&s, CLASS_ANY, &phooks, &params_list)<0) { + LM_DBG("invalid formatted values [%.*s]\n", params->len, params->s); + return -1; + } + + if(params_list==NULL) { + return -1; + } + + + for (pit = params_list; pit; pit=pit->next) + { + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = pit->body; + if(xavp_add_value(&pit->name, &xval, &xavp)==NULL) { + free_params(params_list); + xavp_destroy_list(&xavp); + return -1; + } + } + free_params(params_list); + + /* add main xavp in root list */ + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_XAVP; + xval.v.xavp = xavp; + if(xavp_add_value(xname, &xval, NULL)==NULL) { + xavp_destroy_list(&xavp); + return -1; + } + + return 0; +} #endif diff --git a/modules/pv/pv_xavp.h b/modules/pv/pv_xavp.h index a8020e7..3c8238e 100644 --- a/modules/pv/pv_xavp.h +++ b/modules/pv/pv_xavp.h @@ -29,5 +29,7 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in); int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2); +int xavp_params_explode(str *params, str *xname); + #endif #endif

2 2

git:master:356ef94b: uac: option to execute event_route[uac:reply] for uac_req_send() replies
by Daniel-Constantin Mierla 19 Apr '15

19 Apr '15

Module: kamailio Branch: master Commit: 356ef94bded6d6e63f659b405dc6758de17b694a URL: https://github.com/kamailio/kamailio/commit/356ef94bded6d6e63f659b405dc6758… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T17:12:12+02:00 uac: option to execute event_route[uac:reply] for uac_req_send() replies - $uac(evroute) has to be set to 1 and event_route[uac:reply] defined - inside event_route[uac_reply] the $uac_req(...) variable is restored back as before uac_req_send(), having the values from that time, excepting: - $uac_req(evcode) is set to the reply code - $uac_req(evtype) is set to 1 if the reply was received or to 2 if the reply was self generated (e.g., case of transmission timeout) - if $uac_req(evtype)==1, the message processed inside the event route is the received reply, otherwise is a faked request with no relation to the request sent out by uac_req_send() --- Modified: modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/356ef94bded6d6e63f659b405dc6758… Patch: https://github.com/kamailio/kamailio/commit/356ef94bded6d6e63f659b405dc6758… --- diff --git a/modules/uac/uac_send.c b/modules/uac/uac_send.c index 62b3950..0309b20 100644 --- a/modules/uac/uac_send.c +++ b/modules/uac/uac_send.c @@ -20,6 +20,7 @@ #include "../../dprint.h" #include "../../trim.h" +#include "../../route.h" #include "../../modules/tm/tm_load.h" @@ -27,6 +28,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" #include "../../parser/contact/parse_contact.h" +#include "../../lib/kcore/faked_msg.h" #include "auth.h" #include "auth_hdr.h" @@ -605,6 +607,41 @@ int uac_send_tmdlg(dlg_t *tmdlg, sip_msg_t *rpl) #define MAX_UACH_SIZE 2048 +/** + * + */ +void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) +{ + char *evrtname = "uac:reply"; + int rt, backup_rt; + struct run_act_ctx ctx; + sip_msg_t *fmsg; + + rt = route_get(&event_rt, evrtname); + if (rt < 0 || event_rt.rlist[rt] == NULL) + { + LM_DBG("event_route[uac:reply] does not exist\n"); + return; + } + + uac_send_info_copy(tp, &_uac_req); + _uac_req.evcode = rcode; + if(msg==NULL) + { + _uac_req.evtype = 2; + fmsg = faked_msg_get_next(); + } else { + _uac_req.evtype = 1; + fmsg = msg; + } + + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + set_route_type(backup_rt); +} + /** * TM callback function */ @@ -622,13 +659,21 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) dlg_t tmdlg; uac_send_info_t *tp = NULL; + LM_DBG("tm callback with status %d\n", ps->code); + if(ps->param==NULL || *ps->param==0) { - LM_DBG("message id not received\n"); + LM_DBG("callback param with message id not received\n"); goto done; } tp = (uac_send_info_t*)(*ps->param); - if(ps->code != 401 && ps->code != 407) + + if(tp->evroute!=0) { + uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, + tp, ps->code); + } + + if((ps->code != 401 && ps->code != 407) || tp->s_apasswd.len<=0) { LM_DBG("completed with status %d\n", ps->code); goto done;

2 2

git:master:e242b2cb: uac: uac_req_send() exported via api
by Daniel-Constantin Mierla 18 Apr '15

18 Apr '15

Module: kamailio Branch: master Commit: e242b2cb0e4940f3299a375fe91d7135358dafa9 URL: https://github.com/kamailio/kamailio/commit/e242b2cb0e4940f3299a375fe91d713… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T19:43:06+02:00 uac: uac_req_send() exported via api --- Modified: modules/uac/api.h Modified: modules/uac/uac.c Modified: modules/uac/uac_send.c Modified: modules/uac/uac_send.h --- Diff: https://github.com/kamailio/kamailio/commit/e242b2cb0e4940f3299a375fe91d713… Patch: https://github.com/kamailio/kamailio/commit/e242b2cb0e4940f3299a375fe91d713… --- diff --git a/modules/uac/api.h b/modules/uac/api.h index 2d8e3b6..7a4bcfe 100644 --- a/modules/uac/api.h +++ b/modules/uac/api.h @@ -4,9 +4,11 @@ typedef int (*uac_replace_from_t)(sip_msg_t *, str *, str *); +typedef int (*uac_req_send_t)(void); typedef struct uac_binds { uac_replace_from_t replace_from; + uac_req_send_t req_send; } uac_api_t; typedef int (*bind_uac_f)(uac_api_t*); diff --git a/modules/uac/uac.c b/modules/uac/uac.c index ede7a86..91f7099 100644 --- a/modules/uac/uac.c +++ b/modules/uac/uac.c @@ -115,9 +115,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE }, {"uac_auth", (cmd_function)w_uac_auth, 0, 0, 0, FAILURE_ROUTE }, - {"uac_req_send", (cmd_function)uac_req_send, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, + {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, + ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, ANY_ROUTE }, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, fixup_pvar_uint, fixup_free_pvar_uint, @@ -574,14 +573,15 @@ static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s) } -int bind_uac(struct uac_binds *uacb) +int bind_uac(uac_api_t *uacb) { - if (uacb == NULL) - { - LM_WARN("bind_uac: Cannot load uac API into a NULL pointer\n"); - return -1; - } - - uacb->replace_from = replace_from_api; - return 0; + if (uacb == NULL) { + LM_WARN("bind_uac: Cannot load uac API into a NULL pointer\n"); + return -1; + } + + memset(uacb, 0, sizeof(uac_api_t)); + uacb->replace_from = replace_from_api; + uacb->req_send = uac_req_send; + return 0; } diff --git a/modules/uac/uac_send.c b/modules/uac/uac_send.c index 0309b20..a429bdc 100644 --- a/modules/uac/uac_send.c +++ b/modules/uac/uac_send.c @@ -755,7 +755,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } -int uac_req_send(struct sip_msg *msg, char *s1, char *s2) +int uac_req_send(void) { int ret; uac_req_t uac_r; @@ -801,3 +801,7 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) return 1; } +int w_uac_req_send(struct sip_msg *msg, char *s1, char *s2) +{ + return uac_req_send(); +} diff --git a/modules/uac/uac_send.h b/modules/uac/uac_send.h index 8e2e089..2d43657 100644 --- a/modules/uac/uac_send.h +++ b/modules/uac/uac_send.h @@ -29,6 +29,7 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); int pv_parse_uac_req_name(pv_spec_p sp, str *in); void uac_req_init(void); -int uac_req_send(struct sip_msg *msg, char *s1, char *s2); +int uac_req_send(void); +int w_uac_req_send(struct sip_msg *msg, char *s1, char *s2); #endif

1 0

git:master:344b5958: uac: refreshed the content of readme
by Daniel-Constantin Mierla 18 Apr '15

18 Apr '15

Module: kamailio Branch: master Commit: 344b59580dd01a8d2ae7c24cf20d78b5128b4091 URL: https://github.com/kamailio/kamailio/commit/344b59580dd01a8d2ae7c24cf20d78b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T19:17:12+02:00 uac: refreshed the content of readme --- Modified: modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/344b59580dd01a8d2ae7c24cf20d78b… Patch: https://github.com/kamailio/kamailio/commit/344b59580dd01a8d2ae7c24cf20d78b…

1 0

git:master:54475ed0: uac: docbook for event_route[uac:reply]
by Daniel-Constantin Mierla 18 Apr '15

18 Apr '15

Module: kamailio Branch: master Commit: 54475ed0472fa0d7d3862748020e7428a6a03dbd URL: https://github.com/kamailio/kamailio/commit/54475ed0472fa0d7d3862748020e742… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T19:16:36+02:00 uac: docbook for event_route[uac:reply] --- Modified: modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/54475ed0472fa0d7d3862748020e742… Patch: https://github.com/kamailio/kamailio/commit/54475ed0472fa0d7d3862748020e742… --- diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index 5bd7c9d..0a154d9 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -796,6 +796,39 @@ failure_route[REMOTE_AUTH] { Exported pseudo-variables are documented at &kamwikilink;. </para> </section> + + <section> + <title>Event Routes</title> + <section id="uac.ert.uac_reply"> + <title> + <function moreinfo="none">event_route[uac:reply]</function> + </title> + <para> + Event route executed for the final reply to the request set with + uac_req_send(). The associated $uac_req(evroute) has to be set to + 1. + </para> + <example> + <title><function>event_route[uac:reply]</function> usage</title> + <programlisting format="linespecific"> +... +$uac_req(method)="OPTIONS"; +$uac_req(ruri)="sip:kamailio.org"; +$uac_req(furi)="sip:kamailio.org"; +$uac_req(turi)="sip:kamailio.org"; +$uac_req(callid)=$(mb{s.md5}); +$uac_req(evroute)=1; +uac_req_send(); +... +event_route[uac:reply] { + xlog("received reply code is: $uac_req(evcode)\n"); +} +... + </programlisting> + </example> + </section> + </section> + <section> <title>Counters</title> <itemizedlist>

1 0

git:master:52d08e0b: uac: new fields in $uac_req() to allow execution of event route on reply
by Daniel-Constantin Mierla 18 Apr '15

18 Apr '15

Module: kamailio Branch: master Commit: 52d08e0bde1c16ae19506b8053e6bd1c6c006d21 URL: https://github.com/kamailio/kamailio/commit/52d08e0bde1c16ae19506b8053e6bd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T14:29:12+02:00 uac: new fields in $uac_req() to allow execution of event route on reply - attributes: - evroute - set to 1 to enable execution of event route - evparam - generic string value that will be available in event route - evcode - sip reply code, available in event route - evtype - type of the reply - received or local generated (e.g., timout) --- Modified: modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/52d08e0bde1c16ae19506b8053e6bd1… Patch: https://github.com/kamailio/kamailio/commit/52d08e0bde1c16ae19506b8053e6bd1…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015