sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
286 discussions

git:master:6770afc5: pv: use fixup get int value to evaluate the index parameter
by Daniel-Constantin Mierla 11 May '22

11 May '22

Module: kamailio Branch: master Commit: 6770afc5329c18371fb5149eaf5ef2a95f286eff URL: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:16:47+02:00 pv: use fixup get int value to evaluate the index parameter --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… Patch: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2113115a15..db832d7419 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -935,7 +935,7 @@ static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) LM_ERR("failed to get the xavp name\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)pidx, &idx)<0) { + if(fixup_get_ivalue(msg, (gparam_t*)pidx, &idx)<0) { LM_ERR("failed to get the xavp index\n"); return -1; }

1 0

git:master:eebdabe4: pv: added $shvinc(name) - return incremented value of $shv(inc)
by Daniel-Constantin Mierla 11 May '22

11 May '22

Module: kamailio Branch: master Commit: eebdabe4850d99ff937171d4b723122726c0aa43 URL: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:11:42+02:00 pv: added $shvinc(name) - return incremented value of $shv(inc) - leverage internal mutex to avoid config locks --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… Patch: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 685c0ef9f0..2113115a15 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -526,6 +526,8 @@ static pv_export_t mod_pvs[] = { { {"shv", (sizeof("shv")-1)}, PVT_OTHER, pv_get_shvar, pv_set_shvar, pv_parse_shvar_name, 0, 0, 0}, + { {"shvinc", (sizeof("shvinc")-1)}, PVT_OTHER, pv_get_shvinc, + 0, pv_parse_shvar_name, 0, 0, 0}, { {"time", (sizeof("time")-1)}, PVT_CONTEXT, pv_get_local_time, 0, pv_parse_time_name, 0, 0, 0}, { {"timef", (sizeof("timef")-1)}, PVT_CONTEXT, pv_get_local_strftime, diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index fb4de51114..392c4d823d 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -387,6 +387,38 @@ int pv_get_shvar(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_get_shvinc(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + int len = 0; + char *sval = NULL; + sh_var_t *shv=NULL; + + if(msg==NULL || res==NULL) + return -1; + + if(param==NULL || param->pvn.u.dname==0) + return pv_get_null(msg, param, res); + + shv= (sh_var_t*)param->pvn.u.dname; + + lock_shvar(shv); + if(shv->v.flags&VAR_VAL_STR) + { + res->ri = 0; + } else { + shv->v.value.n++; + res->ri = shv->v.value.n; + } + unlock_shvar(shv); + + sval = sint2str(res->ri, &len); + res->rs.s = sval; + res->rs.len = len; + res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; + return 0; +} + int pv_set_shvar(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { diff --git a/src/modules/pv/pv_shv.h b/src/modules/pv/pv_shv.h index b7873a037e..65a4d1afc9 100644 --- a/src/modules/pv/pv_shv.h +++ b/src/modules/pv/pv_shv.h @@ -57,6 +57,7 @@ int pv_parse_shvar_name(pv_spec_p sp, str *in); int pv_get_shvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_set_shvar(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_get_shvinc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int shvar_init_locks(void); void shvar_destroy_locks(void);

1 0

git:master:85d1881b: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 85d1881b665fd4e380538996b1eb6280af46d31a URL: https://github.com/kamailio/kamailio/commit/85d1881b665fd4e380538996b1eb628… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-10T19:46:22+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/85d1881b665fd4e380538996b1eb628… Patch: https://github.com/kamailio/kamailio/commit/85d1881b665fd4e380538996b1eb628…

1 0

git:master:42678706: pv: docs for xavp_lshift() function
by Daniel-Constantin Mierla 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 426787068bab1dbeb07ca7b973ac90a91a980628 URL: https://github.com/kamailio/kamailio/commit/426787068bab1dbeb07ca7b973ac90a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-10T19:42:48+02:00 pv: docs for xavp_lshift() function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/426787068bab1dbeb07ca7b973ac90a… Patch: https://github.com/kamailio/kamailio/commit/426787068bab1dbeb07ca7b973ac90a… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index dca9392822..bc36df564b 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -732,6 +732,39 @@ xavp_child_rm("x", "y"); ... xavi_child_rm("WhatEver", "FoO"); # same result as: $xavi(whatever=>foo) = $null; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_lshift"> + <title> + <function moreinfo="none">xavp_lshift(xname, idx)</function> + </title> + <para> + Left shift with rotation of the xavps with name xname so that + the one at the index idx becomes the first and the ones before + it are at the end of the list. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter is the index of the XAVP that becomes the + first one. + </para> + <para> + The parameters can be with variables. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_lshift</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(n) = 10; +$xavp(n) = 20; +$xavp(n) = 30; +xavp_lshift("n", "1"); +# results in: $xavp(n) having the list of values 20 30 10 ... </programlisting> </example>

1 0

git:master:72c361fd: pv: config function to shift xavps to left with rotation
by Daniel-Constantin Mierla 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 72c361fd80ba0f3d017591e4bb3fb883f7dec490 URL: https://github.com/kamailio/kamailio/commit/72c361fd80ba0f3d017591e4bb3fb88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-10T19:35:52+02:00 pv: config function to shift xavps to left with rotation --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/72c361fd80ba0f3d017591e4bb3fb88… Patch: https://github.com/kamailio/kamailio/commit/72c361fd80ba0f3d017591e4bb3fb88… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index cdd34ce5b9..685c0ef9f0 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -608,6 +608,8 @@ static int w_xavi_child_sets(sip_msg_t *msg, char *prname, char *pcname, static int w_xavi_rm(sip_msg_t *msg, char *prname, char *p2); static int w_xavi_child_rm(sip_msg_t *msg, char *prname, char *pcname); +static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx); + int pv_xavp_copy_fixup(void** param, int param_no); int pv_evalx_fixup(void** param, int param_no); int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt); @@ -684,6 +686,9 @@ static cmd_export_t cmds[]={ {"xavi_child_rm", (cmd_function)w_xavi_child_rm, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"xavp_lshift", (cmd_function)w_xavp_lshift, + 2, fixup_spve_igp, fixup_free_spve_igp, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -904,6 +909,38 @@ static int ki_xavp_print(sip_msg_t* msg) return 1; } +/** + * + */ +static int ki_xavp_lshift(sip_msg_t *msg, str *xname, int idx) +{ + int ret; + + ret = xavp_lshift(xname, NULL, idx); + + return (ret==0)?1:ret; +} + +/** + * + */ +static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) +{ + str xname = STR_NULL; + int idx = 0; + + if(fixup_get_svalue(msg, (gparam_t*)pxname, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pidx, &idx)<0) { + LM_ERR("failed to get the xavp index\n"); + return -1; + } + + return ki_xavp_lshift(msg, &xname, idx); +} + static int ki_xavu_print(sip_msg_t* msg) { xavu_print_list(NULL); @@ -3173,6 +3210,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_lshift"), + SR_KEMIP_INT, ki_xavp_lshift, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:4b377f07: core: xavp - helper function to shift xavps to left with rotation
by Daniel-Constantin Mierla 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 4b377f07128a5322e7647bd9d492b50e81c5f278 URL: https://github.com/kamailio/kamailio/commit/4b377f07128a5322e7647bd9d492b50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-10T19:35:02+02:00 core: xavp - helper function to shift xavps to left with rotation --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/4b377f07128a5322e7647bd9d492b50… Patch: https://github.com/kamailio/kamailio/commit/4b377f07128a5322e7647bd9d492b50… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 036a5ffbe1..be92510520 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -519,6 +519,105 @@ int xavp_count(str *name, sr_xavp_t **start) return n; } +/** + * Left shift xavps + */ +int xavp_lshift(str *name, sr_xavp_t **head, int idx) +{ + sr_xavp_t *avp; + sr_xavp_t *lhead = NULL; + sr_xavp_t *lhead_last = NULL; + sr_xavp_t *ltail = NULL; + sr_xavp_t *ltail_last = NULL; + sr_xavp_t *crt=0; + sr_xavp_t *prv=0; + unsigned int id; + int n=0; + int xcnt; + + if(name==NULL || name->s==NULL || name->len<=0) { + return 0; + } + + if(idx==0) { + return 1; + } + xcnt = xavp_count(name, head); + if(xcnt <= 0) { + return -2; + } + while(idx < 0) { + idx = xcnt + idx; + } + if(idx==0) { + return 1; + } + idx = idx % xcnt; + if(idx==0) { + return 1; + } + + id = get_hash1_raw(name->s, name->len); + if(head!=NULL) + avp = *head; + else + avp = *_xavp_list_crt; + while(avp) + { + crt = avp; + avp=avp->next; + if(crt->id==id && crt->name.len==name->len + && strncmp(crt->name.s, name->s, name->len)==0) + { + if(prv!=NULL) + prv->next=crt->next; + else if(head!=NULL) + *head = crt->next; + else + *_xavp_list_crt = crt->next; + crt->next = NULL; + if(n < idx) { + if(ltail==NULL) { + ltail = crt; + } + if(ltail_last!=NULL) { + ltail_last->next = crt; + } + ltail_last = crt; + } else { + if(lhead==NULL) { + lhead = crt; + } + if(lhead_last!=NULL) { + lhead_last->next = crt; + } + lhead_last = crt; + } + n++; + } else { + prv = crt; + } + } + + if(lhead_last) { + lhead_last->next = ltail; + } + + if(head!=NULL) { + if(ltail_last) { + ltail_last->next = *head; + } + *head = lhead; + } else { + if(ltail_last) { + ltail_last->next = *_xavp_list_crt; + } + *_xavp_list_crt = lhead; + } + + return 0; +} + void xavp_destroy_list_unsafe(sr_xavp_t **head) { sr_xavp_t *avp, *foo; diff --git a/src/core/xavp.h b/src/core/xavp.h index 446b48eba3..880ea980dc 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -98,6 +98,7 @@ struct str_list *xavp_get_list_key_names(sr_xavp_t *xavp); int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list); sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list); +int xavp_lshift(str *name, sr_xavp_t **head, int idx); void xavp_print_list(sr_xavp_t **head);

1 0

git:master:7e88c988: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 7e88c988a4843ee35172809c6955eac870229ff1 URL: https://github.com/kamailio/kamailio/commit/7e88c988a4843ee35172809c6955eac… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-09T18:46:15+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/7e88c988a4843ee35172809c6955eac… Patch: https://github.com/kamailio/kamailio/commit/7e88c988a4843ee35172809c6955eac… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 80691c5516..3f09eb637a 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -135,6 +135,8 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") Match ipaddr against the GeoIP database and set the pvc container. The function has to be called before accessing a key via: $gip2(pvc=>key). + At least one function needs to be present that access the pvc + container, otherwise this function will not work. Example 1.2. geoip2_match usage ...

1 0

git:master:0c16d682: geoip2: log errors for cases where the container could not evaluated and add docs
by Henning Westerholt 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 0c16d6824fda729bf481e300992fb6bad057c89d URL: https://github.com/kamailio/kamailio/commit/0c16d6824fda729bf481e300992fb6b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-09T16:43:22Z geoip2: log errors for cases where the container could not evaluated and add docs - log errors for cases where the container could not evaluated due to missing initialization of the pvc container because no actual access is done in the cfg - add documentation describing that at least one access to the container is necessary for the match function to work correctly --- Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0c16d6824fda729bf481e300992fb6b… Patch: https://github.com/kamailio/kamailio/commit/0c16d6824fda729bf481e300992fb6b… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 8c5a96caa8..a82b1a9a29 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -112,6 +112,8 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") <para> Match ipaddr against the GeoIP database and set the pvc container. The function has to be called before accessing a key via: $gip2(pvc=>key). + At least one function needs to be present that access the pvc container, + otherwise this function will not work. </para> <example> <title><function>geoip2_match</function> usage</title> diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 0995ae2d25..ff427f259f 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -565,14 +565,14 @@ int geoip2_update_pv(str *tomatch, str *name) if(tomatch->len>255) { - LM_DBG("target too long (max 255): %s\n", tomatch->s); + LM_ERR("target too long (max 255): %s\n", tomatch->s); return -3; } gr = sr_geoip2_get_record(name); if(gr==NULL) { - LM_DBG("container not found: %s\n", tomatch->s); + LM_ERR("container not found: %s\n", tomatch->s); return - 4; }

1 0

Info: converting dokuwiki content to markdown files
by Daniel-Constantin Mierla 09 May '22

09 May '22

Hello, it was discussed a couple of times during the past Kamailio development meetings and several days ago the works started to convert the Kamailio Wiki content to markdown format and host the files on Kamailio github.com organisation. The Dokuwiki engine has served us very well during more than a decade and a half, but open editing had to be disabled many years ago due to bad actors pushing inappropriate content. The contributors had to make a dedicated account on our portal only for Wiki editing. More recently we had add another layer of protection requiring to grant manually edit permissions to newly created wiki accounts because bots started to work around CAPTCHA and other security extensions, posting again inappropriate content. All these added to operational overhead, but also made it difficult for new people to contribute, specially for small editing to fix typos or add usage examples. Thanks to Kenneth Stowe, who undertook the first big effort of converting the Dowkuwiki files to markdown format, we are now in the position of moving further with the plans of using github for hosting the content of the wiki and enable easier contributions via pull requests. The history of changes done via Dokuwiki show up now as git commits. The github repository for the wiki content is available at: * https://github.com/kamailio/kamailio-wiki It is still work in progress, therefore we ask for the help of community to speed up the conversion, among the tasks that need to be done: * convert relative links between wiki pages – the conversion tools used relative paths without file extensions, like: [Install Kamailio v4.4.x From GIT](/install/4.4.x/git) They have to be converted to relative path with .md extension in order to be able to browse directly :n the github.com portal — practically the leading / has to be removed and .md added at the end, like: [Install Kamailio v4.4.x From GIT](install/4.4.x/git.md) * some section heading markers were not detected/converted, onee may notice many equal signs (=) around a section name, it has to be replaced with the appropriate markdown format based on hash signs (#). For example: ======= Install And Maintain Kamailio v4.4.x From GIT ======= Should be converted to: # Install And Maintain Kamailio v4.4.x From GIT * some Dokuwiki paragraphs used special formatting based on plugins, for example the notes, warnings, … had special colors. The common markdown format does not specify a syntax to color the text, the propose solution is to use emoji at the start of the paragraph to signal its special purpose. For example, the Dokuwiki content: <color blue>//IMPORTANT: Content for older releases than 3.2.0 is available at the **Old Wiki Site**://</color> Has to be transformed to: :fire:*IMPORTANT: Content for older releases than 3.2.0 is available at the **Old Wiki Site**:* You are welcome to propose a better syntax for this kind of transformation. * review config examples and evaluate what improvements can be done (e.g., in terms of formatting and syntax highlighting) Any of these changes do not require any C programming knowledge, nor much Kamailio config knowledge. Can be your first contribution to the project and it will be very appreciated. It can also help you learn more about Kamailio, because you may discover documentation that you were not aware of. A very important decision is how to present the wiki markdown content on kamailio.org website. Besides being able to see it on github repository, we want to process the markdown pages somehow and make them available in html format on kamailio.org website for easier navigation and better indexing (e.g., with tables of content for large pages). If you are aware of a suitable cli or web app that can convert markdown to html and generate table of content, let us know. Any questions and suggestions should be addressed to sr-users(a)lists.kamailio.org mailing list. Looking forward to your contributions on this community effort! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:2e38d1a5: mtree: remove single-used small function
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 2e38d1a5a1178ca437d5256d7619fee251b06d6f URL: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T11:19:16+02:00 mtree: remove single-used small function --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Patch: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 8c703f3531..66f72bbd02 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -318,18 +318,6 @@ static int mod_init(void) return -1; } -static int mt_child_init(void) -{ - db_con = mt_dbf.init(&db_url); - if(db_con==NULL) - { - LM_ERR("failed to connect to database\n"); - return -1; - } - - return 0; -} - /* each child get a new connection to the database */ static int child_init(int rank) @@ -338,9 +326,12 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; - if ( mt_child_init()!=0 ) + db_con = mt_dbf.init(&db_url); + if(db_con==NULL) + { + LM_ERR("failed to connect to database\n"); return -1; - + } LM_DBG("#%d: database connection opened successfully\n", rank); return 0; @@ -942,7 +933,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); return; - } + } if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined.");

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022