sr-dev February 2013

sr-dev@lists.kamailio.org

45 participants
200 discussions

by Olle E. Johansson

Hi! Yesterday I tested the TLS module and noticed a few things: - Kamailio compiled on OS/X refuse to connect to a kamailio server running a CAcert class 3 certificate. So does Counterpath Bria and Blink. I need to figure out the difference between their class 1 and class3 certs, unless someone here already knows. - Even though verification is turned off (default) Kamailio refuses to use the self-signed cert created by the install unless you have the selfsigned cert in the ca-list pem file. This is propably a bug. - If you only want to use Kamailio as a TLS client, connecting to other servers you have to add a listen port and a server certificate. Always. This is propably the design. To set up a connection, we base it on an existing listen port. If that doesn't exist, Kamailio refuse to connect. - I can't find any way to check the server certificate for the server we connect to in the routing script. I guess the ONSEND route runs after we've selected server and transport, but before we're actually connected (in first transaction). The TLS module selects claim we have no TLS transport, even though ONSEND claims we have TLS transport... The tls.peer selects seems to be designed for inbound connections, not outbound. This is not yet a bug report, just notes for comments and for the archives :-) /O

11 years, 2 months

git:master: lib/srdb1: while converting strings to int/ bigint check for invalid characters

by Ovidiu Sas

Module: sip-router Branch: master Commit: af7d4496febf95e56b604849a8f818e688b21f53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af7d449… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Feb 4 10:59:10 2013 -0500 lib/srdb1: while converting strings to int/bigint check for invalid characters --- lib/srdb1/db_ut.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/db_ut.c b/lib/srdb1/db_ut.c index c57ef4d..0fa4cf5 100644 --- a/lib/srdb1/db_ut.c +++ b/lib/srdb1/db_ut.c @@ -73,18 +73,23 @@ inline int db_str2int(const char* _s, int* _v) { long tmp; + char* p = NULL; if (!_s || !_v) { LM_ERR("Invalid parameter value\n"); return -1; } - tmp = strtoul(_s, 0, 10); + tmp = strtoul(_s, &p, 10); if ((tmp == ULONG_MAX && errno == ERANGE) || (tmp < INT_MIN) || (tmp > UINT_MAX)) { LM_ERR("Value out of range\n"); return -1; } + if (p && *p != '\0') { + LM_ERR("Unexpected characters: [%s]\n", p); + return -2; + } *_v = (int)tmp; return 0; @@ -94,17 +99,22 @@ inline int db_str2int(const char* _s, int* _v) inline int db_str2longlong(const char* _s, long long * _v) { long long tmp; + char* p = NULL; if (!_s || !_v) { LM_ERR("Invalid parameter value\n"); return -1; } - tmp = strtoll(_s, 0, 10); + tmp = strtoll(_s, &p, 10); if (errno == ERANGE) { LM_ERR("Value out of range\n"); return -1; } + if (p && *p != '\0') { + LM_ERR("Unexpected characters: [%s]\n", p); + return -2; + } *_v = tmp; return 0;

11 years, 2 months

git:master: ims_icscf: getting rid of "defined but not used" compiler warning

by Ovidiu Sas

Module: sip-router Branch: master Commit: 47276cf597ab941016fd49dbcfaaab3da8802834 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47276cf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Feb 3 23:36:26 2013 -0500 ims_icscf: getting rid of "defined but not used" compiler warning --- modules/ims_icscf/nds.c | 3 +++ modules/ims_icscf/nds.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ims_icscf/nds.c b/modules/ims_icscf/nds.c index 0e5b06b..2f2668f 100644 --- a/modules/ims_icscf/nds.c +++ b/modules/ims_icscf/nds.c @@ -65,6 +65,9 @@ extern sl_api_t slb; +static str str_msg_403 = {MSG_403, 9}; +static str str_msg_500 = {MSG_500, 46}; + /** Defines the untrusted headers */ str untrusted_headers[]={ {"P-Asserted-Identity",19}, diff --git a/modules/ims_icscf/nds.h b/modules/ims_icscf/nds.h index 1f7abfa..29f973a 100644 --- a/modules/ims_icscf/nds.h +++ b/modules/ims_icscf/nds.h @@ -62,8 +62,6 @@ #define MSG_403 "Forbidden" #define MSG_500 "I-CSCF Error while stripping untrusted headers" -static str str_msg_403 = {MSG_403, 9}; -static str str_msg_500 = {MSG_500, 46}; int I_NDS_check_trusted(struct sip_msg* msg, char* str1, char* str2);

11 years, 2 months

git:master: ims_usrloc_pcscf: remove unused variables

by Ovidiu Sas

Module: sip-router Branch: master Commit: d474abbb3d93c992ccff561909402ca1b52297bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d474abb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Feb 3 10:50:47 2013 -0500 ims_usrloc_pcscf: remove unused variables --- modules/ims_usrloc_pcscf/ul_rpc.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/ims_usrloc_pcscf/ul_rpc.c b/modules/ims_usrloc_pcscf/ul_rpc.c index aed0411..257604f 100644 --- a/modules/ims_usrloc_pcscf/ul_rpc.c +++ b/modules/ims_usrloc_pcscf/ul_rpc.c @@ -56,17 +56,13 @@ static const char* ul_rpc_dump_doc[2] = { }; static void ul_rpc_dump(rpc_t* rpc, void* ctx) { - struct pcontact* c; - ppublic_t* p; dlist_t* dl; udomain_t* dom; time_t t; void* th; void* ah; - void* ih; - void* sr; void* sh; - int max, n, i, j; + int max, n, i; t = time(0); for (dl = root; dl; dl = dl->next) {

11 years, 2 months

git:master: ims_usrloc_scscf: remove unused variables

by Ovidiu Sas

Module: sip-router Branch: master Commit: 7d6d016c7556a3241d47801b0480c022ca2dd3c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d6d016… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Feb 3 10:31:55 2013 -0500 ims_usrloc_scscf: remove unused variables --- modules/ims_usrloc_scscf/ul_rpc.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/modules/ims_usrloc_scscf/ul_rpc.c b/modules/ims_usrloc_scscf/ul_rpc.c index d5ce024..f0c29db 100644 --- a/modules/ims_usrloc_scscf/ul_rpc.c +++ b/modules/ims_usrloc_scscf/ul_rpc.c @@ -177,18 +177,11 @@ static void ul_rpc_show_impu(rpc_t* rpc, void* ctx) static void ul_rpc_dump(rpc_t* rpc, void* ctx) { - struct impurecord* r; dlist_t* dl; udomain_t* dom; time_t t; - ucontact_t* c; - str empty_str = { "[not set]", 9 }; void* th; - void* ah; - void* ih; - void* vh; void* sh; - void* dh; int max, n, i; t = time(0);

11 years, 2 months

git:master: xhttp_pi: new commands in the pi_framework_sample:

by Ovidiu Sas

Module: sip-router Branch: master Commit: 622b01719bb8a95c5995c8412cd040787f0cd0a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=622b017… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 1 19:45:28 2013 -0500 xhttp_pi: new commands in the pi_framework_sample: - add - update - delete --- .../dbschema_k/xsl/pi_framework_mod.xsl | 87 +- utils/kamctl/xhttp_pi/acc-mod | 72 + utils/kamctl/xhttp_pi/alias_db-mod | 30 + utils/kamctl/xhttp_pi/auth_db-mod | 36 + utils/kamctl/xhttp_pi/avpops-mod | 36 + utils/kamctl/xhttp_pi/carrierroute-mod | 132 ++ utils/kamctl/xhttp_pi/cpl-mod | 30 + utils/kamctl/xhttp_pi/dialog-mod | 98 + utils/kamctl/xhttp_pi/dialplan-mod | 38 + utils/kamctl/xhttp_pi/dispatcher-mod | 34 + utils/kamctl/xhttp_pi/domain-mod | 60 + utils/kamctl/xhttp_pi/domainpolicy-mod | 32 + utils/kamctl/xhttp_pi/drouting-mod | 126 ++ utils/kamctl/xhttp_pi/group-mod | 56 + utils/kamctl/xhttp_pi/htable-mod | 32 + utils/kamctl/xhttp_pi/imc-mod | 58 + utils/kamctl/xhttp_pi/lcr-mod | 114 + utils/kamctl/xhttp_pi/matrix-mod | 9 + utils/kamctl/xhttp_pi/msilo-mod | 46 + utils/kamctl/xhttp_pi/mtree-mod | 54 + utils/kamctl/xhttp_pi/pdt-mod | 28 + utils/kamctl/xhttp_pi/permissions-mod | 62 + utils/kamctl/xhttp_pi/pi_framework.xml | 2337 +++++++++++++++++++- utils/kamctl/xhttp_pi/pipelimit-mod | 28 + utils/kamctl/xhttp_pi/presence-mod | 240 ++ utils/kamctl/xhttp_pi/purple-mod | 30 + utils/kamctl/xhttp_pi/registrar-mod | 58 + utils/kamctl/xhttp_pi/rls-mod | 106 + utils/kamctl/xhttp_pi/sca-mod | 46 + utils/kamctl/xhttp_pi/siptrace-mod | 44 + utils/kamctl/xhttp_pi/speeddial-mod | 38 + utils/kamctl/xhttp_pi/standard-mod | 8 + utils/kamctl/xhttp_pi/uac-mod | 42 + utils/kamctl/xhttp_pi/uid_auth_db-mod | 38 + utils/kamctl/xhttp_pi/uid_avp_db-mod | 32 + utils/kamctl/xhttp_pi/uid_domain-mod | 60 + utils/kamctl/xhttp_pi/uid_gflags-mod | 30 + utils/kamctl/xhttp_pi/uid_uri_db-mod | 68 + utils/kamctl/xhttp_pi/uri_db-mod | 30 + utils/kamctl/xhttp_pi/userblacklist-mod | 58 + utils/kamctl/xhttp_pi/usrloc-mod | 94 + 41 files changed, 4598 insertions(+), 59 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=622…

11 years, 2 months

git:master: sca: restore correct table version number in db creation files.

by Andrew Mortensen

Module: sip-router Branch: master Commit: 60e60e26cebeea2d8e07ec4ffd036ab1f35e2f12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60e60e2… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Feb 1 11:45:32 2013 -0500 sca: restore correct table version number in db creation files. - Had been reverted by commit f636e215089a9b14daa113d93025831e827192b5 because the schema xml file had the wrong version number. --- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/sca-create.sql | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/sca-create.sql | 2 +- utils/kamctl/oracle/sca-create.sql | 2 +- utils/kamctl/postgres/sca-create.sql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index eb1d8e7..ef9cac4 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -95,7 +95,7 @@ rls_presentity|1 rls_watchers| rls_watchers|3 sca_subscriptions| -sca_subscriptions|0 +sca_subscriptions|1 silo| silo|7 sip_trace| diff --git a/utils/kamctl/db_sqlite/sca-create.sql b/utils/kamctl/db_sqlite/sca-create.sql index 1327b3f..46429fb 100644 --- a/utils/kamctl/db_sqlite/sca-create.sql +++ b/utils/kamctl/db_sqlite/sca-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); CREATE TABLE sca_subscriptions ( id INTEGER PRIMARY KEY NOT NULL, subscriber VARCHAR(255) NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 9a3fe62..f76df16 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -42,7 +42,7 @@ purplemap:1 re_grp:1 rls_presentity:1 rls_watchers:3 -sca_subscriptions:0 +sca_subscriptions:1 silo:7 sip_trace:3 speed_dial:2 diff --git a/utils/kamctl/mysql/sca-create.sql b/utils/kamctl/mysql/sca-create.sql index f1633c6..b48d38b 100644 --- a/utils/kamctl/mysql/sca-create.sql +++ b/utils/kamctl/mysql/sca-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); CREATE TABLE sca_subscriptions ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, subscriber VARCHAR(255) NOT NULL, diff --git a/utils/kamctl/oracle/sca-create.sql b/utils/kamctl/oracle/sca-create.sql index 430fd66..f63ee40 100644 --- a/utils/kamctl/oracle/sca-create.sql +++ b/utils/kamctl/oracle/sca-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); CREATE TABLE sca_subscriptions ( id NUMBER(10) PRIMARY KEY, subscriber VARCHAR2(255), diff --git a/utils/kamctl/postgres/sca-create.sql b/utils/kamctl/postgres/sca-create.sql index 94ce539..b5da925 100644 --- a/utils/kamctl/postgres/sca-create.sql +++ b/utils/kamctl/postgres/sca-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); CREATE TABLE sca_subscriptions ( id SERIAL PRIMARY KEY NOT NULL, subscriber VARCHAR(255) NOT NULL,

11 years, 2 months

Kamailio Developer's Guide

by Hugh Waite

Hi, Is there a way to contribute changes to the Kamailio Developer's Guide? I have been working with PVs and while the structures are listed, the required functions and pv helper functions are not, so it's not clear how to put them together. I had to look through the code to find examples of parsing the PVs and names etc. I found the htable module had a good example where a name is parsed that may contain further PVs that need resolving to a string. Another useful addition would be a list of the fixup functions that are available for exported module functions. (fixup_pvar_pvar, fixup_spve_null, fixup_str_str etc.) Under what circumstances would I use these different functions? Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

11 years, 2 months

git:pd/msrp: modules/websocket: moved example WebSocket configuration file to examples directory

by Peter Dunkley

Module: sip-router Branch: pd/msrp Commit: 36c7b450889a8005af3f14b0edb55f4ede6f98a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36c7b45… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 1 10:14:26 2013 +0000 modules/websocket: moved example WebSocket configuration file to examples directory --- .../example/kamailio.cfg => examples/websocket.cfg | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/examples/websocket.cfg similarity index 100% rename from modules/websocket/example/kamailio.cfg rename to examples/websocket.cfg

11 years, 2 months

git:master: modules/websocket: moved example WebSocket configuration file to examples directory

by Peter Dunkley

Module: sip-router Branch: master Commit: 36c7b450889a8005af3f14b0edb55f4ede6f98a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36c7b45… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 1 10:14:26 2013 +0000 modules/websocket: moved example WebSocket configuration file to examples directory --- .../example/kamailio.cfg => examples/websocket.cfg | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/examples/websocket.cfg similarity index 100% rename from modules/websocket/example/kamailio.cfg rename to examples/websocket.cfg

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2013