sr-dev

sr-dev@lists.kamailio.org

13 participants
44209 discussions

git:master: a bunch of small refactorings in the dialog module

by Henning Westerholt

Module: sip-router Branch: master Commit: 80d27be832ff175e31257c612f5b51ce643d4437 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80d27be… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 23:25:05 2009 +0200 a bunch of small refactorings in the dialog module - move populate_leg_info declaration to the proper header file - unify mostly identical dlg_seq_up_onreply, dlg_seq_down_onreply functions - make unref_new_dialog static, this is not used outside the implementation file - compact variable declarations in dlg_onroute and a few other functions - the get_dlg_tl_payload macro is only used once, integrate it into the code --- modules_k/dialog/dlg_handlers.c | 71 +++++++++++++++--------------------- modules_k/dialog/dlg_handlers.h | 15 ++++++++ modules_k/dialog/dlg_req_within.h | 3 -- modules_k/dialog/dlg_transfer.c | 1 + 4 files changed, 46 insertions(+), 44 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 6b3bc3d..2b3d53d 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -293,10 +293,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { struct sip_msg *rpl; struct dlg_cell *dlg; - int new_state; - int old_state; - int unref; - int event; + int new_state, old_state, unref, event; str tag; dlg = (struct dlg_cell *)(*param->param); @@ -403,12 +400,16 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) /*! - * \brief Run dialog callbacks on forwarded requests in upstream direction + * \brief Helper function that run dialog callbacks on forwarded requests + * \see dlg_seq_up_onreply + * \see dlg_seq_down_onreply * \param t transaction, unused * \param type type of the callback, should be TMCB_RESPONSE_FWDED * \param param saved dialog structure inside the callback + * \param direction direction of the request */ -static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *param) +static void dlg_seq_onreply_helper(struct cell* t, int type, + struct tmcb_params *param, const int direction) { struct dlg_cell *dlg; @@ -418,7 +419,7 @@ static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *par if (type==TMCB_RESPONSE_FWDED) { run_dlg_callbacks(DLGCB_RESPONSE_WITHIN, dlg, param->rpl, - DLG_DIR_UPSTREAM, 0); + direction, 0); return; } @@ -427,26 +428,28 @@ static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *par /*! - * \brief Run dialog callbacks on forwarded requests in downstream direction + * \brief Run dialog callbacks on forwarded requests in upstream direction + * \see dlg_seq_onreply_helper * \param t transaction, unused * \param type type of the callback, should be TMCB_RESPONSE_FWDED * \param param saved dialog structure inside the callback */ -static void dlg_seq_down_onreply(struct cell* t, int type, struct tmcb_params *param) +static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *param) { - struct dlg_cell *dlg; - - dlg = (struct dlg_cell *)(*param->param); - if (shutdown_done || dlg==0) - return; + return dlg_seq_onreply_helper(t, type, param, DLG_DIR_UPSTREAM); +} - if (type==TMCB_RESPONSE_FWDED) { - run_dlg_callbacks(DLGCB_RESPONSE_WITHIN, dlg, param->rpl, - DLG_DIR_DOWNSTREAM, 0); - return; - } - return; +/*! + * \brief Run dialog callbacks on forwarded requests in downstream direction + * \see dlg_seq_onreply_helper + * \param t transaction, unused + * \param type type of the callback, should be TMCB_RESPONSE_FWDED + * \param param saved dialog structure inside the callback + */ +static void dlg_seq_down_onreply(struct cell* t, int type, struct tmcb_params *param) +{ + return dlg_seq_onreply_helper(t, type, param, DLG_DIR_DOWNSTREAM); } @@ -492,7 +495,7 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) * \see dlg_onreq * \param dialog unreferenced dialog */ -void unref_new_dialog(void *dialog) +static void unref_new_dialog(void *dialog) { struct tmcb_params p; @@ -755,17 +758,8 @@ static void unreference_dialog(void *dialog) void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { struct dlg_cell *dlg; - str val; - str callid; - str ftag; - str ttag; - int h_entry; - int h_id; - int new_state; - int old_state; - int unref; - int event; - int timeout; + str val, callid, ftag, ttag; + int h_entry, h_id, new_state, old_state, unref, event, timeout; unsigned int dir; int ret = 0; @@ -956,11 +950,6 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) } - -#define get_dlg_tl_payload(_tl_) ((struct dlg_cell*)((char *)(_tl_)- \ - (unsigned long)(&((struct dlg_cell*)0)->tl))) - - /*! * \brief Timer function that removes expired dialogs, run timeout route * \param tl dialog timer list @@ -968,12 +957,12 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) void dlg_ontimeout( struct dlg_tl *tl) { struct dlg_cell *dlg; - int new_state; - int old_state; - int unref; + int new_state, old_state, unref; struct sip_msg *fmsg; - dlg = get_dlg_tl_payload(tl); + /* get the dialog tl payload */ + dlg = ((struct dlg_cell*)((char *)(tl) - + (unsigned long)(&((struct dlg_cell*)0)->tl))); if(dlg->toroute>0 && dlg->toroute<RT_NO) { diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index e0804ba..277db0b 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -71,6 +71,21 @@ void destroy_dlg_handlers(void); /*! + * \brief Parse SIP message and populate leg informations + * + * Parse SIP message and populate leg informations. + * \param dlg the dialog to add cseq, contact & record_route + * \param msg sip message + * \param flag 0-for a request(INVITE), 1- for a reply(200 ok) + * \return 0 on success, -1 on failure + * \note for a request: get record route in normal order, for a reply get + * in reverse order, skipping the ones from the request and the proxies' own + */ +int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, + struct cell* t, unsigned int leg, str *tag); + + +/*! * \brief Function that is registered as TM callback and called on requests * \param t transaction, used to created the dialog * \param type type of the entered callback diff --git a/modules_k/dialog/dlg_req_within.h b/modules_k/dialog/dlg_req_within.h index df7d334..732f430 100644 --- a/modules_k/dialog/dlg_req_within.h +++ b/modules_k/dialog/dlg_req_within.h @@ -49,9 +49,6 @@ struct mi_root * mi_terminate_dlg(struct mi_root *cmd_tree, void *param ); dlg_t* build_dlg_t(struct dlg_cell * cell, int dir); int free_tm_dlg(dlg_t *td); -int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, - struct cell* t, unsigned int leg, str *tag); - int dlg_bye(struct dlg_cell *dlg, str *hdrs, int side); int dlg_bye_all(struct dlg_cell *dlg, str *hdrs); diff --git a/modules_k/dialog/dlg_transfer.c b/modules_k/dialog/dlg_transfer.c index 2348590..df6f5d1 100644 --- a/modules_k/dialog/dlg_transfer.c +++ b/modules_k/dialog/dlg_transfer.c @@ -34,6 +34,7 @@ #include "../../modules/tm/tm_load.h" #include "dlg_req_within.h" +#include "dlg_handlers.h" #include "dlg_transfer.h" #define DLG_HOLD_SDP "v=0\r\no=kamailio-bridge 0 0 IN IP4 0.0.0.0\r\ns=kamailio\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 9 RTP/AVP 8 0\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\n"

15 years, 8 months

git:master: add complete doxygen documentation for dlg_handlers.{c, h} in dialog module

by Henning Westerholt

Module: sip-router Branch: master Commit: f7aa0a8984868a4e5f48d034cdb2b275cc374389 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7aa0a8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 22:54:24 2009 +0200 add complete doxygen documentation for dlg_handlers.{c,h} in dialog module --- modules_k/dialog/dlg_handlers.c | 220 ++++++++++++++++++++++++++++++++------- modules_k/dialog/dlg_handlers.h | 83 +++++++++++++++- 2 files changed, 262 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f7a…

15 years, 8 months

git:master: generate and add README for auth_identity module

by Henning Westerholt

Module: sip-router Branch: master Commit: 69f6036c2ee649a4ce2e85234e1ff027dec47c9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69f6036… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:37:04 2009 +0200 generate and add README for auth_identity module --- modules_s/auth_identity/README | 404 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 404 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=69f…

15 years, 8 months

git:master: documentation fix, acc_syslog contains no parameter 'secret'

by Henning Westerholt

Module: sip-router Branch: master Commit: 4f6c9ff9acb7c0564c380940d91f42241b5682b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f6c9ff… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:16:10 2009 +0200 documentation fix, acc_syslog contains no parameter 'secret' --- modules_s/acc_syslog/README | 141 ++++++++++++++----------------- modules_s/acc_syslog/doc/acc_syslog.xml | 6 +- modules_s/acc_syslog/doc/params.xml | 19 ---- 3 files changed, 67 insertions(+), 99 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4f6…

15 years, 8 months

git:master: small spelling fix in docs and comment

by Henning Westerholt

Module: sip-router Branch: master Commit: 45974eba796c4cf5d3b0888ce51634fe4109ed92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45974eb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:20:23 2009 +0200 small spelling fix in docs and comment --- forward.c | 2 +- modules_s/auth/doc/params.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forward.c b/forward.c index 5fca78e..f651120 100644 --- a/forward.c +++ b/forward.c @@ -407,7 +407,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, } } /* try to send the message until success or all the ips are exhausted - * (if dns lookup is peformed && the dns cache used ) */ + * (if dns lookup is performed && the dns cache used ) */ #ifdef USE_DNS_FAILOVER do{ #endif diff --git a/modules_s/auth/doc/params.xml b/modules_s/auth/doc/params.xml index 8a84cac..403de2c 100644 --- a/modules_s/auth/doc/params.xml +++ b/modules_s/auth/doc/params.xml @@ -24,7 +24,7 @@ These three module parameters control which optional integrity checks will be performed on the SIP message carrying digest response during digest authentication. <varname>auth_check_register</varname> - controls integrity checks to be peformed on REGISTER messages, + controls integrity checks to be performed on REGISTER messages, <varname>auth_checks_no_dlg</varname> controls which optional integrity checks will be performed on SIP requests that have no To header field or no To tag (in other words the requests either

15 years, 8 months

git:master: generate README for bdb module

by Henning Westerholt

Module: sip-router Branch: master Commit: c90d02e608c048a3bbcf263daadb024c829bded2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c90d02e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:54:26 2009 +0200 generate README for bdb module --- modules_s/bdb/README | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 199 insertions(+), 0 deletions(-) diff --git a/modules_s/bdb/README b/modules_s/bdb/README new file mode 100644 index 0000000..4817972 --- /dev/null +++ b/modules_s/bdb/README @@ -0,0 +1,199 @@ +1. BDB Module + + Sippy Software, Inc. + + Copyright � 2006 Sippy Software, Inc. + Revision History + Revision $Revision$ $Date$ + __________________________________________________________________ + + 1.1. Overview + + 1.1.1. Design of DBD Engine + + 1.2. Dependencies + + 1.2.1. External libraries or applications + + 1.3. Exported parameters + + 1.3.1. describe_table (string) + + 1.4. Constrains and limitations + 1.5. Installation and running + + 1.5.1. Using BDB With Basic SER Configuration + +1.1. Overview + + The SER (SIP Express Router) supports several different persistent + storage backends (flatfile, dbtext and several SQL servers). However, + in certain cases those existing backends don't satisfy conditions. + Particularly, SQL server-based backends typically provide good + performance and scalability, but at the same time require considerable + efforts to configure and manage and also have significant memory and + on-disk footprint, while simpler storage backends (flatfile, dbtext) + are lighter and simpler to setup and manage, but scale poorly and don't + provide sufficient performance. For certain types of applications (i.e. + embedded SIP applications, SIP load balancing farms etc), different + solution that would combine some of the non-overlapping properties of + those two existing classes of backends is necessary. + + Berkeley DB is widely regarded as industry-leading open source, + embeddable database engine that provides developers with fast, + reliable, local persistence with almost zero administration. + +1.1.1. Design of DBD Engine + + The dbtext database system architecture: + * A database is represented by a directory in the local file system + where BDB environment is located. + +Note + When using BDB driver in SER, the database URL for modules must be + the path to the directory where the BDB environment is located, + prefixed by "bdb://", e.g., "bdb:///var/db/ser". If there is no "/" + after "bdb://" then "CFG_DIR/" (the OS-specific path defined at + SER's compile time) is inserted at the beginning of the database + path automatically. So that, either an absolute path to database + directory, or one relative to "CFG_DIR" directory should be + provided in the URL. + * The individual tables internaly are represented by binary files + inside environment directory. + +Note + The BDB driver uses BTree access method. + On-disk storage format has been developed to be as simple as + possible, while meeting performance requirements set forth above. + It is not compatible with on-disk format of any other BDB-based DB + engine (e.g. MySQL's BDB table handler). + +1.2. Dependencies + +1.2.1. External libraries or applications + + The next libraries or applications must be installed before running SER + with this module: + * Berkeley DB 4.X + +1.3. Exported parameters + +1.3.1. describe_table (string) + + Define the table and its structure. Each table that will be used by + other modules has to be defined. The format of the parameter is: + table_name:column_name_1(column_type_1)[column_name_2(column_type_2)[.. + . column_name_N(column_type_N)]] + + The names of table and columns must not include white spaces. + + The first column in definition is used as index. + + Between name of table and name of first column must be ":". + + Between two columns definitions must be exactly one white space. + + Type of column has to be enclosed into parentheses. + + Supported column types are: + * int + * float + * double + * string + * str + * datetime + * blob + * bitmap + +1.4. Constrains and limitations + + Use of indexes: + * Effective SELECT, UPDATE and DELETE operations on a structured + storage that contains any more or less decent number of records are + impossible without using some kind of indexing scheme. Since + Berkley DB is relatively simple storage engine it provides only + basic support for indexing, nearly not as rich as usually expected + by an average SQL user. Therefore, it has been decided to limit + number of indexes supported to one per table. This is sufficient + for most of the uses in the SER (for example: usrloc, auth_db etc). + * SELECT/UPDATE/DELETE records matching criteria. Due to its + simplicity, Berkley DB only supports exact match on indexed field. + In order to support <, >, <= and >= operations mandated by the SIP + DB API it is necessary to fall back to sequental scan of the index + values, which obviously has significant negative impact on + performance. Fortunately those advanced records matching criterias + are not required neither by the usrloc module nor by auth_db + module. + * BDB driver uses index only if key column appears in search clause + at least once and records matching operator associated with it is + '='. + * It is not allowed to set index value to NULL or an empty string. + * It is not allowed to update index value. The DELETE followed by + INSERT should be used instead. + + BDB driver does not support db_raw_query() method. + + BDB driver does not support ORDER BY clause of db_query() method. + +1.5. Installation and running + + Compile the module and load it instead of mysql or other DB modules. + + Example 1. Load the bdb module +... +loadmodule "/path/to/ser/modules/dbb.so" +... +modparam("module_name", "db_url", "bdb:///path/to/bdb/database") +... + + Example 2. definition of the standard version table +... +modparam("bdb", "describe_table", "version:table_name(str) table_version(int)") +... + +1.5.1. Using BDB With Basic SER Configuration + + Here are the definitions for tables used by usrloc module as well as a + part of basic configuration file to use BDB driver with SER. The table + structures may change in future releases, so that some adjustment to + example below may be necessary. That example corresponds to SER v0.9.4 + + According to the configuration file below, the table files will be + placed in the //var/db/ser/ directory. + + The table version should be populated manually before the SER is + started. To do this version.dump file located in the directotry of BDB + driver sources and db_load utility from Berkeley BD distribution should + be used as follows: + + Example 3. Population of version table +$ db_load -h /var/db/ser -f version.dump version + + Example 4. Configuration file +# ---------- global configuration parameters ------------------------ + +# [skip] + +# ---------- module loading ----------------------------------------- + +loadmodule "/usr/local/lib/ser/modules/usrloc.so" +loadmodule "/usr/local/lib/ser/modules/bdb.so" + +# ---------- module-specific configuration parameteres -------------- + +modparam("usrloc", "db_mode", 2) +modparam("usrloc", "timer_interval", 3) +modparam("usrloc", "db_url", "bdb:///var/db/ser") + +modparam("bdb", "describe_table", "version:table_name(str) table_version(int)") + +modparam("bdb", "describe_table", "location:username(str) domain(str) contact(st +r) i_env(int) expires(datetime) q(double) callid(str) cseq(int) method(str) flag +s(int) user_agent(str) received(str)") +modparam("bdb", "describe_table", "aliases:username(str) domain(str) contact(str +) i_env(int) expires(datetime) q(double) callid(str) cseq(int) method(str) flags +(int) user_agent(str) received(str)") + +# ---------- request routing logic ---------------------------------- + +# [skip]

15 years, 8 months

git:master: core expr eval: fix script functions failure check

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f8a33b329085731db4a00aead676f044cd27b939 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8a33b3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 10:41:07 2009 +0200 core expr eval: fix script functions failure check script/module functions integer/boolean evaluation did not respect the module return convention (>0 success, <0 failure). Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- rvalue.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rvalue.c b/rvalue.c index 897fb4d..f75c6e9 100644 --- a/rvalue.c +++ b/rvalue.c @@ -693,8 +693,8 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - *i=run_actions(h, rv->v.action, msg); - else + *i=(run_actions(h, rv->v.action, msg)>0); + else *i=0; break; case RV_SEL: @@ -796,8 +796,8 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - i=run_actions(h, rv->v.action, msg); - else + i=(run_actions(h, rv->v.action, msg)>0); + else i=0; tmpv->s=int2str(i, &tmpv->len); break;

15 years, 8 months

git:master: tm: which cancel exported via TM API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d8d0b92dfed5e41b8952325da1509d91bfa611cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8d0b92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 15:18:21 2009 +0200 tm: which cancel exported via TM API --- modules/tm/t_cancel.h | 1 + modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 2ae96f2..d3ff20a 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -84,6 +84,7 @@ typedef int(*cancel_uacs_f)( struct cell *t, branch_bm_t cancel_bm, int flags ); typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); +typedef void (*which_cancel_f)(struct cell *t, branch_bm_t *cancel_bm ); /* diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 13b9f23..22e1782 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -234,6 +234,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_lookup_request = t_lookup_request; tmb->t_check = t_check; tmb->unref_cell = unref_cell; + tmb->which_cancel = which_cancel; #ifdef WITH_TM_CTX tmb->tm_ctx_get = tm_ctx_get; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 22e7201..54c0b9a 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -141,6 +141,7 @@ struct tm_binds { tlookup_request_f t_lookup_request; tcheck_f t_check; unref_cell_f unref_cell; + which_cancel_f which_cancel; #ifdef WITH_TM_CTX tm_ctx_get_f tm_ctx_get; #else

15 years, 8 months

git:master: tmx: added t_cancel_branches()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a6c25ed122ea00542af390a7b9222700c7846a14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6c25ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 15:19:25 2009 +0200 tmx: added t_cancel_branches() --- modules_k/tmx/tmx_mod.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index ddcd45c..711e966 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -44,6 +44,9 @@ struct tm_binds _tmx_tmb; static int mod_init(void); void destroy(void); +static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2); +static int fixup_cancel_branches(void** param, int param_no); + /* statistic variables */ stat_var *tm_rcv_rpls; stat_var *tm_rld_rpls; @@ -101,6 +104,8 @@ static mi_export_t mi_cmds [] = { static cmd_export_t cmds[]={ + {"t_cancel_branches", (cmd_function)t_cancel_branches, 1, + fixup_cancel_branches, 0, ONREPLY_ROUTE }, {0,0,0,0,0,0} }; @@ -163,4 +168,70 @@ void destroy(void) return; } +static int fixup_cancel_branches(void** param, int param_no) +{ + char *val; + int n = 0; + + if (param_no==1) { + val = (char*)*param; + if (strcasecmp(val,"all")==0) { + n = 0; + } else if (strcasecmp(val,"others")==0) { + n = 1; + } else if (strcasecmp(val,"this")==0) { + n = 2; + } else { + LM_ERR("invalid param \"%s\"\n", val); + return E_CFG; + } + pkg_free(*param); + *param=(void*)(long)n; + } else { + LM_ERR("called with parameter != 1\n"); + return E_BUG; + } + return 0; +} + +static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) +{ + branch_bm_t cb = 0; + struct cell *t = 0; + tm_ctx_t *tcx = 0; + int n=0; + int idx = 0; + t=_tmx_tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED || !is_invite(t)) + return -1; + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx != NULL) + idx = tcx->branch_index; + n = (int)k; + switch(n) { + case 1: + LOCK_REPLIES(t); + _tmx_tmb.which_cancel(t, &cb); + if(t->uac[idx].local_cancel.buffer==BUSY_BUFFER) + t->uac[idx].local_cancel.buffer=NULL; + UNLOCK_REPLIES(t); + cb &= ~(1<<idx); + case 2: + if(msg->first_line.u.reply.statuscode>=200) + break; + cb = 1<<idx; + break; + default: + LOCK_REPLIES(t); + _tmx_tmb.which_cancel(t, &cb); + UNLOCK_REPLIES(t); + if (msg->first_line.u.reply.statuscode>=200) + cb &= ~(1<<idx); + } + LM_DBG("canceling %d/%d\n", n, (int)cb); + if(cb==0) + return -1; + _tmx_tmb.cancel_uacs(t, cb, 0); + return 1; +}

15 years, 8 months

git:master: pv: doc updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 941c2ca3e031a1ad100ed92ce4e7447c0dfe3ea1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=941c2ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 14:47:21 2009 +0200 pv: doc updated --- modules_k/pv/README | 31 +++++++++++++++++++++++-------- modules_k/pv/doc/pv_admin.xml | 19 +++++++++++++++++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index 9c6ef99..6b9b892 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. shvset (string) 3.2. varset (string) + 3.3. avp_aliases (string) 4. Exported Functions @@ -43,10 +44,11 @@ Daniel-Constantin Mierla 1.1. shvset parameter usage 1.2. varset parameter usage - 1.3. pv_isset usage - 1.4. pv_unset usage - 1.5. shv_set usage - 1.6. shv_get usage + 1.3. avp_aliases parameter usage + 1.4. pv_isset usage + 1.5. pv_unset usage + 1.6. shv_set usage + 1.7. shv_get usage Chapter 1. Admin Guide @@ -62,6 +64,7 @@ Chapter 1. Admin Guide 3.1. shvset (string) 3.2. varset (string) + 3.3. avp_aliases (string) 4. Exported Functions @@ -99,6 +102,7 @@ Chapter 1. Admin Guide 3.1. shvset (string) 3.2. varset (string) + 3.3. avp_aliases (string) 3.1. shvset (string) @@ -142,6 +146,17 @@ modparam("pv", "varset", "init=i:1") modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") ... +3.3. avp_aliases (string) + + Define aliases for PV AVP names. + + Default value is NULL. + + Example 1.3. avp_aliases parameter usage +... +modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") +... + 4. Exported Functions 4.1. pv_isset(pvar) @@ -156,7 +171,7 @@ modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") This function can be used from ANY_ROUTE. - Example 1.3. pv_isset usage + Example 1.4. pv_isset usage ... if(pv_isset("$avp("s:x")")) { @@ -173,7 +188,7 @@ if(pv_isset("$avp("s:x")")) This function can be used from ANY_ROUTE. - Example 1.4. pv_unset usage + Example 1.5. pv_unset usage ... pv_unset("$avp("s:x")"); ... @@ -201,7 +216,7 @@ pv_unset("$avp("s:x")"); _value_ _empty_line_ - Example 1.5. shv_set usage + Example 1.6. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -219,7 +234,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.6. shv_get usage + Example 1.7. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get diff --git a/modules_k/pv/doc/pv_admin.xml b/modules_k/pv/doc/pv_admin.xml index f8b50ad..f6d42cf 100644 --- a/modules_k/pv/doc/pv_admin.xml +++ b/modules_k/pv/doc/pv_admin.xml @@ -124,6 +124,25 @@ modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") </programlisting> </example> </section> + <section> + <title><varname>avp_aliases</varname> (string)</title> + <para> + Define aliases for PV AVP names. + </para> + <para> + <emphasis> + Default value is NULL. + </emphasis> + </para> + <example> + <title><varname>avp_aliases</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") +... + </programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev