sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: module_k/db_text: making some error probes visible

by Ovidiu Sas

Module: sip-router Branch: master Commit: 745e44e7555d0df789ecfae3b460650a43ecbf8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=745e44e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 17 12:04:49 2012 -0500 module_k/db_text: making some error probes visible --- modules_k/db_text/dbt_tb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/db_text/dbt_tb.c b/modules_k/db_text/dbt_tb.c index 2977316..637519b 100644 --- a/modules_k/db_text/dbt_tb.c +++ b/modules_k/db_text/dbt_tb.c @@ -452,7 +452,7 @@ int dbt_table_check_row(dbt_table_p _dtp, dbt_row_p _drp) if(!_drp->fields[i].nul && dbt_is_neq_type(_dtp->colv[i]->type, _drp->fields[i].type)) { - LM_DBG("incompatible types - field %d [%d/%d]\n",i, + LM_ERR("incompatible types - field %d [%d/%d]\n",i, _dtp->colv[i]->type, _drp->fields[i].type); return -1; } @@ -471,7 +471,7 @@ int dbt_table_check_row(dbt_table_p _dtp, dbt_row_p _drp) continue; } - LM_DBG("null value not allowed - field %d\n",i); + LM_ERR("null value not allowed - field %d\n",i); return -1; }

12 years

git:master: modules_k/db_text: documentation updates for db_text. dump rpc command

by Ovidiu Sas

Module: sip-router Branch: master Commit: b7f51d5d2b24063037ae18e82fb046b066cc52a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7f51d5… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 17 12:03:11 2012 -0500 modules_k/db_text: documentation updates for db_text.dump rpc command --- modules_k/db_text/README | 71 ++++++++++++++++++++---------- modules_k/db_text/doc/db_text.xml | 5 ++ modules_k/db_text/doc/db_text_admin.xml | 17 ++++++-- 3 files changed, 65 insertions(+), 28 deletions(-) diff --git a/modules_k/db_text/README b/modules_k/db_text/README index c4698cb..6e2b176 100644 --- a/modules_k/db_text/README +++ b/modules_k/db_text/README @@ -6,11 +6,17 @@ Daniel-Constantin Mierla Edited by +Ovidiu Sas + + <osas(a)voipembedded.com> + +Edited by + Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2003, 2004 FhG FOKUS + Copyright © 2003, 2004 FhG FOKUS __________________________________________________________________ Table of Contents @@ -32,7 +38,10 @@ Daniel-Constantin Mierla 3.1. db_mode (integer) - 4. Functions + 4. Exported RPC Functions + + 4.1. db_text.dump + 5. Installation and Running 5.1. Using dbtext with basic Kamailio configuration @@ -70,7 +79,10 @@ Chapter 1. Admin Guide 3.1. db_mode (integer) - 4. Functions + 4. Exported RPC Functions + + 4.1. db_text.dump + 5. Installation and Running 5.1. Using dbtext with basic Kamailio configuration @@ -107,10 +119,10 @@ Chapter 1. Admin Guide * a database is represented by a directory in the local file system. NOTE: when you use dbtext in Kamailio, the database URL for modules must be the path to the directory where the table-files are - located, prefixed by "text://", e.g., "text:///var/dbtext/ser". If - there is no "/" after "text://" then "CFG_DIR/" is inserted at the + located, prefixed by “text://”, e.g., “text:///var/dbtext/ser”. If + there is no “/” after “text://” then “CFG_DIR/” is inserted at the beginning of the database path. So, either you provide an absolute - path to database directory or a relative one to "CFG_DIR" + path to database directory or a relative one to “CFG_DIR” directory. * a table is represented by a text file inside database directory. @@ -121,7 +133,7 @@ Chapter 1. Admin Guide * the name of column must not include white spaces. * the format of a column definition is: name(type,attr). * between two column definitions must be a white space, e.g., - "first_name(str) last_name(str)". + “first_name(str) last_name(str)”. * the type of a column can be: + int - integer numbers. + double - real numbers with two decimals. @@ -133,11 +145,11 @@ Chapter 1. Admin Guide + null - accept null values in column fields. + if no attribute is set, the fields of the column cannot have null value. - * each other line is a row with data. The line ends with "\n". - * the fields are separated by ":". + * each other line is a row with data. The line ends with “\n”. + * the fields are separated by “:”. * no value between two ':' (or between ':' and start/end of a row) - means "null" value. - * next characters must be escaped in strings: "\n", "\r", "\t", ":". + means “null” value. + * next characters must be escaped in strings: “\n”, “\r”, “\t”, “:”. * 0 -- the zero value must be escaped too. Example 1.1. Sample of a dbtext table @@ -195,16 +207,27 @@ suser:supasswd:xxx:alpha.org:xxx table is requested whether the corresponding file on disk has changed, and if yes, will re-load table from file. - Default value is "0". + Default value is “0”. Example 1.4. Set db_mode parameter ... modparam("db_text", "db_mode", 1) ... -4. Functions +4. Exported RPC Functions - None. + 4.1. db_text.dump + +4.1. db_text.dump + + Write back to hard drive modified tables. + + Name: db_text.dump + + Parameters: none + + RPC Command Format: + kamcmd db_text.dump 5. Installation and Running @@ -214,10 +237,10 @@ modparam("db_text", "db_mode", 1) REMINDER: when you use text in Kamailio, the database URL for modules must be the path to the directory where the table-files are located, - prefixed by "text://", e.g., "text:///var/dbtext/ser". If there is no - "/" after "text://" then "CFG_DIR/" is inserted at the beginning of the + prefixed by “text://”, e.g., “text:///var/dbtext/ser”. If there is no + “/” after “text://” then “CFG_DIR/” is inserted at the beginning of the database path. So, either you provide an absolute path to database - directory or a relative one to "CFG_DIR" directory. + directory or a relative one to “CFG_DIR” directory. Example 1.5. Load the dbtext module ... @@ -239,17 +262,17 @@ modparam("module_name", "db_url", "text:///path/to/dbtext/database") Example 1.6. Definition of 'subscriber' table (one line) ... -username(str) domain(str) password(str) first_name(str) last_name(str) phone(str -) email_address(str) datetime_created(int) datetime_modified(int) confirmation(s -tr) flag(str) sendnotification(str) greeting(str) ha1(str) ha1b(str) perms(str) -allow_find(str) timezone(str,null) rpid(str,null) +username(str) domain(str) password(str) first_name(str) last_name(str) phone(st +r) email_address(str) datetime_created(int) datetime_modified(int) confirmation +(str) flag(str) sendnotification(str) greeting(str) ha1(str) ha1b(str) perms(st +r) allow_find(str) timezone(str,null) rpid(str,null) ... Example 1.7. Definition of 'location' and 'aliases' tables (one line) ... -username(str) domain(str,null) contact(str,null) received(str) expires(int,null) - q(double,null) callid(str,null) cseq(int,null) last_modified(str) flags(int) us -er_agent(str) socket(str) +username(str) domain(str,null) contact(str,null) received(str) expires(int,null +) q(double,null) callid(str,null) cseq(int,null) last_modified(str) flags(int) +user_agent(str) socket(str) ... Example 1.8. Definition of 'version' table and sample records diff --git a/modules_k/db_text/doc/db_text.xml b/modules_k/db_text/doc/db_text.xml index a1b856a..7836c92 100644 --- a/modules_k/db_text/doc/db_text.xml +++ b/modules_k/db_text/doc/db_text.xml @@ -19,6 +19,11 @@ <email>miconda(a)gmail.com</email> </author> <editor> + <firstname>Ovidiu</firstname> + <surname>Sas</surname> + <email>osas(a)voipembedded.com</email> + </editor> + <editor> <firstname>Daniel-Constantin</firstname> <surname>Mierla</surname> <email>miconda(a)gmail.com</email> diff --git a/modules_k/db_text/doc/db_text_admin.xml b/modules_k/db_text/doc/db_text_admin.xml index 4403e20..fa63826 100644 --- a/modules_k/db_text/doc/db_text_admin.xml +++ b/modules_k/db_text/doc/db_text_admin.xml @@ -266,10 +266,19 @@ modparam("db_text", "db_mode", 1) </section> </section> <section> - <title>Functions</title> - <para> - <emphasis>None</emphasis>. - </para> + <title>Exported RPC Functions</title> + <section> + <title> + <function moreinfo="none">db_text.dump</function> + </title> + <para>Write back to hard drive modified tables.</para> + <para>Name: <emphasis>db_text.dump</emphasis></para> + <para>Parameters: <emphasis>none</emphasis></para> + <para>RPC Command Format:</para> + <programlisting format="linespecific"> + kamcmd db_text.dump + </programlisting> + </section> </section> <section> <title>Installation and Running</title>

12 years

git:master: modules_k/db_text: new rpc command 'db_text.dump'

by Ovidiu Sas

Module: sip-router Branch: master Commit: 82a03cb5af01c1275bc9a1664643cf3645c4b87a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82a03cb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 17 12:01:49 2012 -0500 modules_k/db_text: new rpc command 'db_text.dump' - allows forcing a write back to disk for modified tables --- modules_k/db_text/dbtext.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/modules_k/db_text/dbtext.c b/modules_k/db_text/dbtext.c index 633dbb3..187b28f 100644 --- a/modules_k/db_text/dbtext.c +++ b/modules_k/db_text/dbtext.c @@ -34,6 +34,7 @@ #include "../../sr_module.h" #include "../../lib/srdb1/db.h" +#include "../../rpc_lookup.h" #include "dbtext.h" #include "dbt_lib.h" #include "dbt_api.h" @@ -67,6 +68,7 @@ static param_export_t params[] = { {0, 0, 0} }; +static rpc_export_t rpc_methods[]; struct module_exports exports = { "db_text", @@ -85,6 +87,11 @@ struct module_exports exports = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { + if (rpc_register_array(rpc_methods)!=0) { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + if(db_api_init()<0) return -1; return 0; @@ -127,3 +134,23 @@ int dbt_bind_api(db_func_t *dbb) return 0; } +/* rpc function documentation */ +static const char *rpc_dump_doc[2] = { + "Write back to disk modified tables", 0 +}; + +/* rpc function implementations */ +static void rpc_dump(rpc_t *rpc, void *c) { + if (0!=dbt_cache_print(0)) + rpc->printf(c, "Dump failed"); + else + rpc->printf(c, "Dump OK"); + + return; +} + +static rpc_export_t rpc_methods[] = { + {"db_text.dump", rpc_dump, rpc_dump_doc, 0}, + {0, 0, 0, 0} +}; +

12 years

git:3.3: parser/digest: use next_sibling_hdr() instead of hand-rolling it

by Richard Fuchs

Module: sip-router Branch: 3.3 Commit: 8b703e0e8b5c01ac315819b12bdbe35a657bb5f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b703e0… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Dec 17 11:56:24 2012 -0500 parser/digest: use next_sibling_hdr() instead of hand-rolling it --- parser/digest/digest.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/parser/digest/digest.c b/parser/digest/digest.c index 2aef8e1..18e31df 100644 --- a/parser/digest/digest.c +++ b/parser/digest/digest.c @@ -303,12 +303,7 @@ int find_credentials(struct sip_msg* msg, str* realm, LOG(L_ERR, "auth:find_credentials: Error while parsing headers\n"); return -4; } else { - ptr = ptr->next; - while (ptr) { - if (ptr->type == hftype) - break; - ptr = ptr->next; - } + ptr = next_sibling_hdr(ptr); if (!ptr) break; }

12 years

git:master: parser/digest: use next_sibling_hdr() instead of hand-rolling it

by Richard Fuchs

Module: sip-router Branch: master Commit: 5ece7e315ee8d3c3529eed94179fcb4e08d41c66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ece7e3… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Dec 17 11:56:24 2012 -0500 parser/digest: use next_sibling_hdr() instead of hand-rolling it --- parser/digest/digest.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/parser/digest/digest.c b/parser/digest/digest.c index 512ce31..9b87efd 100644 --- a/parser/digest/digest.c +++ b/parser/digest/digest.c @@ -301,12 +301,7 @@ int find_credentials(struct sip_msg* msg, str* realm, LOG(L_ERR, "auth:find_credentials: Error while parsing headers\n"); return -4; } else { - ptr = ptr->next; - while (ptr) { - if (ptr->type == hftype) - break; - ptr = ptr->next; - } + ptr = next_sibling_hdr(ptr); if (!ptr) break; }

12 years

git:master: parser/digest: Fix hunting for Auth header in rare cases

by Richard Fuchs

Module: sip-router Branch: master Commit: 624a9bbf777a1c1d44400eec78911a9714872977 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=624a9bb… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Sun Dec 16 15:06:32 2012 -0500 parser/digest: Fix hunting for Auth header in rare cases Fix a bug where find_credentials() would fail to find the correct Auth header when multiple headers are present, the one being looked for isn't the first and the full message had been parsed already. --- parser/digest/digest.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/parser/digest/digest.c b/parser/digest/digest.c index 064f42e..512ce31 100644 --- a/parser/digest/digest.c +++ b/parser/digest/digest.c @@ -239,7 +239,7 @@ int get_authorized_cred(struct hdr_field* _f, struct hdr_field** _h) int find_credentials(struct sip_msg* msg, str* realm, hdr_types_t hftype, struct hdr_field** hdr) { - struct hdr_field** hook, *ptr, *prev; + struct hdr_field** hook, *ptr; hdr_flags_t hdr_flags; int res; str* r; @@ -297,15 +297,18 @@ int find_credentials(struct sip_msg* msg, str* realm, } } - prev = ptr; if (parse_headers(msg, hdr_flags, 1) == -1) { LOG(L_ERR, "auth:find_credentials: Error while parsing headers\n"); return -4; } else { - if (prev != msg->last_header) { - if (msg->last_header->type == hftype) ptr = msg->last_header; - else break; - } else break; + ptr = ptr->next; + while (ptr) { + if (ptr->type == hftype) + break; + ptr = ptr->next; + } + if (!ptr) + break; } }

12 years

[tracker] Comment added: kamailio can't accept new connections(tls)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#257 - kamailio can't accept new connections(tls) User who did this - Shaobin.Feng (saxon_leo) ---------- yeah,you are right. Well I have added physical memory to try to fix this problem, but it still remains. It really confuse me that CPU & Memory are quite enough,but where the bottleneck is? In my opinion,lots of connections acception and release cause many memory fragments. I add a option "mem_join=1" to config,but it not work. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=257#comment756 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.

12 years

git:3.3: parser/digest: Fix hunting for Auth header in rare cases

by Richard Fuchs

Module: sip-router Branch: 3.3 Commit: 74460a7e75fe6c8be1dee475b93e1765f5c72a3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74460a7… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Sun Dec 16 15:06:32 2012 -0500 parser/digest: Fix hunting for Auth header in rare cases Fix a bug where find_credentials() would fail to find the correct Auth header when multiple headers are present, the one being looked for isn't the first and the full message had been parsed already. --- parser/digest/digest.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/parser/digest/digest.c b/parser/digest/digest.c index 66400b5..2aef8e1 100644 --- a/parser/digest/digest.c +++ b/parser/digest/digest.c @@ -241,7 +241,7 @@ int get_authorized_cred(struct hdr_field* _f, struct hdr_field** _h) int find_credentials(struct sip_msg* msg, str* realm, hdr_types_t hftype, struct hdr_field** hdr) { - struct hdr_field** hook, *ptr, *prev; + struct hdr_field** hook, *ptr; hdr_flags_t hdr_flags; int res; str* r; @@ -299,15 +299,18 @@ int find_credentials(struct sip_msg* msg, str* realm, } } - prev = ptr; if (parse_headers(msg, hdr_flags, 1) == -1) { LOG(L_ERR, "auth:find_credentials: Error while parsing headers\n"); return -4; } else { - if (prev != msg->last_header) { - if (msg->last_header->type == hftype) ptr = msg->last_header; - else break; - } else break; + ptr = ptr->next; + while (ptr) { + if (ptr->type == hftype) + break; + ptr = ptr->next; + } + if (!ptr) + break; } }

12 years

Bug in mediaproxy module

by Emil Kroymann

Hi, the mediaproxy-module in 3.3 branch establishes a single shared connection to the mediaproxy dispatcher socket before sip-router is forking sub-processes. This leads to race-conditions when multiple calls to use_mediaproxy() are made in parallel. The fix is simple, it seems it was just forgotten to restrict the opening of the dispatcher connection to subprocess initialization. Patch attached. Regards, Emil Kroymann -- Emil Kroymann VoIP Services Engineer Email: emil.kroymann(a)isaco.de Tel: +49-30-203899885 Mobile: +49-176-38389303 ISACO GmbH Kurfürstenstraße 79 10787 Berlin Germany Amtsgericht Charlottenburg, HRB 112464B Geschäftsführer: Daniel Frommherz

12 years

git:misi/dns_srv: core/dns: fix an issue when using it without dns cache

by Mihaly Meszaros

Module: sip-router Branch: misi/dns_srv Commit: 7ce7d6413b45e7e9df190167e7faba8c10f96492 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ce7d64… Author: Mihály Mészáros <misi(a)niif.hu> Committer: Mihály Mészáros <misi(a)niif.hu> Date: Sun Dec 16 13:03:18 2012 +0100 core/dns: fix an issue when using it without dns cache - fixing an issue what caused that without dns cache we have to use a different function for srv resolution. --- resolve.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/resolve.c b/resolve.c index eddb073..cac0d86 100644 --- a/resolve.c +++ b/resolve.c @@ -1576,7 +1576,12 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch } srv_name.s=tmp_srv; srv_name.len=len; - if ((he=dns_srv_get_he(&srv_name, port, dns_flags))!=0) { + #ifdef USE_DNS_CACHE + he=dns_srv_get_he(&srv_name, port, dns_flags); + #else + he=srv_sip_resolvehost(&srv_name, 0, port, proto, 1, 0); + #endif + if (he!=0) { return he; } }

12 years

← Newer
1
...
23
24
25
26
27
28
29
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012