sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: xlog(k): parameter to control printing cfg name

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: e01ed4b2eebff83849fc838f265c5d12927b5e13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e01ed4b… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Feb 2 15:45:58 2010 +0100 xlog(k): parameter to control printing cfg name - long_format set to 1 makes xlogl() and xdbgl() to print config file name before line number (useful for usage of 'include_file') --- modules_k/xlog/README | 36 ++++++++++++++++++++++++++---------- modules_k/xlog/doc/xlog_admin.xml | 20 ++++++++++++++++++++ modules_k/xlog/xlog.c | 12 ++++++++++-- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index d7a1a61..6c02463 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -33,7 +33,8 @@ Elena-Ramona Modroiu 4.1. buf_size (integer) 4.2. force_color (integer) - 4.3. prefix (str) + 4.3. long_format (integer) + 4.4. prefix (str) 5. Exported Functions @@ -46,9 +47,10 @@ Elena-Ramona Modroiu 1.1. Set buf_size parameter 1.2. Set force_color parameter - 1.3. Set prefix parameter - 1.4. xlog usage - 1.5. xdbg usage + 1.3. Set long_format parameter + 1.4. Set prefix parameter + 1.5. xlog usage + 1.6. xdbg usage Chapter 1. Admin Guide @@ -65,7 +67,8 @@ Chapter 1. Admin Guide 4.1. buf_size (integer) 4.2. force_color (integer) - 4.3. prefix (str) + 4.3. long_format (integer) + 4.4. prefix (str) 5. Exported Functions @@ -119,7 +122,8 @@ Chapter 1. Admin Guide 4.1. buf_size (integer) 4.2. force_color (integer) - 4.3. prefix (str) + 4.3. long_format (integer) + 4.4. prefix (str) 4.1. buf_size (integer) @@ -143,13 +147,25 @@ modparam("xlog", "buf_size", 8192) modparam("xlog", "force_color", 0) ... -4.3. prefix (str) +4.3. long_format (integer) + + When set to 1, prints config file name in xlogl() and xdbgl() before + line number. + + Default value is 0. + + Example 1.3. Set long_format parameter +... +modparam("xlog", "long_format", 1) +... + +4.4. prefix (str) Prefix to be printed before the log message. Default value is "<script>: ". - Example 1.3. Set prefix parameter + Example 1.4. Set prefix parameter ... modparam("xlog", "prefix", "-xlog: ") ... @@ -185,7 +201,7 @@ modparam("xlog", "prefix", "-xlog: ") This function can be used from ANY_ROUTE. - Example 1.4. xlog usage + Example 1.5. xlog usage ... xlog("L_ERR", "time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); ... @@ -204,7 +220,7 @@ xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); This function can be used from ANY_ROUTE. - Example 1.5. xdbg usage + Example 1.6. xdbg usage ... xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); ... diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index f9949de..683d110 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -132,6 +132,26 @@ modparam("xlog", "force_color", 0) </example> </section> <section> + <title><varname>long_format</varname> (integer)</title> + <para> + When set to 1, prints config file name in xlogl() and xdbgl() + before line number. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>long_format</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xlog", "long_format", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>prefix</varname> (str)</title> <para> Prefix to be printed before the log message. diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 67cc913..d626b0a 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -48,6 +48,7 @@ char *_xlog_prefix = "<script>: "; /** parameters */ static int buf_size=4096; static int force_color=0; +static int long_format=0; /** module functions */ static int mod_init(void); @@ -107,6 +108,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"buf_size", INT_PARAM, &buf_size}, {"force_color", INT_PARAM, &force_color}, + {"long_format", INT_PARAM, &long_format}, {"prefix", STR_PARAM, &_xlog_prefix}, {0,0,0} }; @@ -153,8 +155,14 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, return -1; txt.s = _xlog_buf; if(line>0) - LOG_(DEFAULT_FACILITY, level, _xlog_prefix, - "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); + if(long_format==1) + LOG_(DEFAULT_FACILITY, level, _xlog_prefix, + "%s:%d:%.*s", + (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", + (xm->a)?xm->a->cline:0, txt.len, txt.s); + else + LOG_(DEFAULT_FACILITY, level, _xlog_prefix, + "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else LOG_(DEFAULT_FACILITY, level, _xlog_prefix, "%.*s", txt.len, txt.s);

14 years, 12 months

git:master: mqueue: new module offering memory queues

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: ceb69ce0949d3e2f6ece2467cbce90b0255e057a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ceb69ce… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Feb 2 12:37:59 2010 +0100 mqueue: new module offering memory queues - for usage in cfg file - many queues can be defined - one item in queue is a pair (key, value), both string - functions to add and consume items in the queue - fetching the oldest item makes it available to pseudo-variables - example of usage: send tasks from SIP workers to a timer process (e.g., defined by rtimer module) that consumes them. Can be some time expensive operation, like email notification, etc. --- modules/mqueue/Makefile | 12 + modules/mqueue/README | 123 +++++++++++ modules/mqueue/doc/Makefile | 4 + modules/mqueue/doc/mqueue.xml | 36 +++ modules/mqueue/doc/mqueue_admin.xml | 158 ++++++++++++++ modules/mqueue/mqueue_api.c | 408 +++++++++++++++++++++++++++++++++++ modules/mqueue/mqueue_api.h | 46 ++++ modules/mqueue/mqueue_mod.c | 208 ++++++++++++++++++ 8 files changed, 995 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ceb…

14 years, 12 months

git:kamailio_3.0: core: use one buffer for int2str

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 229496c7170bcc85f517a4985f7ab4bad553c8d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=229496c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 2 13:23:03 2010 +0100 core: use one buffer for int2str - static declaration inside ut.h function results in hard copy to many places, affecting acc detection of int to str conversions in buffer - reported by Alex Balashov --- ut.c | 3 +++ ut.h | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ut.c b/ut.c index 7c63941..11d4fe7 100644 --- a/ut.c +++ b/ut.c @@ -42,6 +42,9 @@ #include "mem/mem.h" #include "globals.h" +/* global buffer for ut.h int2str() */ +char ut_buf_int2str[INT2STR_MAX_LEN]; + /* converts a username into uid:gid, * returns -1 on error & 0 on success */ diff --git a/ut.h b/ut.h index 6861af7..3e4d7a6 100644 --- a/ut.h +++ b/ut.h @@ -292,10 +292,10 @@ static inline char* int2str_base(unsigned int l, int* len, int base) -/* returns a pointer to a static buffer containing l in asciiz & sets len */ -static inline char* int2str(unsigned int l, int* len) +/* print int to asciiz in a string buffer + * - be sure result buffer is at least INT2STR_MAX_LEN in size */ +static inline char* int2strbuf(unsigned int l, char *r, int* len) { - static char r[INT2STR_MAX_LEN]; int i; i=INT2STR_MAX_LEN-2; @@ -312,6 +312,13 @@ static inline char* int2str(unsigned int l, int* len) return &r[i+1]; } +extern char ut_buf_int2str[INT2STR_MAX_LEN]; +/* returns a pointer to a static buffer containing l in asciiz & sets len */ +static inline char* int2str(unsigned long l, int* len) +{ + return int2strbuf(l, ut_buf_int2str, len); +} + /* Signed INTeger-TO-STRing: convers a long to a string * returns a pointer to a static buffer containing l in asciiz & sets len */ static inline char* sint2str(long l, int* len)

14 years, 12 months

master feature freeze

by Andrei Pelinescu-Onciul

Please don't commit any new features to master, only bug fixes and documentation updates (they should go to sr_3.0, but for a short time until everybody gets used to the new branch we will use both of them). If you want to commit new features, please use another branch name, either something under tmp/ or under <your_username>/ and we will merge it into master once the freeze is over. This freeze should last only a short time (maybe 1 week, we'll see how things are going). Andrei

14 years, 12 months

Problems with git backend?!

by marius zbihlei

Hello When I try to do a push I get the following error: file write error (No space left on device) fatal: unable to write sha1 file error: unpack failed: unpacker exited with error code To ssh://mariuszbihlei@git.sip-router.org/sip-router ! [remote rejected] master -> master (n/a (unpacker error)) error: failed to push some refs to 'ssh://mariuszbihlei@git.sip-router.org/sip-router' Any errors with git.sip-router.org ?! Marius

14 years, 12 months

PV bug in modules_k/acc/acc_extra.c in K 3.0.0

by Alex Balashov

I ran into a very interesting problem last night with 'acc' that took me a few hours to solve, so I am posting my workaround for collective benefit. It is probably not the cleanest and most appropriate solution because I am not extensively familiar with the 'acc' code; this is my first dive into it. Thus, I do not presume to submit an actual patch. The problem I had was that PVs read from the db_extra parameter that had an internal type of integer (TYPE_INT) because of their lexical scope were not being correctly evaluated, resulting in bizarre values being put in the database. I am using K 3.0.0 on 64-bit Xen guest running CentOS with db_postgres. I did not check to see if this problem occurs with db_mysql as I do not have MySQL anywhere nearby, but I don't believe it is happening at the database layer anyhow. I also know this problem was not present in 1.5.x, or several of my installations would be non-functional; this must have something to do with use of new 'srdb1' stuff in the database side of 'acc', I hypothesise. Anyway, the actual problem went like this. Let us say, for simplicity of example, that I am using 'acc' with Postgres backing and have something like this: modparam("acc", "db_extra", "account_id=$avp(s:account_id)") ... modparam("acc", "db_flag", 1) What was happening was that if I did this in a request route: $avp(s:account_id) = 42; ... setflag(1); if(!t_relay()) sl_reply_error(); exit; Very strange and occasionally bizarre values, mostly duplicates of other values I have in db_extra, would be written to acc.account_id (a column of type 'integer') - at any rate, certainly not 42. I enabled SQL statement logging on my PostgreSQL database to ensure that the data being inserted was literally not 42, rather than this being some sort of database-layer type conversion / representation problem. Sure enough, it was true, although I also did notice that 'acc' encloses all inserted values in single quotes to be treated as string literals. But this is immaterial, because RDBMs automatically cast such input: INSERT INTO acc (..., account_id) VALUES(..., '12'); Now, I could fix the problem by simply assigning the AVP a string literal instead: $avp(s:account_id) = '42'; Now the data was inserted normally. I also tested with user variables ($var(...)) and the same was true, so the problem is not AVP-specific. Also, all other evaluative contexts for PVs with these values work fine, such as printing them. The problem does not seem to be with 'db_postgres', neither with 'pv', nor with 'avpops' -- it is particular to 'acc'. After some hours of investigation I found that what was happening is that the type of the PV being referenced is not being correctly packed into the various arrays populated by extra2strar() in modules_k/acc/acc_extra.c, and thus was being misread when iterated in acc_db_request() in modules_k/acc/acc.c. Specifically, this check was inadequate: if (value.rs.s+value.rs.len==static_detector) { val_arr[n].s = int_buf + r*INT2STR_MAX_LEN; val_arr[n].len = value.rs.len; memcpy(val_arr[n].s, value.rs.s, value.rs.len); r++; LM_INFO("New int tenant: %s\n", val_arr[n].s); } else { val_arr[n] = value.rs; LM_INFO("New str tenant: %s\n", value.rs); } In my debugging, all PV values were showing up as "New str tenant" regardless of whether they were natively integers, and regardless of what the PV spec type was actually set to. The type was set correctly on the PV spec, so of course the integer value got stored correctly in int_var[] below: if (value.flags&PV_VAL_INT) { int_arr[n] = value.ri; type_arr[n] = TYPE_INT; } else { type_arr[n] = TYPE_STR; } ... but since 'acc' wants to treat all extra values as strings, this was not sufficient, because what was failing was this condition: if (value.rs.s+value.rs.len==static_detector) I guess value.rs.s in case of the PV value being PV_VAL_INT is not null terminated properly? This I truly do not know. In any event, I just added a check on the PV flags to see if it is an integer value and this fixed my problem: if (value.rs.s+value.rs.len==static_detector || value.flags & PV_VAL_INT) { ... however, I do not know that this was the most insightful solution. This is rather critical I think, because it means anyone trying to store PV values that are initialised with a natively numerical type in script (or extracted as a numerical value from a database, e.g. sql_query("SELECT account_id::integer FROM table ..."), I found this to be a problem as well) cannot store them in the database reliably using 'db_extra'. Thanks! -- Alex Balashov - Principal Evariste Systems LLC Tel : +1 678-954-0670 Direct : +1 678-954-0671 Web : http://www.evaristesys.com/

14 years, 12 months

Re: [sr-dev] [Kamailio-Users] kamailio / deadlock3

by Daniel-Constantin Mierla

I am cc-ing sr-dev, since tcp code is from ser and Andrei may have more insights... On 1/28/10 2:41 PM, Aymeric Moizard wrote: > > > On Thu, 28 Jan 2010, Henning Westerholt wrote: > >> On Thursday 28 January 2010, Aymeric Moizard wrote: >>> here is the backtrace I have. unfortunatly without debug symbol! >>> I found the same for many of the kamailio process. "sched_yield" >>> is pending for ever. My system is a debian/etch. >>> >>> #0 0xffffe424 in __kernel_vsyscall () >>> #1 0xb7cef4ac in sched_yield () from /lib/tls/i686/cmov/libc.so.6 >>> #2 0x080a93fd in tcp_send () >>> #3 0xb7975679 in send_pr_buffer () from >>> /usr/lib/kamailio/modules/tm.so >>> #4 0xb79789ac in t_forward_nonack () from >>> /usr/lib/kamailio/modules/tm.so >>> #5 0xb7974784 in t_relay_to () from /usr/lib/kamailio/modules/tm.so >>> #6 0xb7983a11 in load_tm () from /usr/lib/kamailio/modules/tm.so >>> #7 0x081cf810 in mem_pool () >>> #8 0x00000000 in ?? () >>> >>> I guess most t_relay operation towards my "mobipouce.com" domain >>> with one IP being down breaks each kamailio process one after the >>> other... I'm not sure every such t_relay operation is always breaking >>> exactly one thread each time. >>> >>> I went through the lock/unlock of tcp_main.c but it seems every >>> lock has an unlock at least... >> >> Hi Aymeric, >> >> i remember that we observed this "sched_yield" problems on one old >> 0.9 system >> after some time (like weeks or month). We did not found the solution >> in this >> case, after a restart it was gone again.. >> >> You mentioned in an earlier mail that you see this related to UDP >> traffic, but >> in the log file and also in your investigations you think its related >> to TPC? > > This is the exact case: > 1-> SUBSCRIBE sent to/received by over UDP to kamailio. > 2-> kamailio does a SRV record lookup for "mobipouce.com" > 3-> kamailio try sip2.mobipouce.com (91.199.234.47) over TCP first > 4-> connection failed with logs: > Jan 27 12:56:38 ns26829 /usr/sbin/kamailio[9763]: > ERROR:core:tcp_blocking_connect: poll error: flags 18 > Jan 27 12:56:38 ns26829 /usr/sbin/kamailio[9763]: > ERROR:core:tcp_blocking_connect: failed to retrieve SO_ERROR (111) > Connection refused > Jan 27 12:56:38 ns26829 /usr/sbin/kamailio[9763]: > ERROR:core:tcpconn_connect: tcp_blocking_connect failed > Jan 27 12:56:38 ns26829 /usr/sbin/kamailio[9763]: ERROR:core:tcp_send: > connect failed > Jan 27 12:56:38 ns26829 /usr/sbin/kamailio[9763]: ERROR:tm:msg_send: > tcp_send failed > Jan 27 12:56:38 ns26829 /usr/sbin/kamailio[9763]: > ERROR:tm:t_forward_nonack: sending request failed > 5-> I guess kamailio is supposed to try other SRV record value: > sip2.mobipouce.com (91.199.234.46) but it doesn't > > Thus, I'm guessing the issue is related to SRV record with failover OR > just tcp failure. Not related to UDP at all. so TCP connect failed, the tcp worker returned as it prints the message and, to be sure I got it right, the UDP worker (the one that received) got blocked? > > It's definitly possible to reproduce the issue now! > > I guess anyone can try your version of kamailio and t_relay message > to "mobipouce.com" and you'll fall in that case! Sending plenty of > those messages will finally lock all kamailio process. All? tcp and udp? Cheers, Daniel > > Regards, > Aymeric MOIZARD / ANTISIP > amsip - http://www.antisip.com > osip2 - http://www.osip.org > eXosip2 - http://savannah.nongnu.org/projects/exosip/ > > >> Regards, >> >> Henning >> >> Viele Grüße, >> >> Henning >> > > _______________________________________________ > Kamailio (OpenSER) - Users mailing list > Users(a)lists.kamailio.org > http://lists.kamailio.org/cgi-bin/mailman/listinfo/users > http://lists.openser-project.org/cgi-bin/mailman/listinfo/users -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 12 months

git:master: core:forward.c Small typo regarding tested socket

by Marius Zbihlei

Module: sip-router Branch: master Commit: cd94c13eb696096cb7ac021720cb11b0696488c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd94c13… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Feb 2 11:23:59 2010 +0200 core:forward.c Small typo regarding tested socket --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index 17094dd..96d5ca1 100644 --- a/forward.c +++ b/forward.c @@ -173,7 +173,7 @@ retry: sock_inet=-1; } #ifdef USE_IPV6 - if (sock_inet>=0){ + if (sock_inet6>=0){ close(sock_inet6); sock_inet6=-1; }

14 years, 12 months

SF.net SVN: openser:[5972] branches/1.5/forward.c

by Marius Zbihlei

Revision: 5972 http://openser.svn.sourceforge.net/openser/?rev=5972&view=rev Author: mariuszbihlei Date: 2010-02-02 10:03:07 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Fixes based on Andrei Pelinescu-Onciul's patch for sip-router Added ifdefs for USE_IPV6, error handling in case of EISCONN Modified Paths: -------------- branches/1.5/forward.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 12 months

git:master: core: fix missing close() in get_out_socket()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ced07a1fe1ce07c13aff2d65b303fa7bba04f6d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ced07a1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 2 10:09:15 2010 +0100 core: fix missing close() in get_out_socket() - errorpath for EISCONN missed close()-ing the sockets - added unlikely() on all the error checks --- forward.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/forward.c b/forward.c index 2e6f05e..17094dd 100644 --- a/forward.c +++ b/forward.c @@ -129,14 +129,14 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto) struct socket_info* si; struct ip_addr ip; - if (proto!=PROTO_UDP) { + if (unlikely(proto!=PROTO_UDP)) { LOG(L_CRIT, "BUG: get_out_socket can only be called for UDP\n"); return 0; } retry: switch(to->s.sa_family){ case AF_INET : { - if(sock_inet < 0){ + if(unlikely(sock_inet < 0)){ sock_inet = socket(AF_INET, SOCK_DGRAM, 0); if (sock_inet==-1) { LM_ERR("socket() failed: %s\n", strerror(errno)); @@ -148,7 +148,7 @@ retry: } #ifdef USE_IPV6 case AF_INET6 : { - if(sock_inet6 < 0){ + if(unlikely(sock_inet6 < 0)){ sock_inet6 = socket(AF_INET6, SOCK_DGRAM, 0); if (sock_inet6==-1) { LM_ERR("socket() failed: %s\n", strerror(errno)); @@ -164,13 +164,19 @@ retry: return 0; } } - if (connect(*temp_sock, &to->s, sockaddru_len(*to))==-1) { - if (errno==EISCONN && !mhomed_sock_cache_disabled){ + if (unlikely(connect(*temp_sock, &to->s, sockaddru_len(*to))==-1)) { + if (unlikely(errno==EISCONN && !mhomed_sock_cache_disabled)){ /* no multiple connects support on the same socket */ mhomed_sock_cache_disabled=1; - sock_inet=-1; + if (sock_inet>=0){ + close(sock_inet); + sock_inet=-1; + } #ifdef USE_IPV6 - sock_inet6=-1; + if (sock_inet>=0){ + close(sock_inet6); + sock_inet6=-1; + } #endif /* USE_IPV6 */ goto retry; } @@ -179,7 +185,7 @@ retry: goto error; } len=sizeof(from); - if (getsockname(*temp_sock, &from.s, &len)==-1) { + if (unlikely(getsockname(*temp_sock, &from.s, &len)==-1)) { LOG(L_ERR, "ERROR: get_out_socket: getsockname failed: %s\n", strerror(errno)); goto error; @@ -195,7 +201,7 @@ retry: return si; error: LOG(L_ERR, "ERROR: get_out_socket: no socket found\n"); - if (unlikely(*temp_sock >=0 && mhomed_sock_cache_disabled)){ + if (unlikely(mhomed_sock_cache_disabled && *temp_sock >=0)){ close(*temp_sock); *temp_sock=-1; }

14 years, 12 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev