sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:2266bb9c: Core Update of doxygen, removal of history, changing "ser" to "kamailio"
by Olle E. Johansson 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 2266bb9cc206112afe7a07e22f43100e5f94f3ce URL: https://github.com/kamailio/kamailio/commit/2266bb9cc206112afe7a07e22f43100… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-03T15:03:24+01:00 Core Update of doxygen, removal of history, changing "ser" to "kamailio" --- Modified: kstats_types.h Modified: list.h Modified: local_timer.h Modified: lock_alloc.h Modified: lock_ops.h Modified: lock_ops_init.h Modified: locking.h Modified: lump_struct.h Modified: lvalue.h Modified: md5utils.h Modified: mod_fix.h Modified: modparam.h Modified: msg_translator.h Modified: name_alias.h Modified: nonsip_hooks.h Modified: onsend.h Modified: pass_fd.h Modified: poll_types.h Modified: ppcfg.h Modified: proxy.h Modified: pt.h Modified: pv_core.h Modified: pvapi.h Modified: pvar.h Modified: qvalue.h Modified: rad_dict.h Modified: raw_listener.h Modified: raw_sock.h Modified: re.h Modified: receive.h Modified: resolve.h Modified: route.h Modified: route_struct.h Modified: rpc.h Modified: rpc_lookup.h Modified: rvalue.h Modified: sched_yield.h Modified: script_cb.h Modified: sctp_core.h Modified: select.h Modified: select_buf.h Modified: select_core.h Modified: ser_time.h Modified: shm_init.h --- Diff: https://github.com/kamailio/kamailio/commit/2266bb9cc206112afe7a07e22f43100… Patch: https://github.com/kamailio/kamailio/commit/2266bb9cc206112afe7a07e22f43100…

1 0

git:master:a31cfa79: presence: readme rebuilt
by Daniel-Constantin Mierla 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: a31cfa79bf35fc65920db0584295c23699d51a47 URL: https://github.com/kamailio/kamailio/commit/a31cfa79bf35fc65920db0584295c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-03T12:21:05+01:00 presence: readme rebuilt --- Modified: modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/a31cfa79bf35fc65920db0584295c23… Patch: https://github.com/kamailio/kamailio/commit/a31cfa79bf35fc65920db0584295c23… --- diff --git a/modules/presence/README b/modules/presence/README index 6395628..f406337 100644 --- a/modules/presence/README +++ b/modules/presence/README @@ -56,6 +56,7 @@ Juha Heinanen 3.21. fetch_rows (integer) 3.22. db_table_lock_type (integer) 3.23. local_log_level (int) + 3.24. subs_remove_match (int) 4. Functions @@ -123,11 +124,12 @@ Juha Heinanen 1.21. Set fetch_rows parameter 1.22. Set db_table_lock_type parameter 1.23. Set local_log_level parameter - 1.24. handle_publish usage - 1.25. handle_subscribe usage - 1.26. pres_auth_status usage - 1.27. pres_refresh_watchers usage - 1.28. pres_update_watchers usage + 1.24. Set subs_remove_match parameter + 1.25. handle_publish usage + 1.26. handle_subscribe usage + 1.27. pres_auth_status usage + 1.28. pres_refresh_watchers usage + 1.29. pres_update_watchers usage 2.1. presence_api_t structure Chapter 1. Admin Guide @@ -165,6 +167,7 @@ Chapter 1. Admin Guide 3.21. fetch_rows (integer) 3.22. db_table_lock_type (integer) 3.23. local_log_level (int) + 3.24. subs_remove_match (int) 4. Functions @@ -253,6 +256,7 @@ Chapter 1. Admin Guide 3.21. fetch_rows (integer) 3.22. db_table_lock_type (integer) 3.23. local_log_level (int) + 3.24. subs_remove_match (int) 3.1. db_url(str) @@ -601,6 +605,20 @@ modparam("presence", "db_table_lock_type", 0) modparam("presence", "local_log_level", 3) ... +3.24. subs_remove_match (int) + + Control how to match the subscriptions to remove from memory. If set to + 0, then the match is done on To-Tag (local generated), if set to 1, + then the match is done on all dialog attributes (Call-Id, From-Tag, + To-Tag). + + Default value is 0. + + Example 1.24. Set subs_remove_match parameter +... +modparam("presence", "subs_remove_match", 1) +... + 4. Functions 4.1. handle_publish(char* sender_uri) @@ -629,7 +647,7 @@ modparam("presence", "local_log_level", 3) The module sends an appropriate stateless reply in all cases. - Example 1.24. handle_publish usage + Example 1.25. handle_publish usage ... if(is_method("PUBLISH")) { @@ -660,7 +678,7 @@ modparam("presence", "local_log_level", 3) The module sends an appropriate stateless reply in all cases. - Example 1.25. handle_subscribe usage + Example 1.26. handle_subscribe usage ... if(method=="SUBSCRIBE") handle_subscribe(); @@ -677,7 +695,7 @@ if(method=="SUBSCRIBE") This function can be used from REQUEST_ROUTE. - Example 1.26. pres_auth_status usage + Example 1.27. pres_auth_status usage ... if (method=="MESSAGE") { pres_auth_status("$fu", $ru"); @@ -713,7 +731,7 @@ if (method=="MESSAGE") { This function can be used from ANY_ROUTE. - Example 1.27. pres_refresh_watchers usage + Example 1.28. pres_refresh_watchers usage ... pres_refresh_watchers("sip:test@kamailio.org", "presence", 1); ... @@ -731,7 +749,7 @@ pres_refresh_watchers("sip:test@kamailio.org", "presence", 1); This function can be used from ANY_ROUTE. - Example 1.28. pres_update_watchers usage + Example 1.29. pres_update_watchers usage ... pres_update_watchers("sip:test@kamailio.org", "presence"); ...

1 0

git:master:25a99503: presence: added section for subs_remove_match parameter in docs
by Daniel-Constantin Mierla 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 25a99503c2fb1733f201552028be9c030e48efe3 URL: https://github.com/kamailio/kamailio/commit/25a99503c2fb1733f201552028be9c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-03T12:21:05+01:00 presence: added section for subs_remove_match parameter in docs --- Modified: modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25a99503c2fb1733f201552028be9c0… Patch: https://github.com/kamailio/kamailio/commit/25a99503c2fb1733f201552028be9c0… --- diff --git a/modules/presence/doc/presence_admin.xml b/modules/presence/doc/presence_admin.xml index e37ddc9..f7472f9 100644 --- a/modules/presence/doc/presence_admin.xml +++ b/modules/presence/doc/presence_admin.xml @@ -621,6 +621,28 @@ modparam("presence", "local_log_level", 3) </programlisting> </example> </section> + <section id="presence.p.subs_remove_match"> + <title><varname>subs_remove_match</varname> (int)</title> + <para> + Control how to match the subscriptions to remove from memory. + If set to 0, then the match is done on To-Tag (local generated), + if set to 1, then the match is done on all dialog attributes + (Call-Id, From-Tag, To-Tag). + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>subs_remove_match</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "subs_remove_match", 1) +... +</programlisting> + </example> + </section> </section>

1 0

git:master:85029d41: presence: configurable matching criteria to remove subscriptions from memory
by Daniel-Constantin Mierla 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 85029d414384912879b45a34bdeb8f1372cc3780 URL: https://github.com/kamailio/kamailio/commit/85029d414384912879b45a34bdeb8f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-03T12:21:04+01:00 presence: configurable matching criteria to remove subscriptions from memory - adjusted the commit 74d73953327ad7702922b27ba37c71e3283659c3, being reported that subscriptions are not found (Jan Gaida) --- Modified: modules/presence/hash.c Modified: modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/85029d414384912879b45a34bdeb8f1… Patch: https://github.com/kamailio/kamailio/commit/85029d414384912879b45a34bdeb8f1… --- diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 4c6f181..6e85d37 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -42,6 +42,13 @@ #include "hash.h" #include "notify.h" +/* matching mode when removing subscriptions from memory */ +extern int pres_subs_remove_match; + +/** + * create the subscription hash table in shared memory + * - hash_size: number of slots + */ shtable_t new_shtable(int hash_size) { shtable_t htable= NULL; @@ -287,12 +294,26 @@ int delete_shtable(shtable_t htable,unsigned int hash_code,subs_t* subs) while(s) { - if(s->callid.len==subs->callid.len + if(pres_subs_remove_match==0) { + /* match on to-tag only (unique, local generated - faster) */ + if(s->to_tag.len==subs->to_tag.len + && strncmp(s->to_tag.s,subs->to_tag.s,subs->to_tag.len)==0) + { + found = 0; + } + } else { + /* match on all dialog attributes (distributed systems) */ + if(s->callid.len==subs->callid.len && s->to_tag.len==subs->to_tag.len && s->from_tag.len==subs->from_tag.len && strncmp(s->callid.s,subs->callid.s,subs->callid.len)==0 && strncmp(s->to_tag.s,subs->to_tag.s,subs->to_tag.len)==0 && strncmp(s->from_tag.s,subs->from_tag.s,subs->from_tag.len)==0) + { + found = 0; + } + } + if(found==0) { found= s->local_cseq +1; ps->next= s->next; diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 03eeb56..5175665 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -98,6 +98,7 @@ int pres_fetch_rows = 500; int library_mode= 0; str server_address= {0, 0}; evlist_t* EvList= NULL; +int pres_subs_remove_match = 0; /* to tag prefix */ char* to_tag_pref = "10"; @@ -205,6 +206,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, + { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, {0,0,0} };

1 0

git:master:02ca141b: core : Update include files - delete IDs, update doxygen, delete history
by Olle E. Johansson 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 02ca141bb8a741ad516f8d60c84006c8ed09c14d URL: https://github.com/kamailio/kamailio/commit/02ca141bb8a741ad516f8d60c84006c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-03T11:55:48+01:00 core : Update include files - delete IDs, update doxygen, delete history --- Modified: action.h Modified: async_task.h Modified: atomic_ops.h Modified: atomic_ops_init.h Modified: basex.h Modified: bit_count.h Modified: bit_scan.h Modified: bit_test.h Modified: cfg_core.h Modified: cfg_parser.h Modified: char_msg_val.h Modified: clist.h Modified: comp_defs.h Modified: compiler_opt.h Modified: config.h Modified: core_cmd.h Modified: core_stats.h Modified: counters.h Modified: crc.h Modified: daemonize.h Modified: data_lump.h Modified: data_lump_rpl.h Modified: dns_cache.h Modified: dns_func.h Modified: dns_wrappers.h Modified: dprint.h Modified: dset.h Modified: dst_blacklist.h Modified: endianness.h Modified: error.h Modified: events.h Modified: fastlock.h Modified: fix_lumps.h Modified: flags.h Modified: forward.h Modified: futexlock.h Modified: globals.h Modified: hash_func.h Modified: hashes.h Modified: id.h Modified: io_wait.h Modified: ip_addr.h Modified: kstats_types.h --- Diff: https://github.com/kamailio/kamailio/commit/02ca141bb8a741ad516f8d60c84006c… Patch: https://github.com/kamailio/kamailio/commit/02ca141bb8a741ad516f8d60c84006c…

1 0

git:master:6a0f4382: Core Removed history, svn $id$ and doxygen udpates on the .c files
by Olle E. Johansson 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 6a0f438258996ed5cad4028b59fe3a3f5cbf955d URL: https://github.com/kamailio/kamailio/commit/6a0f438258996ed5cad4028b59fe3a3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-03T10:53:17+01:00 Core Removed history, svn $id$ and doxygen udpates on the .c files --- Modified: action.c Modified: atomic_ops.c Modified: basex.c Modified: bit_count.c Modified: bit_scan.c Modified: cfg_core.c Modified: cfg_parser.c Modified: core_cmd.c Modified: counters.c Modified: crc.c Modified: daemonize.c Modified: data_lump.c Modified: data_lump_rpl.c Modified: dns_cache.c Modified: dns_func.c Modified: dprint.c Modified: dset.c Modified: dst_blacklist.c Modified: endianness.c Modified: error.c Modified: events.c Modified: flags.c Modified: forward.c Modified: hash_func.c Modified: id.c Modified: io_wait.c Modified: ip_addr.c Modified: local_timer.c Modified: lock_ops.c Modified: lvalue.c Modified: main.c Modified: md5utils.c Modified: mod_fix.c Modified: modparam.c Modified: msg_translator.c Modified: nonsip_hooks.c Modified: pass_fd.c Modified: ppcfg.c Modified: proxy.c Modified: pt.c Modified: pv_core.c Modified: pvapi.c Modified: qvalue.c Modified: raw_listener.c Modified: raw_sock.c Modified: re.c Modified: receive.c Modified: resolve.c Modified: route.c Modified: route_struct.c Modified: rpc_lookup.c Modified: rvalue.c Modified: script_cb.c Modified: sctp_core.c Modified: select.c Modified: select_buf.c Modified: select_core.c Modified: shm_init.c Modified: signals.c Modified: sip_msg_clone.c Modified: sock_ut.c Modified: socket_info.c Modified: sr_compat.c Modified: sr_module.c Modified: stats.c Modified: str.c Modified: str_list.c Modified: stun.c Modified: switch.c Modified: tcp_main.c Modified: tcp_options.c Modified: tcp_read.c Modified: tcp_stats.c Modified: timer.c Modified: timer_proc.c Modified: tls_hooks.c Modified: tsend.c Modified: udp_server.c Modified: usr_avp.c Modified: ut.c Modified: ver.c Modified: xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/6a0f438258996ed5cad4028b59fe3a3… Patch: https://github.com/kamailio/kamailio/commit/6a0f438258996ed5cad4028b59fe3a3…

1 0

[kamailio] modules/cdp: added src_addr parameter in peer definition (#16)
by Federico Cabiddu 03 Jan '15

03 Jan '15

You can merge this Pull Request by running: git pull https://github.com/grumvalski/kamailio cdp_src_addr Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/16 -- Commit Summary -- * modules/cdp: added src_addr parameter in peer definition -- File Changes -- M modules/cdp/config.h (1) M modules/cdp/configexample/ConfigExample.xml (2) M modules/cdp/configparser.c (9) M modules/cdp/peer.c (5) M modules/cdp/peer.h (23) M modules/cdp/peermanager.c (6) M modules/cdp/receiver.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/16.patch https://github.com/kamailio/kamailio/pull/16.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/16

1 2

git:master:df92a532: core: don't do initgroups() if started by same user as -u
by Ovidiu Sas 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: df92a532f82a25f0b1ea0cb18cb800562d7f7a97 URL: https://github.com/kamailio/kamailio/commit/df92a532f82a25f0b1ea0cb18cb8005… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-01-02T22:03:22-05:00 core: don't do initgroups() if started by same user as -u - closing FS#473 --- Modified: daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/df92a532f82a25f0b1ea0cb18cb8005… Patch: https://github.com/kamailio/kamailio/commit/df92a532f82a25f0b1ea0cb18cb8005… --- diff --git a/daemonize.c b/daemonize.c index 63d96be..f8992d7 100644 --- a/daemonize.c +++ b/daemonize.c @@ -465,12 +465,12 @@ int do_suid() LM_CRIT("user lookup failed: %s\n", strerror(errno)); goto error; } - if(initgroups(pw->pw_name, pw->pw_gid)<0){ - LM_CRIT("cannot set supplementary groups: %s\n", - strerror(errno)); - goto error; - } if(uid!=getuid()) { + if(initgroups(pw->pw_name, pw->pw_gid)<0){ + LM_CRIT("cannot set supplementary groups: %s\n", + strerror(errno)); + goto error; + } if(setuid(uid)<0){ LM_CRIT("cannot change uid to %d: %s\n", uid, strerror(errno)); goto error;

1 0

git:master:ad94c568: xhttp Minor typo fixes in README
by Olle E. Johansson 02 Jan '15

02 Jan '15

Module: kamailio Branch: master Commit: ad94c568accb5efb02657c82740b6e39db88f018 URL: https://github.com/kamailio/kamailio/commit/ad94c568accb5efb02657c82740b6e3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-02T22:56:21+01:00 xhttp Minor typo fixes in README --- Modified: modules/xhttp/README Modified: modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ad94c568accb5efb02657c82740b6e3… Patch: https://github.com/kamailio/kamailio/commit/ad94c568accb5efb02657c82740b6e3…

1 0

git:master:ecbc0f34: userblacklist Minor typo fixes in README
by Olle E. Johansson 02 Jan '15

02 Jan '15

Module: kamailio Branch: master Commit: ecbc0f34bd36d9559d4b8d78d7ba864d2fc6874e URL: https://github.com/kamailio/kamailio/commit/ecbc0f34bd36d9559d4b8d78d7ba864… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-02T22:42:57+01:00 userblacklist Minor typo fixes in README --- Modified: modules/userblacklist/README Modified: modules/userblacklist/doc/userblacklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ecbc0f34bd36d9559d4b8d78d7ba864… Patch: https://github.com/kamailio/kamailio/commit/ecbc0f34bd36d9559d4b8d78d7ba864…

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 January 2015