sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

git:master: auth_db: added sections ids for functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d17f162ee565b80ecd46b6f8f916a683748bf08b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d17f162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 8 09:11:32 2014 +0100 auth_db: added sections ids for functions - better reference for web indexing --- modules/auth_db/doc/auth_db_admin.xml | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/auth_db/doc/auth_db_admin.xml b/modules/auth_db/doc/auth_db_admin.xml index a6f667e..74d6d00 100644 --- a/modules/auth_db/doc/auth_db_admin.xml +++ b/modules/auth_db/doc/auth_db_admin.xml @@ -304,7 +304,7 @@ modparam("auth_db", "version_table", 0) <section> <title>Functions</title> - <section> + <section id="auth_db.f.www_authenticate"> <title> <function moreinfo="none">www_authenticate(realm, table [, method])</function> </title> @@ -395,7 +395,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { </example> </section> - <section> + <section id="auth_db.f.www_authorize"> <title> <function moreinfo="none">www_authorize(realm, table)</function> </title> @@ -406,7 +406,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { </para> </section> - <section> + <section id="auth_db.f.proxy_authenticate"> <title> <function moreinfo="none">proxy_authenticate(realm, table)</function> </title> @@ -469,7 +469,7 @@ if (!proxy_authorize("$fd", "subscriber)) { </example> </section> - <section> + <section id="auth_db.f.proxy_authorize"> <title> <function moreinfo="none">proxy_authorize(realm, table)</function> </title> @@ -480,7 +480,7 @@ if (!proxy_authorize("$fd", "subscriber)) { </para> </section> - <section> + <section id="auth_db.f.auth_check"> <title> <function moreinfo="none">auth_check(realm, table, flags)</function> </title> @@ -557,9 +557,8 @@ if (!auth_check("$fd", "subscriber", "1")) { </example> </section> - <section> - <title> + <title id="auth_db.f.is_subscriber"> <function moreinfo="none">is_subscriber(uri, dbtable, flags)</function> </title> <para>The function checks if there is a subscriber corresponding to

9 years, 11 months

[tracker] Comment added: fixes for memory leak in TLS module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#380 - fixes for memory leak in TLS module User who did this - Olle Johansson (oej) ---------- Kind reminder that we are waiting for a patch. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=380#comment1733 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.

9 years, 11 months

[tracker] Task closed: tm module README lacks exported RPC commands section

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#469 - tm module README lacks exported RPC commands section User who did this - Olle Johansson (oej) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=469 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.

9 years, 11 months

[tracker] Comment added: tm module README lacks exported RPC commands section

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#469 - tm module README lacks exported RPC commands section User who did this - Olle Johansson (oej) ---------- Fixed in trunk. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=469#comment1732 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.

9 years, 11 months

git:master: acc: fixed computation of extra accounting fields

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0cf6fdc78d2171dba8d31370b84da99d8c94fb29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cf6fdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 7 20:26:37 2014 +0100 acc: fixed computation of extra accounting fields - introduced in previous commit - reported by and credits for troubleshooting to Anthony Messina --- modules/acc/acc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/acc/acc.c b/modules/acc/acc.c index 8eb1acf..7bf7dd7 100644 --- a/modules/acc/acc.c +++ b/modules/acc/acc.c @@ -229,7 +229,7 @@ int acc_log_request( struct sip_msg *rq) char *p; int n; int m; - int o = 0; + int o; int i; struct tm *t; @@ -237,7 +237,7 @@ int acc_log_request( struct sip_msg *rq) m = core2strar( rq, val_arr, int_arr, type_arr); /* get extra values */ - o += extra2strar( log_extra, rq, val_arr+m, int_arr+m, type_arr+m); + o = extra2strar( log_extra, rq, val_arr+m, int_arr+m, type_arr+m); m += o; for ( i=0,p=log_msg ; i<m ; i++ ) { @@ -476,7 +476,7 @@ int acc_db_request( struct sip_msg *rq) } /* extra columns */ - o += extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m); + o = extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m); m += o; for( i++ ; i<m; i++)

9 years, 11 months

git:master: auth_db: added ids to parameters

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4eebd5d5cbf6c3f8c6b350c6d7e62f4f2a3e7610 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4eebd5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 7 19:44:38 2014 +0100 auth_db: added ids to parameters - better reference for web indexing --- modules/auth_db/doc/auth_db_admin.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/auth_db/doc/auth_db_admin.xml b/modules/auth_db/doc/auth_db_admin.xml index 9f41c53..a6f667e 100644 --- a/modules/auth_db/doc/auth_db_admin.xml +++ b/modules/auth_db/doc/auth_db_admin.xml @@ -64,7 +64,7 @@ <section> <title>Parameters</title> - <section> + <section id="auth_db.p.db_url"> <title><varname>db_url</varname> (string)</title> <para> This is URL of the database to be used. Value of the parameter depends @@ -88,7 +88,7 @@ modparam("auth_db", "db_url", "&exampledb;") </example> </section> - <section> + <section id="auth_db.p.user_column"> <title><varname>user_column</varname> (string)</title> <para> This is the name of the column holding usernames. Default value is @@ -107,7 +107,7 @@ modparam("auth_db", "user_column", "user") </example> </section> - <section> + <section id="auth_db.p.domain_column"> <title><varname>domain_column</varname> (string)</title> <para> This is the name of the column holding domains of users. Default value @@ -127,7 +127,7 @@ modparam("auth_db", "domain_column", "domain") </example> </section> - <section> + <section id="auth_db.p.password_column"> <title><varname>password_column</varname> (string)</title> <para> This is the name of the column holding passwords. Passwords can be @@ -149,7 +149,7 @@ modparam("auth_db", "password_column", "password") </example> </section> - <section> + <section id="auth_db.p.2password_column_2"> <title><varname>password_column_2</varname> (string)</title> <para> As described in the previous section this parameter contains name of @@ -171,7 +171,7 @@ modparam("auth_db", "password_column_2", "ha1_2") </example> </section> - <section> + <section id="auth_db.p.calculate_ha1"> <title><varname>calculate_ha1</varname> (integer)</title> <para> This parameter tells the server whether it should use a pre-calculated @@ -216,7 +216,7 @@ modparam("auth_db", "calculate_ha1", 1) </example> </section> - <section> + <section id="auth_db.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> If true (not 0), domain will be also used when looking up in the @@ -242,7 +242,7 @@ modparam("auth_db", "use_domain", 1) </example> </section> - <section> + <section id="auth_db.p.load_credentials"> <title><varname>load_credentials</varname> (string)</title> <para> This parameter specifies of credentials to be fetch from database when @@ -281,7 +281,7 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") </example> </section> - <section> + <section id="auth_db.p.version_table"> <title><varname>version_table</varname> (integer)</title> <para> If set to 0, the module will skip checking the version

9 years, 11 months

git:master: xlog Add minor note in docs about dependency on other modules

by Olle E. Johansson

Module: sip-router Branch: master Commit: b0832752202bf62e5912c5a2a015a078ac1b5563 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b083275… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 7 19:22:56 2014 +0100 xlog Add minor note in docs about dependency on other modules --- modules/xlog/README | 4 +++- modules/xlog/doc/xlog_admin.xml | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/xlog/README b/modules/xlog/README index c770cf6..29b02c8 100644 --- a/modules/xlog/README +++ b/modules/xlog/README @@ -114,7 +114,9 @@ Chapter 1. Admin Guide 3.1. Kamailio Modules The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. + * No dependencies on other Kamailio modules. Note that many modules + publish pseudovariables that you can use in this module. The core + module for this is the pv module. 3.2. External Libraries or Applications diff --git a/modules/xlog/doc/xlog_admin.xml b/modules/xlog/doc/xlog_admin.xml index dad27a6..60677c2 100644 --- a/modules/xlog/doc/xlog_admin.xml +++ b/modules/xlog/doc/xlog_admin.xml @@ -71,6 +71,8 @@ <listitem> <para> <emphasis>No dependencies on other &kamailio; modules</emphasis>. + Note that many modules publish pseudovariables that you can use + in this module. The core module for this is the <emphasis>pv</emphasis> module. </para> </listitem> </itemizedlist>

9 years, 11 months

git:master: tmx Add missing pseudovariables

by Olle E. Johansson

Module: sip-router Branch: master Commit: 1f3821d49311525921d8be4a48426e95f053c696 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f3821d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 7 19:08:45 2014 +0100 tmx Add missing pseudovariables --- modules/tmx/README | 2 ++ modules/tmx/doc/tmx_admin.xml | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/tmx/README b/modules/tmx/README index bb3254e..1ad67a4 100644 --- a/modules/tmx/README +++ b/modules/tmx/README @@ -412,6 +412,8 @@ event_route [tm:branch-failure:contact] { * $T_rpl(pv) * $T_reply_ruid * $T_branch(name) + * $T_inv(pv) + * $T(name) Exported pseudo-variables are documented at http://www.kamailio.org/wiki/. diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index 9958185..c2d8044 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -455,6 +455,12 @@ event_route [tm:branch-failure:contact] { <listitem><para> <emphasis>$T_branch(name)</emphasis> </para></listitem> + <listitem><para> + <emphasis>$T_inv(pv)</emphasis> + </para></listitem> + <listitem><para> + <emphasis>$T(name)</emphasis> + </para></listitem> </itemizedlist> <para> Exported pseudo-variables are documented at &kamwikilink;.

9 years, 11 months

git:master: dialplan Add dialplan.dump <id> RPC command

by Olle E. Johansson

Module: sip-router Branch: master Commit: 11f3eb6788c1f4db5848b1c05e424aa81512d8d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11f3eb6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 7 18:58:43 2014 +0100 dialplan Add dialplan.dump <id> RPC command --- modules/dialplan/README | 30 +++++++--- modules/dialplan/dialplan.c | 102 +++++++++++++++++++++++++++++++ modules/dialplan/doc/dialplan_admin.xml | 16 +++++ 3 files changed, 140 insertions(+), 8 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index 08ee011..5604c7c 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -56,8 +56,9 @@ Juha Heinanen 8. Exported RPC Commands - 8.1. dialplan.reload - 8.2. dialplan.translate + 8.1. dialplan.dump + 8.2. dialplan.reload + 8.3. dialplan.translate 9. Installation @@ -121,8 +122,9 @@ Chapter 1. Admin Guide 8. Exported RPC Commands - 8.1. dialplan.reload - 8.2. dialplan.translate + 8.1. dialplan.dump + 8.2. dialplan.reload + 8.3. dialplan.translate 9. Installation @@ -453,10 +455,22 @@ xlog("translated to var $var(y) \n"); 8. Exported RPC Commands - 8.1. dialplan.reload - 8.2. dialplan.translate + 8.1. dialplan.dump + 8.2. dialplan.reload + 8.3. dialplan.translate -8.1. dialplan.reload +8.1. dialplan.dump + + Dumps the content of one dialplan ID + + Name: dialplan.dump + + Parameters: Dialplan ID + + Example: + kamcmd dialplan.dump 100 + +8.2. dialplan.reload Forces an update of the translation rules from the database. @@ -467,7 +481,7 @@ xlog("translated to var $var(y) \n"); Example: kamcmd dialplan.reload -8.2. dialplan.translate +8.3. dialplan.translate Will apply a translation rule identified by a dialplan id and an input string. diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index d86eb56..3d6fcbe 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -5,6 +5,8 @@ * * Copyright (C) 2008 Juha Heinanen * + * Copyright (C) 2015 Olle E. Johansson, Edvina AB + * * This file is part of SIP-router, a free SIP server. * * SIP-router is free software; you can redistribute it and/or modify @@ -25,6 +27,7 @@ * -------- * 2007-08-01 initial version (ancuta onofrei) * 2008-10-09 module is now using pcre regexp lib (juha heinanen) + * 2015-11-25 added RPC command for listing dialplan */ /*! @@ -657,12 +660,111 @@ static void dialplan_rpc_translate(rpc_t* rpc, void* ctx) return; } +/* + * RPC command to dump dialplan + */ +static void dialplan_rpc_dump(rpc_t* rpc, void* ctx) +{ + dpl_id_p idp; + dpl_index_p indexp; + dpl_node_p rulep; + str input; + int dpid; + str attrs = {"", 0}; + str output = {0, 0}; + void* th; + void* ih; + void* sh; + + if (rpc->scan(ctx, "d", &dpid) < 1) + { + rpc->fault(ctx, 500, "Missing parameter"); + return; + } + + if ((idp = select_dpid(dpid)) == 0 ) { + LM_ERR("no information available for dpid %i\n", dpid); + rpc->fault(ctx, 500, "Dialplan ID not matched"); + return; + } + + LM_DBG("trying to dump dpid %i\n", idp->dp_id); + + /* add entry node */ + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + + if(rpc->struct_add(th, "d[", + "DPID", dpid, + "ENTRIES", &ih)<0) + { + rpc->fault(ctx, 500, "Internal error sets structure"); + return; + } + + for(indexp=idp->first_index; indexp!=NULL;indexp=indexp->next) { + LM_DBG("INDEX LEN: %i\n", indexp->len); + for(rulep = indexp->first_rule; rulep!= NULL;rulep = rulep->next) { + LM_DBG("DPID: %i PRIO : %i\n", rulep->dpid, rulep->pr); + if (rpc->struct_add(ih, "{","ENTRY", &sh) < 0) + { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + + if (rpc->struct_add(sh, "dd", "PRIO", rulep->pr, + "MATCHOP", rulep->matchop)<0) + { + rpc->fault(ctx, 500, "Internal error adding prio"); + return; + } + if (rpc->struct_add(sh, "s", "MATCHEXP", rulep->match_exp) < 0 ) + { + rpc->fault(ctx, 500, "Internal error adding match exp"); + return; + } + if (rpc->struct_add(sh, "d", "MATCHLEN", rulep->matchlen) < 0 ) + { + rpc->fault(ctx, 500, "Internal error adding expression data and attribute"); + return; + } + if (rpc->struct_add(sh, "s", "SUBSTEXP", rulep->subst_exp) < 0 ) + { + rpc->fault(ctx, 500, "Internal error adding subst exp"); + return; + } + if (rpc->struct_add(sh, "s", "REPLEXP", rulep->repl_exp) < 0 ) + { + rpc->fault(ctx, 500, "Internal error adding replace exp "); + return; + } + if (rpc->struct_add(sh, "s", "ATTRS", rulep->attrs) < 0 ) + { + rpc->fault(ctx, 500, "Internal error adding attribute"); + return; + } + } + } + + return; +} + +static const char* dialplan_rpc_dump_doc[2] = { + "Dump dialplan content", + 0 +}; + rpc_export_t dialplan_rpc_list[] = { {"dialplan.reload", dialplan_rpc_reload, dialplan_rpc_reload_doc, 0}, {"dialplan.translate", dialplan_rpc_translate, dialplan_rpc_translate_doc, 0}, + {"dialplan.dump", dialplan_rpc_dump, + dialplan_rpc_dump_doc, 0}, {0, 0, 0, 0} }; diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index 6b07a2d..5bfa870 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -553,6 +553,22 @@ xlog("translated to var $var(y) \n"); <section> <title>Exported RPC Commands</title> + <section id="dialplan.r.dp.dump"> + <title><varname>dialplan.dump</varname></title> + <para> + Dumps the content of one dialplan ID + </para> + <para> + Name: <emphasis>dialplan.dump</emphasis> + </para> + <para>Parameters: <emphasis>Dialplan ID</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &sercmd; dialplan.dump 100 + </programlisting> + </section> <section id="dialplan.r.dp.reload"> <title><varname>dialplan.reload</varname></title> <para>

9 years, 11 months

git:master: dialplan updating author/copyright

by Olle E. Johansson

Module: sip-router Branch: master Commit: 101eccc8719d31016948834198ee6508b794865d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=101eccc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 7 19:02:19 2014 +0100 dialplan updating author/copyright --- modules/dialplan/README | 6 ++++++ modules/dialplan/dialplan.c | 2 +- modules/dialplan/doc/dialplan.xml | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index 5604c7c..88cc07b 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -12,9 +12,15 @@ Edited by Juha Heinanen +Edited by + +Olle E. Johansson + Copyright � 2007-2008 Voice Sistem SRL Copyright � 2008-2010 Juha Heinanen + + Copyright � 2014 Olle E. Johansson, Edvina AB __________________________________________________________________ Table of Contents diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 3d6fcbe..7cecf39 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -5,7 +5,7 @@ * * Copyright (C) 2008 Juha Heinanen * - * Copyright (C) 2015 Olle E. Johansson, Edvina AB + * Copyright (C) 2014 Olle E. Johansson, Edvina AB * * This file is part of SIP-router, a free SIP server. * diff --git a/modules/dialplan/doc/dialplan.xml b/modules/dialplan/doc/dialplan.xml index ddaf1ab..386e7eb 100644 --- a/modules/dialplan/doc/dialplan.xml +++ b/modules/dialplan/doc/dialplan.xml @@ -32,6 +32,10 @@ <firstname>Juha</firstname> <surname>Heinanen</surname> </editor> + <editor> + <firstname>Olle E.</firstname> + <surname>Johansson</surname> + </editor> </authorgroup> <copyright> <year>2007-2008</year> @@ -41,6 +45,10 @@ <year>2008-2010</year> <holder>Juha Heinanen</holder> </copyright> + <copyright> + <year>2014</year> + <holder>Olle E. Johansson, Edvina AB</holder> + </copyright> </bookinfo> <toc></toc>

9 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014