sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
191 discussions

git:master:9c943031: dmq_usrloc: check existence of usrloc domain before continuing.

by Charles Chance

Module: kamailio Branch: master Commit: 9c943031f29889c21b25b49b5dd267f4b2460bae URL: https://github.com/kamailio/kamailio/commit/9c943031f29889c21b25b49b5dd267f… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-08-24T18:17:23+01:00 dmq_usrloc: check existence of usrloc domain before continuing. - avoids crash caused by passing null pointer to get_urecord_by_ruid(). - eventually need to implement multi-domain replication but usrloc API needs enhancing first. --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/9c943031f29889c21b25b49b5dd267f… Patch: https://github.com/kamailio/kamailio/commit/9c943031f29889c21b25b49b5dd267f… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index dd87721..792f86e 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -140,6 +140,12 @@ void usrloc_get_all_ucontact(dmq_node_t* node) LM_ERR("dmq_ul.get_all_ucontacts is NULL\n"); goto done; } + + if (dmq_ul.get_udomain("location", &_d) < 0) { + LM_ERR("Failed to get domain\n"); + goto done; + } + rval = dmq_ul.get_all_ucontacts(buf, len, 0, 0, 1, 0); if (rval<0) { LM_ERR("failed to fetch contacts\n"); @@ -185,8 +191,6 @@ void usrloc_get_all_ucontact(dmq_node_t* node) memcpy( &aorhash, cp, sizeof(aorhash)); cp = (char*)cp + sizeof(aorhash); - dmq_ul.get_udomain("location", &_d); - res = dmq_ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr); aor = r->aor; if (res > 0) {

9 years, 3 months

git:master:0f479b53: sanity: adjusted log messages for check_proxy_require()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0f479b5366fae4c5ad0c78e4c91661b7a421d5e8 URL: https://github.com/kamailio/kamailio/commit/0f479b5366fae4c5ad0c78e4c91661b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-24T09:28:29+02:00 sanity: adjusted log messages for check_proxy_require() --- Modified: modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/0f479b5366fae4c5ad0c78e4c91661b… Patch: https://github.com/kamailio/kamailio/commit/0f479b5366fae4c5ad0c78e4c91661b… --- diff --git a/modules/sanity/sanity.c b/modules/sanity/sanity.c index 0e2cb45..8140c07 100644 --- a/modules/sanity/sanity.c +++ b/modules/sanity/sanity.c @@ -652,19 +652,18 @@ int check_proxy_require(struct sip_msg* _msg) { int u_len; #ifdef EXTRA_DEBUG - DBG("check_proxy_require entered\n"); + LM_DBG("checking proxy require\n"); #endif if (parse_headers(_msg, HDR_PROXYREQUIRE_F, 0) != 0) { - LOG(L_WARN, "sanity_check(): check_proxy_require():" - " failed to parse proxy require header\n"); + LM_WARN("failed to parse proxy require header\n"); return SANITY_CHECK_FAILED; } if (_msg->proxy_require != NULL) { //dump_hdr_field(_msg->proxy_require); if (_msg->proxy_require->parsed == NULL && parse_proxyrequire(_msg->proxy_require) < 0) { - LOG(L_WARN, "sanity_check(): check_proxy_require(): parse_proxy_require failed\n"); + LM_WARN("parse_proxy_require failed\n"); return SANITY_CHECK_FAILED; } r_pr = _msg->proxy_require->parsed; @@ -672,7 +671,7 @@ int check_proxy_require(struct sip_msg* _msg) { l_pr = proxyrequire_list; while (l_pr != NULL) { #ifdef EXTRA_DEBUG - DBG("check_proxy_require(): comparing r='%.*s' l='%.*s'\n", + LM_DBG("comparing r='%.*s' l='%.*s'\n", r_pr->string.len, r_pr->string.s, l_pr->string.len, l_pr->string.s); #endif @@ -685,14 +684,12 @@ int check_proxy_require(struct sip_msg* _msg) { l_pr = l_pr->next; } if (l_pr == NULL) { - DBG("sanit_check(): check_proxy_require():" - " request contains unsupported extension: %.*s\n", + LM_DBG("request contains unsupported extension: %.*s\n", r_pr->string.len, r_pr->string.s); u_len = UNSUPPORTED_HEADER_LEN + 2 + r_pr->string.len; u = pkg_malloc(u_len); if (u == NULL) { - LOG(L_ERR, "sanity_check(): check_proxy_require():" - " failed to allocate memory for" + LM_ERR("failed to allocate memory for" " Unsupported header\n"); } else { @@ -706,12 +703,11 @@ int check_proxy_require(struct sip_msg* _msg) { if (_msg->REQ_METHOD != METHOD_ACK) { if (sanity_reply(_msg, 420, "Bad Extension") < 0) { - LOG(L_WARN, "sanity_check(): check_proxy_require():" - " failed to send 420 via sl reply\n"); + LM_WARN("failed to send 420 via sl reply\n"); } } #ifdef EXTRA_DEBUG - DBG("check_proxy_require failed\n"); + LM_DBG("checking proxy require failed\n"); #endif if (u) pkg_free(u); return SANITY_CHECK_FAILED; @@ -721,7 +717,7 @@ int check_proxy_require(struct sip_msg* _msg) { } } #ifdef EXTRA_DEBUG - DBG("check_proxy_require passed\n"); + LM_DBG("checking proxy require passed\n"); #endif if (_msg->proxy_require->parsed) { /* TODO we have to free it here, because it is not automatically @@ -732,7 +728,7 @@ int check_proxy_require(struct sip_msg* _msg) { } #ifdef EXTRA_DEBUG else { - DBG("check_proxy_require(): no proxy-require header found\n"); + LM_DBG("no proxy-require header found\n"); } #endif

9 years, 3 months

[kamailio] evapi event_route segfault crash when using $sel() to access custom options in cfg (#287)

by zxcpoiu

=== Description === use $sel() in event_route from evapi module will cause segfault and kamailio crash. === How to re-produce === --- Step 1. kamailio.cfg: --- # --- evapi params --- # loadmodule "evapi.so" modparam("evapi", "bind_addr", "127.0.0.1:8448") modparam("evapi", "netstring_format", 1) modparam("evapi", "workers", 4) # --- set a custom options outside any route block self.MYIP = "1.2.3.4" # --- set event_route for evapi and invoke $sel; both route will segfault and crash event_route[evapi:connection-new] { xlog("L_NOTICE", "[ROUTEDEBUG][evapi:connection-new] new connection from $evapi(srcaddr):$evapi(srcport)"); xlog("L_NOTICE", "[ROUTEDEBUG][evapi:connection-new] TEST sel: $sel(cfg_get.self.MYIP)"); } event_route[evapi:message-received] { xlog("L_NOTICE", "[ROUTEDEBUG][evapi:message-received] test sel: $sel(cfg_get.self.MYIP)"); } --- 2. try connect to evapi --- You can use any client to try to connect or send message. in bash, you can just use the following command to connect to and send a message: exec 3<>/dev/tcp/127.0.0.1/5014; printf "5:Hello," >&3; === Debug level 3 error log at event_route[evapi:connection-new] === Aug 12 16:35:07 SIP /home/pkg/kamailio/sbin/kamailio[47034]: NOTICE: <script>: [ROUTEDEBUG][evapi:connection-new] new connection from 127.0.0.1:27088 Aug 12 16:35:07 SIP /home/pkg/kamailio/sbin/kamailio[46977]: ALERT: <core> [main.c:728]: handle_sigs(): child process 47034 exited by a signal 11 Aug 12 16:35:07 SIP /home/pkg/kamailio/sbin/kamailio[46977]: ALERT: <core> [main.c:731]: handle_sigs(): core was not generated Aug 12 16:35:07 SIP /home/pkg/kamailio/sbin/kamailio[46977]: INFO: <core> [main.c:743]: handle_sigs(): terminating due to SIGCHLD Aug 12 16:35:07 SIP kernel: [28325875.619264] kamailio[47034]: segfault at 10 ip 00007f062cd91470 sp 00007fff5518e068 error 4 in libc-2.13.so[7f062cc6e000+182000] Aug 12 16:35:07 SIP /home/pkg/kamailio/sbin/kamailio[47056]: INFO: <core> [main.c:794]: sig_usr(): signal 15 received Aug 12 16:35:07 SIP /home/pkg/kamailio/sbin/kamailio[47057]: INFO: <core> [main.c:794]: sig_usr(): signal 15 received --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/287

9 years, 3 months

git:master:4404f75c: evapi: do cfg framework update on i/o events

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4404f75cf194e8fd727c2ffaeeea41d2193decf6 URL: https://github.com/kamailio/kamailio/commit/4404f75cf194e8fd727c2ffaeeea41d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-22T13:47:47+02:00 evapi: do cfg framework update on i/o events --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4404f75cf194e8fd727c2ffaeeea41d… Patch: https://github.com/kamailio/kamailio/commit/4404f75cf194e8fd727c2ffaeeea41d… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 159d14e..0d76c9f 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -36,6 +36,7 @@ #include "../../sr_module.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../cfg/cfg_struct.h" #include "../../lib/kcore/faked_msg.h" #include "evapi_dispatch.h" @@ -254,6 +255,8 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) return; } + cfg_update(); + evapi_env_reset(&evenv); if(rlen == 0) { /* client is gone */ @@ -342,6 +345,8 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent return; } + cfg_update(); + /* accept new client connection */ csock = accept(watcher->fd, (struct sockaddr *)&caddr, &clen); @@ -417,6 +422,8 @@ void evapi_recv_notify(struct ev_loop *loop, struct ev_io *watcher, int revents) return; } + cfg_update(); + /* read message from client */ rlen = read(watcher->fd, &sbuf, sizeof(str*));

9 years, 3 months

git:master:a16c6108: db_postgres: memset vars to 0 to avoid using invalid values inside db_postgres_new_connection()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a16c6108e1f6d1a3f6b6c962bbaaedf37e57a8d2 URL: https://github.com/kamailio/kamailio/commit/a16c6108e1f6d1a3f6b6c962bbaaedf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-22T09:47:43+02:00 db_postgres: memset vars to 0 to avoid using invalid values inside db_postgres_new_connection() - reported by mading087, GH#292 --- Modified: modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/a16c6108e1f6d1a3f6b6c962bbaaedf… Patch: https://github.com/kamailio/kamailio/commit/a16c6108e1f6d1a3f6b6c962bbaaedf… --- diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index d053c55..ec98add 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -71,6 +71,10 @@ struct pg_con* db_postgres_new_connection(struct db_id* id) memset(ptr, 0, sizeof(struct pg_con)); ptr->ref = 1; + memset(keywords, 0, (sizeof(char*) * 10)); + memset(values, 0, (sizeof(char*) * 10)); + memset(to, 0, (sizeof(char) * 16)); + if (id->port) { ports = int2str(id->port, 0); keywords[i] = "port";

9 years, 3 months

[kamailio] Issue with session timers (#288)

by nbougues

RFC 4028 mandates that the Session-Expires header contains a refresher= parameter. The current implementation fails against some SBCs. Here is a small patch that solves this. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/288

9 years, 3 months

git:master:86e3ed03: Merge pull request #289 from kamailio/vseva/session_timers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86e3ed032fc738a596bab8f2ff314a280bf18545 URL: https://github.com/kamailio/kamailio/commit/86e3ed032fc738a596bab8f2ff314a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-22T09:38:40+02:00 Merge pull request #289 from kamailio/vseva/session_timers stt: add refresher param following RFC 4028 --- Modified: modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/86e3ed032fc738a596bab8f2ff314a2… Patch: https://github.com/kamailio/kamailio/commit/86e3ed032fc738a596bab8f2ff314a2… --- diff --git a/modules/sst/sst_handlers.c b/modules/sst/sst_handlers.c index 1cacb29..8f622c2 100644 --- a/modules/sst/sst_handlers.c +++ b/modules/sst/sst_handlers.c @@ -173,13 +173,19 @@ static inline int sst_build_minse_hdr(int seval, str *sehdr) sehdr->s = sst_se_buf; return 0; } -static inline int sst_build_se_hdr(int seval, str *sehdr) +static inline int sst_build_se_hdr(int seval, str *sehdr, char *refresher) { if(sehdr==NULL) return -1; - sehdr->len = snprintf(sst_se_buf, SST_SE_BUF_SIZE, - "Session-Expires: %d\r\n", seval); + if(refresher==NULL) { + sehdr->len = snprintf(sst_se_buf, SST_SE_BUF_SIZE, + "Session-Expires: %d\r\n", seval); + } + else { + sehdr->len = snprintf(sst_se_buf, SST_SE_BUF_SIZE, + "Session-Expires: %d;refresher=%s\r\n", seval, refresher); + } sehdr->s = sst_se_buf; return 0; } @@ -342,7 +348,7 @@ void sst_dialog_created_CB(struct dlg_cell *did, int type, } info->requester = SST_PXY; - sst_build_se_hdr(info->interval, &msehdr); + sst_build_se_hdr(info->interval, &msehdr, NULL); if (append_header(msg, msehdr.s)) { LM_ERR("failed to append Session-Expires header to proxy " "requested SST.\n"); @@ -562,7 +568,7 @@ static void sst_dialog_response_fwded_CB(struct dlg_cell* did, int type, * header and forward back to the UAC and it will * deal with refreshing the session. */ - sst_build_se_hdr(info->interval, &sehdr); + sst_build_se_hdr(info->interval, &sehdr, "uac"); if (append_header(msg, sehdr.s)) { LM_ERR("failed to append Session-Expires header\n"); return;

9 years, 3 months

git:master:5b97d817: stt: add refresher param following RFC 4028

by Victor Seva

Module: kamailio Branch: master Commit: 5b97d81756b3e5b5ddbea4e6337d4e6bbadea024 URL: https://github.com/kamailio/kamailio/commit/5b97d81756b3e5b5ddbea4e6337d4e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-12T18:50:11+02:00 stt: add refresher param following RFC 4028 Fixes: #288 Patch by: https://github.com/nbougues --- Modified: modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5b97d81756b3e5b5ddbea4e6337d4e6… Patch: https://github.com/kamailio/kamailio/commit/5b97d81756b3e5b5ddbea4e6337d4e6… --- diff --git a/modules/sst/sst_handlers.c b/modules/sst/sst_handlers.c index 1cacb29..8f622c2 100644 --- a/modules/sst/sst_handlers.c +++ b/modules/sst/sst_handlers.c @@ -173,13 +173,19 @@ static inline int sst_build_minse_hdr(int seval, str *sehdr) sehdr->s = sst_se_buf; return 0; } -static inline int sst_build_se_hdr(int seval, str *sehdr) +static inline int sst_build_se_hdr(int seval, str *sehdr, char *refresher) { if(sehdr==NULL) return -1; - sehdr->len = snprintf(sst_se_buf, SST_SE_BUF_SIZE, - "Session-Expires: %d\r\n", seval); + if(refresher==NULL) { + sehdr->len = snprintf(sst_se_buf, SST_SE_BUF_SIZE, + "Session-Expires: %d\r\n", seval); + } + else { + sehdr->len = snprintf(sst_se_buf, SST_SE_BUF_SIZE, + "Session-Expires: %d;refresher=%s\r\n", seval, refresher); + } sehdr->s = sst_se_buf; return 0; } @@ -342,7 +348,7 @@ void sst_dialog_created_CB(struct dlg_cell *did, int type, } info->requester = SST_PXY; - sst_build_se_hdr(info->interval, &msehdr); + sst_build_se_hdr(info->interval, &msehdr, NULL); if (append_header(msg, msehdr.s)) { LM_ERR("failed to append Session-Expires header to proxy " "requested SST.\n"); @@ -562,7 +568,7 @@ static void sst_dialog_response_fwded_CB(struct dlg_cell* did, int type, * header and forward back to the UAC and it will * deal with refreshing the session. */ - sst_build_se_hdr(info->interval, &sehdr); + sst_build_se_hdr(info->interval, &sehdr, "uac"); if (append_header(msg, sehdr.s)) { LM_ERR("failed to append Session-Expires header\n"); return;

9 years, 3 months

[kamailio] stt: add refresher param following RFC 4028 (#289)

by Victor Seva

Fixes: #288 Patch by: https://github.com/nbougues You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/289 -- Commit Summary -- * stt: add refresher param following RFC 4028 -- File Changes -- M modules/sst/sst_handlers.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/289.patch https://github.com/kamailio/kamailio/pull/289.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/289

9 years, 3 months

git:master:9902ca14: sanity: commented priting require header on error level

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9902ca145178498ff47092f0ecdd3bca6650c97c URL: https://github.com/kamailio/kamailio/commit/9902ca145178498ff47092f0ecdd3bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-22T09:28:29+02:00 sanity: commented priting require header on error level --- Modified: modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/9902ca145178498ff47092f0ecdd3bc… Patch: https://github.com/kamailio/kamailio/commit/9902ca145178498ff47092f0ecdd3bc… --- diff --git a/modules/sanity/sanity.c b/modules/sanity/sanity.c index 7e1842e..0e2cb45 100644 --- a/modules/sanity/sanity.c +++ b/modules/sanity/sanity.c @@ -661,7 +661,7 @@ int check_proxy_require(struct sip_msg* _msg) { return SANITY_CHECK_FAILED; } if (_msg->proxy_require != NULL) { - dump_hdr_field(_msg->proxy_require); + //dump_hdr_field(_msg->proxy_require); if (_msg->proxy_require->parsed == NULL && parse_proxyrequire(_msg->proxy_require) < 0) { LOG(L_WARN, "sanity_check(): check_proxy_require(): parse_proxy_require failed\n");

9 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2015