sr-dev

sr-dev@lists.kamailio.org

12 participants
44188 discussions

by Andrei Pelinescu-Onciul

Right now we have a problem with old scripts that use things like if ($v) (where $v could be avp, pseudovar or select). $v can evaluate to a int, a string or undefined. Now for string and undefined the if will evaluate to false (string being an error) and an error will be logged. If the type of $v can be found prior to runtime (e.g. @select is always string) you'll even get a parse error. I plan to add some new operators, to properly deal with these cases: defined($v) strempty($v) strlen($v) but the question still remains if we should preserve compatibility and still support things like if (@to.tag), instead of if (!strempty((a)to.tag)) or if (@to.tag!=""). What's trickier is that if we allow strings in int expressions then we have 2 problems: - "" evaluates to 1 or 0? - how to evaluate a string in an integer context: is "abc" 1 or 3 (strlen)? How about "123" ? - $v is 0 if v is not defined? Note that if we do this it will work in all types of expressions, e.g. if string evaluates to strlen(string) in interger context then: 3+"abc" = 6 ; 3+ ""=3 ; 3+"9"=4 3+"0"=4. Andrei

15 years, 8 months

git:master: generate README for blst module

by Henning Westerholt

Module: sip-router Branch: master Commit: a13da049257f5c6b9a5da52ac1a55f25e6dadfe5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a13da04… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:55:41 2009 +0200 generate README for blst module --- modules_s/blst/README | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/modules_s/blst/README b/modules_s/blst/README new file mode 100644 index 0000000..8387e98 --- /dev/null +++ b/modules_s/blst/README @@ -0,0 +1,82 @@ +1. Blst Module + +Andrei Pelinescu-Onciul + + iptelorg GmbH + + Copyright � 2007 iptelorg GmbH + Revision History + Revision $Revision$ $Date$ + __________________________________________________________________ + + 1.1. Overview + 1.2. Functions + + 1.2.1. blst_add([timeout]) + 1.2.2. blst_add_retry_after(min, max) + 1.2.3. blst_del() + 1.2.4. blst_is_blacklisted() + +1.1. Overview + + This module exports blacklist related functions to the script. + +1.2. Functions + + Revision History + Revision $Revision$ $Date$ + +1.2.1. blst_add([timeout]) + + Adds the source of the current message to the blacklist for timeout + seconds. If timeout is missing or 0 it uses the default blacklist + timeout (dst_blacklist_expire). + + Example 1. blst_add usage +... +if (src_ip==10.0.0.0/9) + blst_add(30); # 30 s +else + blst_add(); # use default blacklist timeout +... + +1.2.2. blst_add_retry_after(min, max) + + Adds the source of the current message to the blacklist for the time + interval specified in the Retry-After header. If the Retry-After header + is missing, it will fail (returns false). If the Retry-After value is + less then min, then min seconds will be used instead. If the + Retry-After value is greater then max, then max seconds will be used + instead. + + Example 2. blst_add_retry_after usage +... +# on_reply route +if (msg_status==503){ # blacklist 503 source for Retry-After seconds + if (! blst_add_retry_after(30, 3600)) + blst_add(60); # if no retry_after header add it for 60s +} +... + +1.2.3. blst_del() + + Removes the source of the current message from the blacklist. If the + address is not present in the blacklist at the time of the call it + returns false. + + Example 3. blst_del usage +... + blst_del(); +... + +1.2.4. blst_is_blacklisted() + + Returns true if the source of the current message is blacklisted. + + Example 4. blst_is_blacklisted usage +... + if (blst_is_blacklisted()){ + log("message from a blacklisted source"); + drop; + } +...

15 years, 8 months

git:master: add more doxygen documentation for dialog module

by Henning Westerholt

Module: sip-router Branch: master Commit: be8fd54a6b59210a7d426f64530ebf5902a61a68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be8fd54… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 23:09:50 2009 +0200 add more doxygen documentation for dialog module --- modules_k/dialog/dlg_hash.c | 124 +++++++++++++++++++---- modules_k/dialog/dlg_hash.h | 240 +++++++++++++++++++++++++++++++------------ modules_k/dialog/dlg_var.h | 1 + 3 files changed, 281 insertions(+), 84 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=be8…

15 years, 8 months

git:master: spelling fix in documentation

by Henning Westerholt

Module: sip-router Branch: master Commit: 26fa3cf1464b0cddb67be64cd30918b9c2965c13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26fa3cf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 19:23:22 2009 +0200 spelling fix in documentation --- modules/tm/README | 2 +- modules/tm/doc/functions.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/README b/modules/tm/README index 87579b1..7b1ce8f 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -838,7 +838,7 @@ t_reply("404", "Not found"); Checks if a transaction exists. Returns a positive value if so, negative otherwise. Most likely you will not want to use it, as a - typical application of a looku-up is to introduce a new transaction if + typical application of a look-up is to introduce a new transaction if none was found. However this is safely (atomically) done using t_newtran. diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 6571fd3..1c25aeb 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -320,7 +320,7 @@ t_reply("404", "Not found"); <para> Checks if a transaction exists. Returns a positive value if so, negative otherwise. Most likely you will not want to use it, as a - typical application of a looku-up is to introduce a new transaction + typical application of a look-up is to introduce a new transaction if none was found. However this is safely (atomically) done using <function>t_newtran</function>. </para>

15 years, 8 months

git:master: complete doxygen documentation for dlg_hash header and implementation

by Henning Westerholt

Module: sip-router Branch: master Commit: f666a4e53f79843f82b867c5dd4ce64e100feb82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f666a4e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 20:02:10 2009 +0200 complete doxygen documentation for dlg_hash header and implementation --- modules_k/dialog/dlg_hash.c | 48 +++++++++++++++++++++++++++-- modules_k/dialog/dlg_hash.h | 72 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index e7f9522..a699e72 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -42,6 +42,14 @@ * CONFIRMED_NA due delayed "200 OK" (bogdan) */ + +/*! + * \file + * \brief Functions related to dialog creation and searching + * \ingroup dialog + * Module: \ref dialog + */ + #include <stdlib.h> #include <string.h> @@ -450,7 +458,11 @@ struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir) } - +/*! + * \brief Link a dialog structure + * \param dlg dialog + * \param n extra increments for the reference counter + */ void link_dlg(struct dlg_cell *dlg, int n) { struct dlg_entry *d_entry; @@ -477,7 +489,12 @@ void link_dlg(struct dlg_cell *dlg, int n) } - +/*! + * \brief Unlink a dialog from the list without locking + * \see unref_dlg_unsafe + * \param d_entry unlinked entry + * \param dlg unlinked dialog + */ inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg) { @@ -496,6 +513,12 @@ inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, } +/*! + * \brief Refefence a dialog with locking + * \see ref_dlg_unsafe + * \param dlg dialog + * \param cnt increment for the reference counter + */ void ref_dlg(struct dlg_cell *dlg, unsigned int cnt) { struct dlg_entry *d_entry; @@ -508,6 +531,12 @@ void ref_dlg(struct dlg_cell *dlg, unsigned int cnt) } +/*! + * \brief Unreference a dialog with locking + * \see unref_dlg_unsafe + * \param dlg dialog + * \param cnt decrement for the reference counter + */ void unref_dlg(struct dlg_cell *dlg, unsigned int cnt) { struct dlg_entry *d_entry; @@ -535,8 +564,21 @@ static inline void log_next_state_dlg(const int event, const struct dlg_cell *dl } +/*! + * \brief Update a dialog state according a event and the old state + * + * This functions implement the main state machine that update a dialog + * state according a processed event and the current state. If necessary + * it will delete the processed dialog. The old and new state are also + * saved for reference. + * \param dlg updated dialog + * \param event current event + * \param old_state old dialog state + * \param new_state new dialog state + * \param unref set to 1 when the dialog was deleted, 0 otherwise + */ void next_state_dlg(struct dlg_cell *dlg, int event, - int *old_state, int *new_state, int *unref) + int *old_state, int *new_state, int *unref) { struct dlg_entry *d_entry; diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 197f222..e717a2b 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -34,6 +34,12 @@ * CONFIRMED_NA due delayed "200 OK" (bogdan) */ +/*! + * \file + * \brief Functions and definitions related to dialog creation and searching + * \ingroup dialog + * Module: \ref dialog + */ #ifndef _DIALOG_DLG_HASH_H_ #define _DIALOG_DLG_HASH_H_ @@ -126,17 +132,37 @@ struct dlg_table gen_lock_set_t *locks; /*!< lock table */ }; + /*! global dialog table */ extern struct dlg_table *d_table; /*! point to the current dialog */ extern struct dlg_cell *current_dlg_pointer; + +/*! + * \brief Set a dialog lock + * \param _table dialog table + * \param _entry locked entry + */ #define dlg_lock(_table, _entry) \ lock_set_get( (_table)->locks, (_entry)->lock_idx); + + +/*! + * \brief Release a dialog lock + * \param _table dialog table + * \param _entry locked entry + */ #define dlg_unlock(_table, _entry) \ lock_set_release( (_table)->locks, (_entry)->lock_idx); +/*! + * \brief Unlink a dialog from the list without locking + * \see unref_dlg_unsafe + * \param d_entry unlinked entry + * \param dlg unlinked dialog + */ inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg); @@ -146,6 +172,12 @@ inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg); */ inline void destroy_dlg(struct dlg_cell *dlg); + +/*! + * \brief Reference a dialog without locking + * \param _dlg dialog + * \param _cnt increment for the reference counter + */ #define ref_dlg_unsafe(_dlg,_cnt) \ do { \ (_dlg)->ref += (_cnt); \ @@ -153,6 +185,12 @@ inline void destroy_dlg(struct dlg_cell *dlg); (_dlg),(_cnt),(_dlg)->ref); \ }while(0) + +/*! + * \brief Unreference a dialog without locking + * \param _dlg dialog + * \param _cnt decrement for the reference counter + */ #define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ do { \ (_dlg)->ref -= (_cnt); \ @@ -252,12 +290,46 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id); */ struct dlg_cell* get_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir); + +/*! + * \brief Link a dialog structure + * \param dlg dialog + * \param n extra increments for the reference counter + */ void link_dlg(struct dlg_cell *dlg, int n); + +/*! + * \brief Unreference a dialog with locking + * \see unref_dlg_unsafe + * \param dlg dialog + * \param cnt decrement for the reference counter + */ void unref_dlg(struct dlg_cell *dlg, unsigned int cnt); + +/*! + * \brief Refefence a dialog with locking + * \see ref_dlg_unsafe + * \param dlg dialog + * \param cnt increment for the reference counter + */ void ref_dlg(struct dlg_cell *dlg, unsigned int cnt); + +/*! + * \brief Update a dialog state according a event and the old state + * + * This functions implement the main state machine that update a dialog + * state according a processed event and the current state. If necessary + * it will delete the processed dialog. The old and new state are also + * saved for reference. + * \param dlg updated dialog + * \param event current event + * \param old_state old dialog state + * \param new_state new dialog state + * \param unref set to 1 when the dialog was deleted, 0 otherwise + */ void next_state_dlg(struct dlg_cell *dlg, int event, int *old_state, int *new_state, int *unref);

15 years, 8 months

git:master: spelling fixes in documentation

by Henning Westerholt

Module: sip-router Branch: master Commit: 247a71839a3112aac26ce0ac27e0507664bfe810 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=247a718… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 19:58:20 2009 +0200 spelling fixes in documentation --- modules_s/registrar/README | 14 +++++++------- modules_s/registrar/doc/registrar.xml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules_s/registrar/README b/modules_s/registrar/README index 102fe58..0bb62ee 100644 --- a/modules_s/registrar/README +++ b/modules_s/registrar/README @@ -70,12 +70,12 @@ UA2 ---- NAT2 ----| 5090 | Registrar and usrloc would store the public IP of NAT with each registered contact, thus it would know how to reach both user agents. - In addition to the publi IP and port of the NAT device, registrar would - also remember the destination IP and port of the REGISTER request (the - IP and port used in SER). If registrar did not store this information, - it would not know what outbound socket it should use when sending SIP - messages to the registered contact. It would use the default port - number (often 5060) for such outgoing requests. + In addition to the public IP and port of the NAT device, registrar + would also remember the destination IP and port of the REGISTER request + (the IP and port used in SER). If registrar did not store this + information, it would not know what outbound socket it should use when + sending SIP messages to the registered contact. It would use the + default port number (often 5060) for such outgoing requests. When an INVITE for UA1 comes, everything would work because UA1 used port 5060 when registering and that is also the destination port in the @@ -98,7 +98,7 @@ UA1 ---- NAT1 +------ | 5060 | <--------------- UA2 ---- NAT2 X <----+ | 5090 | +--------+ - That is the reason why registrar and usrloc also need to remmember the + That is the reason why registrar and usrloc also need to remember the IP and port used on the server side, that information would be used later when forwarding INVITEs: SER diff --git a/modules_s/registrar/doc/registrar.xml b/modules_s/registrar/doc/registrar.xml index da8e93e..b553f0a 100644 --- a/modules_s/registrar/doc/registrar.xml +++ b/modules_s/registrar/doc/registrar.xml @@ -72,7 +72,7 @@ UA2 ---- NAT2 ----| 5090 | agents. </para> <para> - In addition to the publi IP and port of the NAT device, registrar + In addition to the public IP and port of the NAT device, registrar would also remember the destination IP and port of the REGISTER request (the IP and port used in SER). If registrar did not store this information, it would not know what outbound socket it should @@ -111,7 +111,7 @@ UA2 ---- NAT2 X <----+ | 5090 | ]]> </programlisting> <para> - That is the reason why registrar and usrloc also need to remmember + That is the reason why registrar and usrloc also need to remember the IP and port used on the server side, that information would be used later when forwarding INVITEs: </para>

15 years, 8 months

git:master: generate README for the cfg_rpc module

by Henning Westerholt

Module: sip-router Branch: master Commit: a8539942044b15eef743b28380fa25aefaec0721 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a853994… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:58:11 2009 +0200 generate README for the cfg_rpc module --- modules_s/cfg_rpc/README | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules_s/cfg_rpc/README b/modules_s/cfg_rpc/README new file mode 100644 index 0000000..7e457da --- /dev/null +++ b/modules_s/cfg_rpc/README @@ -0,0 +1,45 @@ +1. cfg_rpc Module + +Miklos Tirpak + + <miklos(a)iptel.org> + + Copyright � 2007 iptelorg GmbH + __________________________________________________________________ + + 1.1. Overview + 1.2. RPC Interface + +1.1. Overview + + The module implements RPC functions to set and get configuration + variables on-the-fly, that are declared by SER core and by the modules. + It can be used to fine-tune or debug SER without the need of restart. + +1.2. RPC Interface + + The module implements the following RPC interface commands: + * cfg_rpc.set_now_int - Set the value of a configuration variable and + commit the change immediately. The function accepts three + parameters: group name, variable name, integer value. + * cfg_rpc.set_now_string - Set the value of a configuration variable + and commit the change immediately. The function accepts three + parameters: group name, variable name, string value. + * cfg_rpc.set_delayed_int - Prepare the change of a configuration + variable, but does not commit the new value yet. The function + accepts three parameters: group name, variable name, integer value. + * cfg_rpc.set_delayed_string - Prepare the change of a configuration + variable, but does not commit the new value yet. The function + accepts three parameters: group name, variable name, string value. + * cfg_rpc.commit - Commit the previously prepared configuration + changes. The function does not have any parameters. + * cfg_rpc.rollback - Drop the prepared configuration changed. The + function does not have any parameters. + * cfg_rpc.get - Get the value of a configuration variable. The + function accepts two parameters: group name, variable name. + * cfg_rpc.help - Print the description of a configuration variable. + The function accepts two parameters: group name, variable name. + * cfg_rpc.list - List the configuration variables. The function does + not have any parameters. + * cfg_rpc.diff - List the pending configuration changes that have not + been committed yet. The function does not have any parameters.

15 years, 8 months

git:master: don't include and link with database API, this is not needed

by Henning Westerholt

Module: sip-router Branch: master Commit: 15e2e89e5d1e7f9dc6265c270153088596159ee5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15e2e89… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 20:32:26 2009 +0200 don't include and link with database API, this is not needed --- modules_s/uri/Makefile | 2 +- modules_s/uri/checks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/uri/Makefile b/modules_s/uri/Makefile index a609c52..d7d185f 100644 --- a/modules_s/uri/Makefile +++ b/modules_s/uri/Makefile @@ -13,6 +13,6 @@ LIBS= DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2 +#SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2 include ../../Makefile.modules diff --git a/modules_s/uri/checks.c b/modules_s/uri/checks.c index 23e98c1..9d5a1c6 100644 --- a/modules_s/uri/checks.c +++ b/modules_s/uri/checks.c @@ -43,7 +43,7 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_param.h" #include "../../ut.h" /* Handy utilities */ -#include "../../lib/srdb2/db.h" /* Database API */ +//#include "../../lib/srdb2/db.h" /* Database API */ #include "../../dset.h" #include "uri_mod.h" #include "checks.h"

15 years, 8 months

git:master: small refactoring to decrease exported symbols signature

by Henning Westerholt

Module: sip-router Branch: master Commit: 020559fd87eca6605371be4e9d21778b6285f6f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=020559f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 20:07:53 2009 +0200 small refactoring to decrease exported symbols signature - move unlink_unsafe_dlg function to header file, make them static - move unref_dlg_unsafe, ref_dlg_unsafe macros to implementation file --- modules_k/dialog/dlg_hash.c | 54 ++++++++++++++++++++++++++------------- modules_k/dialog/dlg_hash.h | 58 +++++++++++------------------------------- 2 files changed, 51 insertions(+), 61 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index a699e72..65e5876 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -490,27 +490,45 @@ void link_dlg(struct dlg_cell *dlg, int n) /*! - * \brief Unlink a dialog from the list without locking - * \see unref_dlg_unsafe - * \param d_entry unlinked entry - * \param dlg unlinked dialog + * \brief Reference a dialog without locking + * \param _dlg dialog + * \param _cnt increment for the reference counter */ -inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, - struct dlg_cell *dlg) -{ - if (dlg->next) - dlg->next->prev = dlg->prev; - else - d_entry->last = dlg->prev; - if (dlg->prev) - dlg->prev->next = dlg->next; - else - d_entry->first = dlg->next; +#define ref_dlg_unsafe(_dlg,_cnt) \ + do { \ + (_dlg)->ref += (_cnt); \ + LM_DBG("ref dlg %p with %d -> %d\n", \ + (_dlg),(_cnt),(_dlg)->ref); \ + }while(0) - dlg->next = dlg->prev = 0; - return; -} +/*! + * \brief Unreference a dialog without locking + * \param _dlg dialog + * \param _cnt decrement for the reference counter + */ +#define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ + do { \ + (_dlg)->ref -= (_cnt); \ + LM_DBG("unref dlg %p with %d -> %d\n",\ + (_dlg),(_cnt),(_dlg)->ref);\ + if ((_dlg)->ref<0) {\ + LM_CRIT("bogus ref %d with cnt %d for dlg %p [%u:%u] "\ + "with clid '%.*s' and tags '%.*s' '%.*s'\n",\ + (_dlg)->ref, _cnt, _dlg,\ + (_dlg)->h_entry, (_dlg)->h_id,\ + (_dlg)->callid.len, (_dlg)->callid.s,\ + (_dlg)->tag[DLG_CALLER_LEG].len,\ + (_dlg)->tag[DLG_CALLER_LEG].s,\ + (_dlg)->tag[DLG_CALLEE_LEG].len,\ + (_dlg)->tag[DLG_CALLEE_LEG].s); \ + }\ + if ((_dlg)->ref<=0) { \ + unlink_unsafe_dlg( _d_entry, _dlg);\ + LM_DBG("ref <=0 for dialog %p\n",_dlg);\ + destroy_dlg(_dlg);\ + }\ + }while(0) /*! diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index e717a2b..e01c311 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -163,7 +163,21 @@ extern struct dlg_cell *current_dlg_pointer; * \param d_entry unlinked entry * \param dlg unlinked dialog */ -inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg); +static inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg) +{ + if (dlg->next) + dlg->next->prev = dlg->prev; + else + d_entry->last = dlg->prev; + if (dlg->prev) + dlg->prev->next = dlg->next; + else + d_entry->first = dlg->next; + + dlg->next = dlg->prev = 0; + + return; +} /*! @@ -174,48 +188,6 @@ inline void destroy_dlg(struct dlg_cell *dlg); /*! - * \brief Reference a dialog without locking - * \param _dlg dialog - * \param _cnt increment for the reference counter - */ -#define ref_dlg_unsafe(_dlg,_cnt) \ - do { \ - (_dlg)->ref += (_cnt); \ - LM_DBG("ref dlg %p with %d -> %d\n", \ - (_dlg),(_cnt),(_dlg)->ref); \ - }while(0) - - -/*! - * \brief Unreference a dialog without locking - * \param _dlg dialog - * \param _cnt decrement for the reference counter - */ -#define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ - do { \ - (_dlg)->ref -= (_cnt); \ - LM_DBG("unref dlg %p with %d -> %d\n",\ - (_dlg),(_cnt),(_dlg)->ref);\ - if ((_dlg)->ref<0) {\ - LM_CRIT("bogus ref %d with cnt %d for dlg %p [%u:%u] "\ - "with clid '%.*s' and tags '%.*s' '%.*s'\n",\ - (_dlg)->ref, _cnt, _dlg,\ - (_dlg)->h_entry, (_dlg)->h_id,\ - (_dlg)->callid.len, (_dlg)->callid.s,\ - (_dlg)->tag[DLG_CALLER_LEG].len,\ - (_dlg)->tag[DLG_CALLER_LEG].s,\ - (_dlg)->tag[DLG_CALLEE_LEG].len,\ - (_dlg)->tag[DLG_CALLEE_LEG].s); \ - }\ - if ((_dlg)->ref<=0) { \ - unlink_unsafe_dlg( _d_entry, _dlg);\ - LM_DBG("ref <=0 for dialog %p\n",_dlg);\ - destroy_dlg(_dlg);\ - }\ - }while(0) - - -/*! * \brief Initialize the global dialog table * \param size size of the table * \return 0 on success, -1 on failure

15 years, 8 months

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev