sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:21c50888: http_async_client Minor indentations, code duplication

by Giacomo Vacca

Module: kamailio Branch: master Commit: 21c508888cfaa4bf085ac3b2285b466bd03b8955 URL: https://github.com/kamailio/kamailio/commit/21c508888cfaa4bf085ac3b2285b466… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2016-06-16T12:11:31+02:00 http_async_client Minor indentations, code duplication --- Modified: modules/http_async_client/http_async_client_mod.c Modified: modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/21c508888cfaa4bf085ac3b2285b466… Patch: https://github.com/kamailio/kamailio/commit/21c508888cfaa4bf085ac3b2285b466… --- diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 0ea2923..f8d2cc2 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -284,15 +284,6 @@ static int mod_init(void) return -1; } - if (strncmp("shm", memory_manager, 3) == 0) { - curl_memory_manager = 0; - } else if (strncmp("sys", memory_manager, 3) == 0) { - curl_memory_manager = 1; - } else { - LM_ERR("invalid memory_manager parameter: '%s'\n", memory_manager); - return -1; - } - /* init faked sip msg */ if(faked_msg_init()<0) { LM_ERR("failed to init faked sip msg\n"); @@ -581,7 +572,7 @@ static int w_http_set_tls_client_cert(sip_msg_t* msg, char* sc, char*foo) return -1; } - return set_query_param(&ah_params.tls_client_cert, _tls_client_cert); + return set_query_param(&ah_params.tls_client_cert, _tls_client_cert); } static int w_http_set_tls_client_key(sip_msg_t* msg, char* sk, char*foo) @@ -593,7 +584,7 @@ static int w_http_set_tls_client_key(sip_msg_t* msg, char* sk, char*foo) return -1; } - return set_query_param(&ah_params.tls_client_key, _tls_client_key); + return set_query_param(&ah_params.tls_client_key, _tls_client_key); } static int w_http_set_tls_ca_path(sip_msg_t* msg, char* cp, char*foo) @@ -605,7 +596,7 @@ static int w_http_set_tls_ca_path(sip_msg_t* msg, char* cp, char*foo) return -1; } - return set_query_param(&ah_params.tls_ca_path, _tls_ca_path); + return set_query_param(&ah_params.tls_ca_path, _tls_ca_path); } /* diff --git a/modules/http_async_client/http_multi.c b/modules/http_async_client/http_multi.c index a5df0ab..acc7b7b 100644 --- a/modules/http_async_client/http_multi.c +++ b/modules/http_async_client/http_multi.c @@ -401,7 +401,7 @@ int init_http_multi(struct event_base *evbase, struct http_m_global *wg) g->multi = curl_multi_init(); LM_DBG("curl_multi %p initialized on global %p (evbase %p)\n", g->multi, g, evbase); - g->timer_event = evtimer_new(g->evbase, timer_cb, g); + g->timer_event = evtimer_new(g->evbase, timer_cb, g); /* setup the generic multi interface options we want */ curl_multi_setopt(g->multi, CURLMOPT_SOCKETFUNCTION, sock_cb);

8 years, 5 months

git:master:8fa5c9f9: imc Fix formatting

by Olle E. Johansson

Module: kamailio Branch: master Commit: 8fa5c9f915b3aadb93835ae18a4f88a08b799f5e URL: https://github.com/kamailio/kamailio/commit/8fa5c9f915b3aadb93835ae18a4f88a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-15T22:30:07+02:00 imc Fix formatting --- Modified: modules/imc/imc_mng.c --- Diff: https://github.com/kamailio/kamailio/commit/8fa5c9f915b3aadb93835ae18a4f88a… Patch: https://github.com/kamailio/kamailio/commit/8fa5c9f915b3aadb93835ae18a4f88a… --- diff --git a/modules/imc/imc_mng.c b/modules/imc/imc_mng.c index 69f747f..b86e27f 100644 --- a/modules/imc/imc_mng.c +++ b/modules/imc/imc_mng.c @@ -91,14 +91,15 @@ int imc_htable_destroy(void) for(i=0; i<imc_hash_size; i++) { lock_destroy(&_imc_htable[i].lock); - if(_imc_htable[i].rooms==NULL) + if(_imc_htable[i].rooms==NULL) { continue; - irp = _imc_htable[i].rooms; - while(irp){ - irp_temp = irp->next; - imc_del_room(&irp->name, &irp->domain); - irp = irp_temp; - } + } + irp = _imc_htable[i].rooms; + while(irp){ + irp_temp = irp->next; + imc_del_room(&irp->name, &irp->domain); + irp = irp_temp; + } } shm_free(_imc_htable); _imc_htable = NULL; @@ -253,12 +254,14 @@ int imc_del_room(str* name, str* domain) && !strncasecmp(irp->name.s, name->s, name->len) && !strncasecmp(irp->domain.s, domain->s, domain->len)) { - if(irp->prev==NULL) + if(irp->prev==NULL) { _imc_htable[hidx].rooms = irp->next; - else + } else { irp->prev->next = irp->next; - if(irp->next!=NULL) + } + if(irp->next!=NULL) { irp->next->prev = irp->prev; + } /* delete members */ imp = irp->members; @@ -327,9 +330,9 @@ imc_member_p imc_add_member(imc_room_p room, str* user, str* domain, int flags) room->nr_of_members++; - if(room->members==NULL) + if(room->members==NULL) { room->members = imp; - else { + } else { imp->next = room->members->next; if((room->members)->next!=NULL) ((room->members)->next)->prev = imp;

8 years, 5 months

[kamailio/kamailio] modules/tm documentation improvements (#672)

by Mikko Lehto

t_relay() return values copied from 1.5.x documentation: http://kamailio.org/docs/modules/1.5.x/tm.html#id2514020 In route naming CAPITALS seem more common than <emphasis> (tm, tmx, sl, corex). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/672 -- Commit Summary -- * modules/tm: document t_relay() script function return values * modules/tm: use consistent naming for route names -- File Changes -- M modules/tm/doc/functions.xml (41) -- Patch Links -- https://github.com/kamailio/kamailio/pull/672.patch https://github.com/kamailio/kamailio/pull/672.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/672

8 years, 5 months

git:master:84bd3366: Merge pull request #671 from athonet-open/fix-cdp-dbg-level

by GitHub

Module: kamailio Branch: master Commit: 84bd336687cd602b89a898ae38860b9842a9c97d URL: https://github.com/kamailio/kamailio/commit/84bd336687cd602b89a898ae38860b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-06-15T11:55:30+02:00 Merge pull request #671 from athonet-open/fix-cdp-dbg-level cdp: Change debug level of peer state to DBG --- Modified: modules/cdp/peermanager.c --- Diff: https://github.com/kamailio/kamailio/commit/84bd336687cd602b89a898ae38860b9… Patch: https://github.com/kamailio/kamailio/commit/84bd336687cd602b89a898ae38860b9… --- diff --git a/modules/cdp/peermanager.c b/modules/cdp/peermanager.c index 6bb7360..10ac507 100644 --- a/modules/cdp/peermanager.c +++ b/modules/cdp/peermanager.c @@ -275,7 +275,7 @@ int peer_timer(time_t now,void *ptr) } if (p->activity+config->tc<=now){ - LM_INFO("peer_timer(): Peer %.*s \tState %d \n",p->fqdn.len,p->fqdn.s,p->state); + LM_DBG("peer_timer(): Peer %.*s \tState %d \n",p->fqdn.len,p->fqdn.s,p->state); switch (p->state){ /* initiating connection */ case Closed:

8 years, 5 months

[kamailio/kamailio] cdp: Change debug level of peer state to DBG (#671)

by Federico Favaro

IMHO debug level of message telling the state of the peer should be DBG. If any problem occurs on peers proper message will be written on log. This way we have lighter log You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/671 -- Commit Summary -- * cdp: Change debug level of peer state to DBG -- File Changes -- M modules/cdp/peermanager.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/671.patch https://github.com/kamailio/kamailio/pull/671.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/671

8 years, 5 months

[kamailio/kamailio] utils: introduced the ability to add User-Agent header in HTTP requests. (#670)

by Jurijs Ivolga

following commit will introduce possibility to add User-Agent header for http_query by adding utils module parameter - user_agent, if none is defined then no User-Agent header is added. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/670 -- Commit Summary -- * utils: introduced the ability to add User-Agent header in HTTP requests. -- File Changes -- M modules/utils/doc/utils_admin.xml (19) M modules/utils/functions.c (1) M modules/utils/utils.c (2) M modules/utils/utils.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/670.patch https://github.com/kamailio/kamailio/pull/670.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/670

8 years, 5 months

git:master:483c26b8: modules: readme files regenerated - rtpproxy ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 483c26b83a27a004f72c6a15a97fa8bf8600be91 URL: https://github.com/kamailio/kamailio/commit/483c26b83a27a004f72c6a15a97fa8b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-06-14T15:31:15+02:00 modules: readme files regenerated - rtpproxy ... --- Modified: modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/483c26b83a27a004f72c6a15a97fa8b… Patch: https://github.com/kamailio/kamailio/commit/483c26b83a27a004f72c6a15a97fa8b… --- diff --git a/modules/rtpproxy/README b/modules/rtpproxy/README index 6715faa..ff027f3 100644 --- a/modules/rtpproxy/README +++ b/modules/rtpproxy/README @@ -454,7 +454,8 @@ rtpproxy_offer(); “delete” command for the previous branch, which would otherwise delete the full call, breaking the subsequent “lookup” for the new branch. This flag is only supported by - the ngcp-mediaproxy-ng rtpproxy at the moment! + the ngcp-mediaproxy-ng rtpproxy (now named rtpengine) at the + moment! + 2 - append second Via branch to Call-ID when sending command to rtpproxy. See flag '1' for its meaning. + 3 - behave like flag 1 is set for a request and like flag 2 is @@ -601,7 +602,8 @@ onreply_route[2] “delete” command for the previous branch, which would otherwise delete the full call, breaking the subsequent “lookup” for the new branch. This flag is only supported by - the ngcp-mediaproxy-ng rtpproxy at the moment! + the ngcp-mediaproxy-ng rtpproxy (now named rtpengine) at the + moment! + 2 - append second Via branch to Call-ID when sending command to rtpproxy. See flag '1' for its meaning. + b - append branch specific variable to Call-ID when sending

8 years, 5 months

git:master:daa89b4e: rtpproxy: added section ids and small adjustments to content and format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: daa89b4e206dac49607c25bf67748915b9f280a2 URL: https://github.com/kamailio/kamailio/commit/daa89b4e206dac49607c25bf6774891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-14T15:26:52+02:00 rtpproxy: added section ids and small adjustments to content and format --- Modified: modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/daa89b4e206dac49607c25bf6774891… Patch: https://github.com/kamailio/kamailio/commit/daa89b4e206dac49607c25bf6774891…

8 years, 5 months

git:master:105cd064: modules: readme files regenerated - dispatcher ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 105cd064f343532f9ba708f708c2b315dab50b37 URL: https://github.com/kamailio/kamailio/commit/105cd064f343532f9ba708f708c2b31… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-06-14T15:16:22+02:00 modules: readme files regenerated - dispatcher ... --- Modified: modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/105cd064f343532f9ba708f708c2b31… Patch: https://github.com/kamailio/kamailio/commit/105cd064f343532f9ba708f708c2b31… --- diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 9978bcb..d12a88a 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -28,6 +28,10 @@ Alessandro Arrichiello Hewlett Packard +Edited by + +Luis Martin + Copyright © 2004 FhG FOKUS Copyright © 2005 Voice Sistem @@ -97,6 +101,7 @@ Alessandro Arrichiello 4.8. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.9. ds_load_update() 4.10. ds_load_unset() + 4.11. ds_reload() 5. MI Commands @@ -231,6 +236,7 @@ Chapter 1. Admin Guide 4.8. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.9. ds_load_update() 4.10. ds_load_unset() + 4.11. ds_reload() 5. MI Commands @@ -831,6 +837,7 @@ Note 4.8. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.9. ds_load_update() 4.10. ds_load_unset() + 4.11. ds_reload() 4.1. ds_select_dst(set, alg[, limit]) @@ -1120,6 +1127,16 @@ onreply_route { } ... +4.11. ds_reload() + + Reloads the groups and included destinations. + + Name: ds_reload + + Parameters: none + + This function can be used from ANY_ROUTE. + 5. MI Commands 5.1. ds_set_state

8 years, 5 months

git:master:a4ec3b5b: Merge pull request #664 from kamailio/luismartingil/dispatcher_reload

by GitHub

Module: kamailio Branch: master Commit: a4ec3b5baeb4b4fdce44dab0dc2e776d2e4fd595 URL: https://github.com/kamailio/kamailio/commit/a4ec3b5baeb4b4fdce44dab0dc2e776… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-06-14T15:02:50+02:00 Merge pull request #664 from kamailio/luismartingil/dispatcher_reload Exporting ds_reload to cfg script --- Modified: modules/dispatcher/dispatcher.c Modified: modules/dispatcher/doc/dispatcher.xml Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a4ec3b5baeb4b4fdce44dab0dc2e776… Patch: https://github.com/kamailio/kamailio/commit/a4ec3b5baeb4b4fdce44dab0dc2e776… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 5220fdb..69ba1ec 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -161,6 +161,7 @@ static int w_ds_is_from_list1(struct sip_msg*, char*, char*); static int w_ds_is_from_list2(struct sip_msg*, char*, char*); static int w_ds_is_from_list3(struct sip_msg*, char*, char*, char*); static int w_ds_list_exist(struct sip_msg*, char*); +static int w_ds_reload(struct sip_msg* msg); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -211,6 +212,8 @@ static cmd_export_t cmds[]={ 0, 0, ANY_ROUTE}, {"bind_dispatcher", (cmd_function)bind_dispatcher, 0, 0, 0, 0}, + {"ds_reload", (cmd_function)w_ds_reload, 0, + 0, 0, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -822,6 +825,21 @@ static int ds_warn_fixup(void** param, int param_no) return 0; } +static int w_ds_reload(struct sip_msg* msg) +{ + if(!ds_db_url.s) { + if (ds_load_list(dslistfile)!=0) + LM_ERR("Error reloading from list\n"); + return -1; + } else { + if(ds_reload_db()<0) + LM_ERR("Error reloading from db\n"); + return -1; + } + LM_DBG("reloaded dispatcher\n"); + return 1; +} + /************************** MI STUFF ************************/ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) diff --git a/modules/dispatcher/doc/dispatcher.xml b/modules/dispatcher/doc/dispatcher.xml index 471ebbe..6e9212b 100644 --- a/modules/dispatcher/doc/dispatcher.xml +++ b/modules/dispatcher/doc/dispatcher.xml @@ -47,6 +47,13 @@ <email>alezzandro(a)gmail.com</email> </address> </editor> + <editor> + <firstname>Luis</firstname> + <surname>Martin</surname> + <address> + <email>martingil.luis(a)gmail.com</email> + </address> + </editor> </authorgroup> <copyright> <year>2004</year> diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 8368bb7..c10b502 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1350,6 +1350,21 @@ onreply_route { </programlisting> </example> </section> + <section id="dispatcher.f.ds_reload"> + <title> + <function moreinfo="none">ds_reload()</function> + </title> + <para> + Reloads the groups and included destinations. + </para> + <para> + Name: <emphasis>ds_reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + This function can be used from ANY_ROUTE. + </para> + </section> </section> <section>

8 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016