sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

git:master:24a792d2: topos: record routing storage for handling sip responses

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 24a792d23c30a258a95bfc29fe4dc20bc4bce8c8 URL: https://github.com/kamailio/kamailio/commit/24a792d23c30a258a95bfc29fe4dc20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-08-30T15:13:26+02:00 topos: record routing storage for handling sip responses --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/24a792d23c30a258a95bfc29fe4dc20… Patch: https://github.com/kamailio/kamailio/commit/24a792d23c30a258a95bfc29fe4dc20…

8 years, 3 months

git:master:b0f8516f: Merge pull request #734 from gaaf/random-fixes

by GitHub

Module: kamailio Branch: master Commit: b0f8516fbf1300fc10b09772dcaf5a6539f783f5 URL: https://github.com/kamailio/kamailio/commit/b0f8516fbf1300fc10b09772dcaf5a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-30T13:51:34+02:00 Merge pull request #734 from gaaf/random-fixes Random fixes --- Modified: main.c Modified: modules/dispatcher/dispatcher.c Modified: modules/jsonrpc-s/jsonrpc-s_mod.c Modified: modules/mqueue/mqueue_api.c Modified: modules/pv/pv_xavp.c Modified: modules/sl/sl_funcs.c Modified: modules/sl/sl_funcs.h Modified: modules/tmx/t_var.c Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/b0f8516fbf1300fc10b09772dcaf5a6… Patch: https://github.com/kamailio/kamailio/commit/b0f8516fbf1300fc10b09772dcaf5a6…

8 years, 3 months

git:master:28224ba2: sl: Convert get_ticks() to the somewhat faster get_ticks_raw()

by Alex Hermann

Module: kamailio Branch: master Commit: 28224ba2da2cc111239c173bedfcc4a7c295f394 URL: https://github.com/kamailio/kamailio/commit/28224ba2da2cc111239c173bedfcc4a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-05T15:07:11+02:00 sl: Convert get_ticks() to the somewhat faster get_ticks_raw() Avoid a multiplication on every call. --- Modified: modules/sl/sl_funcs.c Modified: modules/sl/sl_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/28224ba2da2cc111239c173bedfcc4a… Patch: https://github.com/kamailio/kamailio/commit/28224ba2da2cc111239c173bedfcc4a… --- diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index ec5a2ba..ac7701c 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -86,7 +86,7 @@ int sl_startup() LOG(L_ERR,"ERROR:sl_startup: no more free memory!\n"); return -1; } - *(sl_timeout)=get_ticks(); + *(sl_timeout)=get_ticks_raw(); return 1; } @@ -182,7 +182,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) sl_run_callbacks(SLCB_REPLY_READY, msg, code, reason, &buf, &dst); - *(sl_timeout) = get_ticks() + SL_RPL_WAIT_TIME; + *(sl_timeout) = get_ticks_raw() + SL_RPL_WAIT_TIME; /* supress multhoming support when sending a reply back -- that makes sure that replies will come from where requests came in; good for NATs @@ -383,7 +383,7 @@ int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) goto pass_it; /*check the timeout value*/ - if ( *(sl_timeout)<= get_ticks() ) + if ( *(sl_timeout)<= get_ticks_raw() ) { DBG("DEBUG : sl_filter_ACK: to late to be a local ACK!\n"); goto pass_it; diff --git a/modules/sl/sl_funcs.h b/modules/sl/sl_funcs.h index 4928fc9..077ad93 100644 --- a/modules/sl/sl_funcs.h +++ b/modules/sl/sl_funcs.h @@ -24,8 +24,9 @@ #include "../../sr_module.h" #include "../../parser/msg_parser.h" +#include "../../timer_ticks.h" -#define SL_RPL_WAIT_TIME 2 /* in sec */ +#define SL_RPL_WAIT_TIME S_TO_TICKS(2) /* in sec */ #define SL_TOTAG_SEPARATOR '.'

8 years, 3 months

git:master:d2f695d6: sl: Reset timeout before sending the message

by Alex Hermann

Module: kamailio Branch: master Commit: d2f695d63266a5e1762db2e762396e7943687180 URL: https://github.com/kamailio/kamailio/commit/d2f695d63266a5e1762db2e762396e7… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-05T15:07:03+02:00 sl: Reset timeout before sending the message Fix a common race where the reply would arrive before resetting the timeout. --- Modified: modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d2f695d63266a5e1762db2e762396e7… Patch: https://github.com/kamailio/kamailio/commit/d2f695d63266a5e1762db2e762396e7… --- diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index a65a7b8..ec5a2ba 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -182,6 +182,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) sl_run_callbacks(SLCB_REPLY_READY, msg, code, reason, &buf, &dst); + *(sl_timeout) = get_ticks() + SL_RPL_WAIT_TIME; + /* supress multhoming support when sending a reply back -- that makes sure that replies will come from where requests came in; good for NATs (there is no known use for mhomed for locally generated replies; @@ -286,8 +288,6 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) if (ret<0) { goto error; } - - *(sl_timeout) = get_ticks() + SL_RPL_WAIT_TIME; update_sl_stats(code); return 1;

8 years, 3 months

git:master:8102ca5f: core: Don't bind to IPv6 addresses if auto_bind_ipv6 is disabled

by Alex Hermann

Module: kamailio Branch: master Commit: 8102ca5f67de979a3597a97f96a05c99d13fb29d URL: https://github.com/kamailio/kamailio/commit/8102ca5f67de979a3597a97f96a05c9… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:48:29+02:00 core: Don't bind to IPv6 addresses if auto_bind_ipv6 is disabled With the following listen statement: listen=udp:eth0:5060 Kamailio would try to bind to the IPv6 address(es) on that interface and fail with: ERROR: <core> [udp_server.c:369]: udp_init(): might be caused by using a link local address, try site local or global --- Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/8102ca5f67de979a3597a97f96a05c9… Patch: https://github.com/kamailio/kamailio/commit/8102ca5f67de979a3597a97f96a05c9… --- diff --git a/socket_info.c b/socket_info.c index aa8928a..ee48e11 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1406,8 +1406,8 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) for (si=*list;si;){ next=si->next; ai_lst=0; - if (add_interfaces(si->name.s, 0, si->port_no, - si->proto, &ai_lst)!=-1){ + if (add_interfaces(si->name.s, auto_bind_ipv6 ? 0 : AF_INET, + si->port_no, si->proto, &ai_lst)!=-1){ if (si->flags & SI_IS_MHOMED){ if((new_si=new_sock2list_after(ai_lst->name.s, 0, si->port_no, si->proto, si->useinfo.name.s,

8 years, 3 months

git:master:bbacab49: jsonrpc_s: Return an error when JSON parsing fails

by Alex Hermann

Module: kamailio Branch: master Commit: bbacab495841ef270f98b743352ad8aca9649b47 URL: https://github.com/kamailio/kamailio/commit/bbacab495841ef270f98b743352ad8a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:48:05+02:00 jsonrpc_s: Return an error when JSON parsing fails --- Modified: modules/jsonrpc-s/jsonrpc-s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bbacab495841ef270f98b743352ad8a… Patch: https://github.com/kamailio/kamailio/commit/bbacab495841ef270f98b743352ad8a… --- diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 62f2506..9c0fc72 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -571,7 +571,7 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) case '{': case '[': LM_ERR("Unsupported param type '%c'\n", *fmt); - jsonrpc_fault(ctx, 500, "Unsupported param type"); + jsonrpc_fault(ctx, 400, "Unsupported param type"); goto error; default: LM_ERR("Invalid param type in formatting string: [%c]\n", *fmt); @@ -1041,7 +1041,7 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) ctx->jreq = srjson_NewDoc(NULL); if(ctx->jreq==NULL) { LM_ERR("Failed to init the json document\n"); - return NONSIP_MSG_PASS; + return NONSIP_MSG_ERROR; } ctx->jreq->buf.s = get_body(msg); @@ -1050,7 +1050,7 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) if(ctx->jreq->root == NULL) { LM_ERR("invalid json doc [[%s]]\n", ctx->jreq->buf.s); - return NONSIP_MSG_PASS; + return NONSIP_MSG_ERROR; } if (jsonrpc_init_reply(ctx) < 0) goto send_reply;

8 years, 3 months

git:master:72ae9283: tmx: Try to get branch_index for all replies

by Alex Hermann

Module: kamailio Branch: master Commit: 72ae9283fa969c13ba1c6d599c2844e1473883f4 URL: https://github.com/kamailio/kamailio/commit/72ae9283fa969c13ba1c6d599c2844e… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:47:45+02:00 tmx: Try to get branch_index for all replies Just check if the tm context is set and return its branch_index. The check for CORE_ONREPLY_ROUTE is flawed as the transaction may have been set anyway (by t_check_trans() for example). --- Modified: modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/72ae9283fa969c13ba1c6d599c2844e… Patch: https://github.com/kamailio/kamailio/commit/72ae9283fa969c13ba1c6d599c2844e… --- diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 6e83761..83cd8c6 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -396,7 +396,7 @@ int pv_get_tm_branch_idx(struct sip_msg *msg, pv_param_t *param, return -1; /* statefull replies have the branch_index set */ - if(msg->first_line.type == SIP_REPLY && route_type != CORE_ONREPLY_ROUTE) { + if(msg->first_line.type == SIP_REPLY) { tcx = _tmx_tmb.tm_ctx_get(); if(tcx != NULL) idx = tcx->branch_index;

8 years, 3 months

git:master:d33e8efc: mqueu: Convert items to single linked list

by Alex Hermann

Module: kamailio Branch: master Commit: d33e8efc93446c1d5a092740b5a2387dea5de1fc URL: https://github.com/kamailio/kamailio/commit/d33e8efc93446c1d5a092740b5a2387… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:47:23+02:00 mqueu: Convert items to single linked list The doubly-lined feature is not used as the prev attribute was write-only-memory. --- Modified: modules/mqueue/mqueue_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d33e8efc93446c1d5a092740b5a2387… Patch: https://github.com/kamailio/kamailio/commit/d33e8efc93446c1d5a092740b5a2387… --- diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index d9a8536..85ddf7e 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -44,7 +44,6 @@ typedef struct _mq_item { str key; str val; - struct _mq_item *prev; struct _mq_item *next; } mq_item_t; @@ -266,8 +265,6 @@ int mq_head_fetch(str *name) mh->ifirst = mh->ifirst->next; if(mh->ifirst==NULL) { mh->ilast = NULL; - } else { - mh->ifirst->prev = NULL; } mh->csize--; @@ -332,7 +329,6 @@ int mq_item_add(str *qname, str *key, str *val) mh->ilast = mi; } else { mh->ilast->next = mi; - mi->prev = mh->ilast; mh->ilast = mi; } mh->csize++; @@ -341,9 +337,9 @@ int mq_item_add(str *qname, str *key, str *val) mi = mh->ifirst; mh->ifirst = mh->ifirst->next; if(mh->ifirst==NULL) + { mh->ilast = NULL; - else - mh->ifirst->prev = NULL; + } mh->csize--; shm_free(mi); }

8 years, 3 months

git:master:cf085a87: core: Enable SIGUSR1 for child processes

by Alex Hermann

Module: kamailio Branch: master Commit: cf085a870e33bcdef5dad91a3de92f25e159e669 URL: https://github.com/kamailio/kamailio/commit/cf085a870e33bcdef5dad91a3de92f2… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:46:37+02:00 core: Enable SIGUSR1 for child processes Allow dumping of memory statistics during runtime --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/cf085a870e33bcdef5dad91a3de92f2… Patch: https://github.com/kamailio/kamailio/commit/cf085a870e33bcdef5dad91a3de92f2… --- diff --git a/main.c b/main.c index 7993590..887a58a 100644 --- a/main.c +++ b/main.c @@ -833,7 +833,20 @@ void sig_usr(int signo) _exit(0); break; case SIGUSR1: - /* statistics, do nothing, printed only from the main proc */ +#ifdef PKG_MALLOC + cfg_update_no_cbs(); + memlog=cfg_get(core, core_cfg, memlog); + if (memlog <= cfg_get(core, core_cfg, debug)){ + if (cfg_get(core, core_cfg, mem_summary) & 1) { + LOG(memlog, "Memory status (pkg):\n"); + pkg_status(); + } + if (cfg_get(core, core_cfg, mem_summary) & 2) { + LOG(memlog, "Memory still-in-use summary (pkg):\n"); + pkg_sums(); + } + } +#endif break; /* ignored*/ case SIGUSR2:

8 years, 3 months

git:master:fa11a6bd: pv: xavp: log error message when memory allocation fails

by Alex Hermann

Module: kamailio Branch: master Commit: fa11a6bd50aa00994c71561b8de8b0dc8659fe55 URL: https://github.com/kamailio/kamailio/commit/fa11a6bd50aa00994c71561b8de8b0d… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:46:27+02:00 pv: xavp: log error message when memory allocation fails --- Modified: modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/fa11a6bd50aa00994c71561b8de8b0d… Patch: https://github.com/kamailio/kamailio/commit/fa11a6bd50aa00994c71561b8de8b0d… --- diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index 67ffd45..e4e94f3 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -506,8 +506,10 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) return -1; xname = (pv_xavp_name_t*)pkg_malloc(sizeof(pv_xavp_name_t)); - if(xname==NULL) + if(xname==NULL) { + LM_ERR("not enough pkg mem\n"); return -1; + } memset(xname, 0, sizeof(pv_xavp_name_t)); @@ -530,9 +532,10 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) xname->name.s, s.len, s.s); xname->next = (pv_xavp_name_t*)pkg_malloc(sizeof(pv_xavp_name_t)); - if(xname->next==NULL) + if(xname->next==NULL) { + LM_ERR("not enough pkg mem\n"); goto error; - + } memset(xname->next, 0, sizeof(pv_xavp_name_t)); p = pv_xavp_fill_ni(&s, xname->next);

8 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
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 2016