sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

[tracker] Comment added: Change syntax of fr_{inv}_timer_avp parameters of tm module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#2 - Change syntax of fr_{inv}_timer_avp parameters of tm module User who did this - Daniel-Constantin Mierla (miconda) ---------- In #!KAMAILIO xompat mode is accepting $avp(...), so for next version either can be made default for all cases or this task can be closed as implemented. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=2#comment46 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.

14 years, 1 month

[tracker] Task closed: kamailio: presence_mwi should be in the list of excluded module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#45 - kamailio: presence_mwi should be in the list of excluded module User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch applied. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=45 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.

14 years, 1 month

git:kamailio_3.0: makefile: presence_mwi added to excluded list

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: cb3eb04efd0183b96b377a2a08b8db948d11255d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb3eb04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 24 22:44:49 2010 +0100 makefile: presence_mwi added to excluded list - patch by Ovidiu Sas, tracker FS#45 - makes no sense to build it out of presence group - kpresence group includes it and makes easier packaging (cherry picked from commit d91a9b021c494678cd20bc3fd444f9d4d565ec65) --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 51e2f30..210d277 100644 --- a/Makefile +++ b/Makefile @@ -278,7 +278,7 @@ else perl perlvdb purple seas \ snmpstats xmpp \ carrierroute misc_radius peering \ - dialplan lcr utils presence \ + dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ regex xcap_client

14 years, 1 month

git:master: makefile: presence_mwi added to excluded list

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d91a9b021c494678cd20bc3fd444f9d4d565ec65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d91a9b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 24 22:44:49 2010 +0100 makefile: presence_mwi added to excluded list - patch by Ovidiu Sas, tracker FS#45 - makes no sense to build it out of presence group - kpresence group includes it and makes easier packaging --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index b1980f6..650e13f 100644 --- a/Makefile +++ b/Makefile @@ -278,7 +278,7 @@ else perl perlvdb purple seas \ snmpstats xmpp \ carrierroute misc_radius peering \ - dialplan lcr utils presence \ + dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ regex xcap_client

14 years, 1 month

[tracker] Comment added: kamailio: presence_mwi should be in the list of excluded module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#45 - kamailio: presence_mwi should be in the list of excluded module User who did this - Daniel-Constantin Mierla (miconda) ---------- Make sense, just commit. Thanks! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=45#comment45 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.

14 years, 1 month

git:master: * modules/enum: enum_query() params may now contain pseudo variables.

by Juha Heinanen

Module: sip-router Branch: master Commit: e8a3c6dd30b2123a385380b44e9975697f628f01 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8a3c6d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Mar 24 23:03:48 2010 +0200 * modules/enum: enum_query() params may now contain pseudo variables. --- modules/enum/README | 32 ++++++++++++++++-------------- modules/enum/doc/enum_admin.xml | 10 +++++--- modules/enum/enum.c | 40 +++++++++++++++++++++++++++++++------- modules/enum/enum.h | 1 + modules/enum/enum_mod.c | 8 +++--- 5 files changed, 60 insertions(+), 31 deletions(-) diff --git a/modules/enum/README b/modules/enum/README index c7ce8ea..24f727c 100644 --- a/modules/enum/README +++ b/modules/enum/README @@ -8,7 +8,7 @@ Otmar Lendl <lendl(a)nic.at> - Copyright � 2002, 2003 Juha Heinanen + Copyright © 2002, 2003 Juha Heinanen Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -76,9 +76,9 @@ Chapter 1. Admin Guide phone number of the form +decimal-digits, where the number of digits is at least 2 and at most 15. Out of this number enum_query forms a domain name, where the digits are in reverse order and separated by dots - followed by domain suffix that by default is "e164.arpa.". For example, + followed by domain suffix that by default is “e164.arpa.”. For example, if the user part is +35831234567, the domain name will be - "7.6.5.4.3.2.1.3.8.5.3.e164.arpa.". i_enum_query operates in a similar + “7.6.5.4.3.2.1.3.8.5.3.e164.arpa.”. i_enum_query operates in a similar fashion. The only difference is that it adds a label (default "i") to branch off from the default, user-ENUM tree to an infrastructure ENUM tree. @@ -146,7 +146,7 @@ Chapter 1. Admin Guide digits of an E164 number. Can be overridden by a parameter to enum_query. - Default value is "e164.arpa." + Default value is “e164.arpa.” Example 1.1. Setting domain_suffix module parameter modparam("enum", "domain_suffix", "e1234.arpa.") @@ -161,7 +161,7 @@ Note Currently Kamailio does not support tel URIs. This means that at present tel_uri_params is appended as URI parameters to every URI. - Default value is "" + Default value is “” Example 1.2. Setting tel_uri_params module parameter modparam("enum", "tel_uri_params", ";npdi") @@ -171,7 +171,7 @@ modparam("enum", "tel_uri_params", ";npdi") The domain suffix to be used for i_enum_query() lookups. Can be overridden by a parameter to i_enum_query. - Default value is "e164.arpa." + Default value is “e164.arpa.” Example 1.3. Setting i_enum_suffix module parameter modparam("enum", "i_enum_suffix", "e1234.arpa.") @@ -181,7 +181,7 @@ modparam("enum", "i_enum_suffix", "e1234.arpa.") This parameter determines which label i_enum_query() will use to branch off to the infrastructure ENUM tree. - Default value is ""i"" + Default value is “"i"” Example 1.4. Setting brachlabel module parameter modparam("enum", "branchlabel", "i") @@ -220,7 +220,7 @@ i.1.e164.arpa. TYPE65300 \# 14 ( ; ) 9.9.9.8.7.6.5.i.4.3.2.1.e164.arpa. IN NAPTR "NAPTR content for +1 234 5678 999" - Default value is "cc" + Default value is “cc” Example 1.7. Setting the bl_algorithm module parameter modparam("enum", "bl_algorithm", "txt") @@ -232,15 +232,17 @@ modparam("enum", "bl_algorithm", "txt") 4.3. i_enum_query(["suffix"[,"service"]]) 4.4. is_from_user_enum() -4.1. enum_query(["suffix"[,"service"]]) +4.1. enum_query(["suffix"[,"service"]]) The function performs an enum query and rewrites the Request-URI with - the result of the query. See Section 1, "Overview" for more + the result of the query. See Section 1, “Overview” for more information. Meaning of the parameters is as follows: - * suffix - Suffix to be appended to the domain name. - * service - Service string to be used in the service field. + * suffix - Suffix string to be appended to the domain name. String + may contain pseudo variables. + * service - Service string to be used in the service field. String + may contain pseudo variables. This function can be used from REQUEST_ROUTE. @@ -266,11 +268,11 @@ enum_query("e164.arpa.","voice"); enum_query("e164.arpa.","+sip+voice:sip"); ... -4.2. enum_pv_query("pvar"[,"suffix"[,"service"]]) +4.2. enum_pv_query("pvar"[,"suffix"[,"service"]]) The function performs an enum query on E.164 number stored in its pseudo variable argument and rewrites the Request-URI with the result - of the query. See Section 1, "Overview" for more information. + of the query. See Section 1, “Overview” for more information. Meaning of the parameters is as follows: * pvar - Pseudo variable that holds an E.164 number on which enum @@ -302,7 +304,7 @@ enum_pv_query("$avp(i:100)","e164.arpa.","voice"); enum_pv_query("$avp(i:100)","e164.arpa.","+sip+voice:sip"); ... -4.3. i_enum_query(["suffix"[,"service"]]) +4.3. i_enum_query(["suffix"[,"service"]]) The function performs an enum query and rewrites the Request-URI with the result of the query. This the Infrastructure-ENUM version of diff --git a/modules/enum/doc/enum_admin.xml b/modules/enum/doc/enum_admin.xml index ede74c4..8560049 100644 --- a/modules/enum/doc/enum_admin.xml +++ b/modules/enum/doc/enum_admin.xml @@ -247,13 +247,15 @@ modparam("enum", "bl_algorithm", "txt") <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> - <para><emphasis>suffix</emphasis> - Suffix to be appended to the - domain name. + <para><emphasis>suffix</emphasis> - Suffix + string to be appended to the domain name. String may contain + pseudo variables. </para> </listitem> <listitem> - <para><emphasis>service</emphasis> - Service string to be used in - the service field. + <para><emphasis>service</emphasis> - Service + string to be used in the service field. String may contain + pseudo variables. </para> </listitem> </itemizedlist> diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 80793f7..ba4fc48 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -51,6 +51,7 @@ #include <stdlib.h> #include "enum.h" +#include "../../sr_module.h" #include "../../parser/parse_uri.h" #include "../../parser/parse_from.h" #include "../../ut.h" @@ -704,7 +705,7 @@ done: */ int enum_query_0(struct sip_msg* _msg, char* _str1, char* _str2) { - return enum_query_2(_msg, (char *)(&suffix), (char *)(&service)); + return enum_query(_msg, &suffix, &service); } @@ -713,25 +714,48 @@ int enum_query_0(struct sip_msg* _msg, char* _str1, char* _str2) */ int enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2) { - return enum_query_2(_msg, _suffix, (char *)(&service)); + str suffix; + + if (get_str_fparam(&suffix, _msg, (fparam_t*)_suffix) != 0) { + LM_ERR("unable to get suffix\n"); + return -1; + } + + return enum_query(_msg, &suffix, &service); } /* - * See documentation in README file. + * Call enum_query_2 with given suffix and service. */ int enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service) { + str suffix, service; + + if (get_str_fparam(&suffix, _msg, (fparam_t*)_suffix) != 0) { + LM_ERR("unable to get suffix\n"); + return -1; + } + + if (get_str_fparam(&service, _msg, (fparam_t*)_service) != 0) { + LM_ERR("unable to get service\n"); + return -1; + } + + return enum_query(_msg, &suffix, &service); +} + + +/* + * See documentation in README file. + */ +int enum_query(struct sip_msg* _msg, str* suffix, str* service) +{ char *user_s; int user_len, i, j; char name[MAX_DOMAIN_SIZE]; char string[17]; - str *suffix, *service; - - suffix = (str*)_suffix; - service = (str*)_service; - if (parse_sip_msg_uri(_msg) < 0) { LM_ERR("Parsing of R-URI failed\n"); return -1; diff --git a/modules/enum/enum.h b/modules/enum/enum.h index bcd9fea..2dffce0 100644 --- a/modules/enum/enum.h +++ b/modules/enum/enum.h @@ -61,6 +61,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, * Make enum query and if query succeeds, replace current uri with the * result of the query */ +int enum_query(struct sip_msg* _msg, str* suffix, str* service); int enum_query_0(struct sip_msg* _msg, char* _str1, char* _str2); int enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2); int enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service); diff --git a/modules/enum/enum_mod.c b/modules/enum/enum_mod.c index 1215178..0ec1bb9 100644 --- a/modules/enum/enum_mod.c +++ b/modules/enum/enum_mod.c @@ -80,10 +80,10 @@ str i_bl_alg; */ static cmd_export_t cmds[] = { {"enum_query", (cmd_function)enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_1, 1, fixup_str_null, - fixup_free_str_null, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_2, 2, fixup_str_str, - fixup_free_str_str, REQUEST_ROUTE}, + {"enum_query", (cmd_function)enum_query_1, 1, fixup_spve_null, 0, + REQUEST_ROUTE}, + {"enum_query", (cmd_function)enum_query_2, 2, fixup_spve_str, 0, + REQUEST_ROUTE}, {"enum_pv_query", (cmd_function)enum_pv_query_1, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE}, {"enum_pv_query", (cmd_function)enum_pv_query_2, 2, fixup_pvar_str,

14 years, 1 month

git:andrei/tcp_tls_changes: tcp: tcp_send() split in 3 smaller functions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 0c7e84ff04d46be3f7c18c2513fc85715455d173 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c7e84f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 23 17:58:30 2010 +0100 tcp: tcp_send() split in 3 smaller functions - tcp_send() split into 3 smaller internal functions (needed for future tls use) + minor cleanups. - CONN_QUEUED_WRITE now auto-decrements the connection refcnt. --- tcp_main.c | 358 +++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 244 insertions(+), 114 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0c7…

14 years, 1 month

git:andrei/tcp_tls_changes: tcp: comments & new internal command

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 3bcc0056930ddf5ab5f8a3da65de9628fe9b1f48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bcc005… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 23 17:54:12 2010 +0100 tcp: comments & new internal command - commented the enum conn_cmds members - added new cmd. CONN_NOP --- tcp_conn.h | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index 46ab702..bedaf4d 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -98,11 +98,26 @@ enum tcp_conn_states { S_CONN_ERROR=-2, S_CONN_BAD=-1, /* fd communication commands */ -enum conn_cmds { CONN_DESTROY=-3, CONN_ERROR=-2, CONN_EOF=-1, CONN_RELEASE, - CONN_GET_FD, CONN_NEW, CONN_QUEUED_WRITE, - CONN_NEW_PENDING_WRITE, CONN_NEW_COMPLETE }; +enum conn_cmds { + CONN_DESTROY=-3 /* destroy connection & auto-dec. refcnt */, + CONN_ERROR=-2 /* error on connection & auto-dec. refcnt */, + CONN_EOF=-1 /* eof received or conn. closed & auto-dec refcnt */, + CONN_NOP=0 /* do-nothing (invalid for tcp_main) */, + CONN_RELEASE /* release a connection from tcp_read back into tcp_main + & auto-dec refcnt */, + CONN_GET_FD /* request a fd from tcp_main */, + CONN_NEW /* update/set a fd int a new tcp connection; refcnts are + not touched */, + CONN_QUEUED_WRITE /* new write queue: start watching the fd for write & + auto-dec refcnt */, + CONN_NEW_PENDING_WRITE /* like CONN_NEW+CONN_QUEUED_WRITE: set fd and + start watching it for write (write queue + non-empty); refcnts are not touced */, + CONN_NEW_COMPLETE /* like CONN_NEW_PENDING_WRITE, but there is no + pending write (the write queue might be empty) */ +}; /* CONN_RELEASE, EOF, ERROR, DESTROY can be used by "reader" processes - * CONN_GET_FD, NEW, ERROR only by writers */ + * CONN_GET_FD, CONN_NEW*, CONN_QUEUED_WRITE only by writers */ struct tcp_req{ struct tcp_req* next;

14 years, 1 month

[tracker] Task opened: kamailio: presence_mwi should be in the list of excluded module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Ovidiu Sas (osas) Attached to Project - sip-router Summary - kamailio: presence_mwi should be in the list of excluded module Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Currently, the presence_mwi module is not in the list of excluded modules and it is built when kstandard group is selected: make every-module group_include="kstandard" It is also built when the kpresence group is selected: make every-module group_include="kpresence" It would make sense to add the presence_mwi module to the list of excluded modules and keep it only in the kpresence group. There's no point in building presence_mwi module (while building kstandard) if the presence modules is not built inside the same group. The following patch adds presence_mwi to the list of excluded modules and therefore removing it from the kstandard group: diff --git a/Makefile b/Makefile index 51e2f30..434558e 100644 --- a/Makefile +++ b/Makefile @@ -279,7 +279,7 @@ else snmpstats xmpp \ carrierroute misc_radius peering \ dialplan lcr utils presence \ - presence_dialoginfo presence_xml pua pua_bla \ + presence_dialoginfo presence_mwi presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ regex xcap_client Regards, Ovidiu Sas More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=45 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.

14 years, 1 month

[tracker] Assignee added: kamailio: presence_mwi should be in the list of excluded module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#45 - kamailio: presence_mwi should be in the list of excluded module User who did this - Ovidiu Sas (osas) http://sip-router.org/tracker/index.php?do=details&task_id=45 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.

14 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010