sr-dev July 2019

sr-dev@lists.kamailio.org

20 participants
232 discussions

git:5.2:99e78ce4: uac: minor spelling fix in docs

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 99e78ce404da0d7d0e98464916eef794d0f889a1 URL: https://github.com/kamailio/kamailio/commit/99e78ce404da0d7d0e98464916eef79… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-07-21T11:51:42+02:00 uac: minor spelling fix in docs (cherry picked from commit e7061ee85ddcd203fb58fa023eeddd90bc97848e) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/99e78ce404da0d7d0e98464916eef79… Patch: https://github.com/kamailio/kamailio/commit/99e78ce404da0d7d0e98464916eef79… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 6e514eeea1..3964c9afc5 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -925,7 +925,7 @@ if(uac_reg_request_to("$fU", 0)) failure_route[REMOTE_AUTH] { if ($T_reply_code == 401 or $T_reply_code == 407) { xlog("L_NOTICE", "Remote asked for authentication"); - uac_auth() + uac_auth(); } } ...

5 years, 1 month

git:master:e7061ee8: uac: minor spelling fix in docs

by Henning Westerholt

Module: kamailio Branch: master Commit: e7061ee85ddcd203fb58fa023eeddd90bc97848e URL: https://github.com/kamailio/kamailio/commit/e7061ee85ddcd203fb58fa023eeddd9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-07-21T11:51:01+02:00 uac: minor spelling fix in docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7061ee85ddcd203fb58fa023eeddd9… Patch: https://github.com/kamailio/kamailio/commit/e7061ee85ddcd203fb58fa023eeddd9… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index d9fe2a1de2..c5697d9614 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -950,7 +950,7 @@ if(uac_reg_request_to("$fU", 0)) failure_route[REMOTE_AUTH] { if ($T_reply_code == 401 or $T_reply_code == 407) { xlog("L_NOTICE", "Remote asked for authentication"); - uac_auth() + uac_auth(); } } ...

5 years, 1 month

git:master:8334e618: kemix: exported functions to get auth username

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8334e61815f15656051c5b14cf9321f4c65bcf8c URL: https://github.com/kamailio/kamailio/commit/8334e61815f15656051c5b14cf9321f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-21T08:56:39+02:00 kemix: exported functions to get auth username --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8334e61815f15656051c5b14cf9321f… Patch: https://github.com/kamailio/kamailio/commit/8334e61815f15656051c5b14cf9321f… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index fd27d47fca..81a4f2bc1c 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -30,6 +30,7 @@ #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" +#include "../../core/parser/digest/digest.h" MODULE_VERSION @@ -482,6 +483,78 @@ static int ki_kx_get_protoid(sip_msg_t *msg) return (int)msg->rcv.proto; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_auth_attr(sip_msg_t *msg, int iattr, int xmode) +{ + hdr_field_t *hdr; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + if ((msg->REQ_METHOD == METHOD_ACK) || + (msg->REQ_METHOD == METHOD_CANCEL)) { + LM_DBG("no [Proxy-]Authorization header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + if ((parse_headers(msg, HDR_PROXYAUTH_F|HDR_AUTHORIZATION_F, 0)==-1) + || (msg->proxy_auth==0 && msg->authorization==0)) { + LM_DBG("no [Proxy-]Authorization header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; + + if(parse_credentials(hdr)!=0) { + LM_ERR("failed to parse credentials\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + switch(iattr) { + case 1: + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = ((auth_body_t*)(hdr->parsed))->digest.username.user; + return &_sr_kemi_kx_xval; + + break; + default: + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = ((auth_body_t*)(hdr->parsed))->digest.username.whole; + return &_sr_kemi_kx_xval; + } +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_au(sip_msg_t *msg) +{ + return ki_kx_get_auth_attr(msg, 1, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_au(sip_msg_t *msg) +{ + return ki_kx_get_auth_attr(msg, 1, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_au(sip_msg_t *msg) +{ + return ki_kx_get_auth_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); +} + /** * */ @@ -612,6 +685,21 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_au"), + SR_KEMIP_XVAL, ki_kx_get_au, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_au"), + SR_KEMIP_XVAL, ki_kx_getw_au, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_au"), + SR_KEMIP_XVAL, ki_kx_gete_au, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

5 years, 1 month

[kamailio/kamailio] evapi:return code and log fixed for no evapi client while sending (#2013)

by Surendra Tiwari

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Right now, if there is no evapi client to send message then no logs are getting printed. This make us to not set the alert if send failed. After this changes if there is no evapi client we are going to get that in line like send_failed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2013 -- Commit Summary -- * evapi:return code and log fixed for no evapi client while sending -- File Changes -- M src/modules/evapi/evapi_dispatch.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2013.patch https://github.com/kamailio/kamailio/pull/2013.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2013

5 years, 2 months

git:master:a6a2416e: evapi: adjust log message when no client connected for dispatching

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a6a2416e59c1e1a5cbadd3ecceecff52201be10d URL: https://github.com/kamailio/kamailio/commit/a6a2416e59c1e1a5cbadd3ecceecff5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-19T10:03:53+02:00 evapi: adjust log message when no client connected for dispatching --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/a6a2416e59c1e1a5cbadd3ecceecff5… Patch: https://github.com/kamailio/kamailio/commit/a6a2416e59c1e1a5cbadd3ecceecff5… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 52a62d8551..ec56945b5e 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -728,7 +728,6 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) int len; int sbsize; - int evapi_send_count; evapi_msg_t *emsg; LM_DBG("relaying event data [%.*s] (%d)\n", @@ -782,11 +781,10 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) cfg_update(); LM_DBG("dispatching [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, emsg->data.len); - evapi_send_count = evapi_dispatch_notify(emsg); - if (evapi_send_count == 0) { - shm_free(emsg); - LM_ERR("no evapi client to send the message, failed to send message\n"); - return -1; + if(evapi_dispatch_notify(emsg) == 0) { + shm_free(emsg); + LM_WARN("message not delivered - no client connected\n"); + return -1; } shm_free(emsg); }

5 years, 2 months

git:master:72099714: Merge pull request #2013 from surendratiwari3/no_evapi_client_send_failed

by GitHub

Module: kamailio Branch: master Commit: 72099714de86311b704621034b5ef07ec05a1147 URL: https://github.com/kamailio/kamailio/commit/72099714de86311b704621034b5ef07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-07-19T09:56:45+02:00 Merge pull request #2013 from surendratiwari3/no_evapi_client_send_failed evapi:return code and log fixed for no evapi client while sending --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/72099714de86311b704621034b5ef07… Patch: https://github.com/kamailio/kamailio/commit/72099714de86311b704621034b5ef07… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index b6997e2295..52a62d8551 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -728,6 +728,7 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) int len; int sbsize; + int evapi_send_count; evapi_msg_t *emsg; LM_DBG("relaying event data [%.*s] (%d)\n", @@ -781,7 +782,12 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) cfg_update(); LM_DBG("dispatching [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, emsg->data.len); - evapi_dispatch_notify(emsg); + evapi_send_count = evapi_dispatch_notify(emsg); + if (evapi_send_count == 0) { + shm_free(emsg); + LM_ERR("no evapi client to send the message, failed to send message\n"); + return -1; + } shm_free(emsg); } return 0;

5 years, 2 months

git:master:08cf1728: evapi:return code and log fixed for no evapi client while sending

by Surendra Tiwari

Module: kamailio Branch: master Commit: 08cf17288861bcaa8f3b23166059ead517d1b4fe URL: https://github.com/kamailio/kamailio/commit/08cf17288861bcaa8f3b23166059ead… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2019-07-19T13:07:32+05:30 evapi:return code and log fixed for no evapi client while sending --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/08cf17288861bcaa8f3b23166059ead… Patch: https://github.com/kamailio/kamailio/commit/08cf17288861bcaa8f3b23166059ead… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 5b7d534d09..353dc9534b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -728,6 +728,7 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) int len; int sbsize; + int evapi_send_count; evapi_msg_t *emsg; LM_DBG("relaying event data [%.*s] (%d)\n", @@ -781,7 +782,12 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) cfg_update(); LM_DBG("dispatching [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, emsg->data.len); - evapi_dispatch_notify(emsg); + evapi_send_count = evapi_dispatch_notify(emsg); + if (evapi_send_count == 0) { + shm_free(emsg); + LM_ERR("no evapi client to send the message, failed to send message\n"); + return -1; + } shm_free(emsg); } return 0;

5 years, 2 months

git:master:e6b183a1: core: pv - increased the size for vars and transformations tables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e6b183a1ec3b267cc25040a9b67a1c151ee85555 URL: https://github.com/kamailio/kamailio/commit/e6b183a1ec3b267cc25040a9b67a1c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-19T09:50:21+02:00 core: pv - increased the size for vars and transformations tables --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/e6b183a1ec3b267cc25040a9b67a1c1… Patch: https://github.com/kamailio/kamailio/commit/e6b183a1ec3b267cc25040a9b67a1c1… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 28429406c6..1830ba0a2d 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -40,8 +40,8 @@ #include "pvapi.h" #include "pvar.h" -#define PV_TABLE_SIZE 64 /*!< pseudo-variables table size */ -#define TR_TABLE_SIZE 32 /*!< transformations table size */ +#define PV_TABLE_SIZE 512 /*!< pseudo-variables table size */ +#define TR_TABLE_SIZE 256 /*!< transformations table size */ void tr_destroy(trans_t *t); diff --git a/src/core/pvar.h b/src/core/pvar.h index a61072ff6b..f225cbc93a 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -242,7 +242,7 @@ typedef struct _pv_cache struct _pv_cache *next; } pv_cache_t; -#define PV_CACHE_SIZE 64 /*!< pseudo-variables cache table size */ +#define PV_CACHE_SIZE 512 /*!< pseudo-variables cache table size */ pv_cache_t **pv_cache_get_table(void);

5 years, 2 months

git:master:5e961873: corex: debug message for set rcv/snd sock functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e961873401fd0a93ff03ba8d75dbcefbf2fbcf0 URL: https://github.com/kamailio/kamailio/commit/5e961873401fd0a93ff03ba8d75dbce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-18T08:46:27+02:00 corex: debug message for set rcv/snd sock functions --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5e961873401fd0a93ff03ba8d75dbce… Patch: https://github.com/kamailio/kamailio/commit/5e961873401fd0a93ff03ba8d75dbce… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index a6a01e9af1..846043e8aa 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -630,6 +630,8 @@ static int ki_set_socket_helper(sip_msg_t *msg, str *ssock, int smode) ssock->len, ssock->s, smode); goto error; } + LM_DBG("trying to set %s-socket to [%.*s] (%d)\n", + (smode==0)?"snd":"rcv", ssock->len, ssock->s, smode); si = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (si!=NULL) { if(smode==0) {

5 years, 2 months

git:master:abe060b4: core: debug message for forcing send socket action

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abe060b417c5270082aa46660fdc2f78098a5888 URL: https://github.com/kamailio/kamailio/commit/abe060b417c5270082aa46660fdc2f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-18T08:41:29+02:00 core: debug message for forcing send socket action --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/abe060b417c5270082aa46660fdc2f7… Patch: https://github.com/kamailio/kamailio/commit/abe060b417c5270082aa46660fdc2f7… --- diff --git a/src/core/action.c b/src/core/action.c index 8b6725598c..45581ba312 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1434,6 +1434,9 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_BUG; goto error; } + LM_DBG("setting send-socket to [%.*s]\n", + ((struct socket_info*)a->val[0].u.data)->sock_str.len, + ((struct socket_info*)a->val[0].u.data)->sock_str.s); set_force_socket(msg, (struct socket_info*)a->val[0].u.data); ret=1; /* continue processing */ break;

5 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2019