sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:4.4:94ef3dca: dispatcher: proper selection of the gateway when the maxload is 0

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 94ef3dcaa99680cb12897db27d81d39e0e1e2d5e URL: https://github.com/kamailio/kamailio/commit/94ef3dcaa99680cb12897db27d81d39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-28T09:31:04+02:00 dispatcher: proper selection of the gateway when the maxload is 0 - reported and patch by Carlos Cruz Luengo, GH #800 (cherry picked from commit a0521f714a29fe205f83cd176f961344c8d9c79d) --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/94ef3dcaa99680cb12897db27d81d39… Patch: https://github.com/kamailio/kamailio/commit/94ef3dcaa99680cb12897db27d81d39… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index c1a831b..d4c6ab8 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -1449,7 +1449,8 @@ int ds_get_leastloaded(ds_set_t *dset) for(j=0; j<dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) - && dset->dlist[j].dload<dset->dlist[j].attrs.maxload) + && (dset->dlist[j].attrs.maxload == 0 + || dset->dlist[j].dload<dset->dlist[j].attrs.maxload)) { if(dset->dlist[j].dload<t) {

8 years, 2 months

git:master:a0521f71: dispatcher: proper selection of the gateway when the maxload is 0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a0521f714a29fe205f83cd176f961344c8d9c79d URL: https://github.com/kamailio/kamailio/commit/a0521f714a29fe205f83cd176f96134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-28T09:28:02+02:00 dispatcher: proper selection of the gateway when the maxload is 0 - reported and patch by Carlos Cruz Luengo, GH #800 --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/a0521f714a29fe205f83cd176f96134… Patch: https://github.com/kamailio/kamailio/commit/a0521f714a29fe205f83cd176f96134… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index f257475..be268b7 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -1406,7 +1406,8 @@ int ds_get_leastloaded(ds_set_t *dset) for(j=0; j<dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) - && dset->dlist[j].dload<dset->dlist[j].attrs.maxload) + && (dset->dlist[j].attrs.maxload == 0 + || dset->dlist[j].dload<dset->dlist[j].attrs.maxload)) { if(dset->dlist[j].dload<t) {

8 years, 2 months

[kamailio/kamailio] http_client Terminate exported commands list (#798)

by Martin Larsson

The list of exported functions was not terminated, which caused a segfault in find_mod_export_record() when reading outside the list. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/798 -- Commit Summary -- * http_client Terminate exported commands list -- File Changes -- M modules/http_client/http_client.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/798.patch https://github.com/kamailio/kamailio/pull/798.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/798

8 years, 2 months

git:master:af2f5007: Update documentation to include new usrloc_domain parameter.

by Charles Chance

Module: kamailio Branch: master Commit: af2f50071db80d22ebd790608ea409ed4cc36c04 URL: https://github.com/kamailio/kamailio/commit/af2f50071db80d22ebd790608ea409e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2016-09-26T16:00:42+01:00 Update documentation to include new usrloc_domain parameter. --- Modified: modules/dmq_usrloc/README Modified: modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/af2f50071db80d22ebd790608ea409e… Patch: https://github.com/kamailio/kamailio/commit/af2f50071db80d22ebd790608ea409e… --- diff --git a/modules/dmq_usrloc/README b/modules/dmq_usrloc/README index 1d57c90..cbdebc8 100644 --- a/modules/dmq_usrloc/README +++ b/modules/dmq_usrloc/README @@ -31,12 +31,15 @@ Andrey Rybkin 3.3. batch_size (int) 3.4. batch_usleep (int) + 4. usrloc_domain (string) + List of Examples 1.1. Set enable parameter 1.2. Set sync parameter 1.3. Set batch size parameter 1.4. Set batch_usleep parameter + 1.5. Set usrloc_domain parameter Chapter 1. Admin Guide @@ -54,6 +57,8 @@ Chapter 1. Admin Guide 3.3. batch_size (int) 3.4. batch_usleep (int) + 4. usrloc_domain (string) + 1. Overview The module adds user location (usrloc) records replication between @@ -134,3 +139,14 @@ modparam("dmq_usrloc", "batch_size", 4000) ... modparam("dmq_usrloc", "batch_usleep", 1000) ... + +4. usrloc_domain (string) + + The usrloc domain to synchronize. + + Default value is “location”. + + Example 1.5. Set usrloc_domain parameter +... +modparam("dmq_usrloc", "usrloc_domain", "my_domain") +... diff --git a/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index 3c0e2b1..49ffb57 100644 --- a/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -179,5 +179,25 @@ modparam("dmq_usrloc", "batch_usleep", 1000) </section> </section> + <section id="usrloc_dmq.p.usrloc_domain"> + <title><varname>usrloc_domain</varname> (string)</title> + <para> + The usrloc domain to synchronize. + </para> + <para> + <emphasis> + Default value is <quote>location</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>usrloc_domain</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq_usrloc", "usrloc_domain", "my_domain") +... +</programlisting> + </example> + </section> + </chapter>

8 years, 2 months

git:master:b747d469: Add modparam to specify the usrloc domain to synchronize.

by Charles Chance

Module: kamailio Branch: master Commit: b747d469e6c9d12be5e4541c41346b73f9bc1199 URL: https://github.com/kamailio/kamailio/commit/b747d469e6c9d12be5e4541c41346b7… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2016-09-26T16:00:42+01:00 Add modparam to specify the usrloc domain to synchronize. - TODO: allow multiple comma-separated domains --- Modified: modules/dmq_usrloc/dmq_usrloc.c Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/b747d469e6c9d12be5e4541c41346b7… Patch: https://github.com/kamailio/kamailio/commit/b747d469e6c9d12be5e4541c41346b7… --- diff --git a/modules/dmq_usrloc/dmq_usrloc.c b/modules/dmq_usrloc/dmq_usrloc.c index 6000b2a..d026cd2 100644 --- a/modules/dmq_usrloc/dmq_usrloc.c +++ b/modules/dmq_usrloc/dmq_usrloc.c @@ -38,6 +38,7 @@ int dmq_usrloc_enable = 0; int _dmq_usrloc_sync = 1; int _dmq_usrloc_batch_size = 0; int _dmq_usrloc_batch_usleep = 0; +str _dmq_usrloc_domain = str_init("location"); usrloc_api_t dmq_ul; @@ -48,6 +49,7 @@ static param_export_t params[] = { {"sync", INT_PARAM, &_dmq_usrloc_sync}, {"batch_size", INT_PARAM, &_dmq_usrloc_batch_size}, {"batch_usleep", INT_PARAM, &_dmq_usrloc_batch_usleep}, + {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain}, {0, 0, 0} }; diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 86e34ac..c256af4 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -47,6 +47,7 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int action, dmq_node_t* no extern int _dmq_usrloc_sync; extern int _dmq_usrloc_batch_size; extern int _dmq_usrloc_batch_usleep; +extern str _dmq_usrloc_domain; static int add_contact(str aor, ucontact_info_t* ci) { @@ -56,7 +57,7 @@ static int add_contact(str aor, ucontact_info_t* ci) str contact; int res; - if (dmq_ul.get_udomain("location", &_d) < 0) { + if (dmq_ul.get_udomain(_dmq_usrloc_domain.s, &_d) < 0) { LM_ERR("Failed to get domain\n"); return -1; } @@ -109,7 +110,7 @@ static int delete_contact(str aor, ucontact_info_t* ci) urecord_t* r; ucontact_t* c; - if (dmq_ul.get_udomain("location", &_d) < 0) { + if (dmq_ul.get_udomain(_dmq_usrloc_domain.s, &_d) < 0) { LM_ERR("Failed to get domain\n"); return -1; } @@ -159,7 +160,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node) goto done; } - if (dmq_ul.get_udomain("location", &_d) < 0) { + if (dmq_ul.get_udomain(_dmq_usrloc_domain.s, &_d) < 0) { LM_ERR("Failed to get domain\n"); goto done; }

8 years, 2 months

git:master:3a6a8b63: Merge pull request #798 from osthyvel/terminate_list

by GitHub

Module: kamailio Branch: master Commit: 3a6a8b632191ea1940ed8271151ef8564b486708 URL: https://github.com/kamailio/kamailio/commit/3a6a8b632191ea1940ed8271151ef85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-09-26T16:47:05+02:00 Merge pull request #798 from osthyvel/terminate_list http_client Terminate exported commands list --- Modified: modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/3a6a8b632191ea1940ed8271151ef85… Patch: https://github.com/kamailio/kamailio/commit/3a6a8b632191ea1940ed8271151ef85… --- diff --git a/modules/http_client/http_client.c b/modules/http_client/http_client.c index 5e8fc24..de42bc9 100644 --- a/modules/http_client/http_client.c +++ b/modules/http_client/http_client.c @@ -142,6 +142,7 @@ static cmd_export_t cmds[] = { fixup_free_curl_get_redirect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, + {0,0,0,0,0,0} };

8 years, 2 months

git:master:166e6d80: http_client Terminate exported commands list

by Martin Larsson

Module: kamailio Branch: master Commit: 166e6d80308adb822c9342cf75ac1ca8158e2f78 URL: https://github.com/kamailio/kamailio/commit/166e6d80308adb822c9342cf75ac1ca… Author: Martin Larsson <martin.larsson(a)verisure.com> Committer: Martin Larsson <martin.larsson(a)verisure.com> Date: 2016-09-26T15:09:21+02:00 http_client Terminate exported commands list The list of exported functions was not terminated, which caused a segfault in find_mod_export_record() when reading outside the list. --- Modified: modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/166e6d80308adb822c9342cf75ac1ca… Patch: https://github.com/kamailio/kamailio/commit/166e6d80308adb822c9342cf75ac1ca… --- diff --git a/modules/http_client/http_client.c b/modules/http_client/http_client.c index 5e8fc24..de42bc9 100644 --- a/modules/http_client/http_client.c +++ b/modules/http_client/http_client.c @@ -142,6 +142,7 @@ static cmd_export_t cmds[] = { fixup_free_curl_get_redirect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, + {0,0,0,0,0,0} };

8 years, 2 months

git:master:18a3a5aa: ims_usrloc_scscf: fixed derefenrecing of already freed subscription

by jaybeepee

Module: kamailio Branch: master Commit: 18a3a5aa66434b995d51c85d016da0092b0c6c41 URL: https://github.com/kamailio/kamailio/commit/18a3a5aa66434b995d51c85d016da00… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-26T13:21:10+02:00 ims_usrloc_scscf: fixed derefenrecing of already freed subscription --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/18a3a5aa66434b995d51c85d016da00… Patch: https://github.com/kamailio/kamailio/commit/18a3a5aa66434b995d51c85d016da00… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 8485e56..908b76a 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -362,7 +362,7 @@ static inline void process_impurecord(impurecord_t* _r) { ucontact_t* ptr; int hascontacts; udomain_t* _d; - reg_subscriber *s; + reg_subscriber *s, *next; subs_t* sub_dialog; int dbwork = 0; @@ -371,6 +371,7 @@ static inline void process_impurecord(impurecord_t* _r) { s = _r->shead; LM_DBG("Checking validity of IMPU: <%.*s> registration subscriptions\n", _r->public_identity.len, _r->public_identity.s); while (s) { + next = s->next; if (!valid_subscriber(s, act_time)) { LM_DBG("DBG:registrar_timer: Subscriber with watcher_contact <%.*s> and presentity uri <%.*s> expired and removed.\n", s->watcher_contact.len, s->watcher_contact.s, s->presentity_uri.len, s->presentity_uri.s); @@ -397,7 +398,7 @@ static inline void process_impurecord(impurecord_t* _r) { lock_release(&sub_dialog_table[sl].lock); mustdeleteimpu = 0; } - s = s->next; + s = next; } LM_DBG("\tPublic Identity %.*s, Barred: [%d], State: [%s]\n",

8 years, 2 months

git:master:587ec84c: modules/ims_qos: add media subcomponent option for RTP/AVPF as well as prevent crash on unknown subcomponent

by jaybeepee

Module: kamailio Branch: master Commit: 587ec84cea23e891d31151e13eb1d86a0638f8bd URL: https://github.com/kamailio/kamailio/commit/587ec84cea23e891d31151e13eb1d86… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-26T13:20:40+02:00 modules/ims_qos: add media subcomponent option for RTP/AVPF as well as prevent crash on unknown subcomponent --- Modified: modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/587ec84cea23e891d31151e13eb1d86… Patch: https://github.com/kamailio/kamailio/commit/587ec84cea23e891d31151e13eb1d86… --- diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 5a42136..58f7e2e 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -426,10 +426,12 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s /*media-sub-component*/ if (dlg_direction != DLG_MOBILE_ORIGINATING) { media_sub_component[media_sub_component_number] = rx_create_media_subcomponent_avp(number, transport, ipA, portA, ipB, portB, flow_usage_type); - cdpb.AAAAddAVPToList(&list, media_sub_component[media_sub_component_number]); + if (media_sub_component[media_sub_component_number]) + cdpb.AAAAddAVPToList(&list, media_sub_component[media_sub_component_number]); } else { media_sub_component[media_sub_component_number] = rx_create_media_subcomponent_avp(number, transport, ipB, portB, ipA, portA, flow_usage_type); - cdpb.AAAAddAVPToList(&list, media_sub_component[media_sub_component_number]); + if (media_sub_component[media_sub_component_number]) + cdpb.AAAAddAVPToList(&list, media_sub_component[media_sub_component_number]); } @@ -692,6 +694,8 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, str* proto, proto_nr = "17"; /* for now we just use UDP for all RTP */ } else if (proto->len == 8 && strncasecmp(proto->s,"RTP/SAVP", proto->len) == 0) { proto_nr = "17"; /* for now we just use UDP for all RTP */ + } else if (proto->len == 8 && strncasecmp(proto->s,"RTP/AVPF", proto->len) == 0) { + proto_nr = "17"; /* for now we just use UDP for all RTP */ } else { LOG(L_ERR, "Not yet implemented for protocol %.*s\n", proto->len, proto->s); return 0;

8 years, 2 months

Re: [sr-dev] [kamailio/kamailio] inserting contact into database failed (#791)

by Daniel-Constantin Mierla

I guess 'partition' is a reserved word for mariadb, but db_unixodbc is not quoting the column names. Is there any reason not to use db_mysql, afaik, it should work fine for mariadb and it does proper quotation of column names. As for db_unixodbc, it may need a mod param to set the quotation character, because it is not the same for database servers. -- 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/issues/791#issuecomment-249515434

8 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016