January 2011 - sr-dev - kamailio.org

git:master: db_mysql: removed ./km_doc subfolder
by Daniel-Constantin Mierla 23 Jan '11

23 Jan '11

Module: sip-router Branch: master Commit: 62e2c4403897b17715ef46ebd70ae1a370fd37f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62e2c44… Author: kamailio <kamailio(a)kamailio-laptop.(none)> Committer: kamailio <kamailio(a)kamailio-laptop.(none)> Date: Sun Jan 23 23:21:09 2011 +0100 db_mysql: removed ./km_doc subfolder --- modules/db_mysql/km_doc/Makefile | 4 ---- modules/db_mysql/km_doc/db_mysql_parser.dia | Bin 2461 -> 0 bytes 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_doc/Makefile b/modules/db_mysql/km_doc/Makefile deleted file mode 100644 index 7303b01..0000000 --- a/modules/db_mysql/km_doc/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -docs = db_mysql.xml - -docbook_dir = ../../../docbook -include $(docbook_dir)/Makefile.module diff --git a/modules/db_mysql/km_doc/db_mysql_parser.dia b/modules/db_mysql/km_doc/db_mysql_parser.dia deleted file mode 100644 index e17c922..0000000 Binary files a/modules/db_mysql/km_doc/db_mysql_parser.dia and /dev/null differ

1 0

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

git:mariuszbihlei/p_usrloc: modules_k/p_usrloc fixed compilation
by Marius Zbihlei 20 Jan '11

20 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 8a92cf78e8fa94f2ab4ed382b5d61a0712327898 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a92cf7… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 13:35:59 2011 +0200 modules_k/p_usrloc fixed compilation --- modules_k/p_usrloc/ucontact.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules_k/p_usrloc/ucontact.h b/modules_k/p_usrloc/ucontact.h index b8cf662..8bff5f4 100644 --- a/modules_k/p_usrloc/ucontact.h +++ b/modules_k/p_usrloc/ucontact.h @@ -145,6 +145,15 @@ int db_delete_ucontact(ucontact_t* _c); struct urecord; +/*! + * \brief Update ucontact with new values + * \param _r record the contact belongs to + * \param _c updated contact + * \param _ci new contact informations + * \return 0 on success, -1 on failure + */ +int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci); + #endif

1 0

git:mariuszbihlei/p_usrloc: Forgot Makefile
by Marius Zbihlei 20 Jan '11

20 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 1f9453394729e2199e1d617a42f2b00a495a9c27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f94533… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 13:32:48 2011 +0200 Forgot Makefile --- modules_k/p_usrloc/Makefile | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules_k/p_usrloc/Makefile b/modules_k/p_usrloc/Makefile new file mode 100644 index 0000000..57988ea --- /dev/null +++ b/modules_k/p_usrloc/Makefile @@ -0,0 +1,19 @@ +# $Id: Makefile,v 1.1.1.1 2005/06/13 16:47:47 bogdan_iancu Exp $ +# +# sp-ul_db module Makefile +# +# +# WARNING: do not run this directly, it should be run by the master Makefile +include ../../Makefile.defs + +auto_gen= +NAME=p_usrloc.so +LIBS= + +DEFS+=-DOPENSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kcore/kcore +include ../../Makefile.modules

1 0

git:mariuszbihlei/p_usrloc: Further refactoring of usrloc and p_usrloc
by Marius Zbihlei 20 Jan '11

20 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: eee864b9cea1451ee1d3a6b6e651ad9ca6dc1350 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eee864b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 13:23:56 2011 +0200 Further refactoring of usrloc and p_usrloc --- modules_k/p_usrloc/udomain.h | 32 +++++++++++++++++++++++-- modules_k/p_usrloc/urecord.h | 1 + modules_k/usrloc/dlist.h | 49 ++++++++++++++++++++++++++++++++++++++ modules_k/usrloc/ucontact.h | 11 ++++++++ modules_k/usrloc/udomain.h | 42 +++++++++++++++++++++++++++++++++ modules_k/usrloc/urecord.h | 53 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 185 insertions(+), 3 deletions(-) diff --git a/modules_k/p_usrloc/udomain.h b/modules_k/p_usrloc/udomain.h index e6ce0ef..7524b37 100644 --- a/modules_k/p_usrloc/udomain.h +++ b/modules_k/p_usrloc/udomain.h @@ -90,9 +90,6 @@ void free_udomain(udomain_t* _d); void print_udomain(FILE* _f, udomain_t* _d); - - - /*! * \brief Timer function to cleanup expired contacts, DB_ONLY db_mode * \param _d cleaned domain @@ -158,5 +155,34 @@ void unlock_udomain(udomain_t* _d, str *_aor); +/*! + * \brief Create and insert a new record + * \param _d domain to insert the new record + * \param _aor address of the record + * \param _r new created record + * \return return 0 on success, -1 on failure + */ +int insert_urecord(udomain_t* _d, str* _aor, struct urecord** _r); + + +/*! + * \brief Obtain a urecord pointer if the urecord exists in domain + * \param _d domain to search the record + * \param _aor address of record + * \param _r new created record + * \return 0 if a record was found, 1 if nothing could be found + */ +int get_urecord(udomain_t* _d, str* _aor, struct urecord** _r); + + +/*! + * \brief Delete a urecord from domain + * \param _d domain where the record should be deleted + * \param _aor address of record + * \param _r deleted record + * \return 0 on success, -1 if the record could not be deleted + */ +int delete_urecord(udomain_t* _d, str* _aor, struct urecord* _r); + #endif diff --git a/modules_k/p_usrloc/urecord.h b/modules_k/p_usrloc/urecord.h index 34442d8..14bafc6 100644 --- a/modules_k/p_usrloc/urecord.h +++ b/modules_k/p_usrloc/urecord.h @@ -163,4 +163,5 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, void release_urecord(urecord_t* _r); + #endif diff --git a/modules_k/usrloc/dlist.h b/modules_k/usrloc/dlist.h index 5602c67..87692df 100644 --- a/modules_k/usrloc/dlist.h +++ b/modules_k/usrloc/dlist.h @@ -54,6 +54,19 @@ extern dlist_t* root; /*! + * \brief Registers a new domain with usrloc + * + * Registers a new domain with usrloc. If the domain exists, + * a pointer to existing structure will be returned, otherwise + * a new domain will be created + * \param _n domain name + * \param _d new created domain + * \return 0 on success, -1 on failure + */ +int register_udomain(const char* _n, udomain_t** _d); + + +/*! * \brief Free all allocated memory for domains */ void free_all_udomains(void); @@ -74,6 +87,42 @@ int synchronize_all_udomains(void); /*! + * \brief Get all contacts from the usrloc, in partitions if wanted + * + * Return list of all contacts for all currently registered + * users in all domains. The caller must provide buffer of + * sufficient length for fitting all those contacts. In the + * case when buffer was exhausted, the function returns + * estimated amount of additional space needed, in this + * case the caller is expected to repeat the call using + * this value as the hint. + * + * Information is packed into the buffer as follows: + * + * +------------+----------+-----+------+-----+ + * |contact1.len|contact1.s|sock1|flags1|path1| + * +------------+----------+-----+------+-----+ + * |contact2.len|contact2.s|sock2|flags2|path1| + * +------------+----------+-----+------+-----+ + * |..........................................| + * +------------+----------+-----+------+-----+ + * |contactN.len|contactN.s|sockN|flagsN|pathN| + * +------------+----------+-----+------+-----+ + * |000000000000| + * +------------+ + * + * \param buf target buffer + * \param len length of buffer + * \param flags contact flags + * \param part_idx part index + * \param part_max maximal part + * \return 0 on success, positive if buffer size was not sufficient, negative on failure + */ +int get_all_ucontacts(void *, int, unsigned int, + unsigned int part_idx, unsigned int part_max); + + +/*! * \brief Loops through all domains summing up the number of users * \return the number of users, could be zero */ diff --git a/modules_k/usrloc/ucontact.h b/modules_k/usrloc/ucontact.h index 9686a07..6a8a4df 100644 --- a/modules_k/usrloc/ucontact.h +++ b/modules_k/usrloc/ucontact.h @@ -39,6 +39,7 @@ #include <stdio.h> #include "usrloc.h" + /*! \brief ancient time used for marking the contacts forced to expired */ #define UL_EXPIRED_TIME 10 @@ -137,5 +138,15 @@ int db_update_ucontact(ucontact_t* _c); */ int db_delete_ucontact(ucontact_t* _c); +/* ====== Module interface ====== */ + +/*! + * \brief Update ucontact with new values + * \param _r record the contact belongs to + * \param _c updated contact + * \param _ci new contact informations + * \return 0 on success, -1 on failure + */ +int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci); #endif diff --git a/modules_k/usrloc/udomain.h b/modules_k/usrloc/udomain.h index 62509c6..b10df5d 100644 --- a/modules_k/usrloc/udomain.h +++ b/modules_k/usrloc/udomain.h @@ -138,6 +138,21 @@ int mem_insert_urecord(udomain_t* _d, str* _aor, struct urecord** _r); */ void mem_delete_urecord(udomain_t* _d, struct urecord* _r); + +/*! \brief + * Timer handler for given domain + */ +void lock_udomain(udomain_t* _d, str *_aor); + + +/*! + * \brief Release lock for a domain + * \param _d domain + * \param _aor address of record, uses as hash source for the lock slot + */ +void unlock_udomain(udomain_t* _d, str *_aor); + + /*! * \brief Get lock for a slot * \param _d domain @@ -155,7 +170,34 @@ void unlock_ulslot(udomain_t* _d, int i); /* ===== module interface ======= */ +/*! + * \brief Create and insert a new record + * \param _d domain to insert the new record + * \param _aor address of the record + * \param _r new created record + * \return return 0 on success, -1 on failure + */ +int insert_urecord(udomain_t* _d, str* _aor, struct urecord** _r); + + +/*! + * \brief Obtain a urecord pointer if the urecord exists in domain + * \param _d domain to search the record + * \param _aor address of record + * \param _r new created record + * \return 0 if a record was found, 1 if nothing could be found + */ +int get_urecord(udomain_t* _d, str* _aor, struct urecord** _r); + +/*! + * \brief Delete a urecord from domain + * \param _d domain where the record should be deleted + * \param _aor address of record + * \param _r deleted record + * \return 0 on success, -1 if the record could not be deleted + */ +int delete_urecord(udomain_t* _d, str* _aor, struct urecord* _r); #endif diff --git a/modules_k/usrloc/urecord.h b/modules_k/usrloc/urecord.h index 93231d0..5245b2a 100644 --- a/modules_k/usrloc/urecord.h +++ b/modules_k/usrloc/urecord.h @@ -38,6 +38,11 @@ #include "ucontact.h" #include "usrloc.h" +struct hslot; /*!< Hash table slot */ + + + + /*! * \brief Create and initialize new record structure * \param _dom domain name @@ -114,6 +119,54 @@ void timer_urecord(urecord_t* _r); int db_delete_urecord(urecord_t* _r); +/* ===== Module interface ======== */ + + +/*! + * \brief Release urecord previously obtained through get_urecord + * \warning Failing to calls this function after get_urecord will + * result in a memory leak when the DB_ONLY mode is used. When + * the records is later deleted, e.g. with delete_urecord, then + * its not necessary, as this function already releases the record. + * \param _r released record + */ +void release_urecord(urecord_t* _r); + +/*! + * \brief Create and insert new contact into urecord + * \param _r record into the new contact should be inserted + * \param _contact contact string + * \param _ci contact information + * \param _c new created contact + * \return 0 on success, -1 on failure + */ +int insert_ucontact(urecord_t* _r, str* _contact, + ucontact_info_t* _ci, ucontact_t** _c); + + +/*! + * \brief Delete ucontact from urecord + * \param _r record where the contact belongs to + * \param _c deleted contact + * \return 0 on success, -1 on failure + */ +int delete_ucontact(urecord_t* _r, struct ucontact* _c); + + +/*! + * \brief Get pointer to ucontact with given contact + * \param _r record where to search the contacts + * \param _c contact string + * \param _callid callid + * \param _path path + * \param _cseq CSEQ number + * \param _co found contact + * \return 0 - found, 1 - not found, -1 - invalid found, + * -2 - found, but to be skipped (same cseq) + */ +int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, + int _cseq, + struct ucontact** _co); #endif

1 0

git:mariuszbihlei/p_usrloc: modules_k/usrloc Further refactoring of code
by Marius Zbihlei 20 Jan '11

20 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 75d2b1e18a265501729c0186a918b865b44af79b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75d2b1e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 12:06:04 2011 +0200 modules_k/usrloc Further refactoring of code --- modules_k/usrloc/ucontact.h | 1 - modules_k/usrloc/ul_callback.h | 5 +- modules_k/usrloc/usrloc.c | 4 + modules_k/usrloc/usrloc.h | 135 ---------------------------------------- 4 files changed, 7 insertions(+), 138 deletions(-) diff --git a/modules_k/usrloc/ucontact.h b/modules_k/usrloc/ucontact.h index 8ef3491..9686a07 100644 --- a/modules_k/usrloc/ucontact.h +++ b/modules_k/usrloc/ucontact.h @@ -39,7 +39,6 @@ #include <stdio.h> #include "usrloc.h" - /*! \brief ancient time used for marking the contacts forced to expired */ #define UL_EXPIRED_TIME 10 diff --git a/modules_k/usrloc/ul_callback.h b/modules_k/usrloc/ul_callback.h index bb322cb..dadce6d 100644 --- a/modules_k/usrloc/ul_callback.h +++ b/modules_k/usrloc/ul_callback.h @@ -32,6 +32,7 @@ #ifndef _UL_CALLBACKS_H #define _UL_CALLBACKS_H +#include "../../dprint.h" /* forward declaration for ucontact_t */ struct ucontact; @@ -84,8 +85,8 @@ static inline void run_ul_callbacks( int type , struct ucontact *c) for (cbp=ulcb_list->first; cbp; cbp=cbp->next) { if(cbp->types&type) { - /*LM_DBG("contact=%p, callback type %d/%d, id %d entered\n", - c, type, cbp->types, cbp->id );*/ + LM_DBG("contact=%p, callback type %d/%d, id %d entered\n", + c, type, cbp->types, cbp->id ); cbp->callback( c, type, cbp->param ); } } diff --git a/modules_k/usrloc/usrloc.c b/modules_k/usrloc/usrloc.c index f5e1dde..b7a4283 100644 --- a/modules_k/usrloc/usrloc.c +++ b/modules_k/usrloc/usrloc.c @@ -34,6 +34,10 @@ */ #include "usrloc.h" +#include "dlist.h" +#include "urecord.h" +#include "ucontact.h" +#include "udomain.h" #include "../../sr_module.h" #include "ul_mod.h" diff --git a/modules_k/usrloc/usrloc.h b/modules_k/usrloc/usrloc.h index f57387e..827e568 100644 --- a/modules_k/usrloc/usrloc.h +++ b/modules_k/usrloc/usrloc.h @@ -124,168 +124,33 @@ typedef struct urecord { struct urecord* next; /*!< Previous item in the hash entry */ } urecord_t; -/*! - * \brief Create and insert a new record - * \param _d domain to insert the new record - * \param _aor address of the record - * \param _r new created record - * \return return 0 on success, -1 on failure - */ typedef int (*insert_urecord_t)(struct udomain* _d, str* _aor, struct urecord** _r); -int insert_urecord(struct udomain* _d, str* _aor, struct urecord** _r); - -/*! - * \brief Obtain a urecord pointer if the urecord exists in domain - * \param _d domain to search the record - * \param _aor address of record - * \param _r new created record - * \return 0 if a record was found, 1 if nothing could be found - */ typedef int (*get_urecord_t)(struct udomain* _d, str* _aor, struct urecord** _r); -int get_urecord(struct udomain* _d, str* _aor, struct urecord** _r); - -/*! - * \brief Delete a urecord from domain - * \param _d domain where the record should be deleted - * \param _aor address of record - * \param _r deleted record - * \return 0 on success, -1 if the record could not be deleted - */ typedef int (*delete_urecord_t)(struct udomain* _d, str* _aor, struct urecord* _r); -int delete_urecord(struct udomain* _d, str* _aor, struct urecord* _r); - -/*! - * \brief Update ucontact with new values - * \param _r record the contact belongs to - * \param _c updated contact - * \param _ci new contact informations - * \return 0 on success, -1 on failure - */ typedef int (*update_ucontact_t)(struct urecord* _r, struct ucontact* _c, struct ucontact_info* _ci); -int update_ucontact(struct urecord* _r, struct ucontact* _c, struct ucontact_info* _ci); - -/*! - * \brief Release urecord previously obtained through get_urecord - * \warning Failing to calls this function after get_urecord will - * result in a memory leak when the DB_ONLY mode is used. When - * the records is later deleted, e.g. with delete_urecord, then - * its not necessary, as this function already releases the record. - * \param _r released record - */ typedef void (*release_urecord_t)(struct urecord* _r); -void release_urecord(struct urecord* _r); - -/*! - * \brief Create and insert new contact into urecord - * \param _r record into the new contact should be inserted - * \param _contact contact string - * \param _ci contact information - * \param _c new created contact - * \return 0 on success, -1 on failure - */ typedef int (*insert_ucontact_t)(struct urecord* _r, str* _contact, struct ucontact_info* _ci, struct ucontact** _c); -int insert_ucontact(struct urecord* _r, str* _contact, - struct ucontact_info* _ci, struct ucontact** _c); - -/*! - * \brief Delete ucontact from urecord - * \param _r record where the contact belongs to - * \param _c deleted contact - * \return 0 on success, -1 on failure - */ typedef int (*delete_ucontact_t)(struct urecord* _r, struct ucontact* _c); -int delete_ucontact(struct urecord* _r, struct ucontact* _c); - -/*! - * \brief Get pointer to ucontact with given contact - * \param _r record where to search the contacts - * \param _c contact string - * \param _callid callid - * \param _path path - * \param _cseq CSEQ number - * \param _co found contact - * \return 0 - found, 1 - not found, -1 - invalid found, - * -2 - found, but to be skipped (same cseq) - */ typedef int (*get_ucontact_t)(struct urecord* _r, str* _c, str* _callid, str* _path, int _cseq, struct ucontact** _co); -int get_ucontact(struct urecord* _r, str* _c, str* _callid, str* _path, - int _cseq, - struct ucontact** _co); -/*! \brief - * Timer handler for given domain - */ typedef void (*lock_udomain_t)(struct udomain* _d, str *_aor); -void lock_udomain(struct udomain* _d, str *_aor); - -/*! - * \brief Release lock for a domain - * \param _d domain - * \param _aor address of record, uses as hash source for the lock slot - */ typedef void (*unlock_udomain_t)(struct udomain* _d, str *_aor); -void unlock_udomain(struct udomain* _d, str *_aor); -/*! - * \brief Registers a new domain with usrloc - * - * Registers a new domain with usrloc. If the domain exists, - * a pointer to existing structure will be returned, otherwise - * a new domain will be created - * \param _n domain name - * \param _d new created domain - * \return 0 on success, -1 on failure - */ typedef int (*register_udomain_t)(const char* _n, struct udomain** _d); -int register_udomain(const char* _n, struct udomain** _d); -/*! - * \brief Get all contacts from the usrloc, in partitions if wanted - * - * Return list of all contacts for all currently registered - * users in all domains. The caller must provide buffer of - * sufficient length for fitting all those contacts. In the - * case when buffer was exhausted, the function returns - * estimated amount of additional space needed, in this - * case the caller is expected to repeat the call using - * this value as the hint. - * - * Information is packed into the buffer as follows: - * - * +------------+----------+-----+------+-----+ - * |contact1.len|contact1.s|sock1|flags1|path1| - * +------------+----------+-----+------+-----+ - * |contact2.len|contact2.s|sock2|flags2|path1| - * +------------+----------+-----+------+-----+ - * |..........................................| - * +------------+----------+-----+------+-----+ - * |contactN.len|contactN.s|sockN|flagsN|pathN| - * +------------+----------+-----+------+-----+ - * |000000000000| - * +------------+ - * - * \param buf target buffer - * \param len length of buffer - * \param flags contact flags - * \param part_idx part index - * \param part_max maximal part - * \return 0 on success, positive if buffer size was not sufficient, negative on failure - */ typedef int (*get_all_ucontacts_t) (void* buf, int len, unsigned int flags, unsigned int part_idx, unsigned int part_max); -int get_all_ucontacts(void *, int, unsigned int, - unsigned int part_idx, unsigned int part_max); /*! usrloc API export structure */ typedef struct usrloc_api {

1 0

git:mariuszbihlei/p_usrloc: module_k/p_usrloc Refactoring of p_usrloc ( it uses the usrloc API include)
by Marius Zbihlei 20 Jan '11

20 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: a03b115c72508aed5578bd10b3c96d196fc6d693 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a03b115… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 12:08:34 2011 +0200 module_k/p_usrloc Refactoring of p_usrloc (it uses the usrloc API include) --- modules_k/p_usrloc/dlist.h | 55 +++++++++++++++++++++++++++++++++++++++++ modules_k/p_usrloc/ucontact.c | 2 +- modules_k/p_usrloc/ucontact.h | 4 +-- modules_k/p_usrloc/udomain.h | 15 +++++++++++ modules_k/p_usrloc/urecord.h | 48 +++++++++++++++++++++++++++++++++++ modules_k/p_usrloc/usrloc.c | 4 +++ 6 files changed, 124 insertions(+), 4 deletions(-) diff --git a/modules_k/p_usrloc/dlist.h b/modules_k/p_usrloc/dlist.h index 97bbbb3..8ba4b92 100644 --- a/modules_k/p_usrloc/dlist.h +++ b/modules_k/p_usrloc/dlist.h @@ -70,5 +70,60 @@ int synchronize_all_udomains(void); unsigned long get_number_of_users(void); +/*! + * \brief Registers a new domain with usrloc + * + * Registers a new domain with usrloc. If the domain exists, + * a pointer to existing structure will be returned, otherwise + * a new domain will be created + * \param _n domain name + * \param _d new created domain + * \return 0 on success, -1 on failure + */ +int register_udomain(const char* _n, udomain_t** _d); + +/*! + * \brief Get all contacts from the usrloc, in partitions if wanted + * + * Return list of all contacts for all currently registered + * users in all domains. The caller must provide buffer of + * sufficient length for fitting all those contacts. In the + * case when buffer was exhausted, the function returns + * estimated amount of additional space needed, in this + * case the caller is expected to repeat the call using + * this value as the hint. + * + * Information is packed into the buffer as follows: + * + * +------------+----------+-----+------+-----+ + * |contact1.len|contact1.s|sock1|flags1|path1| + * +------------+----------+-----+------+-----+ + * |contact2.len|contact2.s|sock2|flags2|path1| + * +------------+----------+-----+------+-----+ + * |..........................................| + * +------------+----------+-----+------+-----+ + * |contactN.len|contactN.s|sockN|flagsN|pathN| + * +------------+----------+-----+------+-----+ + * |000000000000| + * +------------+ + * + * \param buf target buffer + * \param len length of buffer + * \param flags contact flags + * \param part_idx part index + * \param part_max maximal part + * \return 0 on success, positive if buffer size was not sufficient, negative on failure + */ +int get_all_ucontacts(void *, int, unsigned int, + unsigned int part_idx, unsigned int part_max); + +/*! + * \brief Find a particular domain, small wrapper around find_dlist + * \param _d domain name + * \param _p pointer to domain if found + * \return 1 if domain was found, 0 otherwise + */ +int find_domain(str* _d, udomain_t** _p); + #endif diff --git a/modules_k/p_usrloc/ucontact.c b/modules_k/p_usrloc/ucontact.c index b97f0f1..f7c0b9e 100644 --- a/modules_k/p_usrloc/ucontact.c +++ b/modules_k/p_usrloc/ucontact.c @@ -46,7 +46,7 @@ #include "urecord.h" #include "ucontact.h" #include "ul_db_layer.h" - +#include "dlist.h" /*! * \brief Create a new contact structure diff --git a/modules_k/p_usrloc/ucontact.h b/modules_k/p_usrloc/ucontact.h index 3dcb126..b8cf662 100644 --- a/modules_k/p_usrloc/ucontact.h +++ b/modules_k/p_usrloc/ucontact.h @@ -45,9 +45,6 @@ /*! \brief ancient time used for marking the contacts forced to expired */ #define UL_EXPIRED_TIME 10 -/*! \brief Valid contact is a contact that either didn't expire yet or is permanent */ -#define VALID_CONTACT(c, t) ((c->expires>t) || (c->expires==0)) - /*! * \brief Create a new contact structure @@ -149,4 +146,5 @@ int db_delete_ucontact(ucontact_t* _c); struct urecord; + #endif diff --git a/modules_k/p_usrloc/udomain.h b/modules_k/p_usrloc/udomain.h index 6a9a7a8..e6ce0ef 100644 --- a/modules_k/p_usrloc/udomain.h +++ b/modules_k/p_usrloc/udomain.h @@ -40,6 +40,7 @@ #include "../../locking.h" #include "../../str.h" #include "../../lib/srdb1/db.h" +#include "../usrloc/usrloc.h" #include "urecord.h" #include "hslot.h" @@ -142,6 +143,20 @@ void unlock_ulslot(udomain_t* _d, int i); /* ===== module interface ======= */ +/*! \brief + * Timer handler for given domain + */ +void lock_udomain(udomain_t* _d, str *_aor); + + +/*! + * \brief Release lock for a domain + * \param _d domain + * \param _aor address of record, uses as hash source for the lock slot + */ +void unlock_udomain(udomain_t* _d, str *_aor); + + #endif diff --git a/modules_k/p_usrloc/urecord.h b/modules_k/p_usrloc/urecord.h index dfabddc..34442d8 100644 --- a/modules_k/p_usrloc/urecord.h +++ b/modules_k/p_usrloc/urecord.h @@ -113,6 +113,54 @@ void timer_urecord(urecord_t* _r); */ int db_delete_urecord(struct udomain* _d, urecord_t* _r); +/*! + * \brief Create and insert new contact into urecord + * \param _r record into the new contact should be inserted + * \param _contact contact string + * \param _ci contact information + * \param _c new created contact + * \return 0 on success, -1 on failure + */ +int insert_ucontact(urecord_t* _r, str* _contact, + ucontact_info_t* _ci, ucontact_t** _c); + + +/*! + * \brief Delete ucontact from urecord + * \param _r record where the contact belongs to + * \param _c deleted contact + * \return 0 on success, -1 on failure + */ +int delete_ucontact(urecord_t* _r, struct ucontact* _c); + + +/*! + * \brief Get pointer to ucontact with given contact + * \param _r record where to search the contacts + * \param _c contact string + * \param _callid callid + * \param _path path + * \param _cseq CSEQ number + * \param _co found contact + * \return 0 - found, 1 - not found, -1 - invalid found, + * -2 - found, but to be skipped (same cseq) + */ +int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, + int _cseq, + struct ucontact** _co); + +/* ===== Module interface ======== */ + + +/*! + * \brief Release urecord previously obtained through get_urecord + * \warning Failing to calls this function after get_urecord will + * result in a memory leak when the DB_ONLY mode is used. When + * the records is later deleted, e.g. with delete_urecord, then + * its not necessary, as this function already releases the record. + * \param _r released record + */ +void release_urecord(urecord_t* _r); #endif diff --git a/modules_k/p_usrloc/usrloc.c b/modules_k/p_usrloc/usrloc.c index b74632f..3a1b4fc 100644 --- a/modules_k/p_usrloc/usrloc.c +++ b/modules_k/p_usrloc/usrloc.c @@ -36,6 +36,10 @@ #include "../usrloc/usrloc.h" #include "../../sr_module.h" #include "p_usrloc_mod.h" +#include "ucontact.h" +#include "udomain.h" +#include "dlist.h" +#include "urecord.h" /*! nat branch flag */ extern unsigned int nat_bflag;

1 0

git:carstenbock/ims: PCSCF: Rx interface: specifying another application identifier when an emergency call is established
by Carsten Bock 19 Jan '11

19 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 6d73534b01d14bf6317fc74b628e8f1a8aff5825 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d73534… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Jan 19 22:06:07 2011 +0100 PCSCF: Rx interface: specifying another application identifier when an emergency call is established (taken from commit r1017 of OpenIMSCore) --- modules/pcscf/pcc.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/pcscf/pcc.c b/modules/pcscf/pcc.c index 2e13aa9..fb98296 100644 --- a/modules/pcscf/pcc.c +++ b/modules/pcscf/pcc.c @@ -589,10 +589,11 @@ error: //AF Service is IMS Services although it should be the IMS Communication Services static str IMS_Serv_AVP_val = {"IMS Services", 12}; +static str IMS_Em_Serv_AVP_val = {"Emergency IMS Call", 18}; static str IMS_Reg_AVP_val = {"IMS Registration", 16}; /* Session-Id, Origin-Host, Origin-Realm AVP are added by the stack. */ -int pcc_rx_req_add_mandat_avps(AAAMessage* msg, unsigned int dia_req_code, struct sip_msg * res, int registr){ +int pcc_rx_req_add_mandat_avps(AAAMessage* msg, unsigned int dia_req_code, struct sip_msg * res, int registr, int sos){ char x[4]; AAA_AVP * avp; @@ -618,9 +619,10 @@ int pcc_rx_req_add_mandat_avps(AAAMessage* msg, unsigned int dia_req_code, struc } /* Add AF-Application-Identifier AVP */ - if(!registr) - af_id = IMS_Serv_AVP_val; - else af_id = IMS_Reg_AVP_val; + if(!registr) { + if(sos) af_id = IMS_Em_Serv_AVP_val; + else af_id = IMS_Serv_AVP_val; + } else af_id = IMS_Reg_AVP_val; if(!PCC_add_avp(msg, af_id.s,af_id.len, AVP_IMS_AF_Application_Identifier, @@ -735,7 +737,7 @@ AAAMessage *PCC_AAR(struct sip_msg *req, struct sip_msg *res, char *str1, contac } /*---------- 1. Add mandatory AVPs ----------*/ - if(!pcc_rx_req_add_mandat_avps(aar, IMS_AAR, res, is_register)) + if(!pcc_rx_req_add_mandat_avps(aar, IMS_AAR, res, is_register, service_urn.len>0)) goto error; LOG(L_INFO,"INF:"M_NAME":PCC_AAR: auth_lifetime %u\n", auth_lifetime); @@ -993,7 +995,7 @@ AAAMessage * PCC_create_STR_auth_session_safe(AAASession * auth, int is_register if (!dia_str) goto error; - if(!pcc_rx_req_add_mandat_avps(dia_str, IMS_STR, NULL, is_register)) goto error; + if(!pcc_rx_req_add_mandat_avps(dia_str, IMS_STR, NULL, is_register, 0)) goto error; //Termination-Cause set_4bytes(x,1);

1 0

git:carstenbock/ims: - Initial development of Dialog-Variables: Key-Value pairs associated with a dialog
by Carsten Bock 19 Jan '11

19 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 6fd8b45736f9d79329451f01fd2d683c792462ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fd8b45… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Jan 19 21:57:11 2011 +0100 - Initial development of Dialog-Variables: Key-Value pairs associated with a dialog - open points: persistence, API-support, testing --- modules_k/dialog/dialog.c | 16 +++ modules_k/dialog/dlg_db_handler.c | 14 +++- modules_k/dialog/dlg_db_handler.h | 25 ++++- modules_k/dialog/dlg_hash.c | 14 +++ modules_k/dialog/dlg_hash.h | 3 +- modules_k/dialog/dlg_var.c | 178 +++++++++++++++++++++++++++++++++ modules_k/dialog/dlg_var.h | 17 +++ modules_k/dialog/doc/dialog.xml | 19 ++++ modules_k/dialog/doc/dialog_admin.xml | 118 ++++++++++++++++++++++ 9 files changed, 399 insertions(+), 5 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6fd…

1 0

git:master: modules_k/presence fixed issue when sending resubscribes
by Marius Ovidiu Bucur 19 Jan '11

19 Jan '11

Module: sip-router Branch: master Commit: b41744eb10217dbd5a94c9545eb062cef08185bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b41744e… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Wed Jan 19 16:35:29 2011 +0200 modules_k/presence fixed issue when sending resubscribes Fixed an issue regarding sending resubscribes (within the same dialog) when in DB_ONLY mode. --- modules_k/presence/subscribe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 6838aee..e96efc0 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -1211,7 +1211,7 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, lock_release(&subs_htable[i].lock); } - if(dbmode == DB_FALLBACK) + if(dbmode != DB_MEMORY_ONLY) { return get_database_info(msg, subs, reply_code, reply_str); }

1 0

git:3.1: kex: fix compile warning on 64b
by Daniel-Constantin Mierla 19 Jan '11

19 Jan '11

Module: sip-router Branch: 3.1 Commit: 67785434ca2caaea539578a584a278d861dadd31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6778543… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 19 10:30:29 2011 +0100 kex: fix compile warning on 64b (cherry picked from commit 3fac57bc2ba9ed5239af12a350841b78d8c4717a) --- modules_k/kex/core_stats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 6c5cd30..9974056 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -133,7 +133,7 @@ static int sts_update_core_stats(void *data) { int type; - type = (int)data; + type = (int)(long)data; switch(type) { case 1: /* fwd_requests */

1 0

git:master: kex: fix compile warning on 64b
by Daniel-Constantin Mierla 19 Jan '11

19 Jan '11

Module: sip-router Branch: master Commit: 3fac57bc2ba9ed5239af12a350841b78d8c4717a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3fac57b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 19 10:30:29 2011 +0100 kex: fix compile warning on 64b --- modules_k/kex/core_stats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 6c5cd30..9974056 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -133,7 +133,7 @@ static int sts_update_core_stats(void *data) { int type; - type = (int)data; + type = (int)(long)data; switch(type) { case 1: /* fwd_requests */

1 0

git:3.1: permissions(k): do not check db con in child init
by Daniel-Constantin Mierla 18 Jan '11

18 Jan '11

Module: sip-router Branch: 3.1 Commit: 021ae26451bcb80d817f6ef069a77c1830625782 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=021ae26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 18 20:16:31 2011 +0100 permissions(k): do not check db con in child init - proper connection is returned by comparison of pids (cherry picked from commit be92c6713c2b7c7cb04320758a346ba6a1324982) --- modules_k/permissions/address.c | 2 +- modules_k/permissions/trusted.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 469e21a..8aa6b81 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -287,7 +287,7 @@ error: */ int mi_init_addresses(void) { - if (!db_url.s || db_handle) return 0; + if (!db_url.s) return 0; db_handle = perm_dbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n"); diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 33cae33..1f8a106 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -235,7 +235,7 @@ int init_child_trusted(int rank) if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK)) return 0; - if (!db_url.s || db_handle) { + if (!db_url.s) { return 0; } @@ -261,7 +261,7 @@ int init_child_trusted(int rank) */ int mi_init_trusted(void) { - if (!db_url.s || db_handle) return 0; + if (!db_url.s) return 0; db_handle = perm_dbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n");

1 0

git:mariuszbihlei/p_usrloc: modules/p_usrloc Fixed mode WRITE_THROUGH ( and WRITE_BACK) (crash)
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 0cc01cc1b0b9a19072b97e874e4ad7007e43d3d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cc01cc… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 17:09:06 2011 +0200 modules/p_usrloc Fixed mode WRITE_THROUGH (and WRITE_BACK) (crash) TODO: list of domains is kept in private mem, not shared. (!) --- modules_k/p_usrloc/dlist.c | 14 +++++++++++++- modules_k/p_usrloc/ucontact.c | 1 - modules_k/p_usrloc/ul_db_layer.c | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules_k/p_usrloc/dlist.c b/modules_k/p_usrloc/dlist.c index 23b9c50..a2687b2 100644 --- a/modules_k/p_usrloc/dlist.c +++ b/modules_k/p_usrloc/dlist.c @@ -71,7 +71,7 @@ static inline struct domain_list_item * find_dlist (str *name) { static inline struct domain_list_item * add_to_dlist (str *name, int type) { struct domain_list_item *item; - + int i; item = (struct domain_list_item *) pkg_malloc (sizeof (struct domain_list_item)); if (item == NULL) { @@ -90,6 +90,18 @@ static inline struct domain_list_item * add_to_dlist (str *name, int type) { memset (&item->domain, 0, sizeof (struct udomain)); item->domain.name = &item->name; item->domain.dbt = type; + + item->domain.table = (hslot_t*)pkg_malloc(sizeof(hslot_t) * ul_hash_size); + if (!item->domain.table) { + LM_ERR("no memory left 2\n"); + return NULL; + } + + for(i = 0; i < ul_hash_size; i++) { + init_slot(&item->domain, &(item->domain.table[i]), i); + } + + item->domain.size = ul_hash_size; /* Everything else is not useful for now. */ item->next = domain_list; diff --git a/modules_k/p_usrloc/ucontact.c b/modules_k/p_usrloc/ucontact.c index 859408f..b97f0f1 100644 --- a/modules_k/p_usrloc/ucontact.c +++ b/modules_k/p_usrloc/ucontact.c @@ -399,7 +399,6 @@ int db_insert_ucontact(ucontact_t* _c) if(register_udomain(_c->domain->s, &_d) < 0){ return -1; } - keys[0] = &user_col; keys[1] = &contact_col; keys[2] = &expires_col; diff --git a/modules_k/p_usrloc/ul_db_layer.c b/modules_k/p_usrloc/ul_db_layer.c index 2731201..474db5d 100644 --- a/modules_k/p_usrloc/ul_db_layer.c +++ b/modules_k/p_usrloc/ul_db_layer.c @@ -213,7 +213,7 @@ int ul_db_layer_free_result(udomain_t * domain, db1_res_t * res) { int ul_add_domain_db(str * d, int t, str * url) { ul_domain_db_list_t * new_d = NULL; - LM_DBG("%.*s, type: %s\n", d->len, d->s, + LM_ERR("%.*s, type: %s\n", d->len, d->s, t==DB_TYPE_SINGLE ? "SINGLE" : "CLUSTER"); if((new_d = pkg_malloc(sizeof(ul_domain_db_list_t))) == NULL) { return -1;

1 0

git:mariuszbihlei/p_usrloc: modules/usrloc Refactoring of usrloc: Moved interface declaration/definitions to one common header (usrloc.h)
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 9b75b8d0da994d3f27a2b756fe944c3f1cdccfd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b75b8d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:06:17 2011 +0200 modules/usrloc Refactoring of usrloc: Moved interface declaration/definitions to one common header (usrloc.h) Before, mostly every header was included when using usrloc, thus the private parts were not hidden to user. Added a udomain_head_t data type which contains the first member of the udomain_t structure (this structure is different between p_usrloc and usrloc) --- modules_k/usrloc/dlist.h | 56 +-------- modules_k/usrloc/ucontact.h | 79 +------------ modules_k/usrloc/udomain.h | 53 +-------- modules_k/usrloc/ul_callback.h | 11 +- modules_k/usrloc/ul_mod.h | 4 - modules_k/usrloc/urecord.h | 76 +------------ modules_k/usrloc/usrloc.h | 262 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 269 insertions(+), 272 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9b7…

1 0

git:mariuszbihlei/p_usrloc: modules/ p_usrloc Module implement the API of usrloc module.
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: e1dd94c2d5e67577ab04eb68ee1300f1592a892a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1dd94c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:11:12 2011 +0200 modules/p_usrloc Module implement the API of usrloc module. --- modules_k/p_usrloc/dlist.h | 19 +------- modules_k/p_usrloc/p_usrloc_mod.c | 9 ++- modules_k/p_usrloc/p_usrloc_mod.h | 7 +-- modules_k/p_usrloc/ucontact.c | 2 +- modules_k/p_usrloc/ucontact.h | 69 +-------------------------- modules_k/p_usrloc/udomain.h | 51 +------------------- modules_k/p_usrloc/ul_callback.c | 4 +- modules_k/p_usrloc/ul_callback.h | 95 ------------------------------------- modules_k/p_usrloc/ul_db_layer.c | 2 +- modules_k/p_usrloc/ul_db_layer.h | 4 +- modules_k/p_usrloc/urecord.c | 5 +- modules_k/p_usrloc/urecord.h | 76 +----------------------------- modules_k/p_usrloc/usrloc.c | 2 +- 13 files changed, 23 insertions(+), 322 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e1d…

1 0

git:mariuszbihlei/p_usrloc: modules/registrar : changes caused by usrloc refactoring
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: b27f9a1881185b55743dc7b3fda9397249732f00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b27f9a1… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:09:16 2011 +0200 modules/registrar : changes caused by usrloc refactoring --- modules_k/registrar/reg_mod.c | 2 +- modules_k/registrar/regpv.c | 2 +- modules_k/registrar/save.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 239447e..8ef3cfc 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -67,7 +67,7 @@ #include "../../socket_info.h" #include "../../pvar.h" #include "../../lib/kcore/km_ut.h" -#include "../usrloc/ul_mod.h" +#include "../../lib/kcore/statistics.h" #include "../../modules/sl/sl.h" #include "../../mod_fix.h" diff --git a/modules_k/registrar/regpv.c b/modules_k/registrar/regpv.c index 60e8c1f..7f5f8ec 100644 --- a/modules_k/registrar/regpv.c +++ b/modules_k/registrar/regpv.c @@ -442,7 +442,7 @@ int pv_fetch_contacts(struct sip_msg* msg, char* table, char* uri, } memcpy(rpp->aor.s, aor.s, aor.len); rpp->aor.len = aor.len; - rpp->domain = *((udomain_t*)table)->name; + rpp->domain = *((udomain_head_t*)table)->name; rpp->flags = 1; /* copy contacts */ diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 9955034..efe0961 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -59,6 +59,7 @@ #include "../../dset.h" #include "../../mod_fix.h" #include "../../lib/kcore/cmpapi.h" +#include "../../lib/kcore/statistics.h" #ifdef USE_TCP #include "../../tcp_server.h" #endif

1 0

git:mariuszbihlei/p_usrloc: modules/ usrloc Some refactoring of usrloc to allow both usrloc and p_usrloc to coexist and share structs , code etc.
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 0ea2d47311f4655714853a567bdd07609af4575f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ea2d47… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:03:29 2011 +0200 modules/usrloc Some refactoring of usrloc to allow both usrloc and p_usrloc to coexist and share structs, code etc. First commit contains changes to code (.c files) Module interface (exported to registrar) is now in a common file "usrloc.h" which is used by every user of user location modules. P_usrloc also uses that header so changes to usrloc also affect it(changes to interface) --- modules_k/p_usrloc/usrloc.h | 69 ---------------------------------------- modules_k/usrloc/ucontact.c | 2 +- modules_k/usrloc/udomain.c | 2 +- modules_k/usrloc/ul_callback.c | 2 +- modules_k/usrloc/ul_mi.c | 2 +- modules_k/usrloc/urecord.c | 2 +- 6 files changed, 5 insertions(+), 74 deletions(-) diff --git a/modules_k/p_usrloc/usrloc.h b/modules_k/p_usrloc/usrloc.h deleted file mode 100644 index 5077b52..0000000 --- a/modules_k/p_usrloc/usrloc.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * $Id: usrloc.h 5193 2008-11-13 10:21:53Z henningw $ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/*! \file - * \brief USRLOC - module API exports interface - * \ingroup usrloc - */ - -#ifndef USRLOC_H -#define USRLOC_H - - -#include "dlist.h" -#include "udomain.h" -#include "urecord.h" -#include "ucontact.h" -#include "ul_callback.h" - - -/*! usrloc API export structure */ -typedef struct usrloc_api { - int use_domain; /*! use_domain module parameter */ - int db_mode; /*! db_mode module parameter */ - unsigned int nat_flag; /*! nat_flag module parameter */ - - register_udomain_t register_udomain; - get_all_ucontacts_t get_all_ucontacts; - - insert_urecord_t insert_urecord; - delete_urecord_t delete_urecord; - get_urecord_t get_urecord; - lock_udomain_t lock_udomain; - unlock_udomain_t unlock_udomain; - - release_urecord_t release_urecord; - insert_ucontact_t insert_ucontact; - delete_ucontact_t delete_ucontact; - get_ucontact_t get_ucontact; - - update_ucontact_t update_ucontact; - - register_ulcb_t register_ulcb; -} usrloc_api_t; - - -/*! usrloc API export bind function */ -typedef int (*bind_usrloc_t)(usrloc_api_t* api); - - -#endif diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index 170ce00..3f9639e 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -45,7 +45,7 @@ #include "ul_callback.h" #include "urecord.h" #include "ucontact.h" - +#include "usrloc.h" /*! * \brief Create a new contact structure diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index 8f21e0f..58c89d7 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -46,7 +46,7 @@ #include "../../lib/kcore/hash_func.h" #include "ul_mod.h" /* usrloc module parameters */ #include "utime.h" - +#include "usrloc.h" #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) diff --git a/modules_k/usrloc/ul_callback.c b/modules_k/usrloc/ul_callback.c index 91c4d5e..0519919 100644 --- a/modules_k/usrloc/ul_callback.c +++ b/modules_k/usrloc/ul_callback.c @@ -38,7 +38,7 @@ #include "../../error.h" #include "../../mem/shm_mem.h" #include "ul_callback.h" - +#include "ucontact.h" struct ulcb_head_list* ulcb_list = 0; diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index bb7d50a..62d8017 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -44,7 +44,7 @@ #include "udomain.h" #include "utime.h" #include "ul_mod.h" - +#include "usrloc.h" /*! CSEQ nr used */ #define MI_UL_CSEQ 1 diff --git a/modules_k/usrloc/urecord.c b/modules_k/usrloc/urecord.c index e0ff894..5ce2813 100644 --- a/modules_k/usrloc/urecord.c +++ b/modules_k/usrloc/urecord.c @@ -43,7 +43,7 @@ #include "ul_mod.h" #include "utime.h" #include "ul_callback.h" - +#include "usrloc.h" /*! contact matching mode */ int matching_mode = CONTACT_ONLY;

1 0

git:mariuszbihlei/p_usrloc: test/unit Update p_usrloc test ( it executes correctly now and performs cleaning)
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 74546cd9f98da0a1d945c735a2dc9dbece2121f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74546cd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:47:55 2011 +0200 test/unit Update p_usrloc test (it executes correctly now and performs cleaning) --- test/unit/50.cfg | 2 +- test/unit/50.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/unit/50.cfg b/test/unit/50.cfg index 5970842..a23dc08 100644 --- a/test/unit/50.cfg +++ b/test/unit/50.cfg @@ -31,7 +31,7 @@ modparam("p_usrloc", "alg_location", 1) modparam("p_usrloc", "reg_db_table", "locdb") loadmodule "registrar" -modparam("registrar", "min_expires", 5) +modparam("registrar", "min_expires", 60) modparam("p_usrloc", "timer_interval", 2) #------------------------- request routing logic ------------------- diff --git a/test/unit/50.sh b/test/unit/50.sh index 0b9fd4d..5c0979a 100755 --- a/test/unit/50.sh +++ b/test/unit/50.sh @@ -40,9 +40,9 @@ sleep 1 # register two contacts echo "adding new contacts" -sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null -sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null -sipsak -U -C sip:foobar2@localhost -s sip:49721123456790@localhost -H localhost &> /dev/null +sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost -x 30 &> /dev/null +sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost -x 30 &> /dev/null +sipsak -U -C sip:foobar2@localhost -s sip:49721123456790@localhost -H localhost -x 30 &> /dev/null ret=$? if [ ! "$ret" -eq 0 ]; then @@ -71,7 +71,6 @@ if [ "$ret" -eq 0 ]; then fi; fi; - if [ "$ret" -eq 0 ]; then echo "check if the contact is registered" sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" #&> /dev/null

1 0

git:mariuszbihlei/p_usrloc: test/unit improved p_usrloc test
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 65a1229cb3a77eb2162bd7efddc15f92974fafd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65a1229… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:24:17 2011 +0200 test/unit improved p_usrloc test --- test/unit/50.cfg | 3 +- test/unit/50.sh | 109 +++++++++++++++++++++-------------------------------- 2 files changed, 44 insertions(+), 68 deletions(-) diff --git a/test/unit/50.cfg b/test/unit/50.cfg index 7a414a9..5970842 100644 --- a/test/unit/50.cfg +++ b/test/unit/50.cfg @@ -21,7 +21,6 @@ modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") loadmodule "p_usrloc" modparam("p_usrloc", "db_mode", 3) -modparam("p_usrloc", "db_url", "mysql://ser:ser@localhost/ser") modparam("p_usrloc", "read_db_url", "mysql://ser:ser@localhost/ser") modparam("p_usrloc", "write_db_url", "mysql://ser:ser@localhost/ser") @@ -71,7 +70,7 @@ route{ sl_send_reply("404", "Not Found"); exit; } - append_hf("P-hint: usrloc applied\r\n"); + append_hf("P-hint: p_usrloc applied\r\n"); } route(1); diff --git a/test/unit/50.sh b/test/unit/50.sh index 5865794..0b9fd4d 100755 --- a/test/unit/50.sh +++ b/test/unit/50.sh @@ -29,9 +29,11 @@ if ! (check_sipsak && check_kamailio && check_module "db_mysql" && check_mysql); exit 0 fi ; +MYSQL_LOC_A="mysql loc_a --show-warnings --batch --user=ser --password=ser -e" +MYSQL_LOC_B="mysql loc_b --show-warnings --batch --user=ser --password=ser -e" cp $CFG $CFG.bak -#$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG #> /dev/null ret=$? sleep 1 @@ -40,84 +42,97 @@ sleep 1 echo "adding new contacts" sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null +sipsak -U -C sip:foobar2@localhost -s sip:49721123456790@localhost -H localhost &> /dev/null ret=$? -sleep 100 +if [ ! "$ret" -eq 0 ]; then + echo "registration failed" +fi if [ "$ret" -eq 0 ]; then - $CTL ul show | grep "AOR:: 49721123456789" &> /dev/null - ret=$? + TMP=`$MYSQL_LOC_A "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + TMP=`$MYSQL_LOC_B "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + echo "User 49721123456789 was NOT saved to either loc_a or loc_b" + ret=1 + fi + fi; fi; if [ "$ret" -eq 0 ]; then - TMP=`$MYSQL "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + TMP=`$MYSQL_LOC_A "select COUNT(*) from location where username='49721123456790';" | tail -n 1` if [ "$TMP" -eq 0 ] ; then - ret=1 + TMP=`$MYSQL_LOC_B "select COUNT(*) from location where username='49721123456790';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + echo "User 49721123456790 was NOT saved to either loc_a or loc_b" + ret=1 + fi fi; fi; + if [ "$ret" -eq 0 ]; then - # check if the contact is registered - sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" &> /dev/null + echo "check if the contact is registered" + sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" #&> /dev/null ret=$? + echo "sipsak exited with status $ret" fi; if [ "$ret" -eq 0 ]; then - # update the registration + echo "update the registration" sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # check if we get a hint when we try to unregister a non-existent conctact + echo "check if we get a hint when we try to unregister a non-existent conctact" sipsak -U -C "sip:foobar2@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 -q "Contact: <sip:foobar@localhost>" &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # unregister the contact + echo " unregister the contact" sipsak -U -C "sip:foobar@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # unregister the user again should not fail - sipsak -U -C "sip:foobar@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 &> /dev/null + echo "unregister the user again should not fail" + sipsak -U -C "sip:foobar@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 #&> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # check if the other contact is still registered + echo "check if the other contact is still registered" sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar1@localhost>" &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # register the other again + echo " register the other again" sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # unregister all contacts + echo " unregister all contacts" sipsak -U -C "*" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - $CTL ul show | grep "AOR:: 49721123456789" > /dev/null - ret=$? - if [ "$ret" -eq 0 ]; then - ret=1 - else - ret=0 + executed=1 + ret=`$MYSQL_LOC_A "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + ret=`$MYSQL_LOC_B "select COUNT(*) from location where username='49721123456789';" | tail -n 1` fi; -fi ; - -if [ "$ret" -eq 0 ]; then - ret=`$MYSQL "select COUNT(*) from location where username='49721123456789';" | tail -n 1` fi; +if [ "x$executed" == "x1" ]; then + echo "After un-registration user has $ret contacts " +fi + if [ "$ret" -eq 0 ]; then # test min_expires functionality sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost -x 2 &> /dev/null @@ -136,48 +151,10 @@ if [ "$ret" -eq 0 ]; then sipsak -U -e 9 -s sip:49721123456789@localhost -H localhost &> /dev/null fi; -if [ "$ret" -eq 0 ]; then - # let the timer cleanup the previous registrations - sleep 3 - # and check - TMP=`$MYSQL "select COUNT(*) from location where username like '49721123456789%';" | tail -n 1` - if [ "$TMP" -eq 10 ] ; then - ret=0 - else - ret=1 - fi; -fi; - -$MYSQL "delete from location where username like '49721123456789%';" -if [ "$ret" -eq 0 ]; then - # register again - sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null - ret=$? -fi; - -$KILL - -# restart to test preload_udomain functionality -$BIN -w . -f $CFG > /dev/null -ret=$? - -sleep 1 - -if [ "$ret" -eq 0 ]; then - # check if the contact is still registered - sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" &> /dev/null - ret=$? -fi; - -# check if the methods value is correct -if [ "$ret" -eq 0 ]; then - $CTL ul show | grep "Methods:: 4294967295" &> /dev/null - ret=$? -fi; +$MYSQL_LOC_A "delete from location where username like '497211234567%';" +$MYSQL_LOC_B "delete from location where username like '497211234567%';" -# cleanup -$MYSQL "delete from location where username like '49721123456789%';" $KILL

1 0

git:master: db_postgres: reconnect tuning in submit query
by Daniel-Constantin Mierla 18 Jan '11

18 Jan '11

Module: sip-router Branch: master Commit: 7c10eae7255450b6a176dc03d0d5f516a6dacc10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c10eae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 18 11:49:12 2011 +0100 db_postgres: reconnect tuning in submit query - don't attempt to reconnect if the connection state is ok upon submitting query, the error might be something else and will be reported when fetching the result --- modules/db_postgres/km_dbase.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 1558e49..c01d37a 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -151,14 +151,15 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) /* exec the query */ if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { pqresult = PQresultStatus(CON_RESULT(_con)); - if(pqresult!=PGRES_FATAL_ERROR) + if((pqresult!=PGRES_FATAL_ERROR) + || (PQstatus(CON_CONNECTION(_con))==CONNECTION_OK)) { LM_DBG("sending query ok: %p (%d) - [%.*s]\n", _con, pqresult, _s->len, _s->s); return 0; } - LM_WARN("postgres result check failed with code %d (%s)\n", pqresult, - PQresStatus(pqresult)); + LM_WARN("postgres result check failed with code %d (%s)\n", + pqresult, PQresStatus(pqresult)); } LM_WARN("postgres query command failed, connection status %d," " error [%s]\n", PQstatus(CON_CONNECTION(_con)),

1 0

git:master: modules_k/textops: Fixed memcpy problem
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: master Commit: 958df5cda2af963b893ab7d8af6ce4f4a00cb228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=958df5c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:27:08 2011 +0200 modules_k/textops: Fixed memcpy problem The commit 4b6cfe30 did nothing. --- modules_k/textops/textops.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index f5da969..6b8fa42 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1475,12 +1475,13 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, len=s0.len; if (str2) len+= str2->len + REQ_LINE(msg).uri.len; - if (likely(len>0)){ - s = (char*)pkg_malloc(len); - if (!s) { - LM_ERR("no pkg memory left\n"); - return -1; - } + s = (char*)pkg_malloc(len); + if (!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + + if (likely(s0.len>0)){ memcpy(s, s0.s, s0.len); }

1 0

git:master: modules_k/textops If s0.s is NULL do not memcpy it.
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: master Commit: 4b6cfe30388bd3cd95da2c8f540eedf991a4ee9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b6cfe3… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 10:45:42 2011 +0200 modules_k/textops If s0.s is NULL do not memcpy it. --- modules_k/textops/textops.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 5b0e3b5..f5da969 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1475,13 +1475,15 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, len=s0.len; if (str2) len+= str2->len + REQ_LINE(msg).uri.len; - s = (char*)pkg_malloc(len); - if (!s) { - LM_ERR("no pkg memory left\n"); - return -1; + if (likely(len>0)){ + s = (char*)pkg_malloc(len); + if (!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + memcpy(s, s0.s, s0.len); } - memcpy(s, s0.s, s0.len); if (str2) { memcpy(s+str1->len, REQ_LINE(msg).uri.s, REQ_LINE(msg).uri.len); memcpy(s+str1->len+REQ_LINE(msg).uri.len, str2->s, str2->len );

1 0

[tracker] Task closed: pooling of libsrdb1 doesnt restrict database connection to 1 thread and gives issues with postgresql
by sip-router 17 Jan '11

17 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#97 - pooling of libsrdb1 doesnt restrict database connection to 1 thread and gives issues with postgresql User who did this - Henning Westerholt (henningw) Reason for closing: Fixed Additional comments about closing: Hi Robert, i think this is now in the git master, thanks to the work of Daniel. Please re-open if you still see issues. Henning More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=97 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: typo in RLS (k) module Content-Type
by sip-router 17 Jan '11

17 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#112 - typo in RLS (k) module Content-Type User who did this - Henning Westerholt (henningw) Reason for closing: Fixed Additional comments about closing: Thanks, fixed in master and stable branches. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=112 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:kamailio_3.0: rls: fix small typo, reported from Klaus in FS#11
by Henning Westerholt 17 Jan '11

17 Jan '11

Module: sip-router Branch: kamailio_3.0 Commit: 0f3062c9850bb7d31e0ddcccc1c386104d4e754d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f3062c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 17 18:47:44 2011 +0100 rls: fix small typo, reported from Klaus in FS#11 (cherry picked from commit 47029324eb780242b5c2bda9d707bd5396dd1278) --- modules_k/rls/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 85c62a4..d2fee55 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -231,7 +231,7 @@ int agg_body_sendn_update(str* rl_uri, char* boundary_string, str* rlmi_body, len+= sprintf(body.s+ len , "Content-Transfer-Encoding: binary\r\n"); len+= sprintf(body.s+ len , "Content-ID: <%s>\r\n", cid); len+= sprintf(body.s+ len , - "Content-Type: application/rlmi+xml;charset=\"UTF-8r\"\r\n"); + "Content-Type: application/rlmi+xml;charset=\"UTF-8\"\r\n"); len+= sprintf(body.s+ len, "\r\n"); /*blank line*/ memcpy(body.s+ len, rlmi_body->s, rlmi_body->len); len+= rlmi_body->len;

1 0

git:3.1: rls: fix small typo, reported from Klaus in FS#11
by Henning Westerholt 17 Jan '11

17 Jan '11

Module: sip-router Branch: 3.1 Commit: 98fda6224ba218de2badbc40ea9c0de4e8f9a208 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98fda62… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 17 18:47:44 2011 +0100 rls: fix small typo, reported from Klaus in FS#11 (cherry picked from commit 47029324eb780242b5c2bda9d707bd5396dd1278) --- modules_k/rls/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 9b83f21..1ec842f 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -231,7 +231,7 @@ int agg_body_sendn_update(str* rl_uri, char* boundary_string, str* rlmi_body, len+= sprintf(body.s+ len , "Content-Transfer-Encoding: binary\r\n"); len+= sprintf(body.s+ len , "Content-ID: <%s>\r\n", cid); len+= sprintf(body.s+ len , - "Content-Type: application/rlmi+xml;charset=\"UTF-8r\"\r\n"); + "Content-Type: application/rlmi+xml;charset=\"UTF-8\"\r\n"); len+= sprintf(body.s+ len, "\r\n"); /*blank line*/ memcpy(body.s+ len, rlmi_body->s, rlmi_body->len); len+= rlmi_body->len;

1 0

git:master: rls: fix small typo, reported from Klaus in FS#11
by Henning Westerholt 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: 47029324eb780242b5c2bda9d707bd5396dd1278 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4702932… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 17 18:47:44 2011 +0100 rls: fix small typo, reported from Klaus in FS#11 --- modules_k/rls/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 9b83f21..1ec842f 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -231,7 +231,7 @@ int agg_body_sendn_update(str* rl_uri, char* boundary_string, str* rlmi_body, len+= sprintf(body.s+ len , "Content-Transfer-Encoding: binary\r\n"); len+= sprintf(body.s+ len , "Content-ID: <%s>\r\n", cid); len+= sprintf(body.s+ len , - "Content-Type: application/rlmi+xml;charset=\"UTF-8r\"\r\n"); + "Content-Type: application/rlmi+xml;charset=\"UTF-8\"\r\n"); len+= sprintf(body.s+ len, "\r\n"); /*blank line*/ memcpy(body.s+ len, rlmi_body->s, rlmi_body->len); len+= rlmi_body->len;

1 0

[tracker] User took ownership: typo in RLS (k) module Content-Type
by sip-router 17 Jan '11

17 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Henning Westerholt has taken ownership of the following task: FS#112 - typo in RLS (k) module Content-Type More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=112 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: typo in RLS (k) module Content-Type
by sip-router 17 Jan '11

17 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Klaus Darilion (klaus3000) Attached to Project - sip-router Summary - typo in RLS (k) module Content-Type Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - # rgrep UTF-8r * modules_k/rls/notify.c: "Content-Type: application/rlmi+xml;charset=\"UTF-8r\"\r\n"); I guess it should be "UTF-8" instead of "UTF-8r" More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=112 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: typo in RLS (k) module Content-Type
by sip-router 17 Jan '11

17 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#112 - typo in RLS (k) module Content-Type User who did this - Klaus Darilion (klaus3000) http://sip-router.org/tracker/index.php?do=details&task_id=112 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: modules_k/group : In case of incorrect param, don't crash
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: 5d668ec98ccf4c315da67a1cce6dc3a5cf1b2dc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d668ec… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 17 14:32:22 2011 +0200 modules_k/group : In case of incorrect param, don't crash --- modules_k/group/group.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/group/group.c b/modules_k/group/group.c index 3a2368b..faac07d 100644 --- a/modules_k/group/group.c +++ b/modules_k/group/group.c @@ -117,6 +117,10 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, } turi = &puri; break; + default: { + LM_ERR("incorrect check id %d\n", gcp->id); + return -1; + } } if (gcp->id != 4) {

1 0

git:master: modules_k/auth_diameter : if realm is NULL, do not crash but instead use uri.host (as it was intended)
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: 6c31510e42369f1025f54c53c354b36faa737af0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c31510… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 17 14:42:31 2011 +0200 modules_k/auth_diameter : if realm is NULL, do not crash but instead use uri.host (as it was intended) --- modules_k/auth_diameter/authorize.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules_k/auth_diameter/authorize.c b/modules_k/auth_diameter/authorize.c index dec3902..7b4f67c 100644 --- a/modules_k/auth_diameter/authorize.c +++ b/modules_k/auth_diameter/authorize.c @@ -151,6 +151,7 @@ auth_diam_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, { int ret; struct sip_uri uri; + str realm; if ((_m->REQ_METHOD == METHOD_ACK) || (_m->REQ_METHOD == METHOD_CANCEL)) return AUTHORIZED; @@ -167,11 +168,12 @@ auth_diam_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, } return ERROR; } - - *_realm = uri.host; + realm = uri.host; + } else { + realm = *_realm; } - ret = find_credentials(_m, _realm, _hftype, _h); + ret = find_credentials(_m, &realm, _hftype, _h); if (ret < 0) { LM_ERR("credentials not found\n");

1 0

git:master: core: switch.c Fixed dereference of null pointer
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: ef82d90bec5d06ae53c202300a553ea7e09b0d27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef82d90… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 19:10:08 2011 +0200 core: switch.c Fixed dereference of null pointer c->ct_rve is NULL in else branch, further deref. will cause chaos. --- switch.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/switch.c b/switch.c index 467e00c..b09d8ae 100644 --- a/switch.c +++ b/switch.c @@ -220,10 +220,7 @@ int fix_switch(struct action* t) n++; /* count only non-default cases */ }else{ if (default_found){ - LOG(L_ERR, "ERROR: fix_switch: more then one \"default\"" - " label found (%d, %d)\n", - c->ct_rve->fpos.s_line, - c->ct_rve->fpos.s_col); + LOG(L_ERR, "ERROR: fix_switch: more then one \"default\""); return E_UNSPEC; } default_found=1;

1 0

git:master: modules/auth Fixed a bug when realm is NULL in challenge method
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: 1c9ccc12371b38f546ba874ab8b82d775ad112f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c9ccc1… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 17 12:06:55 2011 +0200 modules/auth Fixed a bug when realm is NULL in challenge method --- modules/auth/challenge.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/auth/challenge.c b/modules/auth/challenge.c index 9bd4ce0..decebf0 100644 --- a/modules/auth/challenge.c +++ b/modules/auth/challenge.c @@ -124,9 +124,13 @@ int get_challenge_hf(struct sip_msg* msg, int stale, str* realm, nonce_len = get_nonce_len(cfg, nc_enabled || otn_enabled); hf.len = hfn->len; - hf.len += DIGEST_REALM_LEN - + realm->len - + DIGEST_NONCE_LEN; + if (realm) { + hf.len += DIGEST_REALM_LEN + + realm->len; + } + + hf.len += DIGEST_NONCE_LEN; + if (nonce) { hf.len += nonce->len + 1; /* '"' */ @@ -156,10 +160,14 @@ int get_challenge_hf(struct sip_msg* msg, int stale, str* realm, ERR("auth: No memory left (%d bytes)\n", hf.len); return -1; } - + memcpy(p, hfn->s, hfn->len); p += hfn->len; - memcpy(p, DIGEST_REALM, DIGEST_REALM_LEN); p += DIGEST_REALM_LEN; - memcpy(p, realm->s, realm->len); p += realm->len; + + if(realm){ + memcpy(p, DIGEST_REALM, DIGEST_REALM_LEN); p += DIGEST_REALM_LEN; + memcpy(p, realm->s, realm->len); p += realm->len; + } + memcpy(p, DIGEST_NONCE, DIGEST_NONCE_LEN); p += DIGEST_NONCE_LEN; if (nonce) { memcpy(p, nonce->s, nonce->len); p += nonce->len;

1 0

git:master: db_postgres: check result status after query
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: 54d14270197a3585451675684ae10e961de0a48e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d1427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 23:05:19 2011 +0100 db_postgres: check result status after query - connection might be broken and reported after the query operation - try to reset the connection in this case - reported by Javier Gallart --- modules/db_postgres/km_dbase.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 649c945..1558e49 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -115,6 +115,7 @@ void db_postgres_close(db1_con_t* _h) static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) { int i; + ExecStatusType pqresult; if(! _con || !_s || !_s->s) { @@ -149,11 +150,17 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) db_postgres_free_query(_con); /* exec the query */ if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { - LM_DBG("sending query ok: %p - [%.*s]\n", - _con, _s->len, _s->s); - return 0; + pqresult = PQresultStatus(CON_RESULT(_con)); + if(pqresult!=PGRES_FATAL_ERROR) + { + LM_DBG("sending query ok: %p (%d) - [%.*s]\n", + _con, pqresult, _s->len, _s->s); + return 0; + } + LM_WARN("postgres result check failed with code %d (%s)\n", pqresult, + PQresStatus(pqresult)); } - LM_WARN("sending postgres command failed, connection status %d," + LM_WARN("postgres query command failed, connection status %d," " error [%s]\n", PQstatus(CON_CONNECTION(_con)), PQerrorMessage(CON_CONNECTION(_con))); if(PQstatus(CON_CONNECTION(_con))!=CONNECTION_OK) @@ -221,11 +228,13 @@ int db_postgres_fetch_result(const db1_con_t* _con, db1_res_t** _res, const int switch(pqresult) { case PGRES_COMMAND_OK: - /* Successful completion of a command returning no data (such as INSERT or UPDATE). */ + /* Successful completion of a command returning no data + * (such as INSERT or UPDATE). */ return 0; case PGRES_TUPLES_OK: - /* Successful completion of a command returning data (such as a SELECT or SHOW). */ + /* Successful completion of a command returning data + * (such as a SELECT or SHOW). */ if (db_postgres_get_columns(_con, *_res) < 0) { LM_ERR("failed to get column names\n"); return -2; @@ -234,8 +243,10 @@ int db_postgres_fetch_result(const db1_con_t* _con, db1_res_t** _res, const int case PGRES_FATAL_ERROR: LM_ERR("%p - invalid query, execution aborted\n", _con); - LM_ERR("%p - PQresultStatus(%s)\n", _con, PQresStatus(pqresult)); - LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); + LM_ERR("%p - PQresultStatus(%s)\n", _con, + PQresStatus(pqresult)); + LM_ERR("%p: %s\n", _con, + PQresultErrorMessage(CON_RESULT(_con))); if (*_res) db_free_result(*_res); *_res = 0;

1 0

git:master: app_lua: updated the docs
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: f3cc40a1e3007eff78a09cfdf767811839a018c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3cc40a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 22:44:32 2011 +0100 app_lua: updated the docs --- modules/app_lua/README | 1 + modules/app_lua/doc/app_lua_admin.xml | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/README b/modules/app_lua/README index 8b45ce2..d8dd8c7 100644 --- a/modules/app_lua/README +++ b/modules/app_lua/README @@ -139,6 +139,7 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") * sqlops - register functions from sqlops module under 'sr.sqlops'. * sl - register functions from sl module under 'sr.sl'. * tm - register functions from tm module under 'sr.tm'. + * xhttp - register functions from xhttp module under 'sr.xhttp'. Note that 'sr', 'sr.hdr' and 'sr.pv' modules are always registered to Lua. diff --git a/modules/app_lua/doc/app_lua_admin.xml b/modules/app_lua/doc/app_lua_admin.xml index 70d92bf..ae77ee7 100644 --- a/modules/app_lua/doc/app_lua_admin.xml +++ b/modules/app_lua/doc/app_lua_admin.xml @@ -163,6 +163,12 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") under 'sr.tm'. </para> </listitem> + <listitem> + <para> + <emphasis>xhttp</emphasis> - register functions from xhttp + module under 'sr.xhttp'. + </para> + </listitem> </itemizedlist> <para> Note that 'sr', 'sr.hdr' and 'sr.pv' modules are always registered

1 0

git:master: app_lua: include xhttp api headers
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: 2bcf11332135c3f23ce2cf0aa519ed57c4d2e4d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bcf113… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 22:40:54 2011 +0100 app_lua: include xhttp api headers --- modules/app_lua/app_lua_exp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index d8bc577..c998b7e 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -40,6 +40,7 @@ #include "../../modules_k/maxfwd/api.h" #include "../../modules_k/registrar/api.h" #include "../../modules_k/dispatcher/api.h" +#include "../../modules/xhttp/api.h" #include "app_lua_api.h" @@ -1249,7 +1250,7 @@ static int lua_sr_xhttp_reply(lua_State *L) LM_WARN("invalid parameters from Lua env\n"); return app_lua_return_error(L); } - rcode = (char*)lua_toint(L, -4); + rcode = lua_tointeger(L, -4); reason.s = (char*)lua_tostring(L, -3); ctype.s = (char*)lua_tostring(L, -2); mbody.s = (char*)lua_tostring(L, -1);

1 0

git:master: app_lua: exported xhttp API to Lua
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: b3d84f21011b023db95e0655c19c46f10d5b063c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3d84f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 22:32:28 2011 +0100 app_lua: exported xhttp API to Lua --- modules/app_lua/app_lua_exp.c | 74 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index a062221..d8bc577 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -52,6 +52,7 @@ #define SR_LUA_EXP_MOD_MAXFWD (1<<6) #define SR_LUA_EXP_MOD_REGISTRAR (1<<7) #define SR_LUA_EXP_MOD_DISPATCHER (1<<8) +#define SR_LUA_EXP_MOD_XHTTP (1<<9) /** * @@ -105,6 +106,11 @@ static tm_api_t _lua_tmb; static tm_xapi_t _lua_xtmb; /** + * xhttp + */ +static xhttp_api_t _lua_xhttpb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -1217,6 +1223,59 @@ static int lua_sr_dispatcher_is_from(lua_State *L) return app_lua_return_int(L, ret); } + +/** + * + */ +static int lua_sr_xhttp_reply(lua_State *L) +{ + int rcode; + str reason; + str ctype; + str mbody; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP)) + { + LM_WARN("weird: xhttp function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + rcode = (char*)lua_toint(L, -4); + reason.s = (char*)lua_tostring(L, -3); + ctype.s = (char*)lua_tostring(L, -2); + mbody.s = (char*)lua_tostring(L, -1); + if(reason.s == NULL || ctype.s == NULL || mbody.s == NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + reason.len = strlen(reason.s); + ctype.len = strlen(ctype.s); + mbody.len = strlen(mbody.s); + + ret = _lua_xhttpb.reply(env_L->msg, rcode, &reason, &ctype, &mbody); + return app_lua_return_int(L, ret); +} + + +/** + * + */ +static const luaL_reg _sr_xhttp_Map [] = { + {"reply", lua_sr_xhttp_reply}, + {NULL, NULL} +}; + + /** * */ @@ -1329,6 +1388,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded dispatcher api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP) + { + /* bind the XHTTP API */ + if (xhttp_load_api(&_lua_xhttpb) < 0) + { + LM_ERR("cannot bind to XHTTP API\n"); + return -1; + } + LM_DBG("loaded xhttp api\n"); + } return 0; } @@ -1369,6 +1438,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==10 && strcmp(mname, "dispatcher")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_DISPATCHER; return 0; + } else if(len==5 && strcmp(mname, "xhttp")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_XHTTP; + return 0; } return -1; @@ -1397,5 +1469,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.registrar", _sr_registrar_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER) luaL_openlib(L, "sr.dispatcher", _sr_dispatcher_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP) + luaL_openlib(L, "sr.xhttp", _sr_xhttp_Map, 0); }

1 0

git:master: xhttp: exported xhttp reply via inter-module api
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: efc3f1f5050ea2302952158098d61b457a7c8df1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efc3f1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 16:29:02 2011 +0100 xhttp: exported xhttp reply via inter-module api --- modules/xhttp/api.h | 58 +++++++++++++++++++++++++++++++++++++++++++++ modules/xhttp/xhttp_mod.c | 17 +++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/modules/xhttp/api.h b/modules/xhttp/api.h new file mode 100644 index 0000000..0fc7ee5 --- /dev/null +++ b/modules/xhttp/api.h @@ -0,0 +1,58 @@ +/** + * $Id$ + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _XHTTP_API_H_ +#define _XHTTP_API_H_ + +#include "../../sr_module.h" + +typedef int (*xhttp_reply_f)(sip_msg_t *msg, int code, str *reason, + str *ctype, str *body); + +typedef struct xhttp_api { + xhttp_reply_f reply; +} xhttp_api_t; + +typedef int (*bind_xhttp_f)(xhttp_api_t* api); +int bind_xhttp(xhttp_api_t* api); + +/** + * @brief Load the XHTTP API + */ +static inline int xhttp_load_api(xhttp_api_t *api) +{ + bind_xhttp_f bindxhttp; + + bindxhttp = (bind_xhttp_f)find_export("bind_xhttp", 0, 0); + if(bindxhttp == 0) { + LM_ERR("cannot find bind_xhttp\n"); + return -1; + } + if(bindxhttp(api)<0) + { + LM_ERR("cannot bind xhttp api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index 1c5ff7e..23ac3c4 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -44,6 +44,8 @@ #include "../../mod_fix.h" #include "../../pvar.h" +#include "api.h" + MODULE_VERSION static int xhttp_handler(sip_msg_t* msg); @@ -69,6 +71,8 @@ sl_api_t slb; static cmd_export_t cmds[] = { {"xhttp_reply", (cmd_function)w_xhttp_send_reply, 4, fixup_xhttp_reply, 0, REQUEST_ROUTE}, + {"bind_xhttp", (cmd_function)bind_xhttp, + 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0} }; @@ -486,4 +490,17 @@ static int fixup_xhttp_reply(void** param, int param_no) return 0; } +/** + * + */ +int bind_xhttp(xhttp_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->reply = xhttp_send_reply; + return 0; +} + /** @} */

1 0

git:3.1: mtree: don't safety check for db con in mod child
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: 3.1 Commit: 76a4dc1731034132b1651dc377bc34575b7ab057 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76a4dc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:22:45 2011 +0100 mtree: don't safety check for db con in mod child - proper connection will be returned based on pid condition (cherry picked from commit 11b19d2f5f471bd151bfc47e82f716526118e834) --- modules/mtree/mtree_mod.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 29ea12a..40ad09b 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -327,8 +327,6 @@ error1: */ static int mi_child_init(void) { - if(db_con!=NULL) - return 0; db_con = mt_dbf.init(&db_url); if(db_con==NULL) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011