sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
191 discussions

git:master:374bfb1c: mi_datagram: free async handler when command completed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 374bfb1c467d6bf2a4cc143d22868c37143783bd URL: https://github.com/kamailio/kamailio/commit/374bfb1c467d6bf2a4cc143d22868c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T16:12:51+02:00 mi_datagram: free async handler when command completed - reported by Torge Szczepanek, GH#298 --- Modified: modules/mi_datagram/datagram_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/374bfb1c467d6bf2a4cc143d22868c3… Patch: https://github.com/kamailio/kamailio/commit/374bfb1c467d6bf2a4cc143d22868c3… --- diff --git a/modules/mi_datagram/datagram_fnc.c b/modules/mi_datagram/datagram_fnc.c index 0309b73..8e2ed71 100644 --- a/modules/mi_datagram/datagram_fnc.c +++ b/modules/mi_datagram/datagram_fnc.c @@ -359,6 +359,7 @@ static void datagram_close_async(struct mi_root *mi_rpl,struct mi_handler *hdl, } free_mi_tree(mi_rpl); pkg_free(dtgram.start); + if (done) free_async_handler( hdl ); } else if (done) { mi_send_dgram(reply_sock, MI_COMMAND_FAILED, MI_COMMAND_FAILED_LEN, (struct sockaddr*)&reply_addr, reply_addr_len, mi_socket_timeout); @@ -372,6 +373,7 @@ static void datagram_close_async(struct mi_root *mi_rpl,struct mi_handler *hdl, if(dtgram.start) pkg_free(dtgram.start); close(reply_sock); + if (done) free_async_handler( hdl ); return; }

9 years, 3 months

git:master:79459d3f: jsonrpc-c: free pipe cmd for notifications

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 79459d3f87731309641794a2b881ee1cacc5e1f2 URL: https://github.com/kamailio/kamailio/commit/79459d3f87731309641794a2b881ee1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T15:53:02+02:00 jsonrpc-c: free pipe cmd for notifications - fixes leak reported by GH#296 --- Modified: modules/jsonrpc-c/jsonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/79459d3f87731309641794a2b881ee1… Patch: https://github.com/kamailio/kamailio/commit/79459d3f87731309641794a2b881ee1… --- diff --git a/modules/jsonrpc-c/jsonrpc_io.c b/modules/jsonrpc-c/jsonrpc_io.c index 9acc149..42d16be 100644 --- a/modules/jsonrpc-c/jsonrpc_io.c +++ b/modules/jsonrpc-c/jsonrpc_io.c @@ -165,7 +165,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if (!payload) { LM_ERR("Failed to build jsonrpc_request_t (method: %s, params: %s)\n", cmd->method, cmd->params); - return; + goto error; } char *json = (char*)json_object_get_string(payload); @@ -203,7 +203,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if (timerfd == -1) { LM_ERR("Could not create timerfd."); - return; + goto error; } req->timerfd = timerfd; @@ -217,7 +217,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if (timerfd_settime(timerfd, 0, itime, NULL) == -1) { LM_ERR("Could not set timer."); - return; + goto error; } pkg_free(itime); struct event *timer_ev = pkg_malloc(sizeof(struct event)); @@ -225,7 +225,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) event_set(timer_ev, timerfd, EV_READ, timeout_cb, req); if(event_add(timer_ev, NULL) == -1) { LM_ERR("event_add failed while setting request timer (%s).", strerror(errno)); - return; + goto error; } req->timer_ev = timer_ev; } else if (!sent) { @@ -239,6 +239,10 @@ void cmd_pipe_cb(int fd, short event, void *arg) pkg_free(ns); json_object_put(payload); + if (cmd->notify_only) free_pipe_cmd(cmd); +error: + if (cmd->notify_only) free_pipe_cmd(cmd); + return; } void socket_cb(int fd, short event, void *arg)

9 years, 3 months

RTPEngine - REDIS Plugin

by Carsten Bock

Hi everyone, several months ago, we've implemented a plugin for RTPEngine to synchronize it with a REDIS-Database. This allows RTPEngine to operate in a HA, as you can restart RTPEngine and/or make a failover to another machine with the same IP (e.g. using Heartbeat or similar), WITHOUT LOOSING ACTIVE SESSIONS. This enhancement was originally implemented by Carlos Ruiz Diaz. Due to lack of time, it still requires RTPEngine 3.3 and needs an update, to work with later versions. It can be found here: https://github.com/ngvoice/rtpengine-redis-plugin If anyone is interested in contributing to this extension, please ping me and i will happily add you as a contributor. Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Schomburgstr. 80 D-22767 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-0 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

9 years, 3 months

git:master:de07fe4e: dialog: refresh value for contact uri for each re-invite

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: de07fe4e78e2b7df59fbdffd74ca655bd77570ba URL: https://github.com/kamailio/kamailio/commit/de07fe4e78e2b7df59fbdffd74ca655… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T15:37:34+02:00 dialog: refresh value for contact uri for each re-invite --- Modified: modules/dialog/dlg_db_handler.c Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/de07fe4e78e2b7df59fbdffd74ca655… Patch: https://github.com/kamailio/kamailio/commit/de07fe4e78e2b7df59fbdffd74ca655…

9 years, 3 months

git:master:3820f41a: dialog: split out storage of contact from common memory block

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3820f41ab7ba33c39cd9f67e179bf203aa60ddeb URL: https://github.com/kamailio/kamailio/commit/3820f41ab7ba33c39cd9f67e179bf20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T15:13:16+02:00 dialog: split out storage of contact from common memory block - kept now in its own malloc'ed chunk --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/3820f41ab7ba33c39cd9f67e179bf20… Patch: https://github.com/kamailio/kamailio/commit/3820f41ab7ba33c39cd9f67e179bf20…

9 years, 3 months

[kamailio] Fix dialog module still loading DB when db_fetch_rows == 0 (#295)

by jaybinks

as per http://kamailio.org/docs/modules/3.3.x/modules_k/dialog.html#idp148408 a db_fetch_row of 0 should not load data from the DB At all. I think doing this in mod_init makes the most sense, rather than further down in select_entire_dialog_table or similar. The docs say setting to 0 will only restrict the initial load on startup, not any subsequent loads. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/295 -- Commit Summary -- * Fix dialog module to not load DB when db_fetch_rows == 0 -- File Changes -- M modules/dialog/dialog.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/295.patch https://github.com/kamailio/kamailio/pull/295.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/295

9 years, 3 months

git:master:0d9e4adb: dialog: dlg var value stored as zero terminated string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0d9e4adb328dabaf2a34d926bc80e022bee65079 URL: https://github.com/kamailio/kamailio/commit/0d9e4adb328dabaf2a34d926bc80e02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T14:28:17+02:00 dialog: dlg var value stored as zero terminated string - easier to use in std lib operations --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/0d9e4adb328dabaf2a34d926bc80e02… Patch: https://github.com/kamailio/kamailio/commit/0d9e4adb328dabaf2a34d926bc80e02… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index a3c7b8e..e8c84ed 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -99,7 +99,7 @@ static inline struct dlg_var *new_dlg_var(str *key, str *val) LM_ERR("no more shm mem\n"); return NULL; } - var->next = NULL; + memset(var, 0, sizeof(struct dlg_var)); var->vflags = DLG_FLAG_NEW; /* set key */ var->key.len = key->len; @@ -113,7 +113,7 @@ static inline struct dlg_var *new_dlg_var(str *key, str *val) var->key.s[var->key.len] = '\0'; /* set value */ var->value.len = val->len; - var->value.s = (char*)shm_malloc(var->value.len); + var->value.s = (char*)shm_malloc(var->value.len+1); if (var->value.s==NULL) { shm_free(var->key.s); shm_free(var); @@ -121,6 +121,7 @@ static inline struct dlg_var *new_dlg_var(str *key, str *val) return NULL; } memcpy(var->value.s, val->s, val->len); + var->value.s[var->value.len] = '\0'; return var; }

9 years, 3 months

git:master:cbc0c720: dialog: set dlg var table as static and rename to avoid name conflicts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cbc0c720e1c239296ff3842d701f75663bead6d9 URL: https://github.com/kamailio/kamailio/commit/cbc0c720e1c239296ff3842d701f756… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T13:35:30+02:00 dialog: set dlg var table as static and rename to avoid name conflicts --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/cbc0c720e1c239296ff3842d701f756… Patch: https://github.com/kamailio/kamailio/commit/cbc0c720e1c239296ff3842d701f756… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index b4f821e..a3c7b8e 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -40,7 +40,7 @@ dlg_ctx_t _dlg_ctx; extern int spiral_detected; /*! global variable table, in case the dialog does not exist yet */ -struct dlg_var * var_table = 0; +static struct dlg_var *_dlg_var_table = 0; /*! ID of the current message */ int msg_id; @@ -127,13 +127,14 @@ static inline struct dlg_var *new_dlg_var(str *key, str *val) /*! Delete the current var-list */ void free_local_varlist() { struct dlg_var *var; - while (var_table) { - var = var_table; - var_table = var_table->next; + while (_dlg_var_table) { + var = _dlg_var_table; + _dlg_var_table = _dlg_var_table->next; shm_free(var->key.s); shm_free(var->value.s); shm_free(var); } + _dlg_var_table = NULL; } /*! Retrieve the local var-list pointer */ @@ -144,9 +145,9 @@ struct dlg_var * get_local_varlist_pointer(struct sip_msg *msg, int clear_pointe free_local_varlist(); msg_id = msg->id; } - var = var_table; + var = _dlg_var_table; if (clear_pointer) - var_table = NULL; + _dlg_var_table = NULL; return var; } @@ -161,7 +162,7 @@ int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val) if (dlg) var_list = &dlg->vars; else - var_list = &var_table; + var_list = &_dlg_var_table; if ( val && (var=new_dlg_var(key, val))==NULL) { LM_ERR("failed to create new dialog variable\n"); @@ -216,7 +217,7 @@ str * get_dlg_variable_unsafe(struct dlg_cell *dlg, str *key) if (dlg) var_list = dlg->vars; else - var_list = var_table; + var_list = _dlg_var_table; /* iterate the list */ for(var=var_list ; var ; var=var->next) { @@ -244,7 +245,7 @@ int pv_parse_dialog_var_name(pv_spec_p sp, str *in) /*! Internal debugging function: Prints the list of dialogs */ void print_lists(struct dlg_cell *dlg) { struct dlg_var *varlist; - varlist = var_table; + varlist = _dlg_var_table; LM_DBG("Internal var-list (%p):\n", varlist); while (varlist) { LM_DBG("%.*s=%.*s (flags %i)\n",

9 years, 3 months

[kamailio] modules/dialog: make dialog context available in event route tm:local… (#291)

by Federico Cabiddu

…-request Set the dialog context before calling dlg_bye_all. In this way the dialog context is the correct one in the event route tm:local-request; otherwise it could happen that, in the timer process, the context is invalid due to some previous timed-out transactions which set (and not reset) the dialog context in the dlg_onreply function (locally generated replies). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/291 -- Commit Summary -- * modules/dialog: make dialog context available in event route tm:local-request -- File Changes -- M modules/dialog/dlg_handlers.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/291.patch https://github.com/kamailio/kamailio/pull/291.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/291

9 years, 3 months

git:master:284fcb68: dispatcher: reformated code to fit in 80char lines for keepalives function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 284fcb685b1691b25ea73a170467d862b1b67929 URL: https://github.com/kamailio/kamailio/commit/284fcb685b1691b25ea73a170467d86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T08:59:44+02:00 dispatcher: reformated code to fit in 80char lines for keepalives function --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/284fcb685b1691b25ea73a170467d86… Patch: https://github.com/kamailio/kamailio/commit/284fcb685b1691b25ea73a170467d86… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 1cc3470..1188692 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -2754,11 +2754,13 @@ static void ds_options_callback( struct cell *t, int type, /* Set the according entry back to "Active" */ state = 0; if (ds_probing_mode==DS_PROBE_ALL || - (ds_probing_mode == DS_PROBE_ONLYFLAGGED && ds_get_state(group, &uri) & DS_PROBING_DST)) + ((ds_probing_mode==DS_PROBE_ONLYFLAGGED) + && (ds_get_state(group, &uri) & DS_PROBING_DST))) state |= DS_PROBING_DST; /* Check if in the meantime someone disabled the target through RPC or MI */ - if (!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state) != 0) + if (!(ds_get_state(group, &uri) & DS_DISABLED_DST) + && ds_update_state(fmsg, group, &uri, state) != 0) { LM_ERR("Setting the state failed (%.*s, group %d)\n", uri.len, uri.s, group); @@ -2768,7 +2770,8 @@ static void ds_options_callback( struct cell *t, int type, if (ds_probing_mode!=DS_PROBE_NONE) state |= DS_PROBING_DST; /* Check if in the meantime someone disabled the target through RPC or MI */ - if (!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state) != 0) + if (!(ds_get_state(group, &uri) & DS_DISABLED_DST) + && ds_update_state(fmsg, group, &uri, state) != 0) { LM_ERR("Setting the probing state failed (%.*s, group %d)\n", uri.len, uri.s, group);

9 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
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