sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

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

19 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#140 - bug in $snd and $sndto pseudo variable User who did this - Klaus Darilion (klaus3000) ---------- $snd(ip) and $sndto(ip) is correct now. I wonder if to_ip is affected as well. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=140#comment238 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

Small request concern XMPP module
by Jedrzej Gorski 19 Jul '11

19 Jul '11

Hi guys, I'm currently working on SIP-to-Jingle Gateway for Kamailio SIP server which is part of my master thesis at Wroclaw University of Technology. I already had occasion to take a closer look at source code, not only in XMPP module. I even create my own idea for Jingle-SIP Gateway. After close code revision of XMPP Gateway I can say that those two gateways have similar attributes and protocol translation algorithm. I decide to start a Jingle extension as a part of XMPP module. I would appreciate a lot any documentation which has some higher level of details then this one available in REDME file in mentioned module. Best regards, Jedrzej

2 1

git:3.1: mqueue: decrease number of items when size limit is reached
by Elena-Ramona Modroiu 19 Jul '11

19 Jul '11

Module: sip-router Branch: 3.1 Commit: e9a61dd16dffb6e6e74810431741a297b62524c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9a61dd… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Jul 19 09:46:35 2011 +0200 mqueue: decrease number of items when size limit is reached - proper counting of intems in the queue - patch by Denis Chukhryaev --- modules/mqueue/mqueue_api.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index 6007ef0..a86d375 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -343,6 +343,8 @@ int mq_item_add(str *qname, str *key, str *val) mh->ilast = NULL; else mh->ifirst->prev = NULL; + mh->csize--; + shm_free(mi); } lock_release(&mh->lock); return 0;

1 0

git:master: mqueue: decrease number of items when size limit is reached
by Elena-Ramona Modroiu 19 Jul '11

19 Jul '11

Module: sip-router Branch: master Commit: f86e6c73e6818df799ac475c499bf641b211df78 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f86e6c7… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Jul 19 09:46:35 2011 +0200 mqueue: decrease number of items when size limit is reached - proper counting of intems in the queue - patch by Denis Chukhryaev --- modules/mqueue/mqueue_api.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index b6b72ef..a86d375 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -343,6 +343,7 @@ int mq_item_add(str *qname, str *key, str *val) mh->ilast = NULL; else mh->ifirst->prev = NULL; + mh->csize--; shm_free(mi); } lock_release(&mh->lock);

1 0

sr 3.1 xmlrpc: No memory Left
by Jasmin Schnatterbeck 18 Jul '11

18 Jul '11

Hello list, when using xmlrpc I get a memory error in kamailio's log: 22(26427) ERROR: xmlrpc [xmlrpc.c:581]: No memory left: 9134 If the error occurs or not depends on the RPC command, which is to be executed and it occurs especially then, if long output text is expected. After taking a look at xmlrpc.c I suppose the executing TCP process runs out of memory while trying to generate the xmlrpc reply. pkg_malloc seems to allocate some sort of private memory (=> increasing shm size with -m will not help), so I think private memory size has to be increased: e.g. http://www.kamailio.org/dokuwiki/doku.php/troubleshooting:private-memory-si… Is it possible to increase private memory size without recompiling or do you think there is another reason for the memory error? Thanks Jasmin

2 2

git:master: core: pkg mem size configurable form the cmd line
by Andrei Pelinescu-Onciul 18 Jul '11

18 Jul '11

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 */

3 2

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

18 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#139 - #!define does not work in $hdr() User who did this - Daniel-Constantin Mierla (miconda) ---------- Parsing pseudo-variables use different states in the lex parser -- not mapping to IDs or STRINGs, so the preprocessor directives can't substitute there. I will look to see if something can be changed here. Meanwhile, there is an option for this case, you can use: pv_printf("$var(hdr)", "$hdr(HEADER)"); ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=139#comment237 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] User took ownership: bug in $snd and $sndto pseudo variable
by sip-router 18 Jul '11

18 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#140 - bug in $snd and $sndto pseudo variable 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] Comment 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. The following task has a new comment added: FS#140 - bug in $snd and $sndto pseudo variable User who did this - Daniel-Constantin Mierla (miconda) ---------- Last two patches should fix the issue. If you can test and report whether it works or not, would be great, then it can be backported. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=140#comment236 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: core: new function to get IP address from su structure
by Daniel-Constantin Mierla 18 Jul '11

18 Jul '11

Module: sip-router Branch: master Commit: fabaa667795e5162fe17afd3e4a073bc99057144 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fabaa66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 18 22:34:47 2011 +0200 core: new function to get IP address from su structure - suip2a(...) returns zero-terminated string representation of IPv4/IPv6 address --- ip_addr.h | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/ip_addr.h b/ip_addr.h index 2f04693..d9cbf02 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -722,7 +722,7 @@ static inline char* su2a(union sockaddr_union* su, int su_len) { static char buf[SU2A_MAX_STR_SIZE]; int offs; - + #ifdef USE_IPV6 if (unlikely(su->s.sa_family==AF_INET6)){ if (unlikely(su_len<sizeof(su->sin6))) @@ -744,6 +744,34 @@ static inline char* su2a(union sockaddr_union* su, int su_len) return buf; } +#define SUIP2A_MAX_STR_SIZE (IP6_MAX_STR_SIZE + 2 /* [] */ + 1 /* \0 */) +/* returns an asciiz string containing the ip + * (<ipv4_addr> or [<ipv6_addr>]) + */ +static inline char* suip2a(union sockaddr_union* su, int su_len) +{ + static char buf[SUIP2A_MAX_STR_SIZE]; + int offs; + +#ifdef USE_IPV6 + if (unlikely(su->s.sa_family==AF_INET6)){ + if (unlikely(su_len<sizeof(su->sin6))) + return "<addr. error>"; + buf[0]='['; + offs=1+ip6tosbuf((unsigned char*)su->sin6.sin6_addr.s6_addr, &buf[1], + sizeof(buf)-4); + buf[offs]=']'; + offs++; + }else +#endif /* USE_IPV6*/ + if (unlikely(su_len<sizeof(su->sin))) + return "<addr. error>"; + else + offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, sizeof(buf)-2); + buf[offs]=0; + return buf; +} + /* converts an ip_addr structure to a hostent, returns pointer to internal

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
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