sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

IMS branch
by Klaus Darilion 11 Oct '11

11 Oct '11

Hi! Carsten, Jason, I wonder what is the main motivation for you to have IMS components? Are you using Kamailio in an mobile operator environment and thus have to support all the IMS interfaces, or do you plan to use those modules also in "normal" VoIP provider scenarios (benefits?) Thanks Klaus

4 6

acc module usage of ftime for acc_cdr
by Daniel-Constantin Mierla 07 Oct '11

07 Oct '11

Hello, I see that acc_cdr extension is using ftime() function. According to the manual, this function is obsolete and should not be used, quote: CONFORMING TO 4.2BSD, POSIX.1-2001. POSIX.1-2008 removes the specification of ftime(). This function is obsolete. Don't use it. If the time in seconds suf- fices, time(2) can be used; gettimeofday(2) gives microseconds; clock_gettime(2) gives nanoseconds but is not as widely available. On freebsd looks like it needs libcompat for linking, otherwise throws error: Undefined symbol "ftime" I think it should be replaced with supported alternatives. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

2 2

git:master: utils: Add database creation scripts for dialog variable table
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: ec21c13b86139f10d2280fe75a7ba15f3e30a83a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec21c13… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 16 20:33:06 2011 +0200 utils: Add database creation scripts for dialog variable table (dialog_vars). --- utils/kamctl/db_berkeley/kamailio/dialog_vars | 10 ++++++++++ utils/kamctl/db_sqlite/dialog-vars-create.sql | 11 +++++++++++ utils/kamctl/dbtext/kamailio/dialog_vars | 1 + utils/kamctl/mysql/dialog-vars-create.sql | 11 +++++++++++ utils/kamctl/oracle/dialog-vars-create.sql | 19 +++++++++++++++++++ utils/kamctl/postgres/dialog-vars-create.sql | 11 +++++++++++ 6 files changed, 63 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/dialog_vars b/utils/kamctl/db_berkeley/kamailio/dialog_vars new file mode 100644 index 0000000..1b66d4e --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/dialog_vars @@ -0,0 +1,10 @@ +METADATA_COLUMNS +id(int) hash_entry(int) hash_id(int) dialog_key(str) dialog_value(str) +METADATA_KEY +1 2 +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|NIL|NIL|NIL|NIL diff --git a/utils/kamctl/db_sqlite/dialog-vars-create.sql b/utils/kamctl/db_sqlite/dialog-vars-create.sql new file mode 100644 index 0000000..860a87d --- /dev/null +++ b/utils/kamctl/db_sqlite/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id INTEGER PRIMARY KEY NOT NULL, + hash_entry INTEGER NOT NULL, + hash_id INTEGER NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) NOT NULL +) ENGINE=MyISAM; + +CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/dbtext/kamailio/dialog_vars b/utils/kamctl/dbtext/kamailio/dialog_vars new file mode 100644 index 0000000..d39ef42 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/dialog_vars @@ -0,0 +1 @@ +id(int,auto) hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string) diff --git a/utils/kamctl/mysql/dialog-vars-create.sql b/utils/kamctl/mysql/dialog-vars-create.sql new file mode 100644 index 0000000..c8787e6 --- /dev/null +++ b/utils/kamctl/mysql/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + hash_entry INT(10) UNSIGNED NOT NULL, + hash_id INT(10) UNSIGNED NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) NOT NULL +) ENGINE=MyISAM; + +CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/oracle/dialog-vars-create.sql b/utils/kamctl/oracle/dialog-vars-create.sql new file mode 100644 index 0000000..9dbaea7 --- /dev/null +++ b/utils/kamctl/oracle/dialog-vars-create.sql @@ -0,0 +1,19 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id NUMBER(10) PRIMARY KEY, + hash_entry NUMBER(10), + hash_id NUMBER(10), + dialog_key VARCHAR2(128), + dialog_value VARCHAR2(512) +); + +CREATE OR REPLACE TRIGGER dialog_vars_tr +before insert on dialog_vars FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dialog_vars_tr; +/ +BEGIN map2users('dialog_vars'); END; +/ +CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/postgres/dialog-vars-create.sql b/utils/kamctl/postgres/dialog-vars-create.sql new file mode 100644 index 0000000..ccc7d68 --- /dev/null +++ b/utils/kamctl/postgres/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id SERIAL PRIMARY KEY NOT NULL, + hash_entry INTEGER NOT NULL, + hash_id INTEGER NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) +); + +CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id); +

2 3

git:master: modules:sipcapture: fixed mirroring capture mode. Currently it works only on Linux.
by Alexandr Dubovikov 30 Sep '11

30 Sep '11

Module: sip-router Branch: master Commit: b7ed9c1e4f83f834ba067b60a54a8eb96083c9c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7ed9c1… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Sep 30 20:44:04 2011 +0200 modules:sipcapture: fixed mirroring capture mode. Currently it works only on Linux. --- modules/sipcapture/README | 14 +++-- modules/sipcapture/doc/sipcapture_admin.xml | 11 ++-- modules/sipcapture/examples/kamailio.cfg | 7 +-- modules/sipcapture/sipcapture.c | 71 ++++++++++++++++++-------- modules/sipcapture/sipcapture.h | 53 -------------------- 5 files changed, 66 insertions(+), 90 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b7e…

1 0

urgent mi_rpc errors
by Juha Heinanen 30 Sep '11

30 Sep '11

i just build master and got hundreds of these kind of error messages: Sep 30 12:22:55 sip /usr/sbin/sip-proxy[27351]: ERROR: <core> [sr_module.c:882]: init_mod_child(): Error while initializing module mi_rpc (/usr/lib/sip-proxy/modules/mi_rpc.so) Sep 30 12:22:55 sip /usr/sbin/sip-proxy[27351]: CRITICAL: mi_rpc [mi_rpc_mod.c:84]: Failed to init the mi commands Sep 30 12:22:55 sip /usr/sbin/sip-proxy[27353]: CRITICAL: mi_rpc [mi_rpc_mod.c:84]: Failed to init the mi commands -- juha

2 11

git:master: xmlrpc: redeclaration of v/snprintf() conditioned by OS type
by Daniel-Constantin Mierla 30 Sep '11

30 Sep '11

Module: sip-router Branch: master Commit: b03a9c1bc72a348c633db94410a7f3e01c5849ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b03a9c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 30 14:02:47 2011 +0200 xmlrpc: redeclaration of v/snprintf() conditioned by OS type --- modules/xmlrpc/xmlrpc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 327df9f..31c0711 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -147,6 +147,13 @@ MODULE_VERSION +#if defined (__OS_darwin) || defined (__OS_freebsd) +/* redeclaration of functions from stdio.h throws errors */ +#else +int snprintf(char *str, size_t size, const char *format, ...); +int vsnprintf(char *str, size_t size, const char *format, va_list ap); +#endif + static int process_xmlrpc(sip_msg_t* msg); static int dispatch_rpc(sip_msg_t* msg, char* s1, char* s2); static int xmlrpc_reply(sip_msg_t* msg, char* code, char* reason);

1 0

git:master: lib/kmi, mi_*: better handling of mi child init
by Daniel-Constantin Mierla 30 Sep '11

30 Sep '11

Module: sip-router Branch: master Commit: a367a923f83a60b1b72907d42afff4484f49ad35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a367a92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 30 13:58:16 2011 +0200 lib/kmi, mi_*: better handling of mi child init --- lib/kmi/mi.c | 21 +++++++++++++++------ lib/kmi/mi.h | 2 +- modules/mi_rpc/mi_rpc_mod.c | 2 +- modules_k/mi_datagram/mi_datagram.c | 2 +- modules_k/mi_fifo/mi_fifo.c | 2 +- modules_k/mi_xmlrpc/mi_xmlrpc.c | 2 +- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lib/kmi/mi.c b/lib/kmi/mi.c index 662de88..b20de19 100644 --- a/lib/kmi/mi.c +++ b/lib/kmi/mi.c @@ -100,7 +100,14 @@ int register_mi_mod( char *mod_name, mi_export_t *mis) static int mi_commands_initialized = 0; -int init_mi_child(void) + +/** + * Init a process to work properly for MI commands + * - rank: rank of the process (PROC_XYZ...) + * - mode: 0 - don't try to init worker for SIP commands + * 1 - try to init worker for SIP commands + */ +int init_mi_child(int rank, int mode) { int i; @@ -114,11 +121,13 @@ int init_mi_child(void) return -1; } } - if(is_sip_worker(PROC_NOCHLDINIT)) { - LM_DBG("initalizing proc rpc for sip handling\n"); - if(init_child(PROC_SIPRPC)<0) { - LM_ERR("failed to init proc rpc for sip handling\n"); - return -1; + if(mode==1) { + if(is_sip_worker(rank)) { + LM_DBG("initalizing proc rpc for sip handling\n"); + if(init_child(PROC_SIPRPC)<0) { + LM_ERR("failed to init proc rpc for sip handling\n"); + return -1; + } } } return 0; diff --git a/lib/kmi/mi.h b/lib/kmi/mi.h index 988bcd1..6735930 100644 --- a/lib/kmi/mi.h +++ b/lib/kmi/mi.h @@ -68,7 +68,7 @@ int register_mi_cmd( mi_cmd_f f, char *name, void *param, int register_mi_mod( char *mod_name, mi_export_t *mis); -int init_mi_child(void); +int init_mi_child(int rank, int mode); struct mi_cmd* lookup_mi_cmd( char *name, int len); diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index bfc4aaf..20acb9e 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -80,7 +80,7 @@ static int child_init(int rank) { if(is_rpc_worker(rank)) { LM_DBG("initializing child[%d] for rpc handling\n", rank); - if(init_mi_child()!=0) { + if(init_mi_child(rank, 0)!=0) { LM_CRIT("Failed to init the mi commands\n"); return -1; } diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index d36af3e..c0fd990 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -329,7 +329,7 @@ static void datagram_process(int rank) LM_INFO("a new child %d/%d\n", rank, getpid()); /*child's initial settings*/ - if ( init_mi_child()!=0) { + if ( init_mi_child(PROC_NOCHLDINIT, 1)!=0) { LM_CRIT("failed to init the mi process\n"); exit(-1); } diff --git a/modules_k/mi_fifo/mi_fifo.c b/modules_k/mi_fifo/mi_fifo.c index 6598e34..88666c8 100644 --- a/modules_k/mi_fifo/mi_fifo.c +++ b/modules_k/mi_fifo/mi_fifo.c @@ -229,7 +229,7 @@ static void fifo_process(int rank) exit(-1); } - if( init_mi_child()!=0) { + if( init_mi_child(PROC_NOCHLDINIT, 1)!=0) { LM_CRIT("Failed to init the mi process\n"); exit(-1); } diff --git a/modules_k/mi_xmlrpc/mi_xmlrpc.c b/modules_k/mi_xmlrpc/mi_xmlrpc.c index 9be1650..784f07e 100644 --- a/modules_k/mi_xmlrpc/mi_xmlrpc.c +++ b/modules_k/mi_xmlrpc/mi_xmlrpc.c @@ -231,7 +231,7 @@ static void xmlrpc_process(int rank) ServerInit(&srv); - if( init_mi_child() != 0 ) { + if( init_mi_child(PROC_NOCHLDINIT, 1) != 0 ) { LM_CRIT("failed to init the mi process\n"); goto error; }

1 0

git:master: lib/kmi: safety re-entrant call of init_mi_child()
by Daniel-Constantin Mierla 30 Sep '11

30 Sep '11

Module: sip-router Branch: master Commit: 0e5fc52895a67818c8559bcc673238b766e70445 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e5fc52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 30 13:29:15 2011 +0200 lib/kmi: safety re-entrant call of init_mi_child() - otherwise can get to a loop of trying, reported by Juha Heinanen --- lib/kmi/mi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/kmi/mi.c b/lib/kmi/mi.c index 395b8ee..662de88 100644 --- a/lib/kmi/mi.c +++ b/lib/kmi/mi.c @@ -106,6 +106,7 @@ int init_mi_child(void) if(mi_commands_initialized) return 0; + mi_commands_initialized = 1; for ( i=0 ; i<mi_cmds_no ; i++ ) { if ( mi_cmds[i].init_f && mi_cmds[i].init_f()!=0 ) { LM_ERR("failed to init <%.*s>\n", @@ -120,7 +121,6 @@ int init_mi_child(void) return -1; } } - mi_commands_initialized = 1; return 0; }

1 0

siptrace and sipcapture broken on non-linux
by Daniel-Constantin Mierla 30 Sep '11

30 Sep '11

Hello, your latest changes seems to have introduced a dependency on linux for siptrace and sipcapture modules (I see in sipcapture.h a comment that code was copied from linux kernel). Here is the errors output: CC (gcc) [M siptrace.so] siptrace.o In file included from siptrace.c:53: ../../modules/sipcapture/sipcapture.h:54: error: expected specifier-qualifier-list before ‘__u16’ ../../modules/sipcapture/sipcapture.h:63: error: expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘*’ token ../../modules/sipcapture/sipcapture.h:72: warning: excess elements in struct initializer This is not good at least for siptrace module. It has to be disabled in a way or another so that siptrace can be used on the other unix distro. I tested on mac os x so far, maybe you can come up with a fix for it. Thanks, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Dec 5-8, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

2 1

git:master: lib/kmi: turned a debug log in error
by Daniel-Constantin Mierla 30 Sep '11

30 Sep '11

Module: sip-router Branch: master Commit: 66ab994a5905d2416a0452841407be6f63f504af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66ab994… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 30 13:17:48 2011 +0200 lib/kmi: turned a debug log in error --- lib/kmi/mi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/kmi/mi.c b/lib/kmi/mi.c index ede6783..395b8ee 100644 --- a/lib/kmi/mi.c +++ b/lib/kmi/mi.c @@ -116,7 +116,7 @@ int init_mi_child(void) if(is_sip_worker(PROC_NOCHLDINIT)) { LM_DBG("initalizing proc rpc for sip handling\n"); if(init_child(PROC_SIPRPC)<0) { - LM_DBG("failed to init proc rpc for sip handling\n"); + LM_ERR("failed to init proc rpc for sip handling\n"); return -1; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011