sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:7a6d3193: modules/textops: msg_apply_changes() comes from textopsx module

by Mikko Lehto

Module: kamailio Branch: master Commit: 7a6d31935c7e8e29dd150412f1e6281fdf3efd53 URL: https://github.com/kamailio/kamailio/commit/7a6d31935c7e8e29dd150412f1e6281… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-19T17:28:16+03:00 modules/textops: msg_apply_changes() comes from textopsx module --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7a6d31935c7e8e29dd150412f1e6281… Patch: https://github.com/kamailio/kamailio/commit/7a6d31935c7e8e29dd150412f1e6281… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 68b3676703..4cb99d708e 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1438,7 +1438,7 @@ if (starts_with("$rU", "+358")) the last and fixing the others if needed. </para> <para> - Note: it may be required that msg_apply_changes() from textops module + Note: it may be required that msg_apply_changes() from textopsx module has to be executed if there are other operations over the new body. </para> <example>

7 years

git:master:01771c42: core: dns case - init local proto to UDP if not provided for srv resolve

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 01771c42d3b96678a2d0ba08bc1e5c83191ada8d URL: https://github.com/kamailio/kamailio/commit/01771c42d3b96678a2d0ba08bc1e5c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-19T14:38:22+02:00 core: dns case - init local proto to UDP if not provided for srv resolve --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/01771c42d3b96678a2d0ba08bc1e5c8… Patch: https://github.com/kamailio/kamailio/commit/01771c42d3b96678a2d0ba08bc1e5c8… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 3558a5ffcb..d933300187 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3227,12 +3227,16 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, return -E_DNS_NO_SRV; } if ((h->srv==0) && (h->a==0)){ /* first call */ - if (proto && *proto==0){ /* makes sure we have a protocol set*/ - *proto=PROTO_UDP; /* default */ - } - h->port=(*proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we + if (proto) { + if(*proto==0) { /* makes sure we have a protocol set*/ + *proto=PROTO_UDP; /* default */ + } + h->port=(*proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we don't find another */ - h->proto=*proto; /* store initial protocol */ + h->proto=*proto; /* store initial protocol */ + } else { + h->proto=PROTO_UDP; /* default */ + } if (port){ if (*port==0){ /* try SRV if initial call & no port specified @@ -3274,7 +3278,8 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, srv_name.len=strlen(tmp); if ((ret=dns_srv_resolve_ip(h, &srv_name, ip, port, flags))>=0) { - h->proto = *proto = srv_proto_list[i].proto; + h->proto = srv_proto_list[i].proto; + if(proto) *proto = h->proto; #ifdef DNS_CACHE_DEBUG LM_DBG("(%.*s, %d, %d), srv0, ret=%d\n", name->len, name->s, h->srv_no, h->ip_no, ret);

7 years

git:5.0:25defde6: tm: copy branch flags in the new branch created by the dns failover

by Juha Heinanen

Module: kamailio Branch: 5.0 Commit: 25defde62284bd23fc41ec4276bb11c0c6ece687 URL: https://github.com/kamailio/kamailio/commit/25defde62284bd23fc41ec4276bb11c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-07-19T13:25:04+03:00 tm: copy branch flags in the new branch created by the dns failover (cherry picked from commit 632304b90f9af7151c99f98ec63ddbecca31df9c) --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/25defde62284bd23fc41ec4276bb11c… Patch: https://github.com/kamailio/kamailio/commit/25defde62284bd23fc41ec4276bb11c… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 5cc649ebdd..ae9a6c3a91 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1018,6 +1018,8 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, t->uac[t->nr_of_outgoings].on_failure = old_uac->on_failure; t->uac[t->nr_of_outgoings].on_reply = old_uac->on_reply; t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; + /* copy branch flags */ + t->uac[t->nr_of_outgoings].branch_flags = old_uac->branch_flags; if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

7 years

git:master:632304b9: tm: copy branch flags in the new branch created by the dns failover

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 632304b90f9af7151c99f98ec63ddbecca31df9c URL: https://github.com/kamailio/kamailio/commit/632304b90f9af7151c99f98ec63ddbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-19T11:12:32+02:00 tm: copy branch flags in the new branch created by the dns failover --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/632304b90f9af7151c99f98ec63ddbe… Patch: https://github.com/kamailio/kamailio/commit/632304b90f9af7151c99f98ec63ddbe… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 64d1036ffc..ac55e3a4f8 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1018,6 +1018,8 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, t->uac[t->nr_of_outgoings].on_failure = old_uac->on_failure; t->uac[t->nr_of_outgoings].on_reply = old_uac->on_reply; t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; + /* copy branch flags */ + t->uac[t->nr_of_outgoings].branch_flags = old_uac->branch_flags; if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

7 years

git:master:2111a605: path: handle return code when getting the values for cfg parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2111a605760f998cc94329713f1d16cfbe0294bc URL: https://github.com/kamailio/kamailio/commit/2111a605760f998cc94329713f1d16c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-19T11:03:49+02:00 path: handle return code when getting the values for cfg parameters --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/2111a605760f998cc94329713f1d16c… Patch: https://github.com/kamailio/kamailio/commit/2111a605760f998cc94329713f1d16c… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 274e6cfc7c..f916e2abff 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -244,10 +244,18 @@ int add_path_usr(struct sip_msg* _msg, char* _usr, char* _parms) str user = {0,0}; str parms = {0,0}; - if (_usr) - get_str_fparam(&user, _msg, (fparam_t *) _usr); - if (_parms) - get_str_fparam(&parms, _msg, (fparam_t *) _parms); + if (_usr) { + if(get_str_fparam(&user, _msg, (fparam_t *) _usr)<0) { + LM_ERR("failed to get user value\n"); + return -1; + } + } + if (_parms) { + if(get_str_fparam(&parms, _msg, (fparam_t *) _parms)<0) { + LM_ERR("failed to get params value\n"); + return -1; + } + } return prepend_path(_msg, &user, PATH_PARAM_NONE, &parms); } @@ -298,10 +306,18 @@ int add_path_received_usr(struct sip_msg* _msg, char* _usr, char* _parms) str user = {0,0}; str parms = {0,0}; - if (_usr) - get_str_fparam(&user, _msg, (fparam_t *) _usr); - if (_parms) - get_str_fparam(&parms, _msg, (fparam_t *) _parms); + if (_usr) { + if(get_str_fparam(&user, _msg, (fparam_t *) _usr)<0) { + LM_ERR("failed to get user value\n"); + return -1; + } + } + if (_parms) { + if(get_str_fparam(&parms, _msg, (fparam_t *) _parms)<0) { + LM_ERR("failed to get params value\n"); + return -1; + } + } return prepend_path(_msg, &user, PATH_PARAM_RECEIVED, &parms); }

7 years

git:master:e5e850bf: app_sqlang: removed dead code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e5e850bf4d35e50303b6827f1578e9492dcbae1e URL: https://github.com/kamailio/kamailio/commit/e5e850bf4d35e50303b6827f1578e94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-19T10:52:49+02:00 app_sqlang: removed dead code --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e5e850bf4d35e50303b6827f1578e94… Patch: https://github.com/kamailio/kamailio/commit/e5e850bf4d35e50303b6827f1578e94… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index eea36f6ab0..f41e665358 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1357,7 +1357,6 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) fname->len, fname->s); return app_sqlang_return_false(J); } - return app_sqlang_return_false(J); } /**

7 years

git:master:150e420b: app_jsdt: removed dead code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 150e420b0906dcba9daac86f8447ba2684062a2c URL: https://github.com/kamailio/kamailio/commit/150e420b0906dcba9daac86f8447ba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-19T10:52:29+02:00 app_jsdt: removed dead code --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/150e420b0906dcba9daac86f8447ba2… Patch: https://github.com/kamailio/kamailio/commit/150e420b0906dcba9daac86f8447ba2… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 0752e2ad31..0657507f12 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1145,7 +1145,6 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) fname->len, fname->s); return app_jsdt_return_false(J); } - return app_jsdt_return_false(J); } /**

7 years

git:master:5937adf0: auth_ephemeral: use dedicated enum type for auth return codes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5937adf01f7c3e2382a1f2dc149a677fe6cd26f1 URL: https://github.com/kamailio/kamailio/commit/5937adf01f7c3e2382a1f2dc149a677… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-18T23:24:07+02:00 auth_ephemeral: use dedicated enum type for auth return codes - reorder safety checks not to access msg structure if null --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/5937adf01f7c3e2382a1f2dc149a677… Patch: https://github.com/kamailio/kamailio/commit/5937adf01f7c3e2382a1f2dc149a677… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index a5b3f48e92..a8815a3b43 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -129,7 +129,7 @@ static inline int get_ha1(struct username *_username, str *_domain, static inline int do_auth(struct sip_msg *_m, struct hdr_field *_h, str *_realm, str *_method, str *_secret) { - int ret; + auth_result_t ret; char ha1[512]; auth_body_t *cred = (auth_body_t*) _h->parsed; @@ -146,21 +146,15 @@ static inline int do_auth(struct sip_msg *_m, struct hdr_field *_h, str *_realm, ret = eph_auth_api.check_response(&cred->digest, _method, ha1); if (ret == AUTHENTICATED) { - if (eph_auth_api.post_auth(_m, _h, ha1) != AUTHENTICATED) - { + if (eph_auth_api.post_auth(_m, _h, ha1) != AUTHENTICATED) { return AUTH_ERROR; } - } - else if (ret == NOT_AUTHENTICATED) - { + return AUTH_OK; + } else if (ret == NOT_AUTHENTICATED) { return AUTH_INVALID_PASSWORD; + } else { + return AUTH_ERROR; } - else - { - ret = AUTH_ERROR; - } - - return AUTH_OK; } int autheph_verify_timestamp(str *_username) @@ -219,15 +213,16 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, hdr_types_t _hftype, str *_method) { struct hdr_field* h; - int ret; + auth_cfg_result_t ret; + auth_result_t rauth; struct secret *secret_struct; str username; LM_DBG("realm: %.*s\n", _realm->len, _realm->s); LM_DBG("method: %.*s\n", _method->len, _method->s); - ret = eph_auth_api.pre_auth(_m, _realm, _hftype, &h, NULL); - switch(ret) + rauth = eph_auth_api.pre_auth(_m, _realm, _hftype, &h, NULL); + switch(rauth) { case NONCE_REUSED: LM_DBG("nonce reused\n"); @@ -294,17 +289,17 @@ int autheph_check(struct sip_msg *_m, char *_realm) return AUTH_ERROR; } - if (_m->REQ_METHOD == METHOD_ACK || _m->REQ_METHOD == METHOD_CANCEL) - { - return AUTH_OK; - } - if(_m == NULL || _realm == NULL) { LM_ERR("invalid parameters\n"); return AUTH_ERROR; } + if (_m->REQ_METHOD == METHOD_ACK || _m->REQ_METHOD == METHOD_CANCEL) + { + return AUTH_OK; + } + if (get_str_fparam(&srealm, _m, (fparam_t*)_realm) < 0) { LM_ERR("failed to get realm value\n"); @@ -340,17 +335,17 @@ int autheph_www(struct sip_msg *_m, char *_realm) return AUTH_ERROR; } - if (_m->REQ_METHOD == METHOD_ACK || _m->REQ_METHOD == METHOD_CANCEL) - { - return AUTH_OK; - } - if(_m == NULL || _realm == NULL) { LM_ERR("invalid parameters\n"); return AUTH_ERROR; } + if (_m->REQ_METHOD == METHOD_ACK || _m->REQ_METHOD == METHOD_CANCEL) + { + return AUTH_OK; + } + if (get_str_fparam(&srealm, _m, (fparam_t*)_realm) < 0) { LM_ERR("failed to get realm value\n"); @@ -428,17 +423,17 @@ int autheph_proxy(struct sip_msg *_m, char *_realm) return AUTH_ERROR; } - if (_m->REQ_METHOD == METHOD_ACK || _m->REQ_METHOD == METHOD_CANCEL) - { - return AUTH_OK; - } - if(_m == NULL || _realm == NULL) { LM_ERR("invalid parameters\n"); return AUTH_ERROR; } + if (_m->REQ_METHOD == METHOD_ACK || _m->REQ_METHOD == METHOD_CANCEL) + { + return AUTH_OK; + } + if (get_str_fparam(&srealm, _m, (fparam_t*)_realm) < 0) { LM_ERR("failed to get realm value\n");

7 years

Issue in xhttp_mod

by Dario Bozzali

Hello, I'm quite new to Kamailio and I'm making some tests using devel release (git head). I'm facing an issue in xhttp_mod module after I updated my repository to master head and in particular after commit dc0765c04c3cb5d8981551e3f28ee6871fc803ff (14/07/2017). In src/core/route.h line 57 #define EVENT_ROUTE REQUEST_ROUTE has been changed to #define EVENT_ROUTE (1 << 9) After this change, xhttp_reply is no more accepted as valid command in event_route[xhttp:request] route in my kamailio.cfg file. I suppose that the issue is caused by REQUEST_ROUTE in src/modules/xhttp/xhttp_mod.c line 74. I think it should be EVENT_ROUTE static cmd_export_t cmds[] = { {"xhttp_reply", (cmd_function)w_xhttp_send_reply, 4, fixup_xhttp_reply, 0, REQUEST_ROUTE}, ==========> should be (?) 4, fixup_xhttp_reply, 0, EVENT_ROUTE}, {"bind_xhttp", (cmd_function)bind_xhttp, 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0} }; I changed REQUEST_ROUTE to EVENT_ROUTE and, after that, kamailio.cfg is loaded without error. I don't know Kamailio code, so I don't know if this change is enough. Thank you and best regards, Dario

7 years

git:master:85ac764b: core: allow event_route blocks to run ONEVENT_ROUTE|REQUEST_ROUTE functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 85ac764bf89009dac758aa178317f15acb42f44d URL: https://github.com/kamailio/kamailio/commit/85ac764bf89009dac758aa178317f15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-18T16:46:10+02:00 core: allow event_route blocks to run ONEVENT_ROUTE|REQUEST_ROUTE functions - preserve compatibility with old behaviour that allowed REQUEST_ROUTE functions to be used inside event_route --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/85ac764bf89009dac758aa178317f15… Patch: https://github.com/kamailio/kamailio/commit/85ac764bf89009dac758aa178317f15… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2bf336caf2..fe545378eb 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -665,7 +665,21 @@ int load_module(char* mod_path) return -1; } - +/** + * test if command flags are compatible with route block flags (type) + * - decide if the command is allowed to run within a specific route block + * - return: 1 if allowed; 0 if not allowed + */ +static inline int sr_cmd_flags_match(int cflags, int rflags) +{ + if((cflags & rflags) == rflags) { + return 1; + } + if((rflags==EVENT_ROUTE) && (cflags & EVENT_ROUTE)) { + return 1; + } + return 0; +} /* searches the module list for function name in module mod and returns * a pointer to the "name" function record union or 0 if not found @@ -688,16 +702,16 @@ sr31_cmd_export_t* find_mod_export_record(char* mod, char* name, if((strcmp(name, cmd->name) == 0) && ((cmd->param_no == param_no) || (cmd->param_no==VAR_PARAM_NO)) && - ((cmd->flags & flags) == flags) + (sr_cmd_flags_match(cmd->flags, flags)==1) ){ - LM_DBG("find_export_record: found <%s> in module %s [%s]\n", + LM_DBG("found export of <%s> in module %s [%s]\n", name, t->exports.name, t->path); *mod_if_ver=t->orig_mod_interface_ver; return cmd; } } } - LM_DBG("find_export_record: <%s> not found \n", name); + LM_DBG("export of <%s> not found (flags %d)\n", name, flags); return 0; }

7 years

← Newer
1
...
21
22
23
24
25
26
27
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017