sr-dev November 2011

sr-dev@lists.kamailio.org

31 participants
340 discussions

git:master: dialog(k): Set dialog parameters (timeout, etc.) before create callback
by Timo Reimann 03 Nov '11

03 Nov '11

Module: sip-router Branch: master Commit: 987c8a5fbfa0f23e1211e4253e7113f4ea79b22b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=987c8a5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Nov 3 23:10:38 2011 +0100 dialog(k): Set dialog parameters (timeout, etc.) before create callback is executed to provide these parameters to registered functions. --- modules_k/dialog/dlg_handlers.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 701d80c..490501b 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -828,6 +828,15 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb link_dlg(dlg,0); + dlg->lifetime = get_dlg_timeout(req); + s.s = _dlg_ctx.to_route_name; + s.len = strlen(s.s); + dlg_set_toroute(dlg, &s); + dlg->sflags |= _dlg_ctx.flags; + + if (_dlg_ctx.to_bye!=0) + dlg->dflags |= DLG_FLAG_TOBYE; + if (run_initial_cbs) run_create_callbacks( dlg, req); /* first INVITE seen (dialog created, unconfirmed) */ @@ -840,15 +849,6 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb /* reference it once for current_dialog_pointer */ ref_dlg(dlg, 1); - dlg->lifetime = get_dlg_timeout(req); - s.s = _dlg_ctx.to_route_name; - s.len = strlen(s.s); - dlg_set_toroute(dlg, &s); - dlg->sflags |= _dlg_ctx.flags; - - if (_dlg_ctx.to_bye!=0) - dlg->dflags |= DLG_FLAG_TOBYE; - if_update_stat( dlg_enable_stats, processed_dlgs, 1); finish:

1 0

git:3.2: docbook: remove double quotes around XML_CATALOG_FILES
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: 3.2 Commit: 019c69196f96c929f5aee2763fa619ce17d5debb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=019c691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 3 22:10:52 2011 +0100 docbook: remove double quotes around XML_CATALOG_FILES (cherry picked from commit c22415ba7a65e0a054cb625440812aae292ea2d5) --- docbook/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile index afe583d..0fd61e2 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -116,7 +116,7 @@ endif ifeq ($(nocatalog),yes) XMLCATALOGX= else -XMLCATALOGX="XML_CATALOG_FILES=$(catalog)" +XMLCATALOGX=XML_CATALOG_FILES=$(catalog) endif all_deps = Makefile $(docbook_dir)/Makefile $(docbook_dir)/entities.xml \

1 0

git:master: docbook: remove double quotes around XML_CATALOG_FILES
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: master Commit: c22415ba7a65e0a054cb625440812aae292ea2d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c22415b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 3 22:10:52 2011 +0100 docbook: remove double quotes around XML_CATALOG_FILES --- docbook/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile index afe583d..0fd61e2 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -116,7 +116,7 @@ endif ifeq ($(nocatalog),yes) XMLCATALOGX= else -XMLCATALOGX="XML_CATALOG_FILES=$(catalog)" +XMLCATALOGX=XML_CATALOG_FILES=$(catalog) endif all_deps = Makefile $(docbook_dir)/Makefile $(docbook_dir)/entities.xml \

1 0

New commits on branch 3.2
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=966851f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 3 21:12:46 2011 +0100 dispatcher(k): sample cfg file updated - some clarifications added to faq (cherry picked from commit 60670bd00570adc5fff2de30929d88b7d956d3ea) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5ca837… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 3 11:48:30 2011 +0100 dispatcher(k): fixed copy&paste typo of maintaining inactive state - instead of setting the inactive state, it was resetting it - restructured the usage of fake msg for running event routes for keepalive replies, so that it is generated only if event routes are defined (cherry picked from commit 1f63d8d3e619ec1e9a0d15f45c507547a72dc715) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29fce24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 2 10:42:52 2011 +0100 dispatcher(k): added clarifications to ds_probing_mode parameter (cherry picked from commit b589e42a06feba2382c2b4dbb9e0d56ebe4b6ed1) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aec0f94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 2 10:35:22 2011 +0100 dispatcher(k): use defines for probing modes - it can be DS_PROBE_NONE (0), DS_PROBE_ALL (1) or DS_PROBE_INACTIVE (2) - when ds_probing_mode is set to 2, keep probing inactive gateways until they become active. Note that the gateway must be set to probing when it goes in trying or inactive state (cherry picked from commit d665458442aed734bf1831e37ccf666ab2846f25) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4152e6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:32:42 2011 +0100 db_text(k): init DB API lib in mod_register() (cherry picked from commit fa9e7de6bbef15110cb4940769b27d90b2c000c8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ef9a9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:30:15 2011 +0100 db_oracle(k): init DB API lib in mod_register() (cherry picked from commit d0ede402a4e5a9163405fa3da66b2cb38ab24552) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=959d06b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:28:26 2011 +0100 db_unixodbc: init DB API lib in mod_register() (cherry picked from commit f122ee6e63087d15cee95642c4e8ac9249b4f958) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2018f85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:26:37 2011 +0100 db_sqlite: init DB API lib in mod_register() (cherry picked from commit 4040fead1833abddee710d18e7c655ca53cfb0ed) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d422ab1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:26:07 2011 +0100 db_postgres: use db_api_init() to initialize srdb1 lib (cherry picked from commit 4578f6eba8b3539202dffa756cf0813dfa7eb328) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f8c246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:22:30 2011 +0100 db_berkeley: init DB API lib in mod_register() (cherry picked from commit 41225392808b1e5462be40e37ba85700e8eab632) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=244cdf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:21:19 2011 +0100 db_postgres: init DB API lib in mod_register() - this will initialize the sql buffer at module load time, avoiding crash at startup if a module using the DB driver is loaded before the db driver itself - reported by Timo Teras (cherry picked from commit b3b34accb2f65ccef6045b083879166cb1a1e060) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1335ac9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:20:38 2011 +0100 db_flatstore: init DB API lib in mod_register() (cherry picked from commit cc88761be68212c7c08dcdef182fe2e16b42a3e1) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=590366c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:18:36 2011 +0100 db_mysql: initialize DB API in mod_register() function - internal buffer sql_buf initialized in this function - renamed sql_buf to mysql_sql_buf to avoid potential conflict with global variable in srdb1 library (cherry picked from commit 9a7e99d01e1c60dae8bec62037e8321c7d671c1d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f96f053… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:15:50 2011 +0100 srdb1: added db_api_init() function - to be executed to initialize internas of DB API library - calls internal function db_query_init() that initialize the buffer to print db queries (cherry picked from commit 86e28b07474e75582423f50f560cf6156022da86) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f9c491… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 16:18:34 2011 +0100 sdpops: support for codecs with same name and many different ids - reported by Juha Heinanen (cherry picked from commit e4d2b647d1b0e8764b1eb0cfe07d446231af0df8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31ec432… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 11:38:51 2011 +0100 sdpops: fixed usage of delim param in sdp_codec_in_str() - matching codecs in a comma separated list should work now - reported by Juha Heinanen as part of testing keep_codecs_by_name() (cherry picked from commit 83253d3a5cc08ce581fad88378de5eb3bd7fc784) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb5bbb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 11:43:28 2011 +0100 parser/sdp: updated parse_sdp() description - reflect properly return codes (cherry picked from commit e1c6eafe29973a05f9f9358efbac9bf6be16a92d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2584220… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 11:22:37 2011 +0100 snmpstats: removed c&p duplicated module parameter - reported by Klaus Darilion (cherry picked from commit 50880207fe208df5de065e0f915c560ac255a9d8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c79ed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 11:20:05 2011 +0100 sdpops: check for sdp structure after parse_sdp() - the function can return 1 in case of no body - reported by Juha Heinanen (cherry picked from commit 704c619f401b6286588c43c8dec9e04670f4ad43) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=524bf12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 16:45:17 2011 +0200 dispatcher(k): clarification about trying transition state from active to inactive (cherry picked from commit 0b8f2ee4c128cd2b532356087272445519c1c08b) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b5e236… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 16:44:44 2011 +0200 dispatcher(k): default probing threshold set to 1 (cherry picked from commit 7330cbc114821732b4f8bed5a43893226a800198) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=beb683f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 16:07:33 2011 +0200 dispatcher(k): docs update and rebuild readme file (cherry picked from commit 372b113b6bd4447dfd73b8b6da6a5672730a5636) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b017f6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 16:00:55 2011 +0200 dispatcher(k): new state trying for destination addresses - the state trying (t) is a transition between active to inactive, when inactive state is wanted after a certain number of failures specified in probing threshold - when in trying state, the destination is still selected, but additional settings of trying state will increment an internal failure counter which results in setting inactive state when probing threshold is matched - the functionality was before based on probing mode, but since 3.2 probing is not longer related to destination selection. This will provide back the lost functionality - ds_mark_dst(x) can have as parameter a combination between state and probing mode, such as 'ip' - inactive and probing, or ap - active and probing, or 'tp' - trying and probing (cherry picked from commit cbe2e236846e6527a2fc9e6b40b80befe329825b) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c928129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 07:17:52 2011 +0200 dialog(k): postpone setting tm callbacks until T is created - add dialog in tm callbacks when transaction is created - when using dlg_manage(), if dialog does not makes it to transaction, clean it up - fixes case when stateless reply is used after dlg_manage() to create a new dialog (cherry picked from commit ad4cfe8a3410059bc5c0b4951e49a952c4b01dfe) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a623f8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 04:21:24 2011 +0200 docbook/Makefile: option to not use local catalog - if nocatalog=yes, the xsltproc is started without XML_CATALOG_FILES and the default ones from system are used (cherry picked from commit a5c9d7e4bfe5949177290671072616ab054722bc) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14bc519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 26 21:21:22 2011 +0200 sdpops: find codec ids in sdp when not found in static table - functions to keep/remove codecs by name work now with dynamic ids for codecs - reported by Juha Heinanen (cherry picked from commit 511dc62e6a6ca74324f42b66a23bd9d80b377252)

1 0

git:master: dispatcher(k): sample cfg file updated
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: master Commit: 60670bd00570adc5fff2de30929d88b7d956d3ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60670bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 3 21:12:46 2011 +0100 dispatcher(k): sample cfg file updated - some clarifications added to faq --- modules_k/dispatcher/README | 274 ++++++++++++++++++++++++--- modules_k/dispatcher/doc/dispatcher.cfg | 262 +++++++++++++++++++++++--- modules_k/dispatcher/doc/dispatcher_faq.xml | 10 +- 3 files changed, 486 insertions(+), 60 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=606…

1 0

RPC WEB interface
by Ovidiu Sas 03 Nov '11

03 Nov '11

Hello all, I plan to build a small embedded web interface into sip-router for executing RPC commands from a web page. I already have part of the infrastructure working (re-using the HTTP part from core and the xhttp module). I would like to provide a simple and clean interface, organizing the access to RPC comands based on the module that provides them. The issue is that once an RPC command is registered into the core, the module that provides the command is not available. I'm looking foe a way to capture this information. One way to capture this information would be to change the signature of the rpc_lookup.h:rpc_register_array() and provide the module name along with the rpc_exports. I know that some modules set the name of their rpc commands based on the following pattern: <module>.<rpc_command>, but his is not fully enforced (there are rpc commands that are not following this pattern). One option would be to change the name of those commands and provide the old names as an alias. Also, there are modules that register the rpc_exports via the sr interface before the modules init and modules that registers the rpc_exports during init (via the rpc_register_array). This means that the list of rpc commands is not complete until all modules are initialized. It would be good to be more strict and enforce rpc registration for all modules before init (this will require a new interface and I think there was a plan to merge the ser module interface with the kamailio module interface). To summarize, I'm trying to solve two issues here: 1. trace back the module that provides an rpc command based on command name; 2. enforcing a common module interface for both ser and kamailio modules. Regards, Ovidiu Sas

2 1

git:master: dialog(k): postpone setting tm callbacks until T is created
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: master Commit: ad4cfe8a3410059bc5c0b4951e49a952c4b01dfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad4cfe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 07:17:52 2011 +0200 dialog(k): postpone setting tm callbacks until T is created - add dialog in tm callbacks when transaction is created - when using dlg_manage(), if dialog does not makes it to transaction, clean it up - fixes case when stateless reply is used after dlg_manage() to create a new dialog --- modules_k/dialog/dialog.c | 3 +- modules_k/dialog/dlg_handlers.c | 95 ++++++++++++++++++++++++++------------- modules_k/dialog/dlg_hash.h | 2 + modules_k/dialog/dlg_profile.c | 7 +++- 4 files changed, 73 insertions(+), 34 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 7d8f239..14e8d81 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -507,7 +507,8 @@ static int mod_init(void) } if (initial_cbs_inscript != 0 && initial_cbs_inscript != 1) { - LM_ERR("invalid parameter for running initial callbacks in-script (must be either 0 or 1)\n"); + LM_ERR("invalid parameter for running initial callbacks in-script" + " (must be either 0 or 1)\n"); return -1; } diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ccc95f1..701d80c 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -106,6 +106,8 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ /*! separator inside the record-route paramter */ #define DLG_SEPARATOR '.' +int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, + int mode); /*! * \brief Initialize the dialog handlers @@ -609,19 +611,28 @@ static inline int pre_match_parse( struct sip_msg *req, str *callid, */ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) { - struct sip_msg *req = param->req; + sip_msg_t *req = param->req; - if (!initial_cbs_inscript) { - if (spiral_detected == 1) - run_dlg_callbacks( DLGCB_SPIRALED, current_dlg_pointer, req, NULL, DLG_DIR_DOWNSTREAM, 0); - else if (spiral_detected == 0) - run_create_callbacks( current_dlg_pointer, req); - } - if((req->flags&dlg_flag)!=dlg_flag) - return; - if (current_dlg_pointer!=NULL) + if(req->first_line.u.request.method_value != METHOD_INVITE) return; - dlg_new_dialog(req, t, 1); + + if (current_dlg_pointer!=NULL) { + if (!initial_cbs_inscript) { + if (spiral_detected == 1) + run_dlg_callbacks( DLGCB_SPIRALED, current_dlg_pointer, + req, NULL, DLG_DIR_DOWNSTREAM, 0); + else if (spiral_detected == 0) + run_create_callbacks( current_dlg_pointer, req); + } + } + if (current_dlg_pointer==NULL) { + if((req->flags&dlg_flag)!=dlg_flag) + return; + dlg_new_dialog(req, t, 1); + } + if (current_dlg_pointer!=NULL) { + dlg_set_tm_callbacks(t, req, current_dlg_pointer, spiral_detected); + } } @@ -782,9 +793,10 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb spiral_detected = 1; if (run_initial_cbs) - run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, DLG_DIR_DOWNSTREAM, 0); - // get_dlg has incremented the ref count by 1 - unref_dlg(dlg, 1); + run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, + DLG_DIR_DOWNSTREAM, 0); + /* get_dlg() has incremented the ref count by 1 + * - it's ok, dlg will be used to set current_dialog_pointer */ goto finish; } } @@ -811,7 +823,6 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb return -1; } - /* Populate initial varlist: */ dlg->vars = get_local_varlist_pointer(req, 1); @@ -826,13 +837,7 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb goto error; } - if ( d_tmb.register_tmcb( req, t, - TMCB_RESPONSE_READY|TMCB_RESPONSE_FWDED, - dlg_onreply, (void*)dlg, unref_new_dialog)<0 ) { - LM_ERR("failed to register TMCB\n"); - goto error; - } - // increase reference counter because of registered callback + /* reference it once for current_dialog_pointer */ ref_dlg(dlg, 1); dlg->lifetime = get_dlg_timeout(req); @@ -847,6 +852,40 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb if_update_stat( dlg_enable_stats, processed_dlgs, 1); finish: + set_current_dialog(req, dlg); + _dlg_ctx.dlg = dlg; + + return 0; + +error: + if (!spiral_detected) + unref_dlg(dlg,1); // undo ref regarding linking + return -1; +} + + +/*! + * \brief add dlg structure to tm callbacks + * \param t current transaction + * \param req current sip request + * \param dlg current dialog + * \param smode if the sip request was spiraled + * \return 0 on success, -1 on failure + */ +int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, + int smode) +{ + if(smode==0) { + if ( d_tmb.register_tmcb( req, t, + TMCB_RESPONSE_READY|TMCB_RESPONSE_FWDED, + dlg_onreply, (void*)dlg, unref_new_dialog)<0 ) { + LM_ERR("failed to register TMCB\n"); + goto error; + } + // increase reference counter because of registered callback + ref_dlg(dlg, 1); + } + if (t) { // transaction exists ==> keep ref counter large enough to // avoid premature cleanup and ensure proper dialog referencing @@ -854,9 +893,7 @@ finish: LM_ERR("failed to store dialog in transaction\n"); goto error; } - } - else - { + } else { // no transaction exists ==> postpone work until we see the // request being forwarded statefully if ( d_tmb.register_tmcb( req, NULL, TMCB_REQUEST_FWDED, @@ -865,16 +902,10 @@ finish: goto error; } } - - set_current_dialog(req, dlg); - _dlg_ctx.dlg = dlg; - ref_dlg(dlg, 1); + dlg->dflags |= DLG_FLAG_TM; return 0; - error: - if (!spiral_detected) - unref_dlg(dlg,1); // undo ref regarding linking return -1; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index ecb6526..9a8854c 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -79,6 +79,8 @@ /* dialog-variable flags (in addition to dialog-flags) */ #define DLG_FLAG_DEL (1<<8) /*!< delete this var */ +#define DLG_FLAG_TM (1<<9) /*!< dialog is set in transaction */ + #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */ diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 2e69291..bb20c57 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -312,7 +312,12 @@ int profile_cleanup( struct sip_msg *msg, unsigned int flags, void *param ) { current_dlg_msg_id = 0; if (current_dlg_pointer) { - unref_dlg( current_dlg_pointer, 1); + if(current_dlg_pointer->dflags & DLG_FLAG_TM) { + unref_dlg( current_dlg_pointer, 1); + } else { + /* dialog didn't make it to tm */ + unref_dlg( current_dlg_pointer, 2); + } current_dlg_pointer = NULL; } if (current_pending_linkers) {

2 3

git:master: dispatcher(k): fixed copy&paste typo of maintaining inactive state
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: master Commit: 1f63d8d3e619ec1e9a0d15f45c507547a72dc715 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f63d8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 3 11:48:30 2011 +0100 dispatcher(k): fixed copy&paste typo of maintaining inactive state - instead of setting the inactive state, it was resetting it - restructured the usage of fake msg for running event routes for keepalive replies, so that it is generated only if event routes are defined --- modules_k/dispatcher/dispatch.c | 57 ++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 11c3523..7aa33fd 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -103,7 +103,7 @@ int *next_idx = NULL; #define _ds_list (ds_lists[*crt_idx]) #define _ds_list_nr (*ds_list_nr) -static void ds_run_route(struct sip_msg *msg, char *route); +static void ds_run_route(struct sip_msg *msg, str *uri, char *route); void destroy_list(int); @@ -2020,8 +2020,8 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) { /* old state is inactive, new state is trying => keep it inactive * - it has to go first to active state and then to trying */ - state &= ~ DS_TRYING_DST; - state |= ~ DS_INACTIVE_DST; + state &= ~(DS_TRYING_DST); + state |= DS_INACTIVE_DST; } /* set the new states */ @@ -2047,11 +2047,11 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) if (!ds_skip_dst(old_state) && ds_skip_dst(idx->dlist[i].flags)) { - ds_run_route(msg, "dispatcher:dst-down"); + ds_run_route(msg, address, "dispatcher:dst-down"); } else { if(ds_skip_dst(old_state) && !ds_skip_dst(idx->dlist[i].flags)) - ds_run_route(msg, "dispatcher:dst-up"); + ds_run_route(msg, address, "dispatcher:dst-up"); } return 0; @@ -2062,12 +2062,11 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) return -1; } -static void ds_run_route(struct sip_msg *msg, char *route) +static void ds_run_route(sip_msg_t *msg, str *uri, char *route) { - int rt, backup_rt = get_route_type(); + int rt, backup_rt; struct run_act_ctx ctx; - - LM_DBG("ds_run_route\n"); + sip_msg_t *fmsg; if (route == NULL) { @@ -2075,6 +2074,8 @@ static void ds_run_route(struct sip_msg *msg, char *route) return; } + LM_DBG("ds_run_route\n"); + rt = route_get(&event_rt, route); if (rt < 0 || event_rt.rlist[rt] == NULL) { @@ -2082,6 +2083,21 @@ static void ds_run_route(struct sip_msg *msg, char *route) return; } + if(msg==NULL) + { + if (faked_msg_init() < 0) + { + LM_ERR("faked_msg_init() failed\n"); + return; + } + fmsg = faked_msg_next(); + fmsg->parsed_orig_ruri_ok = 0; + fmsg->new_uri = *uri; + } else { + fmsg = msg; + } + + backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], msg, 0); @@ -2303,7 +2319,7 @@ static void ds_options_callback( struct cell *t, int type, { int group = 0; str uri = {0, 0}; - struct sip_msg *fmsg; + sip_msg_t *fmsg; int state; /* The Param does contain the group, in which the failed host @@ -2314,6 +2330,9 @@ static void ds_options_callback( struct cell *t, int type, " with code %d\n", ps->code); return; } + + fmsg = NULL; + /* The param is a (void*) Pointer, so we need to dereference it and * cast it to an int. */ group = (int)(long)(*ps->param); @@ -2329,15 +2348,6 @@ static void ds_options_callback( struct cell *t, int type, * We accept both a "200 OK" or the configured reply as a valid response */ if((ps->code>=200 && ps->code<=299) || ds_ping_check_rplcode(ps->code)) { - if (faked_msg_init() < 0) - { - LM_ERR("faked_msg_init() failed\n"); - return; - } - fmsg = faked_msg_next(); - fmsg->parsed_orig_ruri_ok = 0; - fmsg->new_uri = uri; - /* Set the according entry back to "Active" */ state = 0; if (ds_probing_mode==DS_PROBE_ALL) @@ -2352,15 +2362,6 @@ static void ds_options_callback( struct cell *t, int type, if (ds_probing_mode!=DS_PROBE_NONE) state |= DS_PROBING_DST; - if (faked_msg_init() < 0) - { - LM_ERR("faked_msg_init() failed\n"); - return; - } - fmsg = faked_msg_next(); - fmsg->parsed_orig_ruri_ok = 0; - fmsg->new_uri = uri; - if (ds_update_state(fmsg, group, &uri, state) != 0) { LM_ERR("Setting the probing state failed (%.*s, group %d)\n",

1 0

git:3.2: ctl: use SRNAME define to build default ctl file path
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: 3.2 Commit: 233b229e00aa1d1be3a6d9b1484aa2c9ece3407e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=233b229… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 17:16:36 2011 +0100 ctl: use SRNAME define to build default ctl file path - this define is set by sercmd comilation (NAME is set to sercmd in this case) - otherwise use NAME, which is set by sip server compilation - reported by Henning Westerholt (cherry picked from commit b515ac33300f3c1d47195961409812d49fafb58f) --- modules/ctl/ctl_defaults.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index c50af47..5c10c17 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,7 +4,13 @@ #ifndef __ctl_defaults_h #define __ctl_defaults_h /*listen by default on: */ +#ifdef SRNAME +/* this is used when compiling sercmd tool */ +#define DEFAULT_CTL_SOCKET "unixs:/tmp/" SRNAME "_ctl" +#else +/* this is used when compiling sip server */ #define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl" +#endif /* port used by default for tcp/udp if no port is explicitely specified */ #define DEFAULT_CTL_PORT 2049

1 0

git:3.2: utils/sercmd: set SRNAME at compile time
by Juha Heinanen 03 Nov '11

03 Nov '11

Module: sip-router Branch: 3.2 Commit: 1e7488d5a94554cf8e2845240b9c61170537c5f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e7488d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Oct 31 17:18:11 2011 +0100 utils/sercmd: set SRNAME at compile time - it is set to sip server name (e.g., ser, kamailio) - it is used to build the default path to ctl file used to communicate with sip server via ctl module - reported by Henning Westerholt (cherry picked from commit 1b58b26b7ccf7b2c01185a22ad076a3655e43664) --- utils/sercmd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index bc03b74..2cb406a 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -22,7 +22,7 @@ endif #ifneq (,$(MAKECMDGOALS)) # erase common DEFS (not needed) C_DEFS:= -DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ +DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) # use proper libs (we can't rely on LIBS value since we might be called

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2011