sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
255 discussions

git:4.0: app_perl: use local buffer to print dynamic string in pv_sprintf()
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: 4.0 Commit: 9f3f494289ab25d2a4a35672e21d1b1c76cfbd6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f3f494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 16:49:26 2013 +0200 app_perl: use local buffer to print dynamic string in pv_sprintf() - avoid pkg malloc for temporary need - fix leak in case of fmt parse error, discovered on a report … [View More]

1 0

git:4.0: core: resolve down to A/AAAA records when no naptr records
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: 4.0 Commit: 3253fcb7e7ef628727799a92ca68739dba3d10ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3253fcb… Author: Øyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 11:15:13 2013 +0200 core: resolve down to A/AAAA records when no naptr records - try all protocols, not only UDP (cherry picked from commit b50888cf447ea3a3315e665c97f71a07bb687337) --- … [View More]dns_cache.c | 10 +++++++++- resolve.c | 27 +++++++++++---------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 1243c92..5690cb6 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2857,8 +2857,10 @@ struct hostent* dns_naptr_sip_resolvehost(str* name, unsigned short* port, naptr_bmp_t tried_bmp; struct dns_hash_entry* e; char n_proto; + char origproto; str srv_name; + origproto=*proto; he=0; if (dns_hash==0){ /* not init => use normal, non-cached version */ LOG(L_WARN, "WARNING: dns_sip_resolvehost: called before dns cache" @@ -2903,7 +2905,13 @@ struct hostent* dns_naptr_sip_resolvehost(str* name, unsigned short* port, dns_hash_put(e); } naptr_not_found: - return no_naptr_srv_sip_resolvehost(name,port,proto); + *proto = origproto; + he = no_naptr_srv_sip_resolvehost(name,port,proto); + /* fallback all the way down to A/AAAA */ + if (he==0) { + he=dns_get_he(name,dns_flags); + } + return he; } #endif /* USE_NAPTR */ diff --git a/resolve.c b/resolve.c index e739f4b..e29e189 100644 --- a/resolve.c +++ b/resolve.c @@ -1519,20 +1519,7 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch } if (default_order){ for (i=0; i<list_len;i++) { - switch ( srv_proto_list[i].proto) { - case PROTO_UDP: - srv_proto_list[i].proto_pref=4; - break; - case PROTO_TCP: - srv_proto_list[i].proto_pref=3; - break; - case PROTO_TLS: - srv_proto_list[i].proto_pref=2; - break; - case PROTO_SCTP: - srv_proto_list[i].proto_pref=1; - break; - } + srv_proto_list[i].proto_pref=proto_pref_score(i);; } } @@ -1592,6 +1579,9 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch if ((port)&&(*port==0)){ *port=(srv_proto_list[i].proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we don't find another */ } + if ((proto)&&(*proto==0)){ + *proto = PROTO_UDP; + } srv_name.s=tmp_srv; srv_name.len=len; #ifdef USE_DNS_CACHE @@ -1632,9 +1622,9 @@ struct hostent* naptr_sip_resolvehost(str* name, unsigned short* port, char n_proto; str srv_name; naptr_bmp_t tried_bmp; /* tried bitmap */ + char origproto; - - + origproto = *proto; naptr_head=0; he=0; if (name->len >= MAX_DNS_NAME) { @@ -1673,7 +1663,12 @@ struct hostent* naptr_sip_resolvehost(str* name, unsigned short* port, #endif } /* fallback to srv lookup */ + *proto = origproto; he=no_naptr_srv_sip_resolvehost(name,port,proto); + /* fallback all the way down to A/AAAA */ + if (he==0) { + he=dns_get_he(name,dns_flags); + } end: if (naptr_head) free_rdata_list(naptr_head); [View Less]

1 0

git:4.0: presence_xml: updated docs about integrated_xcap_server
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: 4.0 Commit: 82a23f22c1bba400304a7f44523e8db8b09ae295 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82a23f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 26 13:23:46 2013 +0200 presence_xml: updated docs about integrated_xcap_server (cherry picked from commit 8e35cef8716bbd0caa406a5080e93acb3c881c41) --- modules/presence_xml/README … [View More] | 30 +++++++++++----------- modules/presence_xml/doc/presence_xml_admin.xml | 3 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/presence_xml/README b/modules/presence_xml/README index e42dbed..55e4b80 100644 --- a/modules/presence_xml/README +++ b/modules/presence_xml/README @@ -8,7 +8,7 @@ Edited by Anca-Maria Vamanu - Copyright © 2007 Voice Sistem SRL + Copyright � 2007 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -144,7 +144,7 @@ Chapter 1. Admin Guide The database URL. - Default value is “mysql://openser:openserrw@localhost/openser”. + Default value is "mysql://kamailio:kamailiorw@localhost/kamailio". Example 1.1. Set db_url parameter ... @@ -155,7 +155,7 @@ modparam("presence_xml", "db_url", "dbdriver://username:password@dbhost/dbname") The name of the database table where XCAP documents are stored. - Default value is “xcap”. + Default value is "xcap". Example 1.2. Set xcap_table parameter ... @@ -166,7 +166,7 @@ modparam("presence_xml", "xcap_table", "xcaps") Set this parameter to disable the handling of the "presence" event. - Default value: “0”. + Default value: "0". Example 1.3. Set disable_presence parameter ... @@ -178,7 +178,7 @@ modparam("presence_xml", "disable_presence", 1) Set this parameter to disable the handling of the "presence.winfo" event. - Default value: “0”. + Default value: "0". Example 1.4. Set disable_winfo parameter ... @@ -189,7 +189,7 @@ modparam("presence_xml", "disable_winfo", 1) Set this parameter to disable the handling of the "dialog;sla" event. - Default value: “1” (0 - enabled, 1 - disabled). + Default value: "1" (0 - enabled, 1 - disabled). Example 1.5. Set disable_bla parameter ... @@ -209,7 +209,7 @@ modparam("presence_xml", "disable_bla", 1) Note: When switching from one value to another, the watchers table must be emptied. - Default value is “0”. + Default value is "0". Example 1.6. Set force_active parameter ... @@ -229,9 +229,9 @@ modparam("presence_xml", "force_active", 1) database and, if needed, send NOTIFY updates. Otherwise, it uses xcap_client module to fetch documents from the XCAP - servers with HTTP requests. This mode is currently not supported. + servers with HTTP requests. - Default value is “0”. + Default value is "0". Example 1.7. Set integrated_xcap_server parameter ... @@ -257,7 +257,7 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") no connection to database. Useful when needing only to use $xml(...) pseudoc-variable. - Default value: “0” (0 - active mode, 1 - passive mode). + Default value: "0" (0 - active mode, 1 - passive mode). Example 1.9. Set passive_mode parameter ... @@ -274,7 +274,7 @@ modparam("presence_xml", "passive_mode", 1) ones defined by the RFC 3265, this parameter offers the possibility for the admin to decide which one he wishes to use. - Default value: “probation” . Since probation also accepts a retry-after + Default value: "probation" . Since probation also accepts a retry-after parameter to specify after at least how may seconds the client should reattempt to resubscribe, you can include this in the parameter also. @@ -289,7 +289,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) -4.1. pres_check_basic(presentity_uri, status) +4.1. pres_check_basic(presentity_uri, status) Checks the /presence/tuple/status/basic nodes in the presentity for presentity_uri against the value in status. @@ -312,7 +312,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") } ... -4.2. pres_check_activities(presentity_uri, activity) +4.2. pres_check_activities(presentity_uri, activity) Checks whether a /presence/person/activities/activity node exists in the presentity for presentity_uri. @@ -339,7 +339,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") 5. Installation - The module requires one table in Kamailio database: “xcap”. The SQL + The module requires one table in Kamailio database: "xcap". The SQL syntax to create it can be found in presence-create.sql script in the database directories in the kamailio/scripts folder. You can also find the complete database documentation on the project webpage, @@ -350,7 +350,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") * $xml(name=>spec) Exported pseudo-variables are documented at - http://www.kamailio.org/dokuwiki/. + http://www.kamailio.org/wiki/. Chapter 2. Developer Guide diff --git a/modules/presence_xml/doc/presence_xml_admin.xml b/modules/presence_xml/doc/presence_xml_admin.xml index 57b4f26..840628e 100644 --- a/modules/presence_xml/doc/presence_xml_admin.xml +++ b/modules/presence_xml/doc/presence_xml_admin.xml @@ -235,8 +235,7 @@ modparam("presence_xml", "force_active", 1) </para> <para> Otherwise, it uses xcap_client module to fetch documents - from the XCAP servers with HTTP requests. This mode is - currently not supported.</para> + from the XCAP servers with HTTP requests.</para> <para> <emphasis>Default value is <quote>0</quote>. </emphasis> [View Less]

1 0

Planing to release v4..0.4
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Hello, I am planing to release Kamailio v4.0.4 this week on Wednesday, Sep 2. If anyone has patching to push in branch 4.0, do it before noon GMT in that day. Also, if any developer is preferring another release day, just present the option on the mailing lists. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Nov 25-28; Miami, Nov 18-20, 2013 - more details … [View More]

1 1

git:tteras/mohqueue: mohqueue: new module
by Timo Teras 02 Oct '13

02 Oct '13

Module: sip-router Branch: tteras/mohqueue Commit: 93af236644058b4e97162eae689f9b32b8076691 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93af236… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Wed Oct 2 09:05:22 2013 +0300 mohqueue: new module module to queue up calls in music-on-hold and then retrieve them imported from https://github.com/rdboisvert/mohqueue commit … [View More]

1 0

git:master: modules/websocket: tidied up MI commands
by Peter Dunkley 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 6c7a0f3cdaee5ea0300d014f07e4d68f45c6e20b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c7a0f3… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Oct 2 01:29:45 2013 +0100 modules/websocket: tidied up MI commands - Fixed leak in error situations - Improved error responses --- modules/websocket/ws_conn.c | 21 +++++++++++++++++… [View More]---- modules/websocket/ws_frame.c | 19 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 27a9968..263b49f 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -440,10 +440,7 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) int h, connections = 0, truncated = 0, order = 0, found = 0; ws_connection_t *wsc; struct mi_node *node = NULL; - struct mi_root *rpl_tree = init_mi_tree(200, MI_OK_S, MI_OK_LEN); - - if (!rpl_tree) - return 0; + struct mi_root *rpl_tree; node = cmd->node.kids; if (node != NULL) @@ -476,6 +473,10 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) } } + rpl_tree = init_mi_tree(200, MI_OK_S, MI_OK_LEN); + if (rpl_tree == NULL) + return 0; + WSCONN_LOCK; if (order == 0) { @@ -485,7 +486,10 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) while(wsc) { if ((found = add_node(rpl_tree, wsc)) < 0) + { + free_mi_tree(rpl_tree); return 0; + } connections += found; @@ -508,7 +512,10 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) while (wsc) { if ((found = add_node(rpl_tree, wsc)) < 0) + { + free_mi_tree(rpl_tree); return 0; + } connections += found; if (connections >= MAX_WS_CONNS_DUMP) @@ -526,7 +533,10 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) while (wsc) { if ((found = add_node(rpl_tree, wsc)) < 0) + { + free_mi_tree(rpl_tree); return 0; + } connections += found; if (connections >= MAX_WS_CONNS_DUMP) @@ -544,7 +554,10 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) "%d WebSocket connection%s found%s", connections, connections == 1 ? "" : "s", truncated == 1 ? "(truncated)" : "") == 0) + { + free_mi_tree(rpl_tree); return 0; + } return rpl_tree; } diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 086cf79..503722e 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -125,6 +125,7 @@ static str str_status_too_many_params = str_init("Too many parameters"); static str str_status_bad_param = str_init("Bad connection ID parameter"); static str str_status_error_closing = str_init("Error closing connection"); static str str_status_error_sending = str_init("Error sending frame"); +static str str_status_string_error = str_init("Error converting string to int"); static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { @@ -726,7 +727,11 @@ struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) node = cmd->node.kids; if (node == NULL) - return 0; + { + LM_WARN("no connection ID parameter\n"); + return init_mi_tree(400, str_status_empty_param.s, + str_status_empty_param.len); + } if (node->value.s == NULL || node->value.len == 0) { LM_WARN("empty connection ID parameter\n"); @@ -736,7 +741,8 @@ struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) if (str2int(&node->value, &id) < 0) { LM_ERR("converting string to int\n"); - return 0; + return init_mi_tree(400, str_status_string_error.s, + str_status_string_error.len); } if (node->next != NULL) { @@ -772,7 +778,11 @@ static struct mi_root *mi_ping_pong(struct mi_root *cmd, void *param, node = cmd->node.kids; if (node == NULL) - return 0; + { + LM_WARN("no connection ID parameter\n"); + return init_mi_tree(400, str_status_empty_param.s, + str_status_empty_param.len); + } if (node->value.s == NULL || node->value.len == 0) { LM_WARN("empty connection ID parameter\n"); @@ -782,7 +792,8 @@ static struct mi_root *mi_ping_pong(struct mi_root *cmd, void *param, if (str2int(&node->value, &id) < 0) { LM_ERR("converting string to int\n"); - return 0; + return init_mi_tree(400, str_status_string_error.s, + str_status_string_error.len); } if (node->next != NULL) { [View Less]

1 0

git:master: registrar: fix compile warning after previous patch
by Daniel-Constantin Mierla 01 Oct '13

01 Oct '13

Module: sip-router Branch: master Commit: 2934e46a18d9cfba05e657bc1dbbaa559a31b103 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2934e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 1 23:03:32 2013 +0200 registrar: fix compile warning after previous patch --- modules/registrar/save.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/… [View More]

1 0

New commits on branch 4.0
by Andrew Mortensen 01 Oct '13

01 Oct '13

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b49899f… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Sep 19 13:49:24 2013 -0400 modules/sca: fix return value of sca_call_info_uri_update() - return value of 0 can bubble up as return value of sca_call_info_update(), causing early script termination (exported function returning 0 in script is equivalent to "exit") - report and patch from Timo Teräs (cherry … [View More]

1 0

[tracker] Comment added: Invalide tel INVITE crashes 4.0.3
by sip-router 01 Oct '13

01 Oct '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#348 - Invalide tel INVITE crashes 4.0.3 User who did this - Daniel-Constantin Mierla (miconda) ---------- What files have you attached? There is none associated with your last comment. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=348#comment1103 You are receiving this message because you have requested it from the … [View More]

1 0

[tracker] Comment added: uac_redirect not honoring q-value for max_total = 1
by sip-router 01 Oct '13

01 Oct '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#349 - uac_redirect not honoring q-value for max_total = 1 User who did this - Daniel-Constantin Mierla (miconda) ---------- I will look into the code when I get a chance, meanwhile, maybe it works with: <code>get_redirects("*");</code> then use <code>t_load_contacts() and t_next_contacts()</code> from tm module to get serialization of branches based on q and do forwarding … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013