sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

git:master: pv: use suip2a(...) for $snd(..)
by Daniel-Constantin Mierla 18 Jul '11

18 Jul '11

Module: sip-router Branch: master Commit: e151a9e99b1fed7805eaed5d16ca3d6466e1f517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e151a9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 18 22:37:07 2011 +0200 pv: use suip2a(...) for $snd(..) - fixes FS#140, reported by Klaus Darilion --- modules_k/pv/pv_branch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index a9dd1bc..4081429 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -395,7 +395,7 @@ int pv_get_sndto(struct sip_msg *msg, pv_param_t *param, (int)snd_inf->len); default: /* 0 - ip */ - s.s = su2a(snd_inf->to, sizeof(*snd_inf->to)); + s.s = suip2a(snd_inf->to, sizeof(*snd_inf->to)); s.len = strlen(s.s); return pv_get_strval(msg, param, res, &s); }

1 0

[tracker] Task opened: bug in $snd and $sndto pseudo variable
by sip-router 18 Jul '11

18 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Klaus Darilion (klaus3000) Attached to Project - sip-router Summary - bug in $snd and $sndto pseudo variable Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - According to http://www.kamailio.org/dokuwiki/doku.php/pseudovariables:3.1.x#send_addr_a… $snd(ip) should print the IP address, but it prints "IP:port". Thus, checks as described in the manual do not work: if($sndto(ip)=="10.10.10.10") ... INFO: <script>: $snd(ip) = 8.16.33.239:5060 INFO: <script>: $snd(port) = 5060 INFO: <script>: $snd(proto) = 1 INFO: <script>: $snd(af) = 2 INFO: <script>: $sndto(ip) = 8.16.33.239:5060 INFO: <script>: $sndto(port) = 5060 INFO: <script>: $sndto(proto) = 1 INFO: <script>: $sndto(af) = 2 INFO: <script>: $sndfrom(ip) = 8.16.32.159 INFO: <script>: $sndfrom(port) = 5060 INFO: <script>: $sndfrom(proto) = 1 INFO: <script>: $sndfrom(af) = 2 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=140 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: bug in $snd and $sndto pseudo variable
by sip-router 18 Jul '11

18 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#140 - bug in $snd and $sndto pseudo variable User who did this - Klaus Darilion (klaus3000) http://sip-router.org/tracker/index.php?do=details&task_id=140 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: #!define does not work in $hdr()
by sip-router 18 Jul '11

18 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - #!define does not work in $hdr() Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - The following does not work as expected, the header name is not substituted in $hdr(): <code> #!substdef "/HEADER/X-Custom-Header/" if (is_present_hf("HEADER")) { $var(hdr) = $hdr(HEADER); remove_hf("HEADER"); } </code> The value is correctly substituted for the functions is_present_hf() and remove_hf() but not in $hdr(). More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=139 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: #!define does not work in $hdr()
by sip-router 18 Jul '11

18 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#139 - #!define does not work in $hdr() User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=139 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: mi_datagram: don't delete unixsock file in cfg check mode
by Daniel-Constantin Mierla 17 Jul '11

17 Jul '11

Module: sip-router Branch: master Commit: 3ad92e15ad31f27513de21c8ced4d243643b7cad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ad92e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 17 09:55:13 2011 +0200 mi_datagram: don't delete unixsock file in cfg check mode --- modules_k/mi_datagram/mi_datagram.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index 0e2f303..d36af3e 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -56,6 +56,7 @@ #include "../../lib/kmi/mi.h" #include "../../ip_addr.h" #include "../../pt.h" +#include "../../globals.h" #include "../../cfg/cfg_struct.h" #include "mi_datagram.h" #include "datagram_fnc.h" @@ -218,9 +219,11 @@ static int mi_mod_init(void) n=stat(mi_socket, &filestat); if( n==0) { LM_INFO("the socket %s already exists, trying to delete it...\n", mi_socket); - if (unlink(mi_socket)<0) { - LM_ERR("cannot delete old socket: %s\n", strerror(errno)); - return -1; + if(config_check==0) { + if (unlink(mi_socket)<0) { + LM_ERR("cannot delete old socket: %s\n", strerror(errno)); + return -1; + } } } else if (n<0 && errno!=ENOENT) { LM_ERR("socket stat failed:%s\n", strerror(errno)); @@ -364,10 +367,12 @@ static int mi_destroy(void) if(mi_socket_domain == AF_UNIX) { n=stat(mi_socket, &filestat); if (n==0) { - if (unlink(mi_socket)<0){ - LM_ERR("cannot delete the socket (%s): %s\n", + if(config_check==0) { + if (unlink(mi_socket)<0){ + LM_ERR("cannot delete the socket (%s): %s\n", mi_socket, strerror(errno)); - goto error; + goto error; + } } } else if (n<0 && errno!=ENOENT) { LM_ERR("socket stat failed: %s\n", strerror(errno));

1 0

git:master: app_python: provide a clone string to dirname and basename
by Daniel-Constantin Mierla 17 Jul '11

17 Jul '11

Module: sip-router Branch: master Commit: 53605f2ca1718e42f1f1fcb87bb67935c889249a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53605f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 17 00:28:26 2011 +0200 app_python: provide a clone string to dirname and basename - script name value is cloned before execution of dirname and basename since they may modify the parameter - reported by Arnaud Chong, FS#137 --- modules/app_python/python_mod.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index f943e07..c89c928 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -85,7 +85,7 @@ struct module_exports exports = { static int mod_init(void) { - char *dname, *bname; + char *dname, *bname, *tname; int i; PyObject *sys_path, *pDir, *pModule, *pFunc, *pArgs; PyThreadState *mainThreadState; @@ -100,11 +100,19 @@ mod_init(void) child_init_mname.len = strlen(child_init_mname.s); } - dname = dirname(script_name.s); + tname = as_asciiz(&script_name); + if(tname==NULL) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + dname = dirname(tname); if (strlen(dname) == 0) dname = "."; - bname = basename(script_name.s); + memcpy(tname, script_name.s, script_name.len); + bname = basename(tname); i = strlen(bname); + pkg_free(tname); if (bname[i - 1] == 'c' || bname[i - 1] == 'o') i -= 1; if (bname[i - 3] == '.' && bname[i - 2] == 'p' && bname[i - 1] == 'y') {

1 0

git:master: mi_fifo: don't delete fifo file in cfg check mode
by Daniel-Constantin Mierla 17 Jul '11

17 Jul '11

Module: sip-router Branch: master Commit: 0a3fc0da283854b6d25e77f9a1283ee6704e425d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a3fc0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 17 09:54:32 2011 +0200 mi_fifo: don't delete fifo file in cfg check mode --- modules_k/mi_fifo/mi_fifo.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/modules_k/mi_fifo/mi_fifo.c b/modules_k/mi_fifo/mi_fifo.c index 9530c4c..6598e34 100644 --- a/modules_k/mi_fifo/mi_fifo.c +++ b/modules_k/mi_fifo/mi_fifo.c @@ -44,6 +44,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../pt.h" +#include "../../globals.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" #include "../../cfg/cfg_struct.h" @@ -123,11 +124,13 @@ static int mi_mod_init(void) LM_DBG("testing mi_fifo existance ...\n"); n=stat(mi_fifo, &filestat); if (n==0) { - /* FIFO exist, delete it (safer) */ - if (unlink(mi_fifo)<0){ - LM_ERR("Cannot delete old MI fifo (%s): %s\n", - mi_fifo, strerror(errno)); - return -1; + /* FIFO exist, delete it (safer) if no config check */ + if(config_check==0) { + if (unlink(mi_fifo)<0){ + LM_ERR("Cannot delete old MI fifo (%s): %s\n", + mi_fifo, strerror(errno)); + return -1; + } } } else if (n<0 && errno!=ENOENT){ LM_ERR("MI FIFO stat failed: %s\n", strerror(errno)); @@ -256,11 +259,13 @@ static int mi_destroy(void) /* destroying the fifo file */ n=stat(mi_fifo, &filestat); if (n==0){ - /* FIFO exist, delete it (safer) */ - if (unlink(mi_fifo)<0){ - LM_ERR("cannot delete the fifo (%s): %s\n", - mi_fifo, strerror(errno)); - goto error; + /* FIFO exist, delete it (safer) if not config check */ + if(config_check==0) { + if (unlink(mi_fifo)<0){ + LM_ERR("cannot delete the fifo (%s): %s\n", + mi_fifo, strerror(errno)); + goto error; + } } } else if (n<0 && errno!=ENOENT) { LM_ERR("FIFO stat failed: %s\n", strerror(errno));

1 0

git:master: app_python: fixed compile warning
by Daniel-Constantin Mierla 17 Jul '11

17 Jul '11

Module: sip-router Branch: master Commit: 1abde923ee3cbdcce69b72d223fb0c487b892b6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1abde92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 17 00:17:58 2011 +0200 app_python: fixed compile warning - warning: dereferencing type-punned pointer will break strict-aliasing rules --- modules/app_python/python_msgobj.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 4bf601a..3e4a2cd 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -526,8 +526,7 @@ static PyTypeObject MSGtype = { int python_msgobj_init(void) { - - Py_TYPE(&MSGtype) = &PyType_Type; + Py_TYPE((void*)(&MSGtype)) = &PyType_Type; if (PyType_Ready(&MSGtype) < 0) return -1; return 0;

1 0

git:master: core: exit if addstr() cannot get pkg memory
by Daniel-Constantin Mierla 17 Jul '11

17 Jul '11

Module: sip-router Branch: master Commit: 831a9a4876fbcb2b47f82644bc29cb6ce5f265c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=831a9a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jul 16 23:24:42 2011 +0200 core: exit if addstr() cannot get pkg memory - if parsing config file has no enough pkg memory do exit(-1) instead of returning null pointer, makes no sense to continue and there are no safety checks for the return of addstr(), causing crash anyhow --- cfg.lex | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index 83a5879..7b984f1 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1404,7 +1404,9 @@ static char* addstr(struct str_buf* dst_b, char* src, int len) return dst_b->s; error: LOG(L_CRIT, "ERROR:lex:addstr: memory allocation error\n"); - return 0; + LOG(L_CRIT, "ERROR:lex:addstr: try to increase pkg size with" + " -M parameter\n"); + exit(-1); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011