sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:26543b90: acc: warning set to debug level if request is missing for dialog cdrs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 26543b90f80791b9e2b763fb97d78a8c90e445dc URL: https://github.com/kamailio/kamailio/commit/26543b90f80791b9e2b763fb97d78a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-16T12:00:32+02:00 acc: warning set to debug level if request is missing for dialog cdrs - self generating bye requests don't have incoming request --- Modified: modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/26543b90f80791b9e2b763fb97d78a8… Patch: https://github.com/kamailio/kamailio/commit/26543b90f80791b9e2b763fb97d78a8… --- diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index 0532174..a7dc54c 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -294,7 +294,7 @@ static int log_write_cdr( struct dlg_cell* dialog, cdr_int_array + message_index, cdr_type_array + message_index); } else if (cdr_expired_dlg_enable){ - LM_WARN( "fallback to dlg_only search because of message does not exist.\n"); + LM_DBG("fallback to dlg_only search because of message does not exist.\n"); message_index += extra2strar_dlg_only( cdr_extra, dialog, cdr_value_array + message_index,

9 years, 7 months

git:master:06177b12: Merge pull request #89 from linuxmaniac/vseva/defaults

by Victor Seva

Module: kamailio Branch: master Commit: 06177b12936146d48378cc5f6c6e1b157ebd519b URL: https://github.com/kamailio/kamailio/commit/06177b12936146d48378cc5f6c6e1b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-16T11:58:23+02:00 Merge pull request #89 from linuxmaniac/vseva/defaults set defaults of fifo and ctl to /var/run/kamailio Closes: #48 Closes: #89 --- Modified: etc/kamailio-basic.cfg Modified: etc/kamailio-oob.cfg Modified: etc/kamailio.cfg Modified: modules/ctl/ctl_defaults.h Modified: utils/kamctl/kamctl.fifo Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/06177b12936146d48378cc5f6c6e1b1… Patch: https://github.com/kamailio/kamailio/commit/06177b12936146d48378cc5f6c6e1b1… --- diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg index 17d7bcb..55685d5 100644 --- a/etc/kamailio-basic.cfg +++ b/etc/kamailio-basic.cfg @@ -191,8 +191,10 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +# ----- ctl params ----- +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 6a16763..db786d0 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -315,8 +315,10 @@ loadmodule "xhttp_pi.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +# ----- ctl params ----- +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 0644e6a..78f6ee1 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -288,8 +288,10 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +# ----- ctl params ----- +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index 01b6680..10498e3 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,10 +4,10 @@ /*listen by default on: */ #ifdef SRNAME /* this is used when compiling sercmd tool */ -#define DEFAULT_CTL_SOCKET "unixs:/tmp/" SRNAME "_ctl" +#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" SRNAME "/" SRNAME "_ctl" #else /* this is used when compiling sip server */ -#define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl" +#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" NAME "_ctl" #endif /* port used by default for tcp/udp if no port is explicitely specified */ #define DEFAULT_CTL_PORT 2049 diff --git a/utils/kamctl/kamctl.fifo b/utils/kamctl/kamctl.fifo index e57c7df..c94a5cc 100644 --- a/utils/kamctl/kamctl.fifo +++ b/utils/kamctl/kamctl.fifo @@ -25,7 +25,7 @@ fi # if [ -z "$FIFOPATH" ]; then if [ -z "$OSER_FIFO" ]; then - FIFOPATH=/tmp/kamailio_fifo + FIFOPATH=/var/run/kamailio/kamailio_fifo else FIFOPATH=$OSER_FIFO fi diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index b8b241b..f96cab6 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -124,7 +124,7 @@ # CTLENGINE="FIFO" ## path to FIFO file -# FIFOPATH="/tmp/kamailio_fifo" +# FIFOPATH="/var/run/kamailio/kamailio_fifo" ## check ACL names; default on (1); off (0) # VERIFY_ACL=1 @@ -142,7 +142,7 @@ ## Kamailio START Options ## PID file path - default is: /var/run/kamailio.pid -# PID_FILE=/var/run/kamailio.pid +# PID_FILE=/var/run/kamailio/kamailio.pid ## Extra start options - default is: not set # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"

9 years, 7 months

git:master:6909de08: etc: change fifo default to /var/run/kamailio

by Victor Seva

Module: kamailio Branch: master Commit: 6909de08ab5b51c90fe226b325a2492905d3fa40 URL: https://github.com/kamailio/kamailio/commit/6909de08ab5b51c90fe226b325a2492… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-17T10:08:18+01:00 etc: change fifo default to /var/run/kamailio --- Modified: etc/kamailio-basic.cfg Modified: etc/kamailio-oob.cfg Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6909de08ab5b51c90fe226b325a2492… Patch: https://github.com/kamailio/kamailio/commit/6909de08ab5b51c90fe226b325a2492… --- diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg index 4a978ff..55685d5 100644 --- a/etc/kamailio-basic.cfg +++ b/etc/kamailio-basic.cfg @@ -191,7 +191,7 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") # ----- ctl params ----- modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 258b972..db786d0 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -315,7 +315,7 @@ loadmodule "xhttp_pi.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") # ----- ctl params ----- modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ca3dbb5..78f6ee1 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -288,7 +288,7 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") # ----- ctl params ----- modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")

9 years, 7 months

git:master:be486988: utils/kamctl: change fifo default path to /var/run/kamailio

by Victor Seva

Module: kamailio Branch: master Commit: be486988bc2e27ba44961f1c4d2af48cecf06da3 URL: https://github.com/kamailio/kamailio/commit/be486988bc2e27ba44961f1c4d2af48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-17T10:07:06+01:00 utils/kamctl: change fifo default path to /var/run/kamailio --- Modified: utils/kamctl/kamctl.fifo Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/be486988bc2e27ba44961f1c4d2af48… Patch: https://github.com/kamailio/kamailio/commit/be486988bc2e27ba44961f1c4d2af48… --- diff --git a/utils/kamctl/kamctl.fifo b/utils/kamctl/kamctl.fifo index e57c7df..c94a5cc 100644 --- a/utils/kamctl/kamctl.fifo +++ b/utils/kamctl/kamctl.fifo @@ -25,7 +25,7 @@ fi # if [ -z "$FIFOPATH" ]; then if [ -z "$OSER_FIFO" ]; then - FIFOPATH=/tmp/kamailio_fifo + FIFOPATH=/var/run/kamailio/kamailio_fifo else FIFOPATH=$OSER_FIFO fi diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index b8b241b..f96cab6 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -124,7 +124,7 @@ # CTLENGINE="FIFO" ## path to FIFO file -# FIFOPATH="/tmp/kamailio_fifo" +# FIFOPATH="/var/run/kamailio/kamailio_fifo" ## check ACL names; default on (1); off (0) # VERIFY_ACL=1 @@ -142,7 +142,7 @@ ## Kamailio START Options ## PID file path - default is: /var/run/kamailio.pid -# PID_FILE=/var/run/kamailio.pid +# PID_FILE=/var/run/kamailio/kamailio.pid ## Extra start options - default is: not set # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"

9 years, 7 months

git:master:850320ca: etc: set ctl "binrpc" to new /var/run/kamailio default value

by Victor Seva

Module: kamailio Branch: master Commit: 850320cac86e6c5cee6f8d936340678eb32412d3 URL: https://github.com/kamailio/kamailio/commit/850320cac86e6c5cee6f8d936340678… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-17T10:03:35+01:00 etc: set ctl "binrpc" to new /var/run/kamailio default value --- Modified: etc/kamailio-basic.cfg Modified: etc/kamailio-oob.cfg Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/850320cac86e6c5cee6f8d936340678… Patch: https://github.com/kamailio/kamailio/commit/850320cac86e6c5cee6f8d936340678… --- diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg index 17d7bcb..4a978ff 100644 --- a/etc/kamailio-basic.cfg +++ b/etc/kamailio-basic.cfg @@ -193,6 +193,8 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +# ----- ctl params ----- +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 6a16763..258b972 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -317,6 +317,8 @@ loadmodule "xhttp_pi.so" # ----- mi_fifo params ----- modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +# ----- ctl params ----- +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 0644e6a..ca3dbb5 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -290,6 +290,8 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +# ----- ctl params ----- +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg

9 years, 7 months

git:master:084e68b3: ctl: use RUN_DIR env to set DEFAULT_CTL_SOCKET

by Victor Seva

Module: kamailio Branch: master Commit: 084e68b337f3afbc841347a6d27398bacfaf191b URL: https://github.com/kamailio/kamailio/commit/084e68b337f3afbc841347a6d27398b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-17T10:02:20+01:00 ctl: use RUN_DIR env to set DEFAULT_CTL_SOCKET --- Modified: modules/ctl/ctl_defaults.h --- Diff: https://github.com/kamailio/kamailio/commit/084e68b337f3afbc841347a6d27398b… Patch: https://github.com/kamailio/kamailio/commit/084e68b337f3afbc841347a6d27398b… --- diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index 01b6680..10498e3 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,10 +4,10 @@ /*listen by default on: */ #ifdef SRNAME /* this is used when compiling sercmd tool */ -#define DEFAULT_CTL_SOCKET "unixs:/tmp/" SRNAME "_ctl" +#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" SRNAME "/" SRNAME "_ctl" #else /* this is used when compiling sip server */ -#define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl" +#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" NAME "_ctl" #endif /* port used by default for tcp/udp if no port is explicitely specified */ #define DEFAULT_CTL_PORT 2049

9 years, 7 months

[kamailio] set defaults of fifo and ctl to /var/run/kamailio (#89)

by Victor Seva

Following #48 and #80 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/89 -- Commit Summary -- * ctl: use RUN_DIR env to set DEFAULT_CTL_SOCKET * etc: set ctl "binrpc" to new /var/run/kamailio default value * utils/kamctl: change fifo default path to /var/run/kamailio * etc: change fifo default to /var/run/kamailio -- File Changes -- M etc/kamailio-basic.cfg (4) M etc/kamailio-oob.cfg (4) M etc/kamailio.cfg (4) M modules/ctl/ctl_defaults.h (4) M utils/kamctl/kamctl.fifo (2) M utils/kamctl/kamctlrc (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/89.patch https://github.com/kamailio/kamailio/pull/89.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/89

9 years, 7 months

git:4.1:59f3fa67: sqlops: fix use-after-free by deep copying result name

by Timo TerÃ¤s

Module: kamailio Branch: 4.1 Commit: 59f3fa679d35d64db42037ef862bb8a1c4c12cb7 URL: https://github.com/kamailio/kamailio/commit/59f3fa679d35d64db42037ef862bb8a… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2015-04-16T12:55:10+03:00 sqlops: fix use-after-free by deep copying result name When creating a new result handle, deep copy the result name. Otherwise we might end up accessing the name after it's freed. (cherry picked from commit 6e2604464e64cfaaf1e0327228f53f4787b69470) --- Modified: modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/59f3fa679d35d64db42037ef862bb8a… Patch: https://github.com/kamailio/kamailio/commit/59f3fa679d35d64db42037ef862bb8a… --- diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index 2781069..25c25f7 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -199,14 +199,16 @@ sql_result_t* sql_get_result(str *name) return sr; sr = sr->next; } - sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t)); + sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t) + name->len); if(sr==NULL) { LM_ERR("no pkg memory\n"); return NULL; } memset(sr, 0, sizeof(sql_result_t)); - sr->name = *name; + memcpy(sr+1, name->s, name->len); + sr->name.s = (char *)(sr + 1); + sr->name.len = name->len; sr->resid = resid; sr->next = _sql_result_root; _sql_result_root = sr; @@ -665,6 +667,7 @@ void sql_destroy(void) pkg_free(r); r = r0; } + _sql_result_root = NULL; } /**

9 years, 7 months

git:4.2:97f1ee6e: sqlops: fix use-after-free by deep copying result name

by Timo TerÃ¤s

Module: kamailio Branch: 4.2 Commit: 97f1ee6e287b6f711ddbe04700a82295341ed880 URL: https://github.com/kamailio/kamailio/commit/97f1ee6e287b6f711ddbe04700a8229… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2015-04-16T12:55:04+03:00 sqlops: fix use-after-free by deep copying result name When creating a new result handle, deep copy the result name. Otherwise we might end up accessing the name after it's freed. (cherry picked from commit 6e2604464e64cfaaf1e0327228f53f4787b69470) --- Modified: modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/97f1ee6e287b6f711ddbe04700a8229… Patch: https://github.com/kamailio/kamailio/commit/97f1ee6e287b6f711ddbe04700a8229… --- diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index eeb6fac..e11ae29 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -199,14 +199,16 @@ sql_result_t* sql_get_result(str *name) return sr; sr = sr->next; } - sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t)); + sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t) + name->len); if(sr==NULL) { LM_ERR("no pkg memory\n"); return NULL; } memset(sr, 0, sizeof(sql_result_t)); - sr->name = *name; + memcpy(sr+1, name->s, name->len); + sr->name.s = (char *)(sr + 1); + sr->name.len = name->len; sr->resid = resid; sr->next = _sql_result_root; _sql_result_root = sr; @@ -685,6 +687,7 @@ void sql_destroy(void) pkg_free(r); r = r0; } + _sql_result_root = NULL; } /**

9 years, 7 months

git:4.0:e9fd10a1: sqlops: fix use-after-free by deep copying result name

by Timo TerÃ¤s

Module: kamailio Branch: 4.0 Commit: e9fd10a19a6d3cc0de6c51fce2669a890ab61199 URL: https://github.com/kamailio/kamailio/commit/e9fd10a19a6d3cc0de6c51fce2669a8… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2015-04-16T12:55:14+03:00 sqlops: fix use-after-free by deep copying result name When creating a new result handle, deep copy the result name. Otherwise we might end up accessing the name after it's freed. (cherry picked from commit 6e2604464e64cfaaf1e0327228f53f4787b69470) --- Modified: modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e9fd10a19a6d3cc0de6c51fce2669a8… Patch: https://github.com/kamailio/kamailio/commit/e9fd10a19a6d3cc0de6c51fce2669a8… --- diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index bbf86c8..007afd6 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -199,14 +199,16 @@ sql_result_t* sql_get_result(str *name) return sr; sr = sr->next; } - sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t)); + sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t) + name->len); if(sr==NULL) { LM_ERR("no pkg memory\n"); return NULL; } memset(sr, 0, sizeof(sql_result_t)); - sr->name = *name; + memcpy(sr+1, name->s, name->len); + sr->name.s = (char *)(sr + 1); + sr->name.len = name->len; sr->resid = resid; sr->next = _sql_result_root; _sql_result_root = sr; @@ -665,6 +667,7 @@ void sql_destroy(void) pkg_free(r); r = r0; } + _sql_result_root = NULL; } /**

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015