sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:master: db_mysql: moved xml docbook files in ./doc
by Daniel-Constantin Mierla 23 Jan '11

23 Jan '11

Module: sip-router Branch: master Commit: c4e5ea39e4c673bf7a32223d00ca87b815f65b02 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4e5ea3… Author: kamailio <kamailio(a)kamailio-laptop.(none)> Committer: kamailio <kamailio(a)kamailio-laptop.(none)> Date: Sun Jan 23 23:20:06 2011 +0100 db_mysql: moved xml docbook files in ./doc --- modules/db_mysql/{km_doc => doc}/db_mysql.xml | 0 .../db_mysql/{km_doc => doc}/db_mysql_admin.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/km_doc/db_mysql.xml b/modules/db_mysql/doc/db_mysql.xml similarity index 100% rename from modules/db_mysql/km_doc/db_mysql.xml rename to modules/db_mysql/doc/db_mysql.xml diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/doc/db_mysql_admin.xml similarity index 100% rename from modules/db_mysql/km_doc/db_mysql_admin.xml rename to modules/db_mysql/doc/db_mysql_admin.xml

1 0

git:master: db_postgres: renamed subfolder km_doc to doc
by Daniel-Constantin Mierla 23 Jan '11

23 Jan '11

Module: sip-router Branch: master Commit: c14525c044e2c56b594aa529846d8eee9bfb686d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c14525c… Author: kamailio <kamailio(a)kamailio-laptop.(none)> Committer: kamailio <kamailio(a)kamailio-laptop.(none)> Date: Sun Jan 23 22:52:08 2011 +0100 db_postgres: renamed subfolder km_doc to doc --- modules/db_postgres/{km_doc => doc}/Makefile | 0 .../db_postgres/{km_doc => doc}/db_postgres.xml | 0 .../{km_doc => doc}/db_postgres_admin.xml | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/km_doc/Makefile b/modules/db_postgres/doc/Makefile similarity index 100% rename from modules/db_postgres/km_doc/Makefile rename to modules/db_postgres/doc/Makefile diff --git a/modules/db_postgres/km_doc/db_postgres.xml b/modules/db_postgres/doc/db_postgres.xml similarity index 100% rename from modules/db_postgres/km_doc/db_postgres.xml rename to modules/db_postgres/doc/db_postgres.xml diff --git a/modules/db_postgres/km_doc/db_postgres_admin.xml b/modules/db_postgres/doc/db_postgres_admin.xml similarity index 100% rename from modules/db_postgres/km_doc/db_postgres_admin.xml rename to modules/db_postgres/doc/db_postgres_admin.xml

1 0

git:master: db_postgres: documentation updated
by Daniel-Constantin Mierla 23 Jan '11

23 Jan '11

Module: sip-router Branch: master Commit: d55c6bd0f77c9211f429591df6d0a98c2ae96c33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d55c6bd… Author: kamailio <kamailio(a)kamailio-laptop.(none)> Committer: kamailio <kamailio(a)kamailio-laptop.(none)> Date: Sun Jan 23 23:04:16 2011 +0100 db_postgres: documentation updated - documented the retries parameter --- modules/db_postgres/README | 139 +++++++++---------------- modules/db_postgres/doc/db_postgres_admin.xml | 29 ++++- 2 files changed, 73 insertions(+), 95 deletions(-) diff --git a/modules/db_postgres/README b/modules/db_postgres/README index e943699..f5be0af 100644 --- a/modules/db_postgres/README +++ b/modules/db_postgres/README @@ -1,4 +1,3 @@ - postgres Module Greg Fausak @@ -9,126 +8,88 @@ Edited by Greg Fausak - Copyright � 2003 Greg Fausak - _________________________________________________________ + Copyright © 2003 Greg Fausak + Revision History + Revision $Revision$ $Date$ + __________________________________________________________________ Table of Contents - 1. User's Guide - - 1.1. Overview - 1.2. Dependencies - - 1.2.1. SER Modules - 1.2.2. External Libraries or Applications - 1.3. Exported Parameters + 1. Admin Guide - 1.3.1. param_name (param_type) + 1. Overview + 2. Dependencies - 1.4. Exported Functions + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - 1.4.1. function_name(param1, param2) + 3. Exported Parameters - 1.5. Installation & Running + 3.1. retries (integer) - 2. Developer's Guide - 3. Frequently Asked Questions + 4. Exported Functions List of Examples - 1-1. Set param_name parameter - 1-2. function_name usage - _________________________________________________________ -Chapter 1. User's Guide + 1.1. Set retries parameter -1.1. Overview +Chapter 1. Admin Guide - Module description - _________________________________________________________ + Table of Contents -1.2. Dependencies + 1. Overview + 2. Dependencies -1.2.1. SER Modules + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - The following modules must be loaded before this module: + 3. Exported Parameters - * No dependencies on other SER modules. - _________________________________________________________ + 3.1. retries (integer) -1.2.2. External Libraries or Applications + 4. Exported Functions - The following libraries or applications must be installed - before running SER with this module loaded: +1. Overview - * None. - _________________________________________________________ + The module is an implementation of the internal DB API v1 and v2 + connector for PostgreSQL server. It has support for reconnecting when + the connection is broken. -1.3. Exported Parameters +2. Dependencies -1.3.1. param_name (param_type) + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - Param description. +2.1. Kamailio Modules - Default value is "value". + The following modules must be loaded before this module: + * No dependencies on other Kamailio modules. - Example 1-1. Set param_name parameter -... -modparam("module", "param_name", "param_value") -... - _________________________________________________________ +2.2. External Libraries or Applications + + The following libraries or applications must be installed before + running Kamailio with this module loaded: + * PostgreSQL library - e.g., libpq5. + * PostgreSQL devel library - to compile the module (e.g., libpq-dev). -1.4. Exported Functions +3. Exported Parameters -1.4.1. function_name(param1, param2) + 3.1. retries (integer) - Description +3.1. retries (integer) - Meaning of the parameters is as follows: + How many retries to attept to reconnect if connection to Postgres + server becomes broken. - * param1 - description. - * param2 - description. + Default value is 2 (that means three attepts to submit the query, first + will triger the connection error and two more (the value of this + parameter) after resetting the connection). - Example 1-2. function_name usage + Example 1.1. Set retries parameter ... -function_name("sample_param1", "sample_param2"); +modparam("db_mysql", "retries", 3) ... - _________________________________________________________ - -1.5. Installation & Running - - Notes about installation and running. - _________________________________________________________ - -Chapter 2. Developer's Guide - - The module does not provide any sort of API to use in other - SER modules. - _________________________________________________________ - -Chapter 3. Frequently Asked Questions - - 3.1. Where can I find more about SER? - 3.2. Where can I post a question about this module? - 3.3. How can I report a bug? - - 3.1. Where can I find more about SER? - - Take a look at http://iptel.org/ser. - - 3.2. Where can I post a question about this module? - - First at all check if your question was already answered on - one of our mailing lists: - - * http://mail.iptel.org/mailman/listinfo/serusers - * http://mail.iptel.org/mailman/listinfo/serdev - - E-mails regarding any stable version should be sent to - <serusers(a)iptel.org> and e-mail regarding development versions - or CVS snapshots should be send to <serdev(a)iptel.org>. - - 3.3. How can I report a bug? +4. Exported Functions - Please follow the guidelines provided at: - http://iptel.org/ser/bugs + NONE diff --git a/modules/db_postgres/doc/db_postgres_admin.xml b/modules/db_postgres/doc/db_postgres_admin.xml index bf0238e..f82a997 100644 --- a/modules/db_postgres/doc/db_postgres_admin.xml +++ b/modules/db_postgres/doc/db_postgres_admin.xml @@ -16,7 +16,9 @@ <section> <title>Overview</title> - <para>Module description</para> + <para>The module is an implementation of the internal DB API v1 and v2 + connector for PostgreSQL server. It has support for reconnecting + when the connection is broken.</para> </section> <section> <title>Dependencies</title> @@ -57,9 +59,28 @@ <section> <title>Exported Parameters</title> + <section> + <title><varname>retries</varname> (integer)</title> <para> - NONE + How many retries to attept to reconnect if connection to Postgres + server becomes broken. + </para> + <para> + <emphasis> + Default value is 2 (that means three attepts to submit the query, + first will triger the connection error and two more (the value + of this parameter) after resetting the connection). + </emphasis> </para> + <example> + <title>Set <varname>retries</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "retries", 3) +... +</programlisting> + </example> + </section> </section> <section> @@ -68,9 +89,5 @@ NONE </para> </section> - <section> - <title>Installation and Running</title> - <para>Notes about installation and running.</para> - </section> </chapter>

1 0

git:master: textops(k): readme regenerated
by Daniel-Constantin Mierla 23 Jan '11

23 Jan '11

Module: sip-router Branch: master Commit: 4c927f8e3424918a35e9d7f6a1c17cd987934f38 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c927f8… Author: kamailio <kamailio(a)kamailio-laptop.(none)> Committer: kamailio <kamailio(a)kamailio-laptop.(none)> Date: Sun Jan 23 22:49:24 2011 +0100 textops(k): readme regenerated --- modules_k/textops/README | 66 ++++++++++++++++++++++++++++++---------------- 1 files changed, 43 insertions(+), 23 deletions(-) diff --git a/modules_k/textops/README b/modules_k/textops/README index 7cad37b..3d1ed29 100644 --- a/modules_k/textops/README +++ b/modules_k/textops/README @@ -72,10 +72,11 @@ Juha Heinanen 3.27. remove_hf(hname) 3.28. remove_hf_re(re) 3.29. has_body(), has_body(mime) - 3.30. is_privacy(privacy_type) - 3.31. cmp_str(str1, str2) - 3.32. cmp_istr(str1, str2) - 3.33. starts_with(str1, str2) + 3.30. is_audio_on_hold() + 3.31. is_privacy(privacy_type) + 3.32. cmp_str(str1, str2) + 3.33. cmp_istr(str1, str2) + 3.34. starts_with(str1, str2) 4. Known Limitations @@ -116,10 +117,11 @@ Juha Heinanen 1.27. remove_hf usage 1.28. remove_hf_re usage 1.29. has_body usage - 1.30. is_privacy usage - 1.31. cmp_str usage + 1.30. is_audio_on_hold usage + 1.31. is_privacy usage 1.32. cmp_str usage - 1.33. starts_with usage + 1.33. cmp_str usage + 1.34. starts_with usage Chapter 1. Admin Guide @@ -165,10 +167,11 @@ Chapter 1. Admin Guide 3.27. remove_hf(hname) 3.28. remove_hf_re(re) 3.29. has_body(), has_body(mime) - 3.30. is_privacy(privacy_type) - 3.31. cmp_str(str1, str2) - 3.32. cmp_istr(str1, str2) - 3.33. starts_with(str1, str2) + 3.30. is_audio_on_hold() + 3.31. is_privacy(privacy_type) + 3.32. cmp_str(str1, str2) + 3.33. cmp_istr(str1, str2) + 3.34. starts_with(str1, str2) 4. Known Limitations @@ -237,10 +240,11 @@ From: medabeda 3.27. remove_hf(hname) 3.28. remove_hf_re(re) 3.29. has_body(), has_body(mime) - 3.30. is_privacy(privacy_type) - 3.31. cmp_str(str1, str2) - 3.32. cmp_istr(str1, str2) - 3.33. starts_with(str1, str2) + 3.30. is_audio_on_hold() + 3.31. is_privacy(privacy_type) + 3.32. cmp_str(str1, str2) + 3.33. cmp_istr(str1, str2) + 3.34. starts_with(str1, str2) 3.1. search(re) @@ -818,7 +822,23 @@ if(has_body("application/sdp")) } ... -3.30. is_privacy(privacy_type) +3.30. is_audio_on_hold() + + The function returns true if the SIP message has a body attached and at + least one audio stream in on hold. + + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, + FAILURE_ROUTE and BRANCH_ROUTE. + + Example 1.30. is_audio_on_hold usage +... +if(is_audio_on_hold()) +{ + # do interesting stuff here +} +... + +3.31. is_privacy(privacy_type) The function returns true if the SIP message has a Privacy header field that includes the given privacy_type among its privacy values. See @@ -828,7 +848,7 @@ if(has_body("application/sdp")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.30. is_privacy usage + Example 1.31. is_privacy usage ... if(is_privacy("id")) { @@ -836,7 +856,7 @@ if(is_privacy("id")) } ... -3.31. cmp_str(str1, str2) +3.32. cmp_str(str1, str2) The function returns true if the two parameters matches as string case sensitive comparison. @@ -844,7 +864,7 @@ if(is_privacy("id")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.31. cmp_str usage + Example 1.32. cmp_str usage ... if(cmp_str("$rU", "kamailio")) { @@ -852,7 +872,7 @@ if(cmp_str("$rU", "kamailio")) } ... -3.32. cmp_istr(str1, str2) +3.33. cmp_istr(str1, str2) The function returns true if the two parameters matches as string case insensitive comparison. @@ -860,7 +880,7 @@ if(cmp_str("$rU", "kamailio")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.32. cmp_str usage + Example 1.33. cmp_str usage ... if(cmp_istr("$rU@you", "kamailio@YOU")) { @@ -868,7 +888,7 @@ if(cmp_istr("$rU@you", "kamailio@YOU")) } ... -3.33. starts_with(str1, str2) +3.34. starts_with(str1, str2) The function returns true if the first string starts with the second string. @@ -876,7 +896,7 @@ if(cmp_istr("$rU@you", "kamailio@YOU")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.33. starts_with usage + Example 1.34. starts_with usage ... if (starts_with("$rU", "+358")) {

1 0

git:master: modules_k/textops: update docs for is_audio_on_hold()
by Ovidiu Sas 23 Jan '11

23 Jan '11

Module: sip-router Branch: master Commit: e6201dd5b6d49183567cbd6df47564f65b3d435c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6201dd… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Jan 23 12:51:07 2011 -0500 modules_k/textops: update docs for is_audio_on_hold() --- modules_k/textops/doc/textops_admin.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules_k/textops/doc/textops_admin.xml b/modules_k/textops/doc/textops_admin.xml index 0c8ea28..b978f36 100644 --- a/modules_k/textops/doc/textops_admin.xml +++ b/modules_k/textops/doc/textops_admin.xml @@ -1131,6 +1131,31 @@ if(has_body("application/sdp")) <section> <title> + <function moreinfo="none">is_audio_on_hold()</function> + </title> + <para> + The function returns <emphasis>true</emphasis> if the SIP message + has a body attached and at least one audio stream in on hold. + </para> + <para> + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, + FAILURE_ROUTE and BRANCH_ROUTE. + </para> + <example> + <title><function>is_audio_on_hold</function> usage</title> + <programlisting format="linespecific"> +... +if(is_audio_on_hold()) +{ + # do interesting stuff here +} +... +</programlisting> + </example> + </section> + + <section> + <title> <function moreinfo="none">is_privacy(privacy_type)</function> </title> <para>

1 0

git:carstenbock/ims: - fixed some more compile on 64Bit
by Carsten Bock 21 Jan '11

21 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: db4982cb25ea3b34c35b7e4bd65a8e1027fa0481 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db4982c… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Fri Jan 21 16:12:16 2011 +0100 - fixed some more compile on 64Bit --- modules/ecscf/dlg_state.c | 4 ++-- modules/ecscf/lrf.c | 4 ++-- modules/ecscf/release_call.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/ecscf/dlg_state.c b/modules/ecscf/dlg_state.c index 269ca04..761b158 100644 --- a/modules/ecscf/dlg_state.c +++ b/modules/ecscf/dlg_state.c @@ -286,8 +286,8 @@ e_dialog* new_e_dialog(str call_id,str aor, enum e_dialog_direction dir) if (!e_dialog_count_increment()) return 0; d = shm_malloc(sizeof(e_dialog)); if (!d) { - LOG(L_ERR,"ERR:"M_NAME":new_e_dialog(): Unable to alloc %d bytes\n", - sizeof(e_dialog)); + LOG(L_ERR,"ERR:"M_NAME":new_e_dialog(): Unable to alloc %lu bytes\n", + (unsigned long)sizeof(e_dialog)); goto error; } memset(d,0,sizeof(e_dialog)); diff --git a/modules/ecscf/lrf.c b/modules/ecscf/lrf.c index 092ec76..7a7495d 100644 --- a/modules/ecscf/lrf.c +++ b/modules/ecscf/lrf.c @@ -429,8 +429,8 @@ int send_options_req(str req_uri, str location, str service, struct initial_tr * char * p = (char*)shm_malloc(sizeof(struct initial_tr)+sizeof(char)*inv_tr->callid.len); if(!p){ - LOG(L_ERR,"ERR:"M_NAME":send_options_req: Error allocating cb_par: %d bytes\n", - sizeof(struct initial_tr)+sizeof(char)*inv_tr->callid.len); + LOG(L_ERR,"ERR:"M_NAME":send_options_req: Error allocating cb_par: %lu bytes\n", + (unsigned long)sizeof(struct initial_tr)+sizeof(char)*inv_tr->callid.len); goto error; } cb_par = (struct initial_tr *)p; diff --git a/modules/ecscf/release_call.c b/modules/ecscf/release_call.c index a4217b4..8f738ec 100644 --- a/modules/ecscf/release_call.c +++ b/modules/ecscf/release_call.c @@ -493,7 +493,7 @@ int send_request(str method,str reqbuf,dlg_t *d,transaction_cb cb, enum e_dialog * and the ACK is never replied it would be a bug if i did*/ cbp = shm_malloc(sizeof(enum e_dialog_direction)); if (!cbp){ - LOG(L_ERR,"ERR:"M_NAME":send_request(): error allocating %d bytes\n",sizeof(enum e_dialog_direction)); + LOG(L_ERR,"ERR:"M_NAME":send_request(): error allocating %lu bytes\n",(unsigned long)sizeof(enum e_dialog_direction)); return 0; } *cbp=dir;

1 0

git:carstenbock/ims: - Fixed some compile warning for CDP on 64Bit
by Carsten Bock 21 Jan '11

21 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: ec07538c4b253fe1b89e80254ee18e2d3f7f9ad1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec07538… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Fri Jan 21 16:05:04 2011 +0100 - Fixed some compile warning for CDP on 64Bit --- modules/cdp/sem.h | 2 +- modules/cdp/utils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/cdp/sem.h b/modules/cdp/sem.h index db05fc5..63a6aab 100644 --- a/modules/cdp/sem.h +++ b/modules/cdp/sem.h @@ -71,7 +71,7 @@ do {\ sem_ptr=shm_malloc(sizeof(gen_sem_t));\ if (!sem_ptr){\ - LOG(L_ERR,"Error allocating %d bytes of shm!\n",sizeof(gen_sem_t));\ + LOG(L_ERR,"Error allocating %lu bytes of shm!\n",(unsigned long)sizeof(gen_sem_t));\ goto out_of_memory;\ } \ if (sem_init(sem_ptr, 1, value)<0) {\ diff --git a/modules/cdp/utils.h b/modules/cdp/utils.h index fe05bd5..987a45a 100644 --- a/modules/cdp/utils.h +++ b/modules/cdp/utils.h @@ -89,9 +89,9 @@ #ifndef LOG_NO_MEM #define LOG_NO_MEM(mem_type,data_len) \ - LOG(L_ERR,"ERROR:%s:%s()[%d]: Out of %s memory allocating %d bytes\n",\ + LOG(L_ERR,"ERROR:%s:%s()[%d]: Out of %s memory allocating %lu bytes\n",\ __FILE__,__FUNCTION__,__LINE__, \ - mem_type,data_len); + mem_type,(long unsigned)data_len); #endif

1 0

git:carstenbock/ims: - allow setting, editing and removing of variables before the dialog was created.
by Carsten Bock 21 Jan '11

21 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: f61056d444ad9d453281d70c70a297b8561ce204 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f61056d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 20 09:01:29 2011 +0100 - allow setting, editing and removing of variables before the dialog was created. --- modules_k/dialog/dlg_handlers.c | 5 ++ modules_k/dialog/dlg_var.c | 89 +++++++++++++++++++++++++-------------- modules_k/dialog/dlg_var.h | 6 +++ 3 files changed, 68 insertions(+), 32 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a118a91..67b8160 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -679,6 +679,8 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) return -1; } + + /* save caller's tag, cseq, contact and record route*/ if (populate_leg_info(dlg, msg, t, DLG_CALLER_LEG, &(get_from(msg)->tag_value)) !=0) @@ -690,6 +692,9 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) set_current_dialog(msg, dlg); _dlg_ctx.dlg = dlg; + /* Populate initial varlist: */ + dlg->vars = getvarlist(msg); + deletevarlist(); link_dlg(dlg, 2/* extra ref for the callback and current dlg hook */); diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index d540099..e9df6a2 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -29,6 +29,11 @@ dlg_ctx_t _dlg_ctx; +/*! global variable table, in case the dialog does not exist yet */ +struct dlg_var * var_table = 0; +/*! ID of the current message */ +int msg_id; + int dlg_cfg_cb(struct sip_msg *foo, unsigned int flags, void *bar) { memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); @@ -70,7 +75,7 @@ static inline struct dlg_var *new_dlg_var(str *key, str *val) } /* Adds, updates and deletes dialog variables */ -int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) +int set_dlg_variable_unsafe(struct dlg_var * var_list, str *key, str *val) { struct dlg_var * var = NULL; struct dlg_var * it; @@ -81,27 +86,21 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) return -1; } - /* lock dialog */ - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); - /* iterate the list */ - for( it_prev=NULL, it=dlg->vars ; it ; it_prev=it,it=it->next) { + for( it_prev=NULL, it=var_list ; it ; it_prev=it,it=it->next) { if (key->len==it->key.len && memcmp(key->s,it->key.s,key->len)==0) { /* found -> replace or delete it */ if (val==NULL) { /* delete it */ if (it_prev) it_prev->next = it->next; - else dlg->vars = it->next; + else var_list = it->next; } else { /* replace the current it with var and free the it */ var->next = it->next; if (it_prev) it_prev->next = var; - else dlg->vars = var; + else var_list = var; } - /* unlock dialog */ - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - /* Free this var: */ shm_free(it->key.s); shm_free(it->value.s); @@ -113,34 +112,23 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) /* not found -> simply add a new one */ /* insert at the beginning of the list */ - var->next = dlg->vars; - dlg->vars = var; - - /* unlock dialog */ - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + var->next = var_list; + var_list = var; return 0; } -str * get_dlg_variable(struct dlg_cell *dlg, str *key) +str * get_dlg_variable_unsafe(struct dlg_var * var_list, str *key) { struct dlg_var *var; - /* lock dialog */ - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); - /* iterate the list */ - for(var=dlg->vars ; var ; var=var->next) { + for(var=var_list ; var ; var=var->next) { if (key->len==var->key.len && memcmp(key->s,var->key.s,key->len)==0) { - /* unlock dialog */ - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); return &var->value; } } - /* unlock dialog */ - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - return NULL; } @@ -156,10 +144,30 @@ int pv_parse_dialog_var_name(pv_spec_p sp, str *in) return 0; } +/*! Delete the current var-list */ +void deletevarlist() { + struct dlg_var *var; + while (var_table) { + var = var_table; + var_table = var_table->next; + shm_free(var->key.s); + shm_free(var->key.s); + shm_free(var); + } +} + +/*! Retrieve the current var-list */ +struct dlg_var * getvarlist(struct sip_msg *msg) { + /* New list, delete the old one */ + if (msg->id != msg_id) + deletevarlist(); + return var_table; +} int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { struct dlg_cell *dlg; + struct dlg_var *varlist; str * value; if (param==NULL || param->pvn.type!=PV_NAME_INTSTR || param->pvn.u.isname.type!=AVP_NAME_STR || param->pvn.u.isname.name.s.s==NULL) { @@ -168,9 +176,18 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } if ((dlg=get_current_dlg_pointer())==NULL) - return pv_get_null(msg, param, res); + varlist = getvarlist(msg); + else + varlist = dlg->vars; + + /* unlock dialog */ + if (dlg) dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + + value = get_dlg_variable_unsafe(varlist, &param->pvn.u.isname.name.s); + + /* unlock dialog */ + if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - value = get_dlg_variable(dlg, &param->pvn.u.isname.name.s); if (value) return pv_get_strval(msg, param, res, value); return 0; @@ -179,9 +196,12 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { struct dlg_cell *dlg; + struct dlg_var *varlist; - if ( (dlg=get_current_dlg_pointer())==NULL ) - return -1; + if ((dlg=get_current_dlg_pointer())==NULL) + varlist = getvarlist(msg); + else + varlist = dlg->vars; if (param==NULL || param->pvn.type!=PV_NAME_INTSTR || param->pvn.u.isname.type!=AVP_NAME_STR || param->pvn.u.isname.name.s.s==NULL ) { LM_CRIT("BUG - bad parameters\n"); @@ -190,19 +210,25 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value if (val==NULL || val->flags&(PV_VAL_NONE|PV_VAL_NULL|PV_VAL_EMPTY)) { /* if NULL, remove the value */ - if (set_dlg_variable(dlg, &param->pvn.u.isname.name.s, NULL)!=0) { + if (set_dlg_variable_unsafe(varlist, &param->pvn.u.isname.name.s, NULL)!=0) { LM_ERR("failed to delete dialog variable <%.*s>\n", param->pvn.u.isname.name.s.len,param->pvn.u.isname.name.s.s); + /* unlock dialog */ + if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); return -1; } } else { /* if value, must be string */ if ( !(val->flags&PV_VAL_STR)) { LM_ERR("non-string values are not supported\n"); + /* unlock dialog */ + if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); return -1; } - if (set_dlg_variable(dlg, &param->pvn.u.isname.name.s, &val->rs)!=0) { + if (set_dlg_variable_unsafe(varlist, &param->pvn.u.isname.name.s, &val->rs)!=0) { LM_ERR("failed to store dialog values <%.*s>\n",param->pvn.u.isname.name.s.len,param->pvn.u.isname.name.s.s); + /* unlock dialog */ + if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); return -1; } } @@ -210,7 +236,6 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value return 0; } - int pv_get_dlg_ctx(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules_k/dialog/dlg_var.h b/modules_k/dialog/dlg_var.h index c56e074..f166606 100644 --- a/modules_k/dialog/dlg_var.h +++ b/modules_k/dialog/dlg_var.h @@ -57,6 +57,12 @@ int pv_get_dialog_var(struct sip_msg *msg, pv_param_t *param, int pv_set_dialog_var(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +/*! Delete the current var-list */ +void deletevarlist(); + +/*! Retrieve the current var-list */ +struct dlg_var * getvarlist(struct sip_msg *msg); + extern dlg_ctx_t _dlg_ctx; int pv_get_dlg_ctx(struct sip_msg *msg, pv_param_t *param,

1 0

git:carstenbock/ims: - added persistency to dialog-variables
by Carsten Bock 21 Jan '11

21 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 71047b4fb3e0726e2a2c80dd33726193f104b3aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71047b4… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Fri Jan 21 15:44:42 2011 +0100 - added persistency to dialog-variables - testing needed. --- modules_k/dialog/dlg_db_handler.c | 348 ++++++++++++++++--------- modules_k/dialog/dlg_hash.h | 4 + modules_k/dialog/dlg_var.c | 27 ++- modules_k/dialog/dlg_var.h | 4 + utils/kamctl/db_berkeley/kamailio/dialog_vars | 10 + utils/kamctl/db_berkeley/kamailio/version | 1 + utils/kamctl/dbtext/kamailio/dialog_vars | 1 + utils/kamctl/dbtext/kamailio/version | 1 + utils/kamctl/mysql/dialog-create.sql | 8 +- utils/kamctl/oracle/dialog-create.sql | 8 + utils/kamctl/postgres/dialog-create.sql | 8 + 11 files changed, 288 insertions(+), 132 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=710…

1 0

git:master: modules_k/dialog Fixed a crash if a null parameter was given
by Marius Zbihlei 21 Jan '11

21 Jan '11

Module: sip-router Branch: master Commit: 9212b05c66bc0e5088fd521ffbce95a6e770c342 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9212b05… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 21 12:45:21 2011 +0200 modules_k/dialog Fixed a crash if a null parameter was given --- modules_k/dialog/dlg_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 8707ee8..41629cf 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -92,7 +92,7 @@ int pv_set_dlg_ctx(struct sip_msg* msg, pv_param_t *param, _dlg_ctx.to_bye = n; break; case 4: - if(val->flags&PV_VAL_STR) { + if(val && val->flags&PV_VAL_STR) { if(val->rs.s[val->rs.len]=='\0' && val->rs.len<DLG_TOROUTE_SIZE) { _dlg_ctx.to_route = route_lookup(&main_rt, val->rs.s);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011