sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:5.1:6e85e29f: Merge pull request #1388 from oyvindkolbu/5.1

by GitHub

Module: kamailio Branch: 5.1 Commit: 6e85e29f96fe0bafc3fafb815dc8b9e82ff0bee0 URL: https://github.com/kamailio/kamailio/commit/6e85e29f96fe0bafc3fafb815dc8b9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-02T17:53:12+01:00 Merge pull request #1388 from oyvindkolbu/5.1 usrloc: partion column name can be set via modparam --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6e85e29f96fe0bafc3fafb815dc8b9e… Patch: https://github.com/kamailio/kamailio/commit/6e85e29f96fe0bafc3fafb815dc8b9e… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index f7ac066c29..96ff750f97 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -516,6 +516,26 @@ modparam("usrloc", "keepalive_column", "kalive") </example> </section> + <section id="usrloc.p.partition_column"> + <title><varname>partition_column</varname> (string)</title> + <para> + Name of database table column containing the value for partition id. + </para> + <para> + <emphasis> + Default value is <quote>partition</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>partitioncolumn</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "partition_column", "part") +... +</programlisting> + </example> + </section> + <section id="usrloc.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 3191e1bb1e..2eb9037f24 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -218,6 +218,7 @@ static param_export_t params[] = { {"server_id_column", PARAM_STR, &srv_id_col }, {"connection_id_column",PARAM_STR, &con_id_col }, {"keepalive_column", PARAM_STR, &keepalive_col }, + {"partition_column", PARAM_STR, &partition_col }, {"matching_mode", INT_PARAM, &matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows },

6 years, 11 months

[kamailio/kamailio] usrloc: partion column name can be set via modparam (#1388)

by oyvindkolbu

(cherry picked from commit b933b2a7bf631b157bf81b86afffe6b8a43a0308) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) #### Checklist:  - [X] Tested changes locally #### Description Non-instrusive fix which will let us use a stable branch in production. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1388 -- Commit Summary -- * usrloc: partion column name can be set via modparam -- File Changes -- M src/modules/usrloc/doc/usrloc_admin.xml (20) M src/modules/usrloc/usrloc_mod.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1388.patch https://github.com/kamailio/kamailio/pull/1388.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/1388

6 years, 11 months

git:master:71f11210: core: print more details about process when doing child init

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 71f11210b6b36cf69aaf3c8318bba9da3334c4e0 URL: https://github.com/kamailio/kamailio/commit/71f11210b6b36cf69aaf3c8318bba9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-02T12:22:18+01:00 core: print more details about process when doing child init --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/71f11210b6b36cf69aaf3c8318bba9d… Patch: https://github.com/kamailio/kamailio/commit/71f11210b6b36cf69aaf3c8318bba9d… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 489ae55593..594f3d6af8 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -934,10 +934,12 @@ static int init_mod_child( struct sr_module* m, int rank ) */ if (init_mod_child(m->next, rank)!=0) return -1; if (m->exports.init_child_f) { - LM_DBG("rank %d: %s\n", rank, m->exports.name); + LM_DBG("idx %d rank %d: %s [%s]\n", process_no, rank, + m->exports.name, my_desc()); if (m->exports.init_child_f(rank)<0) { - LM_ERR("Error while initializing module %s (%s)\n", - m->exports.name, m->path); + LM_ERR("error while initializing module %s (%s)" + " (idx: %d rank: %d desc: [%s])\n", + m->exports.name, m->path, process_no, rank, my_desc()); return -1; } else { /* module correctly initialized */

6 years, 11 months

git:master:5c4309e4: core: pt - helper function to get description for current process

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c4309e47b0f66c3c4a98145a956bfe0b2ce0953 URL: https://github.com/kamailio/kamailio/commit/5c4309e47b0f66c3c4a98145a956bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-02T12:09:56+01:00 core: pt - helper function to get description for current process --- Modified: src/core/pt.c Modified: src/core/pt.h --- Diff: https://github.com/kamailio/kamailio/commit/5c4309e47b0f66c3c4a98145a956bfe… Patch: https://github.com/kamailio/kamailio/commit/5c4309e47b0f66c3c4a98145a956bfe… --- diff --git a/src/core/pt.c b/src/core/pt.c index bec0869694..bf84df404a 100644 --- a/src/core/pt.c +++ b/src/core/pt.c @@ -195,6 +195,12 @@ int my_pid() } +/* return processes description */ +char* my_desc(void) +{ + return pt ? pt[process_no].desc : "unknown"; +} + /* close unneeded sockets */ int close_extra_socks(int child_id, int proc_no) diff --git a/src/core/pt.h b/src/core/pt.h index ed351a7b99..6b170d34e6 100644 --- a/src/core/pt.h +++ b/src/core/pt.h @@ -64,6 +64,9 @@ int close_extra_socks(int proc_id, int proc_no); /* return processes pid */ int my_pid(void); +/* return processes description */ +char* my_desc(void); + /** * Forks a new process. * @param desc - text description for the process table

6 years, 11 months

git:master:571c9993: mohqueue: handle return code for pv_parse_format()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 571c9993bb42a1c22a575874f186cfef06af19e8 URL: https://github.com/kamailio/kamailio/commit/571c9993bb42a1c22a575874f186cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-02T10:51:28+01:00 mohqueue: handle return code for pv_parse_format() --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/571c9993bb42a1c22a575874f186cfe… Patch: https://github.com/kamailio/kamailio/commit/571c9993bb42a1c22a575874f186cfe… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 161a1ba36c..50eb9bfca0 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -2238,7 +2238,10 @@ strcpy (&pfile [npos], pcall->pmohq->mohq_mohfile); npos += strlen (&pfile [npos]); str pMOH [1] = {{pfile, npos}}; pv_elem_t *pmodel; -pv_parse_format (pMOH, &pmodel); +if(pv_parse_format (pMOH, &pmodel)<0) { + LM_ERR("failed to parse pv format string\n"); + return 0; +} cmd_function fn_stream = bserver ? pmod_data->fn_rtp_stream_s : pmod_data->fn_rtp_stream_c; mohq_debug (pcall->pmohq, "%sStarting RTP link for call (%s)",

6 years, 11 months

git:master:741d3925: auth_identity: use app name to set curl user agent

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 741d39251468429788846c8386f445eeede2f7ba URL: https://github.com/kamailio/kamailio/commit/741d39251468429788846c8386f445e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-01T14:50:18+01:00 auth_identity: use app name to set curl user agent --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.com/kamailio/kamailio/commit/741d39251468429788846c8386f445e… Patch: https://github.com/kamailio/kamailio/commit/741d39251468429788846c8386f445e… --- diff --git a/src/modules/auth_identity/auth_identity.c b/src/modules/auth_identity/auth_identity.c index 7c14a5c4eb..29b7fa21cc 100644 --- a/src/modules/auth_identity/auth_identity.c +++ b/src/modules/auth_identity/auth_identity.c @@ -208,7 +208,7 @@ static int mod_init(void) return -2; } /* we pass our 'glb_tcert' struct to the callback function */ - if ((iRet=curl_easy_setopt(glb_hcurl, CURLOPT_WRITEDATA, (void *)&glb_tcert.scertpem))!=0) { + if ((iRet=curl_easy_setopt(glb_hcurl, CURLOPT_WRITEDATA, (void *)(&glb_tcert.scertpem)))!=0) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Unable to set cURL writedata option: %s\n", curl_easy_strerror(iRet)); @@ -220,7 +220,7 @@ static int mod_init(void) } /* some servers don't like requests that are made without a user-agent field, so we provide one */ - if ((iRet=curl_easy_setopt(glb_hcurl, CURLOPT_USERAGENT, "ser-agent/1.0"))!=0) { + if ((iRet=curl_easy_setopt(glb_hcurl, CURLOPT_USERAGENT, NAME "-Agent/1.0"))!=0) { LOG(L_WARN, "AUTH_IDENTITY:mod_init: Unable to set cURL useragent option: %s\n", curl_easy_strerror(iRet));

6 years, 11 months

git:master:1f5ba1a5: xcap_client: cast curl setopt params to avoid analyzer warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1f5ba1a5ac2f652cd3a374200411767286803f9f URL: https://github.com/kamailio/kamailio/commit/1f5ba1a5ac2f652cd3a374200411767… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-01T13:39:58+01:00 xcap_client: cast curl setopt params to avoid analyzer warnings --- Modified: src/modules/xcap_client/xcap_functions.c --- Diff: https://github.com/kamailio/kamailio/commit/1f5ba1a5ac2f652cd3a374200411767… Patch: https://github.com/kamailio/kamailio/commit/1f5ba1a5ac2f652cd3a374200411767… --- diff --git a/src/modules/xcap_client/xcap_functions.c b/src/modules/xcap_client/xcap_functions.c index cee161b7d0..39768ee74a 100644 --- a/src/modules/xcap_client/xcap_functions.c +++ b/src/modules/xcap_client/xcap_functions.c @@ -514,11 +514,11 @@ char* send_http_get(char* path, unsigned int xcap_port, char* match_etag, curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_function); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, &stream); + curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void*)(&stream)); curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, get_xcap_etag); - curl_easy_setopt(curl_handle, CURLOPT_WRITEHEADER, &etag); + curl_easy_setopt(curl_handle, CURLOPT_WRITEHEADER, (void*)(&etag)); if(match_header) curl_easy_setopt(curl_handle, CURLOPT_HEADER, (long)match_header);

6 years, 11 months

Issue with linking contact to IMPU

by Rafi A.

Hi there, I need some help here to understand why the query in [usrloc_db.c:1084] is empty. This causes the linking of contact to IMPU to fail. I'm using Kamailio 5.0.4. 10(13882) DEBUG: ims_usrloc_scscf [impurecord.c:1284]: unref_subscription_unsafe(): un-reffing subscription [rafi(a)mnc001.mcc001.3gppnetwork.org] - was [3] 10(13882) DEBUG: ims_registrar_scscf [save.c:519]: update_contacts_helper(): updating the contacts for IMPU <sip:rafi@mnc001.mcc001.3gppnetwork.org> 10(13882) DEBUG: ims_registrar_scscf [save.c:137]: calc_contact_expires(): Calculated expires for contact is 600000 10(13882) DEBUG: ims_registrar_scscf [save.c:548]: update_contacts_helper(): Need to update contact: <sip:rafi@192.168.10.48:57230;transport=udp>: q_value [-1],sos: [0],expires [600000] 10(13882) DEBUG: ims_registrar_scscf [save.c:550]: update_contacts_helper(): packing contact information 10(13882) DEBUG: ims_registrar_scscf [save.c:556]: update_contacts_helper(): adding/updating contact based on prior existence 10(13882) DEBUG: ims_usrloc_scscf [impurecord.c:748]: get_scontact(): looking for contact [sip:rafi@192.168.10.48:57230;transport=udp] in slot 300 10(13882) DEBUG: ims_registrar_scscf [save.c:562]: update_contacts_helper(): inserting new contact 10(13882) DEBUG: ims_usrloc_scscf [impurecord.c:562]: insert_scontact(): INSERTing ucontact in usrloc module 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [+g.3gpp.cs-voice] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [+g.3gpp.icsi-ref] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [audio] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [+g.oma.sip-im.large-message] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [+g.3gpp.smsip] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [language] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [+g.oma.sip-im] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:118]: new_ucontact(): Checking param [expires] 10(13882) DEBUG: ims_usrloc_scscf [ucontact.c:173]: new_ucontact(): generating hash based on [sip:rafi@192.168.10.48:57230;transport=udp] 10(13882) DEBUG: ims_usrloc_scscf [impurecord.c:280]: mem_insert_scontact(): Created new contact in memory with AOR: [sip:rafi@192.168.10.48:57230;transport=udp] and hash [300] 10(13882) DEBUG: ims_usrloc_scscf [usrloc_db.c:289]: db_insert_ucontact(): DB: inserting ucontact [sip:rafi@192.168.10.48:57230;transport=udp] 10(13882) DEBUG: ims_usrloc_scscf [usrloc_db.c:311]: db_insert_ucontact(): Converted params to string to insert into db: [+g.3gpp.cs-voice;+g.3gpp.icsi-ref=urn%3Aurn-7%3A3gpp-application.ims.iari.g sma-vs;audio;+g.oma.sip-im.large-message;+g.3gpp.smsip;language=en,fr;+g.oma .sip-im;expires=600000] 10(13882) DEBUG: ims_usrloc_scscf [udomain.c:843]: ref_contact_unsafe(): incrementing ref count on contact [sip:rafi@192.168.10.48:57230;transport=udp], was 1 10(13882) DEBUG: ims_usrloc_scscf [impurecord.c:1225]: link_contact_to_impu(): number of contacts for IMPU [sip:rafi@mnc001.mcc001.3gppnetwork.org] is 1 10(13882) DEBUG: ims_usrloc_scscf [usrloc_db.c:1065]: db_link_contact_to_impu(): DB: linking contact to IMPU 10(13882) DEBUG: ims_usrloc_scscf [usrloc_db.c:1084]: db_link_contact_to_impu(): QUERY IS [] and len is 0 10(13882) ERROR: db_mysql [km_dbase.c:128]: db_mysql_submit_query(): driver error on query: Query was empty (1065) 10(13882) ERROR: <core> [db_query.c:181]: db_do_raw_query(): error while submitting query 10(13882) ERROR: ims_usrloc_scscf [usrloc_db.c:1086]: db_link_contact_to_impu(): Unable to link impu-contact in DB - impu [sip:rafi@mnc001.mcc001.3gppnetwork.org], contact [sip:rafi@192.168.10.48:57230;transport=udp] 10(13882) ERROR: ims_usrloc_scscf [impurecord.c:1227]: link_contact_to_impu(): Failed to update DB linking contact [sip:rafi@192.168.10.48:57230;transport=udp] to IMPU [sip:rafi@mnc001.mcc001.3gppnetwork.org]...continuing but db will be out of sync! 10(13882) DEBUG: ims_usrloc_scscf [udomain.c:852]: unref_contact_unsafe(): decrementing ref count on contact [sip:rafi@192.168.10.48:57230;transport=udp], was 2 Best Regards, Rafael A.

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018