sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

by Peter Dunkley

Module: sip-router Branch: master Commit: b961a960581394913dc79240fe983723a57e5b26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b961a96… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Apr 2 13:23:27 2013 +0100 modules/stun: fixed typo --- modules/stun/README | 4 ++-- modules/stun/doc/stun.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stun/README b/modules/stun/README index e887ff6..8121c9d 100644 --- a/modules/stun/README +++ b/modules/stun/README @@ -4,9 +4,9 @@ Peter Dunkley Crocodile RCS Ltd - Copyright � 2012 Crocodile RCS Ltd + Copyright © 2013 Crocodile RCS Ltd - Copyright � 2001-2003 FhG Fokus + Copyright © 2001-2003 FhG Fokus __________________________________________________________________ Table of Contents diff --git a/modules/stun/doc/stun.xml b/modules/stun/doc/stun.xml index 2cb9584..e9c6ca8 100644 --- a/modules/stun/doc/stun.xml +++ b/modules/stun/doc/stun.xml @@ -23,7 +23,7 @@ </author> </authorgroup> <copyright> - <year>2012</year> + <year>2013</year> <holder>Crocodile RCS Ltd</holder> </copyright> <copyright>

11 years, 8 months

git:master: db_mysql Add transaction support

by Olle E. Johansson

Module: sip-router Branch: master Commit: fe977dfcb940b1c48dd26fe5fe61a25aed23b96a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe977df… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Apr 2 14:13:01 2013 +0200 db_mysql Add transaction support Patch contributed via Google+ by Håkon Nassjöen <haakon.nassjoen(a)gmail.com> --- modules/db_mysql/km_db_mysql.c | 3 + modules/db_mysql/km_dbase.c | 136 ++++++++++++++++++++++++++++++++++++++++ modules/db_mysql/km_dbase.h | 16 +++++ modules/db_mysql/km_my_con.h | 10 ++- 4 files changed, 161 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 8a51f3d..88cc481 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -116,6 +116,9 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->insert_update = db_mysql_insert_update; dbb->insert_delayed = db_mysql_insert_delayed; dbb->affected_rows = db_mysql_affected_rows; + dbb->start_transaction= db_mysql_start_transaction; + dbb->end_transaction = db_mysql_end_transaction; + dbb->abort_transaction= db_mysql_abort_transaction; return 0; } diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 029a674..7288b66 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -500,6 +500,142 @@ int db_mysql_affected_rows(const db1_con_t* _h) return (int)mysql_affected_rows(CON_CONNECTION(_h)); } +/** + * Starts a single transaction that will consist of one or more queries (SQL BEGIN) + * \param _h database handle + * \return 0 on success, negative on failure + */ +int db_mysql_start_transaction(db1_con_t* _h, db_locking_t _l) +{ + str begin_str = str_init("BEGIN"); + str lock_start_str = str_init("LOCK TABLE "); + str lock_end_str = str_init(" WRITE"); + str lock_str = {0, 0}; + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_TRANSACTION(_h) == 1) { + LM_ERR("transaction already started\n"); + return -1; + } + + if (db_mysql_raw_query(_h, &begin_str, NULL) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + CON_TRANSACTION(_h) = 1; + + switch(_l) + { + case DB_LOCKING_NONE: + break; + case DB_LOCKING_FULL: + /* Fall-thru */ + case DB_LOCKING_WRITE: + if ((lock_str.s = pkg_malloc((lock_start_str.len + CON_TABLE(_h)->len + lock_end_str.len) * sizeof(char))) == NULL) + { + LM_ERR("allocating pkg memory\n"); + goto error; + } + + memcpy(lock_str.s, lock_start_str.s, lock_start_str.len); + lock_str.len += lock_start_str.len; + memcpy(lock_str.s + lock_str.len, CON_TABLE(_h)->s, CON_TABLE(_h)->len); + lock_str.len += CON_TABLE(_h)->len; + memcpy(lock_str.s + lock_str.len, lock_end_str.s, lock_end_str.len); + lock_str.len += lock_end_str.len; + + if (db_mysql_raw_query(_h, &lock_str, NULL) < 0) + { + LM_ERR("executing raw_query\n"); + goto error; + } + + if (lock_str.s) pkg_free(lock_str.s); + break; + + default: + LM_WARN("unrecognised lock type\n"); + goto error; + } + + return 0; + +error: + if (lock_str.s) pkg_free(lock_str.s); + db_mysql_abort_transaction(_h); + return -1; +} + +/** + * Ends a transaction and commits the changes (SQL COMMIT) + * \param _h database handle + * \return 0 on success, negative on failure + */ +int db_mysql_end_transaction(db1_con_t* _h) +{ + str query_str = str_init("COMMIT"); + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_TRANSACTION(_h) == 0) { + LM_ERR("transaction not in progress\n"); + return -1; + } + + if (db_mysql_raw_query(_h, &query_str, NULL) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + /* Only _end_ the transaction after the raw_query. That way, if the + raw_query fails, and the calling module does an abort_transaction() + to clean-up, a ROLLBACK will be sent to the DB. */ + CON_TRANSACTION(_h) = 0; + return 0; +} + +/** + * Ends a transaction and rollsback the changes (SQL ROLLBACK) + * \param _h database handle + * \return 1 if there was something to rollback, 0 if not, negative on failure + */ +int db_mysql_abort_transaction(db1_con_t* _h) +{ + str query_str = str_init("ROLLBACK"); + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_TRANSACTION(_h) == 0) { + LM_DBG("nothing to rollback\n"); + return 0; + } + + /* Whether the rollback succeeds or not we need to _end_ the + transaction now or all future starts will fail */ + CON_TRANSACTION(_h) = 0; + + if (db_mysql_raw_query(_h, &query_str, NULL) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + return 1; +} + /** * Insert a row into a specified table, update on duplicate key. diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 3a567f2..52b2778 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -40,6 +40,7 @@ #include "../../lib/srdb1/db_key.h" #include "../../lib/srdb1/db_op.h" #include "../../lib/srdb1/db_val.h" +#include "../../lib/srdb1/db_locking.h" #include "../../str.h" /*! \brief @@ -118,6 +119,21 @@ int db_mysql_last_inserted_id(const db1_con_t* _h); */ int db_mysql_affected_rows(const db1_con_t* _h); +/*! \brief + * Starts transaction + */ +int db_mysql_start_transaction(db1_con_t* _h, db_locking_t _l); + +/*! \brief + * Commits transaction + */ +int db_mysql_end_transaction(db1_con_t* _h); + +/*! \brief + * Aborts transaction + */ +int db_mysql_abort_transaction(db1_con_t* _h); + /*! \brief * Insert a row into table, update on duplicate key diff --git a/modules/db_mysql/km_my_con.h b/modules/db_mysql/km_my_con.h index 2624f34..33f2128 100644 --- a/modules/db_mysql/km_my_con.h +++ b/modules/db_mysql/km_my_con.h @@ -48,16 +48,18 @@ struct my_con { MYSQL* con; /*!< Connection representation */ MYSQL_ROW row; /*!< Actual row in the result */ time_t timestamp; /*!< Timestamp of last query */ + int transaction; /*!< indicates whether a multi-query transaction is currently open */ }; /* * Some convenience wrappers */ -#define CON_RESULT(db_con) (((struct my_con*)((db_con)->tail))->res) -#define CON_CONNECTION(db_con) (((struct my_con*)((db_con)->tail))->con) -#define CON_ROW(db_con) (((struct my_con*)((db_con)->tail))->row) -#define CON_TIMESTAMP(db_con) (((struct my_con*)((db_con)->tail))->timestamp) +#define CON_RESULT(db_con) (((struct my_con*)((db_con)->tail))->res) +#define CON_CONNECTION(db_con) (((struct my_con*)((db_con)->tail))->con) +#define CON_ROW(db_con) (((struct my_con*)((db_con)->tail))->row) +#define CON_TIMESTAMP(db_con) (((struct my_con*)((db_con)->tail))->timestamp) +#define CON_TRANSACTION(db_con) (((struct my_con*)((db_con)->tail))->transaction) /*! \brief

11 years, 8 months

alphabetic indexes generated for development version

by Daniel-Constantin Mierla

Hello, I generated the alphabetic indexes for development version, there are already new modules and code since release of 4.0. If anyone spots missing elements (mod params, functions, etc...), write back here so we fix the issue (could be wrong formatted xml docbook file for module readme). They are available at: - http://www.kamailio.org/wiki/#alphabetic_indexes Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 8 months

[tracker] Task opened: add basic sip-t / sip-i support to sip router (Attachment added)

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 - Torrey Searle (tsearle) Attached to Project - sip-router Summary - add basic sip-t / sip-i support to sip router Task Type - Feature Request Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Attached is a new module called "sipt" to modify iam messages encoded in the initial invite. Attaching it as a GIT diff. First time using GIT so if the diff doesn't work ok let me know and I'll attach the module as a tarball 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=281 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.

11 years, 8 months

git:master: cfgutils Adding ID's to xml sections for alfabetic indexes

by Olle E. Johansson

Module: sip-router Branch: master Commit: e9267d7e6a0c6a1715f70916a6879f4288f14a57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9267d7… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Apr 2 11:09:27 2013 +0200 cfgutils Adding ID's to xml sections for alfabetic indexes --- modules/cfgutils/README | 20 +++++----- modules/cfgutils/doc/cfgutils_admin.xml | 64 +++++++++++++++--------------- 2 files changed, 42 insertions(+), 42 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e92…

11 years, 8 months

git:master: app_lua: readme regenerated to be in sync with xml docbook file

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 399ab478349f320a44180abbb1546c93981b566a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=399ab47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 1 22:40:21 2013 +0200 app_lua: readme regenerated to be in sync with xml docbook file --- modules/app_lua/README | 78 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 67 insertions(+), 11 deletions(-) diff --git a/modules/app_lua/README b/modules/app_lua/README index d12b846..5768778 100644 --- a/modules/app_lua/README +++ b/modules/app_lua/README @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3.1. load (string) 3.2. register (string) + 3.3. reload (boolean) 4. Functions @@ -35,16 +36,22 @@ Daniel-Constantin Mierla 4.3. lua_run(function, params) 4.4. lua_runstring(script) - 5. Example of usage + 5. Exported RPC Commands + + 5.1. app_lua.list + 5.2. app_lua.reload + + 6. Example of usage List of Examples 1.1. Set load parameter 1.2. Set register parameter - 1.3. lua_dofile usage - 1.4. lua_dostring usage - 1.5. lua_run usage - 1.6. lua_runstring usage + 1.3. Set reload parameter + 1.4. lua_dofile usage + 1.5. lua_dostring usage + 1.6. lua_run usage + 1.7. lua_runstring usage Chapter 1. Admin Guide @@ -60,6 +67,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. register (string) + 3.3. reload (boolean) 4. Functions @@ -68,7 +76,12 @@ Chapter 1. Admin Guide 4.3. lua_run(function, params) 4.4. lua_runstring(script) - 5. Example of usage + 5. Exported RPC Commands + + 5.1. app_lua.list + 5.2. app_lua.reload + + 6. Example of usage 1. Overview @@ -109,6 +122,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. register (string) + 3.3. reload (boolean) 3.1. load (string) @@ -167,6 +181,18 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") modparam("app_lua", "register", "sl") ... +3.3. reload (boolean) + + If reload is 1 enables the ability to reload the scripts using the RPC + app_lua.reload command. + + Default value is "0 (off)". + + Example 1.3. Set reload parameter +... +modparam("app_lua", "reload", 1) +... + 4. Functions 4.1. lua_dofile(path) @@ -179,7 +205,7 @@ modparam("app_lua", "register", "sl") Execute the Lua script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. - Example 1.3. lua_dofile usage + Example 1.4. lua_dofile usage ... lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); ... @@ -189,7 +215,7 @@ lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); Execute the Lua script stored in parameter. The parameter can be a string with pseudo-variables. - Example 1.4. lua_dostring usage + Example 1.5. lua_dostring usage ... if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) { @@ -204,7 +230,7 @@ if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) loaded at startup via parameter 'load'. Parameters can be strings with pseudo-variables that are evaluated at runtime. - Example 1.5. lua_run usage + Example 1.6. lua_run usage ... if(!lua_run("sr_append_fu_to_reply")) { @@ -220,7 +246,7 @@ lua_run("lua_funcx", "$rU", "2"); string with pseudo-variables. The script is executed in Lua context specific to loaded Lua files at startup. - Example 1.6. lua_runstring usage + Example 1.7. lua_runstring usage ... if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) { @@ -228,7 +254,37 @@ if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) } ... -5. Example of usage +5. Exported RPC Commands + + 5.1. app_lua.list + 5.2. app_lua.reload + +5.1. app_lua.list + + Lists the id and path for every script loaded by the load parameter. + + Name: app_lua.list + + Parameters: none + + Example: + kamcmd app_lua.lists + +5.2. app_lua.reload + + Marks the need to reload the selected script. The actual reload is done + by every working process when the next call to lua_run function is + executed. If no parameter is added all the scripts are selected to be + reloaded. + + Name: app_lua.reload + + Parameters: id + + Example: + kamcmd app_lua.reload 0 + +6. Example of usage Create your Lua script and stored on file system, say: '/usr/local/etc/kamailio/lua/myscript.lua'.

11 years, 8 months

Wiki site registration updates

by Daniel-Constantin Mierla

Hello, as of yesterday, creation of new accounts for Kamailio's wiki site requires to answer a project related question. Captcha was useless as spam bots were lately going through it easily, creating accounts in a rate of approx 50 new registrations per day. The extra question is asked just after CAPTCHA, see it at: - https://www.kamailio.org/wiki/start?do=register Hopefully the questions are simple enough to allow good people to register and difficult enough for spambots to give up. It is not a very sophisticated system, let's see if there will be any efforts in reverse engineering to break in with bots. So far no new spammer account. If they will succeed, at least they learn something useful. If anyone has difficulties creating wiki accounts, write an email to sr-dev mailing list and it will be investigated. Cheers, Daniel PS. This registration system will last, is not for April 1. -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 8 months

git:master: snmpstats add entry for outbound module

by Olle E. Johansson

Module: sip-router Branch: master Commit: 1262b4401954661028e10bfb3b54d0ed00876711 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1262b44… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Mon Apr 1 20:41:48 2013 +0200 snmpstats add entry for outbound module --- modules/snmpstats/mibs/KAMAILIO-MIB | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/snmpstats/mibs/KAMAILIO-MIB b/modules/snmpstats/mibs/KAMAILIO-MIB index fc32a3c..1998625 100644 --- a/modules/snmpstats/mibs/KAMAILIO-MIB +++ b/modules/snmpstats/mibs/KAMAILIO-MIB @@ -291,7 +291,6 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "Sub-tree for TCP Network Transport objects (incl TLS conncetions)." ::= { kamailioNet 1 } - kamailioNetWebsocket OBJECT-IDENTITY STATUS current DESCRIPTION @@ -719,6 +718,15 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "True if the STUN Server server (SIP Outbound) is loaded in this server." ::= { kamailioNetConfig 11 } + kamailioNetConfOutbound OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DEFVAL { false } + DESCRIPTION + "True if the SIP Outbound module is loaded in this server." + ::= { kamailioNetConfig 12 } + -- -- Websocket Connection Objects --

11 years, 8 months

git:master: snmpstats Documentation updates

by Olle E. Johansson

Module: sip-router Branch: master Commit: 7d272f893c3e0f260db1af5fc07dccd7d93690df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d272f8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Mon Apr 1 10:06:33 2013 +0200 snmpstats Documentation updates --- modules/snmpstats/kamailioNet.c | 9 --------- modules/snmpstats/kamailioNet.h | 31 +++++++++++++++++++++++++++++-- modules/snmpstats/snmpstats.c | 3 +++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/modules/snmpstats/kamailioNet.c b/modules/snmpstats/kamailioNet.c index ab9c7fc..dd23c00 100644 --- a/modules/snmpstats/kamailioNet.c +++ b/modules/snmpstats/kamailioNet.c @@ -1,9 +1,6 @@ /* * SNMPStats Module - Network Statistics * - * Copyright (C) 2006 SOMA Networks, INC. - * Written by: Jeffrey Magder (jmagder(a)somanetworks.com) - * * Kamailio Server Net objects addition * Copyright (C) 2013 Edvina AB, Sollentuna, Sweden * Written by Olle E. Johansson @@ -44,12 +41,6 @@ #include "../../globals.h" #include "../../tcp_options.h" -/* - * Note: this file originally auto-generated by mib2c using - * $ - */ - - /** Initializes the kamailioNet module */ void init_kamailioNet(void) diff --git a/modules/snmpstats/kamailioNet.h b/modules/snmpstats/kamailioNet.h index 30b0052..d9ca827 100644 --- a/modules/snmpstats/kamailioNet.h +++ b/modules/snmpstats/kamailioNet.h @@ -1,6 +1,33 @@ /* - * Note: this file originally auto-generated by mib2c using - * $ + * SNMPStats Module - Network Statistics + * + * Kamailio Server Net objects addition + * Copyright (C) 2013 Edvina AB, Sollentuna, Sweden + * Written by Olle E. Johansson + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * History: + * -------- + * 2013-04-01 initial version (oej) + * + * Note: this file originally auto-generated by mib2c + * */ #ifndef KAMAILIONET_H #define KAMAILIONET_H diff --git a/modules/snmpstats/snmpstats.c b/modules/snmpstats/snmpstats.c index 18df08c..a7f8cec 100644 --- a/modules/snmpstats/snmpstats.c +++ b/modules/snmpstats/snmpstats.c @@ -4,6 +4,8 @@ * SNMPStats Module * Copyright (C) 2006 SOMA Networks, INC. * Written by: Jeffrey Magder (jmagder(a)somanetworks.com) + * Copyright (C) 2013 Edvina AB, Sollentuna, Sweden + * Updated and extended by: Olle E. Johansson (oej(a)edvina.net) * * This file is part of Kamailio, a free SIP server. * @@ -25,6 +27,7 @@ * History: * -------- * 2006-11-23 initial version (jmagder) + * 2013-04-01 updates of the MIB with core memory, tcp stats and much more (oej) * * There are some important points to understanding the SNMPStat modules * architecture.

11 years, 8 months

git:master: outbound add config framework variable to indicate active module

by Olle E. Johansson

Module: sip-router Branch: master Commit: 5397c6c4d9a9b3f50561893855d7469cfbf58858 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5397c6c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Mon Apr 1 09:12:01 2013 +0200 outbound add config framework variable to indicate active module --- modules/outbound/config.c | 42 ++++++++++++++++++++++++++++++++++++++++++ modules/outbound/config.h | 39 +++++++++++++++++++++++++++++++++++++++ modules/outbound/ob_mod.c | 8 +++++++- 3 files changed, 88 insertions(+), 1 deletions(-) diff --git a/modules/outbound/config.c b/modules/outbound/config.c new file mode 100644 index 0000000..657a433 --- /dev/null +++ b/modules/outbound/config.c @@ -0,0 +1,42 @@ +/* + * $Id$ + * This file is part of SIP-router, a free SIP server. + * + * SIP-router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * SIP-router is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/*! + * \file + * \brief Outbound :: Configuration + * \ingroup Outbound + */ + +#include "../../cfg/cfg.h" +#include "../../parser/msg_parser.h" /* method types */ + +#include "config.h" + +struct cfg_group_outbound default_outbound_cfg = { + 0, /* Read only variable to mark if outbound is enabled */ + }; + +void *outbound_cfg = &default_outbound_cfg; + +cfg_def_t outbound_cfg_def[] = { + {"outbound_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY, 0, 0, 0, 0, + "If set to one (true) Outbound is enabled."}, + {0, 0, 0, 0, 0, 0} +}; diff --git a/modules/outbound/config.h b/modules/outbound/config.h new file mode 100644 index 0000000..fc6c74a --- /dev/null +++ b/modules/outbound/config.h @@ -0,0 +1,39 @@ +/* + * $Id$ + * + * SIP-router is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Outbound :: Configuration Framework support + * \ingroup outbound + */ + + +#ifndef _OUTBOUND_CONFIG_H +#define _OUTBOUND_CONFIG_H + +#include "../../qvalue.h" + +#include "../../cfg/cfg.h" +#include "../../str.h" + +struct cfg_group_outbound { + int outbound_active; +}; + +extern struct cfg_group_outbound default_outbound_cfg; +extern void *outbound_cfg; +extern cfg_def_t outbound_cfg_def[]; + +extern void ds_ping_reply_codes_update(str*, str*); + +#endif diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index e5eea65..411e354 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -37,6 +37,7 @@ #include "../../parser/parse_uri.h" #include "api.h" +#include "config.h" MODULE_VERSION @@ -97,7 +98,12 @@ static int mod_init(void) LM_ERR("unable to get %d cryptographically strong pseudo-" "random bytes\n", ob_key.len); } - + if (cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg, + cfg_sizeof(outbound), &outbound_cfg)) { + LM_ERR("declaring config framework variable\n"); + return -1; + } + default_outbound_cfg.outbound_active = 1; return 0; }

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013