sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:7fd97b3f: modules: readme files regenerated - crypto ...
by Kamailio Dev 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 7fd97b3f979931b3f5a6eb5d443723dadd05be6a URL: https://github.com/kamailio/kamailio/commit/7fd97b3f979931b3f5a6eb5d443723d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-11-01T15:01:29+01:00 modules: readme files regenerated - crypto ... --- Modified: modules/crypto/README Modified: modules/dispatcher/README Modified: modules/nathelper/README Modified: modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/7fd97b3f979931b3f5a6eb5d443723d… Patch: https://github.com/kamailio/kamailio/commit/7fd97b3f979931b3f5a6eb5d443723d… --- diff --git a/modules/crypto/README b/modules/crypto/README index 25eb1bf..9cfdd60 100644 --- a/modules/crypto/README +++ b/modules/crypto/README @@ -110,7 +110,7 @@ modparam("crypto", "salt", "l0Bh2M8a") Set it to 1 in order to register a callback to core for generation of callid values for requests generated by Kamailio tm module. - This callid genrator uses libssl random and hashing functions for + This callid generator uses libssl random and hashing functions for generating RFC 4122 version 4 UUID with high quality entropy. It is useful when wanting to have new callids that cannot be predicted from previous values. diff --git a/modules/dispatcher/README b/modules/dispatcher/README index d12a88a..0e30bfe 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -697,7 +697,7 @@ Note code=408 or class=400 will never set a backend down even if it is, because internally the Kamailio transaction layer generates a 408 in the case of no response from the remote server, and this internal code - 408 is accepted as vaild value. + 408 is accepted as valid value. Default value is “” (only 200 OK is accepted). diff --git a/modules/nathelper/README b/modules/nathelper/README index 90db70c..6925cf9 100644 --- a/modules/nathelper/README +++ b/modules/nathelper/README @@ -193,7 +193,7 @@ Chapter 1. Admin Guide 2. NAT pinging types Currently, the nathelper module supports two types of NAT pings: - * UDP package - 4 bytes (zero filled) UDP packages are sent to the + * UDP packet - 4 bytes (zero filled) UDP packets are sent to the contact address. + Advantages: low bandwitdh traffic, easy to generate by Kamailio; @@ -334,7 +334,7 @@ modparam("nathelper", "received_avp", "$avp(i:42)") Which branch flag should be used by the module to identify NATed contacts for which it should perform NAT ping via a SIP request instead - if dummy UDP package. + of dummy UDP packet. Default value is -1 (disabled). diff --git a/modules/sanity/README b/modules/sanity/README index bd20087..90ea878 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -129,7 +129,7 @@ modparam("sanity", "default_checks", 1) 'parse uri' will be executed. Default value is 7. This resolves to the following list of parsed URIs: - Request RUI (1), From URI (2) and To URI (4). + Request URI (1), From URI (2) and To URI (4). Example 1.2. Set uri_checks parameter ...

1 0

git:master:05da8b18: Merge pull request #840 from mslehto/doctypo
by GitHub 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 05da8b18ce4ae6af140e817fc90b7bdf2f56b262 URL: https://github.com/kamailio/kamailio/commit/05da8b18ce4ae6af140e817fc90b7bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-01T14:56:10+01:00 Merge pull request #840 from mslehto/doctypo Random collection of typo fixes --- Modified: modules/crypto/doc/crypto_admin.xml Modified: modules/dispatcher/doc/dispatcher_admin.xml Modified: modules/nathelper/doc/nathelper_admin.xml Modified: modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05da8b18ce4ae6af140e817fc90b7bd… Patch: https://github.com/kamailio/kamailio/commit/05da8b18ce4ae6af140e817fc90b7bd… --- diff --git a/modules/crypto/doc/crypto_admin.xml b/modules/crypto/doc/crypto_admin.xml index 147354e..8ab9c39 100644 --- a/modules/crypto/doc/crypto_admin.xml +++ b/modules/crypto/doc/crypto_admin.xml @@ -91,7 +91,7 @@ modparam("crypto", "salt", "l0Bh2M8a") of callid values for requests generated by &kamailio; tm module. </para> <para> - This callid genrator uses libssl random and hashing functions + This callid generator uses libssl random and hashing functions for generating RFC 4122 version 4 UUID with high quality entropy. It is useful when wanting to have new callids that cannot be predicted from previous values. diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index c10b502..d857f28 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -641,7 +641,7 @@ modparam("dispatcher", "force_dst", 1) that are generated locally. E.g.: setting code=408 or class=400 will never set a backend down even if it is, because internally the Kamailio transaction layer generates a 408 in the case of no response from the remote server, and this - internal code 408 is accepted as vaild value. + internal code 408 is accepted as valid value. </para> <para> <emphasis> diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index 176e17f..f6ef435 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -49,8 +49,8 @@ <itemizedlist> <listitem> <para> - <emphasis>UDP package</emphasis> - 4 bytes (zero filled) UDP - packages are sent to the contact address. + <emphasis>UDP packet</emphasis> - 4 bytes (zero filled) UDP + packets are sent to the contact address. </para> <itemizedlist> <listitem> @@ -265,7 +265,7 @@ modparam("nathelper", "received_avp", "$avp(i:42)") <para> Which branch flag should be used by the module to identify NATed contacts for which it should perform NAT ping via a SIP request - instead if dummy UDP package. + instead of dummy UDP packet. </para> <para> <emphasis> diff --git a/modules/sanity/doc/sanity_admin.xml b/modules/sanity/doc/sanity_admin.xml index d1ddb2b..687a8cd 100644 --- a/modules/sanity/doc/sanity_admin.xml +++ b/modules/sanity/doc/sanity_admin.xml @@ -160,7 +160,7 @@ modparam("sanity", "default_checks", 1) </para> <para> Default value is 7. This resolves to the following list of - parsed URIs: Request RUI (1), From URI (2) and To URI (4). + parsed URIs: Request URI (1), From URI (2) and To URI (4). </para> <example> <title>Set <varname>uri_checks</varname> parameter</title>

1 0

git:master:bb62b0f3: modules/crypto: fix small typo in documentation
by Mikko Lehto 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: bb62b0f32543e6961972679cfe34c48091329a63 URL: https://github.com/kamailio/kamailio/commit/bb62b0f32543e6961972679cfe34c48… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-10-31T22:29:06+02:00 modules/crypto: fix small typo in documentation --- Modified: modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb62b0f32543e6961972679cfe34c48… Patch: https://github.com/kamailio/kamailio/commit/bb62b0f32543e6961972679cfe34c48… --- diff --git a/modules/crypto/doc/crypto_admin.xml b/modules/crypto/doc/crypto_admin.xml index 147354e..8ab9c39 100644 --- a/modules/crypto/doc/crypto_admin.xml +++ b/modules/crypto/doc/crypto_admin.xml @@ -91,7 +91,7 @@ modparam("crypto", "salt", "l0Bh2M8a") of callid values for requests generated by &kamailio; tm module. </para> <para> - This callid genrator uses libssl random and hashing functions + This callid generator uses libssl random and hashing functions for generating RFC 4122 version 4 UUID with high quality entropy. It is useful when wanting to have new callids that cannot be predicted from previous values.

1 0

git:master:02482d1b: modules/dispatcher: fix small typo in documentation
by Mikko Lehto 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 02482d1b71dc618467978b060bc23bfedaa502fb URL: https://github.com/kamailio/kamailio/commit/02482d1b71dc618467978b060bc23bf… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-10-31T22:28:57+02:00 modules/dispatcher: fix small typo in documentation --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/02482d1b71dc618467978b060bc23bf… Patch: https://github.com/kamailio/kamailio/commit/02482d1b71dc618467978b060bc23bf… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index c10b502..d857f28 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -641,7 +641,7 @@ modparam("dispatcher", "force_dst", 1) that are generated locally. E.g.: setting code=408 or class=400 will never set a backend down even if it is, because internally the Kamailio transaction layer generates a 408 in the case of no response from the remote server, and this - internal code 408 is accepted as vaild value. + internal code 408 is accepted as valid value. </para> <para> <emphasis>

1 0

git:master:463569b8: modules/sanity: fix small typo in documentation
by Mikko Lehto 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 463569b8b0c2e29da1c82683e8edab0c2f67a9da URL: https://github.com/kamailio/kamailio/commit/463569b8b0c2e29da1c82683e8edab0… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-10-31T22:28:50+02:00 modules/sanity: fix small typo in documentation --- Modified: modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/463569b8b0c2e29da1c82683e8edab0… Patch: https://github.com/kamailio/kamailio/commit/463569b8b0c2e29da1c82683e8edab0… --- diff --git a/modules/sanity/doc/sanity_admin.xml b/modules/sanity/doc/sanity_admin.xml index d1ddb2b..687a8cd 100644 --- a/modules/sanity/doc/sanity_admin.xml +++ b/modules/sanity/doc/sanity_admin.xml @@ -160,7 +160,7 @@ modparam("sanity", "default_checks", 1) </para> <para> Default value is 7. This resolves to the following list of - parsed URIs: Request RUI (1), From URI (2) and To URI (4). + parsed URIs: Request URI (1), From URI (2) and To URI (4). </para> <example> <title>Set <varname>uri_checks</varname> parameter</title>

1 0

git:master:90781fc6: modules/nathelper: fix small typo in documentation
by Mikko Lehto 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 90781fc664ab3b843390c67f6367240a513828c0 URL: https://github.com/kamailio/kamailio/commit/90781fc664ab3b843390c67f6367240… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-10-31T22:25:01+02:00 modules/nathelper: fix small typo in documentation --- Modified: modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90781fc664ab3b843390c67f6367240… Patch: https://github.com/kamailio/kamailio/commit/90781fc664ab3b843390c67f6367240… --- diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index 176e17f..f6ef435 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -49,8 +49,8 @@ <itemizedlist> <listitem> <para> - <emphasis>UDP package</emphasis> - 4 bytes (zero filled) UDP - packages are sent to the contact address. + <emphasis>UDP packet</emphasis> - 4 bytes (zero filled) UDP + packets are sent to the contact address. </para> <itemizedlist> <listitem> @@ -265,7 +265,7 @@ modparam("nathelper", "received_avp", "$avp(i:42)") <para> Which branch flag should be used by the module to identify NATed contacts for which it should perform NAT ping via a SIP request - instead if dummy UDP package. + instead of dummy UDP packet. </para> <para> <emphasis>

1 0

[kamailio/kamailio] Random collection of typo fixes (#840)
by Mikko Lehto 01 Nov '16

01 Nov '16

Also greped source tree for similar instances, no luck this time. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/840 -- Commit Summary -- * modules/nathelper: fix small typo in documentation * modules/sanity: fix small typo in documentation * modules/dispatcher: fix small typo in documentation * modules/crypto: fix small typo in documentation -- File Changes -- M modules/crypto/doc/crypto_admin.xml (2) M modules/dispatcher/doc/dispatcher_admin.xml (2) M modules/nathelper/doc/nathelper_admin.xml (6) M modules/sanity/doc/sanity_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/840.patch https://github.com/kamailio/kamailio/pull/840.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/840

2 2

git:master:72023c34: Merge pull request #809 from Chocolatbuddha/master
by GitHub 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 72023c347c560c6f7d084c947cea9e9ca2ddce8e URL: https://github.com/kamailio/kamailio/commit/72023c347c560c6f7d084c947cea9e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-01T14:55:54+01:00 Merge pull request #809 from Chocolatbuddha/master Presence: Fix startup inconsistency in presentity hash table --- Modified: modules/presence/notify.c Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/72023c347c560c6f7d084c947cea9e9… Patch: https://github.com/kamailio/kamailio/commit/72023c347c560c6f7d084c947cea9e9… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 82ebf6b..acb052d 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -584,8 +584,9 @@ str* build_empty_bla_body(str pres_uri) str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, str* contact) { - db_key_t query_cols[3]; - db_val_t query_vals[3]; + db_key_t query_cols[4]; + db_val_t query_vals[4]; + db_op_t query_ops[4]; db_key_t result_cols[3]; db1_res_t *result = NULL; int body_col, etag_col= 0, sender_col; @@ -635,18 +636,28 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val = uri.host; + query_ops[n_query_cols] = OP_EQ; n_query_cols++; query_cols[n_query_cols] = &str_username_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val = uri.user; + query_ops[n_query_cols] = OP_EQ; n_query_cols++; query_cols[n_query_cols] = &str_event_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val= event->name; + query_ops[n_query_cols] = OP_EQ; + n_query_cols++; + + query_cols[n_query_cols] = &str_expires_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val= (int)time(NULL); + query_ops[n_query_cols] = OP_GT; n_query_cols++; result_cols[body_col=n_result_cols++] = &str_body_col; @@ -664,7 +675,7 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, } else { query_str = str_received_time_col; } - if (pa_dbf.query (pa_db, query_cols, 0, query_vals, + if (pa_dbf.query (pa_db, query_cols, query_ops, query_vals, result_cols, n_query_cols, n_result_cols, &query_str , &result) < 0) { LM_ERR("failed to query %.*s table\n", presentity_table.len, presentity_table.s); diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index cb819cf..4c8c914 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -1231,9 +1231,6 @@ int pres_htable_restore(void) row = &result->rows[i]; row_vals = ROW_VALUES(row); - if(row_vals[expires_col].val.int_val< (int)time(NULL)) - continue; - sphere= NULL; user.s= (char*)row_vals[user_col].val.string_val; user.len= strlen(user.s);

1 0

git:master:1dceaa24: Presence: Fix startup inconsistency in presentity hash table
by Chocolatbuddha 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 1dceaa24ded727aba5870f28fb63e26ed98464f3 URL: https://github.com/kamailio/kamailio/commit/1dceaa24ded727aba5870f28fb63e26… Author: Chocolatbuddha <chocolatbuddha(a)gmail.com> Committer: Chocolatbuddha <chocolatbuddha(a)gmail.com> Date: 2016-10-17T11:13:22+02:00 Presence: Fix startup inconsistency in presentity hash table pres_htable_restore(): Remove check of expired presentity entries when initially filling the hash table to represent the number of expired + valid entries. Because hash.c::delete_phtable() decrements publ_count on removal of _every_ expired DB entry. get_p_notify_body(): Compensate the fix on hash table restore by checking for the expires time on building the NOTIFY. This also fixes a problem when a SUBSCRIBE is received for an expired entry before the cleaner can remove the entry from the DB. --- Modified: modules/presence/notify.c Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/1dceaa24ded727aba5870f28fb63e26… Patch: https://github.com/kamailio/kamailio/commit/1dceaa24ded727aba5870f28fb63e26… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 82ebf6b..acb052d 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -584,8 +584,9 @@ str* build_empty_bla_body(str pres_uri) str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, str* contact) { - db_key_t query_cols[3]; - db_val_t query_vals[3]; + db_key_t query_cols[4]; + db_val_t query_vals[4]; + db_op_t query_ops[4]; db_key_t result_cols[3]; db1_res_t *result = NULL; int body_col, etag_col= 0, sender_col; @@ -635,18 +636,28 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val = uri.host; + query_ops[n_query_cols] = OP_EQ; n_query_cols++; query_cols[n_query_cols] = &str_username_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val = uri.user; + query_ops[n_query_cols] = OP_EQ; n_query_cols++; query_cols[n_query_cols] = &str_event_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val= event->name; + query_ops[n_query_cols] = OP_EQ; + n_query_cols++; + + query_cols[n_query_cols] = &str_expires_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val= (int)time(NULL); + query_ops[n_query_cols] = OP_GT; n_query_cols++; result_cols[body_col=n_result_cols++] = &str_body_col; @@ -664,7 +675,7 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, } else { query_str = str_received_time_col; } - if (pa_dbf.query (pa_db, query_cols, 0, query_vals, + if (pa_dbf.query (pa_db, query_cols, query_ops, query_vals, result_cols, n_query_cols, n_result_cols, &query_str , &result) < 0) { LM_ERR("failed to query %.*s table\n", presentity_table.len, presentity_table.s); diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 00fdbfd..3a72cff 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -1231,9 +1231,6 @@ int pres_htable_restore(void) row = &result->rows[i]; row_vals = ROW_VALUES(row); - if(row_vals[expires_col].val.int_val< (int)time(NULL)) - continue; - sphere= NULL; user.s= (char*)row_vals[user_col].val.string_val; user.len= strlen(user.s);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016