sr-dev February 2013

sr-dev@lists.kamailio.org

45 participants
201 discussions

git:master: Added own _strnstr method as strnstr is BSD only
by Marius Zbihlei 23 Feb '13

23 Feb '13

Module: sip-router Branch: master Commit: 402e44861c489d4246a0fe1f57bc2cc5fe7a70c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=402e448… Author: Marius Zbihlei <mzbihlei(a)mzbihlei-macbookpro.local> Committer: Marius Zbihlei <mzbihlei(a)mzbihlei-macbookpro.local> Date: Sat Feb 23 14:58:07 2013 +0000 Added own _strnstr method as strnstr is BSD only This cause the tm module to not be loaded on non-BSD (i.e. Linux) system Problem reported by Joel Vandal. --- modules/tm/t_msgbuilder.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index ffdcb7b..60328b3 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1475,11 +1475,34 @@ static inline char* print_callid(char* w, dlg_t* dialog, struct cell* t) memapp(w, CRLF, CRLF_LEN); t->callid.s = w; t->callid.len = CALLID_LEN + dialog->id.call_id.len + CRLF_LEN; - + w = print_callid_mini(w, dialog->id.call_id); return w; } +/* +* Find the first occurrence of find in s, where the search is limited to the +* first slen characters of s. +*/ +static +char * _strnstr(const char* s, const char* find, size_t slen) { + char c, sc; + size_t len; + + if ((c = *find++) != '\0') { + len = strlen(find); + do { + do { + if (slen-- < 1 || (sc = *s++) == '\0') + return (NULL); + } while (sc != c); + if (len > slen) + return (NULL); + } while (strncmp(s, find, len) != 0); + s--; + } + return ((char *)s); +} /* * Create a request @@ -1542,7 +1565,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra w = print_routeset(w, dialog); /* Route set */ if(headers==NULL || headers->len<15 - || strnstr(headers->s, "Max-Forwards:", headers->len)==NULL) + || _strnstr(headers->s, "Max-Forwards:", headers->len)==NULL) memapp(w, MAXFWD_HEADER, MAXFWD_HEADER_LEN); /* Max-forwards */ /* Content-Length */

1 0

git:master: sca: return true if no Contact header is found in an INVITE packet
by Andrew Mortensen 22 Feb '13

22 Feb '13

Module: sip-router Branch: master Commit: 09dcd2353773b011bcce9f24886ab35a47409ff1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09dcd23… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Feb 22 14:45:58 2013 -0500 sca: return true if no Contact header is found in an INVITE packet - stop spurious log messages when receiving a 100 Trying with no Contact. --- modules/sca/sca_call_info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 3c5d451..bf8db04 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1444,7 +1444,7 @@ sca_call_info_invite_handler( sip_msg_t *msg, sca_call_info *call_info, LM_DBG( "sca_call_info_invite_handler: Contact header is empty. " "(From: %.*s To: %.*s)", STR_FMT( from_aor ), STR_FMT( to_aor )); - return( -1 ); + return( 1 ); } if ( msg->first_line.type == SIP_REQUEST ) {

1 0

Using timers
by Carlos Ruiz Díaz 22 Feb '13

22 Feb '13

Hello list, I have a custom made module which uses a timer to monitor some statuses in a period of 1 second. Inside the function there's a loop that iterates over a table that can contain several hundreds of items and using each of them to perform some arithmetical operations. Under certain conditions, the number of items can grow to a few thousands in really exceptional cases and I believe this situation is causing Kamailio's slow timer process to consume more than 90% of CPU hanging up the other group of processes. My questions are: - What is the best way to perform a repetitive task such as a loop in a timely basis taking in consideration a precision of at least 5 seconds? I'm currently registering a function using *register_timer() *call. - Can a loop that takes more than 1 second to complete be causing this extremely high CPU consumption? Below is a copy of the top command when the event occurred: PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 22969 root 20 0 2140m 16m 14m R *98.8* 0.1 7:22.03 kamailio Thanks in advance, -- Carlos http://caruizdiaz.com +595981146623

2 2

[tracker] Comment added: app_lua: add rpc reload command (Attachment added)
by sip-router 22 Feb '13

22 Feb '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Víctor Seva (linuxmaniac) ---------- use gen_lock_set_t in order to increase parallelism ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment775 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: sca: log at debug level when reporting lack of Contact header
by Andrew Mortensen 22 Feb '13

22 Feb '13

Module: sip-router Branch: master Commit: 8fbcb1d1003b3ff3c28cf18aa6791f191a831cea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fbcb1d… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 22:56:37 2013 -0500 sca: log at debug level when reporting lack of Contact header --- modules/sca/sca_call_info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 8e893f5..3c5d451 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1441,7 +1441,7 @@ sca_call_info_invite_handler( sip_msg_t *msg, sca_call_info *call_info, int rc = -1; if ( SCA_STR_EMPTY( contact_uri )) { - LM_ERR( "sca_call_info_invite_handler: Contact header is empty. " + LM_DBG( "sca_call_info_invite_handler: Contact header is empty. " "(From: %.*s To: %.*s)", STR_FMT( from_aor ), STR_FMT( to_aor )); return( -1 );

1 0

git:master: sca: ensure SCA caller has correct callee CLI when callee is non-SCA.
by Andrew Mortensen 22 Feb '13

22 Feb '13

Module: sip-router Branch: master Commit: 9cb26a2eefe93e0ca162db917e34e784e703770a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cb26a2… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 22:32:23 2013 -0500 sca: ensure SCA caller has correct callee CLI when callee is non-SCA. - previously only set when callee was also SCA --- modules/sca/sca_call_info.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index d717eb1..8e893f5 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1185,17 +1185,20 @@ sca_call_info_invite_reply_200_handler( sip_msg_t *msg, if ( call_info != NULL ) { /* this implies To-AoR is SCA */ - rc = sca_call_info_uri_update( to_aor, call_info, from, to, contact_uri, &msg->callid->body ); - - rc = sca_call_info_insert_asserted_identity( msg, contact_uri, to ); } if ( !sca_uri_is_shared_appearance( sca, from_aor )) { goto done; } + if ( sca_call_info_insert_asserted_identity( msg, contact_uri, to ) < 0 ) { + LM_WARN( "sca_call_info_invite_reply_200_handler: failed to " + "add P-Asserted-Identity header to response from %.*s", + STR_FMT( contact_uri )); + } + /* * XXX in a reply with no Call-Info header, we look for a matching * dialog for the From URI. if we don't find one, this isn't an SCA

1 0

git:master: sca: remove misleading comment.
by Andrew Mortensen 21 Feb '13

21 Feb '13

Module: sip-router Branch: master Commit: 86771e45a92f6262a9fee1bd698c8e9dbe3b0b70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86771e4… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 18:55:02 2013 -0500 sca: remove misleading comment. - suggestion in comment has long since been implemented --- modules/sca/sca_subscribe.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 3307820..36a4254 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1245,7 +1245,6 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) goto done; } - /* XXX this should be locked; could use a filled-in req_sub */ if ( sca_notify_subscriber( sca, &req_sub, app_idx ) < 0 ) { LM_ERR( "SCA %s SUBSCRIBE+NOTIFY for %.*s failed", sca_event_name_from_type( req_sub.event ),

1 0

git:master: app_python: Bugfix for rewrite_ruri
by Konstantin Mosesov 21 Feb '13

21 Feb '13

Module: sip-router Branch: master Commit: 3c5b0019bbe1589410d8744545b64a278a222761 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c5b001… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Fri Feb 22 00:51:33 2013 +0200 app_python: Bugfix for rewrite_ruri *) Fixed a bug in msg_rewrite_ruri discovered by "V Tone" <vtone001(a)gmail.com>. *) Removed 'python exception' when do_action returns error. Reason: it is not an exception. *) Removed abort() if first_line type is invalid. --- modules/app_python/python_msgobj.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index c1cac57..fec4d14 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -95,14 +95,13 @@ static PyObject *msg_rewrite_ruri(msgobject *self, PyObject *args) memset(&act, '\0', sizeof(act)); act.type = SET_URI_T; - act.val[0].type = STR_ST; + act.val[0].type = STRING_ST; act.val[0].u.str.s = ruri; act.val[0].u.str.len = strlen(ruri); init_run_actions_ctx(&ra_ctx); if (do_action(&ra_ctx, &act, self->msg) < 0) { LM_ERR("Error in do_action\n"); - PyErr_SetString(PyExc_RuntimeError, "Error in do_action\n"); } Py_INCREF(Py_None); @@ -302,8 +301,8 @@ static PyObject *msg_getType(msgobject *self, PyObject *unused) break; default: - /* Shouldn't happen */ - abort(); + rval = "SIP_INVALID"; + break; } return PyString_FromString(rval);

1 0

git:master: sca: prevent possible NULL-dereference in log message when NOTIFY fails.
by Andrew Mortensen 21 Feb '13

21 Feb '13

Module: sip-router Branch: master Commit: 3bae735a5e38414bd53738928ba531a329290777 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bae735… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 17:00:31 2013 -0500 sca: prevent possible NULL-dereference in log message when NOTIFY fails. - sub struct may be NULL outside of else block. Use non-shmem req_sub from incoming SUBSCRIBE packet instead. --- modules/sca/sca_subscribe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 2f7a7f0..3307820 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1248,8 +1248,8 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) /* XXX this should be locked; could use a filled-in req_sub */ if ( sca_notify_subscriber( sca, &req_sub, app_idx ) < 0 ) { LM_ERR( "SCA %s SUBSCRIBE+NOTIFY for %.*s failed", - sca_event_name_from_type( sub->event ), - STR_FMT( &sub->subscriber )); + sca_event_name_from_type( req_sub.event ), + STR_FMT( &req_sub.subscriber )); /* * XXX - what does subscriber do in this case? drop subscription? * sub is already saved/updated in hash table. let it rot?

1 0

SIPit30: Update
by Olle E. Johansson 21 Feb '13

21 Feb '13

Hi! Tests continue. I've tried using the outbound module so we could mix websocket implementations with others in the test. Using outbound with non-rtcweb clients, traditional SIP ua's, the ACK gets misrouted. Just by not loading the module, everything works as expected. So there is a bug somewhere in outbound. I'll try to catch up with e-mail to see if Peter pushed a fix tonight. /O

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2013