sr-dev

sr-dev@lists.kamailio.org

44307 discussions

Start a nNew thread

topoh module questions

by jerome.marchet＠orange-ftgroup.com

14 years, 7 months

git:master: modules_s/auth: cleaned up readme

by Juha Heinanen

Module: sip-router Branch: master Commit: badbfafb4d5b49b9bf75e26fc47be402fb5c8aa3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=badbfaf… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 2 15:00:45 2010 +0300 modules_s/auth: cleaned up readme - Removed nonexistent stuff from README, but didn't add anything. Some module params are still undocumented. --- modules_s/auth/README | 156 ++------------------------------ modules_s/auth/doc/auth.xml | 13 +--- modules_s/auth/doc/functions.xml | 185 -------------------------------------- modules_s/auth/doc/params.xml | 38 -------- 4 files changed, 9 insertions(+), 383 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bad…

14 years, 7 months

tcp quick connect is not done reliably

by Juha Heinanen

i have noticed that after i restart sip router, it does not immediately try to do tcp quick connect when it relays request over tcp. after restarting sr, i start twinkle and relaying over tcp fails: Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: Routing initial SUBSCRIBE <sip:jh@vm.test.fi> to <sip:127.0.0.1:5082;transport=tcp> Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: t_relay failed with result -1 Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: Routing initial PUBLISH <sip:jh@test.fi> to <sip:127.0.0.1:5082;transport=tcp> Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: t_relay failed with result -1 then i restarted twinkle and quick connect was correctly done: Jul 1 21:20:23 localhost /usr/sbin/sip-proxy[24199]: INFO: Routing initial SUBSCRIBE <sip:jh@vm.test.fi> to <sip:127.0.0.1:5082;transport=tcp> Jul 1 21:20:23 localhost /usr/sbin/sip-proxy[24199]: INFO: <core> [tcp_main.c:1926]: tcp_send: quick connect for 0xb4e70878 why is quick connect not done reliably? -- juha

14 years, 7 months

where is s proxy_challenge function?

by Juha Heinanen

since people seemed to agree that s auth module is superior to k one, i decided to try porting k auth_radius module to use s auth api and was able to compile and build it against s auth api. when testing the result, i get errors about "unknown command, missing loadmodule" when script has proxy_challenge() call. i then went and checked s auth module and found this in README: 1.4.2. proxy_challenge(realm, qop) The function challenges a user agent. ... however, auth_mod.c does not include such function: /* * Exported functions */ static cmd_export_t cmds[] = { {"consume_credentials", consume_credentials, 0, 0, REQUEST_ROUTE}, {"bind_auth_s", (cmd_function)bind_auth_s, 0, 0, 0 }, {0, 0, 0, 0, 0} }; i don't find it even with grep on s modules. where is it? -- juha

14 years, 7 months

git:master: msilo(k): updated readme file

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9d8c55287ea9ac93440d762c511afe531c629552 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d8c552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 21:03:36 2010 +0200 msilo(k): updated readme file - documented the new parameter add_contact - readme file regenerated --- modules_k/msilo/README | 212 +++++++++++++++++++---------------- modules_k/msilo/doc/msilo_admin.xml | 21 ++++ 2 files changed, 135 insertions(+), 98 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9d8…

14 years, 7 months

git:master: msilo(k): parameter to control contact header

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8ffb09ce908088af89e70a5acd87a318baf5a029 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ffb09c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 20:56:23 2010 +0200 msilo(k): parameter to control contact header - add_contact parameter controls whether contact header is added to msilo generated messages - default is off (no contact added, as per RFC3428), reported by Juha Heinanen --- modules_k/msilo/msfuncs.c | 32 ++++++++++++++++++++++++++------ modules_k/msilo/msfuncs.h | 2 +- modules_k/msilo/msilo.c | 6 ++++-- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/modules_k/msilo/msfuncs.c b/modules_k/msilo/msfuncs.c index 735b8d6..eed73bd 100644 --- a/modules_k/msilo/msfuncs.c +++ b/modules_k/msilo/msfuncs.c @@ -36,7 +36,13 @@ #include "../../udp_server.h" #include "../../pt.h" +#define CONTACT_PREFIX "Contact: <" +#define CONTACT_SUFFIX ">;msilo=yes"CRLF +#define CONTACT_PREFIX_LEN (sizeof(CONTACT_PREFIX)-1) +#define CONTACT_SUFFIX_LEN (sizeof(CONTACT_SUFFIX)-1) + extern int ms_add_date; +extern int ms_add_contact; /** * apostrophes escaping @@ -181,21 +187,26 @@ error: /** build MESSAGE headers * - * Add Content-Type, Date, and extra headers if they exist + * Add Content-Type, Contact, Date, and extra headers if they exist * expects - max buf len of the resulted body in body->len * - body->s MUST be allocated * return: 0 OK ; -1 error * */ -int m_build_headers(str *buf, str ctype, time_t date, str extra) +int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) { char *p; char strDate[48]; int lenDate = 0; + int newLen = 0; + + if(!buf || !buf->s || buf->len <= 0 || ctype.len < 0) + goto error; - if(!buf || !buf->s || buf->len <= 0 || ctype.len < 0 - || buf->len <= ctype.len+extra.len+14 - /*Content-Type: */ - +CRLF_LEN) + newLen = 14 + ctype.len + CRLF_LEN + extra.len; + if(contact.len > 0 && ms_add_contact) + newLen += CONTACT_PREFIX_LEN + contact.len + CONTACT_SUFFIX_LEN; + + if(buf->len <= newLen) goto error; p = buf->s; @@ -215,6 +226,15 @@ int m_build_headers(str *buf, str ctype, time_t date, str extra) p += CRLF_LEN; } + if(contact.len > 0 && ms_add_contact) + { + strncpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); + p += CONTACT_PREFIX_LEN; + strncpy(p, contact.s, contact.len); + p += contact.len; + strncpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); + p += CONTACT_SUFFIX_LEN; + } if (extra.len > 0) { strncpy(p, extra.s, extra.len); p += extra.len; diff --git a/modules_k/msilo/msfuncs.h b/modules_k/msilo/msfuncs.h index 79a8fdd..8a70fc4 100644 --- a/modules_k/msilo/msfuncs.h +++ b/modules_k/msilo/msfuncs.h @@ -49,7 +49,7 @@ int m_apo_escape(char*, int, char*, int); int m_extract_content_type(char*, int, content_type_t*, int); /** build MESSAGE headers */ -int m_build_headers(str *buf, str ctype, time_t date, str extra); +int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra); /** build MESSAGE body */ int m_build_body(str *body, time_t date, str msg, time_t sdate); diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 1c59073..b7ffd6a 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -144,6 +144,7 @@ int ms_send_time = 0; int ms_clean_period = 10; int ms_use_contact = 1; int ms_add_date = 1; +int ms_add_contact = 0; int ms_max_messages = 0; static str ms_snd_time_avp_param = {NULL, 0}; @@ -210,6 +211,7 @@ static param_export_t params[]={ { "snd_time_avp", STR_PARAM, &ms_snd_time_avp_param.s }, { "add_date", INT_PARAM, &ms_add_date }, { "max_messages", INT_PARAM, &ms_max_messages }, + { "add_contact", INT_PARAM, &ms_add_contact }, { 0,0,0 } }; @@ -1030,7 +1032,7 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, - rtime /*Date*/, + str_vals[0]/*from*/, rtime /*Date*/, extra_hdrs_str /*extra_hdrs*/) < 0) { LM_ERR("headers building failed [%d]\n", mid); @@ -1297,7 +1299,7 @@ void m_send_ontimer(unsigned int ticks, void *param) extra_hdrs_str.len = 0; hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, - 0/*Date*/, + ms_reminder/*from*/,0/*Date*/, extra_hdrs_str/*extra*/) < 0) {

14 years, 7 months

git:master: pdb: avoid child re-init

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bc34a82fbf5bd903cc50cb34c73afb7b685603a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc34a82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:19:17 2010 +0200 pdb: avoid child re-init - for mi cmd when used over xmlrpc module --- modules/pdb/pdb.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 9720a13..721363c 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -667,17 +667,20 @@ static int mod_init(void) return 0; } - static int child_init (int rank) { - if (init_server_socket() != 0) return -1; - return 0; + return mi_child_init(); } +static int pdb_child_initialized = 0; + static int mi_child_init(void) { + if(pdb_child_initialized) + return 0; if (init_server_socket() != 0) return -1; + pdb_child_initialized = 1; return 0; }

14 years, 7 months

git:master: presence_xml: avoid re-init of db handler

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 098deec785ab7c4e927104e83fc84b6c1b347719 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=098deec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:08:04 2010 +0200 presence_xml: avoid re-init of db handler - safety check for usage of xmlrpc module for mi cmds --- modules_k/presence_xml/presence_xml.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c index ab3f8f3..dbea378 100644 --- a/modules_k/presence_xml/presence_xml.c +++ b/modules_k/presence_xml/presence_xml.c @@ -277,6 +277,8 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } + if(pxml_db) + return 0; pxml_db = pxml_dbf.init(&db_url); if (pxml_db== NULL) { @@ -310,6 +312,8 @@ static int child_init(int rank) LM_CRIT("database not bound\n"); return -1; } + if(pxml_db) + return 0; pxml_db = pxml_dbf.init(&db_url); if (pxml_db== NULL) {

14 years, 7 months

git:master: presence: avoid re-init of db handler

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8a1d985743fe6ec544a215b8ddb6e54adbb024d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a1d985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:07:18 2010 +0200 presence: avoid re-init of db handler - safety check for usage of xmlrpc for mi cmds --- modules_k/presence/presence.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index a07cf21..b826e39 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -363,6 +363,8 @@ static int child_init(int rank) LM_CRIT("child_init: database not bound\n"); return -1; } + if (pa_db) + return 0; pa_db = pa_dbf.init(&db_url); if (!pa_db) { @@ -404,6 +406,8 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } + if (pa_db) + return 0; pa_db = pa_dbf.init(&db_url); if (!pa_db) {

14 years, 7 months

git:master: kex: check if uptime value was initialized

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7537d27782b185a20d32b08f7bcb30557bb3b7ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7537d27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:00:51 2010 +0200 kex: check if uptime value was initialized --- modules_k/kex/mi_core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 7d9a09c..157d9f4 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -66,6 +66,8 @@ static int init_mi_uptime(void) { char *p; + if (kmi_up_since_ctime.s!=0) + return 0; time(&kmi_up_since); p = ctime(&kmi_up_since); kmi_up_since_ctime.len = strlen(p)-1;

14 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev