sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
166 discussions

by Klaus Darilion

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

12 years, 7 months

git:master: modules_k/nathelper: add_contact_alias adds <> s around contact URI

by Juha Heinanen

Module: sip-router Branch: master Commit: 3ff9594a30eff2d18e6ea0595c5f82f878eaca1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ff9594… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. (cherry picked from commit f5ef15fee0c3bf09adf2506effa0895f72af9034) --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 51c1086..52c5e5f 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

12 years, 8 months

git:master: modules/tm: new implementation of load_contacts()/next_contacts ()

by Juha Heinanen

Module: sip-router Branch: master Commit: e973bbe5e7310861f77b17ce0afaf1cca35fe48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e973bbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:38:41 2010 +0300 modules/tm: new implementation of load_contacts()/next_contacts() - Simpler implementation of load_contacts()/next_contacts() functions based on recent changes related to Request-URI handling. - Function next_contacts() does not anymore set any timers. Check contact_avp and call t_set_fr() before calling t_relay() instead. - Removed fr_timer_next module parameter, because it is not needed anymore. --- modules/tm/README | 255 ++++++++++++++------------------------ modules/tm/doc/functions.xml | 51 +++----- modules/tm/doc/params.xml | 73 ----------- modules/tm/doc/tm.xml | 15 +-- modules/tm/t_serial.c | 279 ++++++++++++------------------------------ modules/tm/tm.c | 1 - 6 files changed, 190 insertions(+), 484 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e97…

12 years, 9 months

git:master: core: pkg mem size configurable form the cmd line

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 7b3a6eca7bb6dd1ca2a1395ca1e5821808ec85cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b3a6ec… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 12 21:54:07 2011 +0200 core: pkg mem size configurable form the cmd line The pkg mem size used can be configured by using the "-M" parameter on the command line, e.g.: ser -M 8 -f test.cfg # start ser with 8mb of pkg memory The default remains 4Mb. --- globals.h | 1 + main.c | 83 ++++++++++++++++++++++++++++++++++++++++++++---------------- mem/mem.c | 36 +++++++++++++++++++++----- mem/mem.h | 3 +- 4 files changed, 93 insertions(+), 30 deletions(-) diff --git a/globals.h b/globals.h index 40f7214..8b3a81d 100644 --- a/globals.h +++ b/globals.h @@ -150,6 +150,7 @@ extern int cfg_warnings; extern unsigned int msg_no; extern unsigned long shm_mem_size; +extern unsigned long pkg_mem_size; /* AVP configuration */ extern char *avp_db_url; /* db url used by user preferences (AVPs) */ diff --git a/main.c b/main.c index fcc25ae..d525fb4 100644 --- a/main.c +++ b/main.c @@ -245,6 +245,7 @@ Options:\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -m nr Size of shared memory allocated in Megabytes\n\ + -M nr Size of private memory allocated, in Megabytes\n\ -w dir Change the working directory to \"dir\" (default: \"/\")\n\ -t dir Chroot to \"dir\"\n\ -u uid Change uid \n\ @@ -273,7 +274,7 @@ void print_ct_constants() #endif */ printf("MAX_RECV_BUFFER_SIZE %d, MAX_LISTEN %d," - " MAX_URI_SIZE %d, BUF_SIZE %d, PKG_SIZE %uMB\n", + " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", MAX_RECV_BUFFER_SIZE, MAX_LISTEN, MAX_URI_SIZE, BUF_SIZE, PKG_MEM_SIZE); #ifdef USE_TCP @@ -488,6 +489,8 @@ int cfg_warnings=0; /* shared memory (in MB) */ unsigned long shm_mem_size=0; +/* private (pkg) memory (in MB) */ +unsigned long pkg_mem_size=0; /* export command-line to anywhere else */ int my_argc; @@ -590,6 +593,7 @@ void cleanup(show_status) destroy_lock_ops(); if (pid_file) unlink(pid_file); if (pgid_file) unlink(pgid_file); + destroy_pkg_mallocs(); } @@ -1750,7 +1754,52 @@ int main(int argc, char** argv) dont_fork_cnt=0; daemon_status_init(); - /*init pkg mallocs (before parsing cfg or cmd line !)*/ + /* command line options */ + options= ":f:cm:M:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" +#ifdef STATS + "s:" +#endif + ; + /* Handle special command line arguments, that must be treated before + * intializing the various subsystem or before parsing other arguments: + * - get the startup debug and log_stderr values + * - look if pkg mem size is overriden on the command line (-M) and get + * the new value here (before intializing pkg_mem). + * - look if there is a -h, e.g. -f -h construction won't be caught + * later + */ + opterr = 0; + while((c=getopt(argc,argv,options))!=-1) { + switch(c) { + case 'd': + debug_flag = 1; + default_core_cfg.debug++; + break; + case 'E': + log_stderr=1; + break; + case 'M': + pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; + if (tmp &&(*tmp)){ + fprintf(stderr, "bad private mem size number: -M %s\n", + optarg); + goto error; + }; + break; + default: + if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { + printf("version: %s\n", full_version); + printf("%s",help_msg); + exit(0); + } + break; + } + } + + /*init pkg mallocs (before parsing cfg or the rest of the cmd line !)*/ + if (pkg_mem_size) + LOG(L_INFO, " private (per process) memory: %ld bytes\n", + pkg_mem_size ); if (init_pkg_mallocs()==-1) goto error; @@ -1759,11 +1808,6 @@ int main(int argc, char** argv) "DBG_MSG_QA enabled, ser may exit abruptly\n"); #endif - options= ":f:cm:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" -#ifdef STATS - "s:" -#endif - ; /* init counters / stats */ if (init_counters() == -1) goto error; @@ -1773,16 +1817,6 @@ int main(int argc, char** argv) #ifdef USE_SCTP init_sctp_options(); /* set defaults before the config */ #endif - /* look if there is a -h, e.g. -f -h construction won't catch it later */ - opterr = 0; - while((c=getopt(argc,argv,options))!=-1) { - if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { - printf("version: %s\n", full_version); - printf("%s",help_msg); - exit(0); - break; - } - } /* process command line (cfg. file path etc) */ optind = 1; /* reset getopt */ /* switches required before script processing */ @@ -1808,9 +1842,12 @@ int main(int argc, char** argv) LOG(L_INFO, "ser: shared memory: %ld bytes\n", shm_mem_size ); break; + case 'M': + /* ignore it, it was parsed immediately after startup, + the pkg mem. is already initialized at this point */ + break; case 'd': - debug_flag = 1; - default_core_cfg.debug++; + /* ignore it, was parsed immediately after startup */ break; case 'V': printf("version: %s\n", full_version); @@ -1829,7 +1866,7 @@ int main(int argc, char** argv) exit(0); break; case 'E': - log_stderr=1; + /* ignore it, was parsed immediately after startup */ break; case 'O': scr_opt_lev=strtol(optarg, &tmp, 10); @@ -1974,6 +2011,7 @@ try_again: case 'f': case 'c': case 'm': + case 'M': case 'd': case 'V': case 'h': @@ -1981,7 +2019,8 @@ try_again: case 'A': break; case 'E': - log_stderr=1; // use in both getopt switches + log_stderr=1; /* use in both getopt switches, + takes priority over config */ break; case 'b': maxbuffer=strtol(optarg, &tmp, 10); @@ -2322,7 +2361,7 @@ try_again: } if (disable_core_dump) set_core_dump(0, 0); - else set_core_dump(1, shm_mem_size+PKG_MEM_POOL_SIZE+4*1024*1024); + else set_core_dump(1, shm_mem_size+pkg_mem_size+4*1024*1024); if (open_files_limit>0){ if(increase_open_fds(open_files_limit)<0){ fprintf(stderr, "ERROR: error could not increase file limits\n"); diff --git a/mem/mem.c b/mem/mem.c index a2f1b9a..1180a2a 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -26,6 +26,7 @@ #include <stdio.h> +#include <stdlib.h> #include "../config.h" #include "../dprint.h" #include "../globals.h" @@ -41,15 +42,15 @@ #ifdef PKG_MALLOC #ifndef DL_MALLOC - char mem_pool[PKG_MEM_POOL_SIZE]; + char* mem_pool = 0; #endif #ifdef F_MALLOC - struct fm_block* mem_block; + struct fm_block* mem_block = 0; #elif defined DL_MALLOC /* don't need this */ #else - struct qm_block* mem_block; + struct qm_block* mem_block = 0; #endif #endif @@ -58,18 +59,25 @@ int init_pkg_mallocs() { #ifdef PKG_MALLOC /*init mem*/ + #ifndef DL_MALLOC + if (pkg_mem_size == 0) + pkg_mem_size = PKG_MEM_POOL_SIZE; + mem_pool = malloc(pkg_mem_size); + #endif #ifdef F_MALLOC - mem_block=fm_malloc_init(mem_pool, PKG_MEM_POOL_SIZE); + if (mem_pool) + mem_block=fm_malloc_init(mem_pool, pkg_mem_size); #elif DL_MALLOC /* don't need this */ #else - mem_block=qm_malloc_init(mem_pool, PKG_MEM_POOL_SIZE); + if (mem_pool) + mem_block=qm_malloc_init(mem_pool, pkg_mem_size); #endif #ifndef DL_MALLOC if (mem_block==0){ LOG(L_CRIT, "could not initialize memory pool\n"); - fprintf(stderr, "Too much pkg memory demanded: %d\n", - PKG_MEM_POOL_SIZE ); + fprintf(stderr, "Too much pkg memory demanded: %ld bytes\n", + pkg_mem_size); return -1; } #endif @@ -79,6 +87,20 @@ int init_pkg_mallocs() +void destroy_pkg_mallocs() +{ +#ifdef PKG_MALLOC + #ifndef DL_MALLOC + if (mem_pool) { + free(mem_pool); + mem_pool = 0; + } + #endif +#endif /* PKG_MALLOC */ +} + + + int init_shm_mallocs(int force_alloc) { #ifdef SHM_MEM diff --git a/mem/mem.h b/mem/mem.h index aed1442..510698a 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -58,7 +58,7 @@ extern struct qm_block* mem_block; # endif - extern char mem_pool[PKG_MEM_POOL_SIZE]; + extern char* mem_pool; # ifdef DBG_QM_MALLOC @@ -133,6 +133,7 @@ #endif int init_pkg_mallocs(); +void destroy_pkg_mallocs(); int init_shm_mallocs(int force_alloc); /*! generic logging helper for allocation errors in private memory pool/ system */

12 years, 9 months

Patch to fix definitions for RLS related tables. Size of callid and contact should be larger than 64.

by Peter Dunkley

Please find attached a patch to increase the size of RLS callid and contact database fields. This is the RLS version of the recent presence update by Marius Zbihlei Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

12 years, 11 months

discussing about next major release - v3.2.0

by Daniel-Constantin Mierla

Hello, we should decide the roadmap to next major release v3.2.0, so probably an IRC meeting for some real time chatting would be good. I am thinking of June 3 or 4, 15:00GMT. Anyone interested in the meeting and available in one of those dates? The date with most of devs available will be selected. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

12 years, 11 months

git:master: kamailio.cfg: removed append_branch() from failure_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9f542264b8d022959a2006af6fe73dd6b7cfbf13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f54226… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 25 22:54:53 2011 +0200 kamailio.cfg: removed append_branch() from failure_route - it is no longer necessary --- etc/kamailio.cfg | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 5e6d9f7..decfd0f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -837,7 +837,7 @@ failure_route[FAIL_ONE] { # uncomment the following lines if you want to block client # redirect based on 3xx replies. ##if (t_check_status("3[0-9][0-9]")) { - ##t_reply("404","Not found"); + ## t_reply("404","Not found"); ## exit; ##} @@ -845,8 +845,6 @@ failure_route[FAIL_ONE] { # calls to a different new destination ##if (t_check_status("486|408")) { ## sethostport("192.168.2.100:5060"); - ## append_branch(); - ## # do not set the missed call flag again ## t_relay(); ##} }

12 years, 11 months

db_sqlite branch review request

by Timo Teräs

Hi all, The db_sqlite module is now getting ready for merge to master... It would be nice if it'd get some scrutiny from other developer before the merge, though. So far I've now addressed the earlier comments based on the original patch, added the docbook notes / README, Natanael Copa contributed the kamdbctl related work, and Henning Westerholt did the automation of the SQL script generation from the XML schema. Unless there's major things, I'm planning to merge with master late this week. Thanks, Timo

12 years, 11 months

Kamailio Dispatcher Module with Xcap

by laura testi

Hello all, I’m trying to use the Kamailio Dispatcher module in order to load balancer the SIP requests against two Kamailio Servers (Presence Servers) that are also XCAP Server for the presence and resources management. As far as I know, the Dispatcher works with the SIP messages but I don’t know if it can also work with xcap (http) requests. Could you please tell me if I can use the Dispatcher for processing XCAP requests? Thank in advance and let me know if you need more information about the environment. kind regards, laura

12 years, 11 months

git:master: ipops: use INET6_ADDRSTRLEN constant for IPv4/IPv6 maximun size .

by I�aki Baz Castillo

Module: sip-router Branch: master Commit: 62f96b72d12c812f5990bb3dd4f1fa862a13a112 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62f96b7… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Wed Jun 1 01:30:03 2011 +0200 ipops: use INET6_ADDRSTRLEN constant for IPv4/IPv6 maximun size. --- modules/ipops/ipops_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ipops/ipops_mod.c b/modules/ipops/ipops_mod.c index 172aefa..19fe95a 100644 --- a/modules/ipops/ipops_mod.c +++ b/modules/ipops/ipops_mod.c @@ -133,7 +133,7 @@ static int _compare_ips(char *ip1, size_t len1, enum enum_ip_type ip1_type, char { struct in_addr in_addr1, in_addr2; struct in6_addr in6_addr1, in6_addr2; - char _ip1[40], _ip2[40]; + char _ip1[INET6_ADDRSTRLEN], _ip2[INET6_ADDRSTRLEN]; // Not same IP type, return false. if (ip1_type != ip2_type)

12 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011