sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:eb3a09fb: siptrace: docs for trace_db_mode parameter
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: eb3a09fb92af939372ac292f14850c13f8232df6 URL: https://github.com/kamailio/kamailio/commit/eb3a09fb92af939372ac292f14850c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T10:18:38+02:00 siptrace: docs for trace_db_mode parameter --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eb3a09fb92af939372ac292f14850c1… Patch: https://github.com/kamailio/kamailio/commit/eb3a09fb92af939372ac292f14850c1… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index cc6ead1132..56d69cb95b 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -427,17 +427,45 @@ modparam("siptrace", "hep_version", 3) ... modparam("siptrace", "hep_capture_id", 234) ... +</programlisting> + </example> + </section> + <section id="siptrace.p.trace_db_mode"> + <title><varname>trace_db_mode</varname> (integer)</title> + <para> + If set to 1, the module uses <quote>INSERT DELAYED</quote> to + store to database (when it is available, otherwise falls back + to <quote>INSERT</quote>). + </para> + <para> + If set to 2, the module uses <quote>ASYNC-INSERT</quote> to + store to database (when it is available, otherwise falls back + to <quote>INSERT</quote>). + </para> + <para> + Default value is <emphasis>0 (use <quote>INSERT</quote>)</emphasis>. + </para> + <example> + <title>Set <varname>trace_db_mode</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "trace_db_mode", 1) +... </programlisting> </example> </section> <section id="siptrace.p.trace_delayed"> <title><varname>trace_delayed</varname> (integer)</title> + <para> + Kept for backward compatibily, use trace_db_mode instead. + </para> <para> - Use <quote>INSERT DELAYED</quote> to store to database when it is available, - instead of <quote>INSERT</quote>. + If set to non-zero, ot sets trace_db_mode paremter to 1 + when the module is initialized. </para> <para> - Default value is <emphasis>0 (off)</emphasis>. + Default value is <emphasis>0</emphasis>. </para> <example> <title>Set <varname>trace_delayed</varname>

1 0

git:master:e3a298e3: siptrace: support for using async-insert to store records to database
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: e3a298e30a7d303bbea9a2511e1878295dceb34e URL: https://github.com/kamailio/kamailio/commit/e3a298e30a7d303bbea9a2511e18782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T10:18:38+02:00 siptrace: support for using async-insert to store records to database - new parameter trace_db_mode to control what type of db insert operation is done --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e3a298e30a7d303bbea9a2511e18782… Patch: https://github.com/kamailio/kamailio/commit/e3a298e30a7d303bbea9a2511e18782… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 5cb4e79b67..0a90e3fe23 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -158,7 +158,8 @@ int *trace_on_flag = NULL; int trace_sl_acks = 1; int trace_to_database = 1; -int trace_delayed = 0; +int trace_db_delayed = 0; +int trace_db_mode = 0; int hep_mode_on = 0; int hep_version = 1; @@ -249,7 +250,8 @@ static param_export_t params[] = { {"send_sock_name", PARAM_STR, &trace_send_sock_name_str}, {"hep_version", INT_PARAM, &hep_version}, {"hep_capture_id", INT_PARAM, &hep_capture_id}, - {"trace_delayed", INT_PARAM, &trace_delayed}, + {"trace_delayed", INT_PARAM, &trace_db_delayed}, + {"trace_db_mode", INT_PARAM, &trace_db_mode}, {"trace_init_mode", PARAM_INT, &_siptrace_init_mode}, {"trace_mode", PARAM_INT, &_siptrace_mode}, {0, 0, 0} @@ -300,6 +302,10 @@ static int mod_init(void) } #endif + if(trace_db_delayed!=0) { + trace_db_mode = 1; + } + if(siptrace_init_rpc() != 0) { LM_ERR("failed to register RPC commands\n"); return -1; @@ -571,9 +577,14 @@ static int sip_trace_insert_db(db_key_t *db_keys, db_val_t *db_vals, int db_nkeys, char *dtext) { LM_DBG("storing info - %s\n", dtext); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { + if(trace_db_mode = 2 && db_funcs.insert_async != NULL) { + if(db_funcs.insert_async(db_con, db_keys, db_vals, db_nkeys) < 0) { + LM_ERR("error storing trace - async - %s\n", dtext); + return -1; + } + } else if(trace_db_mode != 1 && db_funcs.insert_delayed != NULL) { if(db_funcs.insert_delayed(db_con, db_keys, db_vals, db_nkeys) < 0) { - LM_ERR("error storing trace - %s\n", dtext); + LM_ERR("error storing trace - delayed - %s\n", dtext); return -1; } } else {

1 0

git:master:bb2894a4: siptrace: helper function for db insert
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: bb2894a453d8b58f34b41870d057c21385b3af81 URL: https://github.com/kamailio/kamailio/commit/bb2894a453d8b58f34b41870d057c21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T10:18:38+02:00 siptrace: helper function for db insert --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/bb2894a453d8b58f34b41870d057c21… Patch: https://github.com/kamailio/kamailio/commit/bb2894a453d8b58f34b41870d057c21… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index dd508372d4..5cb4e79b67 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -567,6 +567,24 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, return ret; } +static int sip_trace_insert_db(db_key_t *db_keys, db_val_t *db_vals, + int db_nkeys, char *dtext) +{ + LM_DBG("storing info - %s\n", dtext); + if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { + if(db_funcs.insert_delayed(db_con, db_keys, db_vals, db_nkeys) < 0) { + LM_ERR("error storing trace - %s\n", dtext); + return -1; + } + } else { + if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace - %s\n", dtext); + return -1; + } + } + return 0; +} + static int sip_trace_store_db(siptrace_data_t *sto) { if((trace_to_database == 0) && ((_siptrace_mode & SIPTRACE_MODE_DB) == 0)) { @@ -646,17 +664,8 @@ static int sip_trace_store_db(siptrace_data_t *sto) db_vals[9].val.str_val.s = ""; db_vals[9].val.str_val.len = 0; - LM_DBG("storing info...\n"); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { - if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } - } else { - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } + if(sip_trace_insert_db(db_keys, db_vals, NR_KEYS, "no user") < 0) { + goto error; } #ifdef STATISTICS update_stat(sto->stat, 1); @@ -668,34 +677,16 @@ static int sip_trace_store_db(siptrace_data_t *sto) db_vals[9].val.str_val = sto->avp_value.s; - LM_DBG("storing info...\n"); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { - if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } - } else { - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } + if(sip_trace_insert_db(db_keys, db_vals, NR_KEYS, "first user") < 0) { + goto error; } sto->avp = search_next_avp(&sto->state, &sto->avp_value); while(sto->avp != NULL) { db_vals[9].val.str_val = sto->avp_value.s; - LM_DBG("storing info...\n"); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { - if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } - } else { - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } + if(sip_trace_insert_db(db_keys, db_vals, NR_KEYS, "extra user") < 0) { + goto error; } sto->avp = search_next_avp(&sto->state, &sto->avp_value); }

1 0

Kamailio stucks at __read_nocancel during stop.
by Andrey Deykunov 09 Apr '20

09 Apr '20

Hi, We're getting periodically core dumps when stopping Kamailio: GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html > This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 9832] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGABRT, Aborted. #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #1 0x00007f79c24e842a in __GI_abort () at abort.c:89 #2 0x000000000043f92a in sig_alarm_abort (signo=14) at main.c:679 #3 <signal handler called> #4 0x00007f79c258f910 in __read_nocancel () at ../sysdeps/unix/syscall-template.S:84 #5 0x00007f793cbd7421 in vio_read_buff () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #6 0x00007f793cbd8aa0 in my_real_read () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #7 0x00007f793cbd87d6 in my_net_read () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #8 0x00007f793cbd085d in cli_safe_read () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #9 0x00007f793cbd539a in cli_read_query_result () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #10 0x00007f793cbd436d in mysql_real_query () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #11 0x00007f793ce80c13 in db_mysql_submit_query (_h=0x7f79c1786890, _s=0x7f793f379250 <sql_str>) at km_dbase.c:111 #12 0x00007f793f16baba in db_do_submit_query (_h=0x7f79c1786890, _query=0x7f793f379250 <sql_str>, submit_query=0x7f793ce801a0 <db_mysql_submit_query>) at db_query.c:58 #13 0x00007f793f16e114 in db_do_delete (_h=0x7f79c1786890, _k=0x7ffeb3ca8df8, _o=0x0, _v=0x7ffeb3ca8dd0, _n=1, val2str=0x7f793cea8990 <db_mysql_val2str>, submit_query=0x7f793ce801a0 <db_mysql_submit_query>) at db_query.c:300 #14 0x00007f793ce86c17 in db_mysql_delete (_h=0x7f79c1786890, _k=0x7ffeb3ca8df8, _o=0x0, _v=0x7ffeb3ca8dd0, _n=1) at km_dbase.c:510 #15 0x00007f793f3cb841 in db_delete_ucontact_ruid (_c=0x7f794186b3c0) at ucontact.c:1552 #16 0x00007f793f3cd096 in db_delete_ucontact (_c=0x7f794186b3c0) at ucontact.c:1570 #17 0x00007f793f3ad0c0 in wb_timer (_r=0x7f79411d7330) at urecord.c:401 #18 0x00007f793f3ab451 in timer_urecord (_r=0x7f79411d7330) at urecord.c:463 #19 0x00007f793f3978aa in mem_timer_udomain (_d=0x7f7940d9baa0, istart=0, istep=1) at udomain.c:1224 #20 0x00007f793f3d4608 in synchronize_all_udomains (istart=0, istep=1) at dlist.c:756 #21 0x00007f793f3a2768 in destroy () at usrloc_mod.c:464 #22 0x0000000000637e2c in destroy_modules () at core/sr_module.c:746 #23 0x000000000041c4d8 in cleanup (show_status=1) at main.c:555 #24 0x0000000000423af7 in shutdown_children (sig=15, show_status=1) at main.c:696 #25 0x000000000041f081 in handle_sigs () at main.c:727 #26 0x0000000000432a01 in main_loop () at main.c:1806 #27 0x000000000043df6f in main (argc=9, argv=0x7ffeb3cac348) at main.c:2802 Looks like libmysql stucks at __read_nocancel() syscall. The exit_timeout parameter is set by default (60 sec), Kamailio version 5.3.1. Any ideas? Thanks, Andrey

2 1

git:master:430e00a2: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 430e00a208c9ae4c2cdc39d628fc0a1d23f30f81 URL: https://github.com/kamailio/kamailio/commit/430e00a208c9ae4c2cdc39d628fc0a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-09T09:46:16+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/430e00a208c9ae4c2cdc39d628fc0a1… Patch: https://github.com/kamailio/kamailio/commit/430e00a208c9ae4c2cdc39d628fc0a1… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index cfae6ac338..cb6413f981 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2237,17 +2237,33 @@ kamcmd dlg.is_alive callid123 fromtag123 totag123 9.16. dlg.briefing - Lists fewer attributes for dialog records in memory. + Lists fewer attributes for dialog records in memory. The dialog hash + entry and id are added always, the rest of them are a matter of 'attrs' + parameter. Name: dlg.briefing Parameters: - * none - no parameter + * attrs - (optional) a list of characters (flags) representing the + fields to be added to the response. If is missing, its default + value is 'ftcFT' (note the characters are case sensitive). + The characters can be: + + f - From URI + + t - To URI + + c - Call-ID + + F - From tag + + T - To tag + + I - Init time + + S - Start time + + E - End time + + s - State RPC Command Example: ... kamctl rpc dlg.briefing ... +kamctl rpc dlg.briefing "ft" +... 10. Exported Variables

3 2

git:master:661fc019: misc: examples kemi, don't fail if optional modules are not loaded
by Victor Seva 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 661fc0193da9e559e22b83b006db3e23345c092c URL: https://github.com/kamailio/kamailio/commit/661fc0193da9e559e22b83b006db3e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-09T13:48:06+02:00 misc: examples kemi, don't fail if optional modules are not loaded kamailio-basic-kemi.cfg has some define instructions that can be removed ( WITH_MYSQL, WITH_AUTH, ...) So lets make sure that modules are there in the lua script before using the defined routes. --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/661fc0193da9e559e22b83b006db3e2… Patch: https://github.com/kamailio/kamailio/commit/661fc0193da9e559e22b83b006db3e2… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 44a09186fd..b28eea0ff1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -240,8 +240,11 @@ end -- IP authorization and user uthentication function ksr_route_auth() + if not KSR.auth then + return 1; + end - if not KSR.is_REGISTER() then + if KSR.permissions and not KSR.is_REGISTER() then if KSR.permissions.allow_source_address(1)>0 then -- source IP allowed return 1; @@ -273,6 +276,9 @@ end -- Caller NAT detection function ksr_route_natdetect() + if not KSR.nathelper then + return 1; + end KSR.force_rport(); if KSR.nathelper.nat_uac_test(19)>0 then if KSR.is_REGISTER() then @@ -287,6 +293,9 @@ end -- RTPProxy control function ksr_route_natmanage() + if not KSR.rtpproxy then + return 1; + end if KSR.siputils.is_request()>0 then if KSR.siputils.has_totag()>0 then if KSR.rr.check_route_param("nat=yes")>0 then @@ -317,6 +326,9 @@ end -- URI update for dialog requests function ksr_route_dlguri() + if not KSR.nathelper then + return 1; + end if not KSR.isdsturiset() then KSR.nathelper.handle_ruri_alias(); end

1 0

git:master:e1239717: misc: kemi examples, add missing kemix module
by Victor Seva 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: e123971726a8d18627091870086ee7d244e9802f URL: https://github.com/kamailio/kamailio/commit/e123971726a8d18627091870086ee7d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-09T13:19:00+02:00 misc: kemi examples, add missing kemix module change introduced at 01ac570c2fbda800d1e00cd50305739cf0596ebf --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e123971726a8d18627091870086ee7d… Patch: https://github.com/kamailio/kamailio/commit/e123971726a8d18627091870086ee7d… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index d6859fb7d5..c1eed6c952 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -198,6 +198,7 @@ loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" +loadmodule "kemix.so" #!ifdef WITH_AUTH loadmodule "auth.so"

1 0

git:master:3466fc59: dialog: docs for attrs parameter of dlg.briefing rpc command
by Daniel-Constantin Mierla 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 3466fc59abff5153c99b438f1e4becdfcba77b6b URL: https://github.com/kamailio/kamailio/commit/3466fc59abff5153c99b438f1e4becd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-09T09:42:58+02:00 dialog: docs for attrs parameter of dlg.briefing rpc command --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3466fc59abff5153c99b438f1e4becd… Patch: https://github.com/kamailio/kamailio/commit/3466fc59abff5153c99b438f1e4becd… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index aeae7da454..987bd54545 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2865,19 +2865,58 @@ dlg_reset_property("timeout-noreset"); <section id="dlg.r.briefing"> <title>dlg.briefing</title> <para> - Lists fewer attributes for dialog records in memory. + Lists fewer attributes for dialog records in memory. The dialog hash + entry and id are added always, the rest of them are a matter of 'attrs' + parameter. </para> <para>Name: <emphasis>dlg.briefing</emphasis></para> <para>Parameters:</para> <itemizedlist> <listitem><para> - <emphasis>none</emphasis> - no parameter - </para></listitem> + <emphasis>attrs</emphasis> - (optional) a list of characters (flags) + representing the fields to be added to the response. If is missing, + its default value is 'ftcFT' (note the characters are case sensitive). + </para> + <para> + The characters can be: + <itemizedlist> + <listitem><para> + <emphasis>f</emphasis> - From URI + </para></listitem> + <listitem><para> + <emphasis>t</emphasis> - To URI + </para></listitem> + <listitem><para> + <emphasis>c</emphasis> - Call-ID + </para></listitem> + <listitem><para> + <emphasis>F</emphasis> - From tag + </para></listitem> + <listitem><para> + <emphasis>T</emphasis> - To tag + </para></listitem> + <listitem><para> + <emphasis>I</emphasis> - Init time + </para></listitem> + <listitem><para> + <emphasis>S</emphasis> - Start time + </para></listitem> + <listitem><para> + <emphasis>E</emphasis> - End time + </para></listitem> + <listitem><para> + <emphasis>s</emphasis> - State + </para></listitem> + </itemizedlist> + </para> + </listitem> </itemizedlist> <para>RPC Command Example:</para> <programlisting format="linespecific"> ... kamctl rpc dlg.briefing +... +kamctl rpc dlg.briefing "ft" ... </programlisting> </section>

1 0

git:master:4507ed57: dialog: customizable list of fields for dlg.briefing rpc command
by Daniel-Constantin Mierla 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 4507ed570a881fc6cd9d364624b71b90b48ecbda URL: https://github.com/kamailio/kamailio/commit/4507ed570a881fc6cd9d364624b71b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-09T09:29:24+02:00 dialog: customizable list of fields for dlg.briefing rpc command - it can take an optional parameter to specify what fields to be added to response - hash entry and id are added by default - if the parameter is not give, then it also adds from-uri, to-uri, call-id, from-tag and to-tag --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/4507ed570a881fc6cd9d364624b71b9… Patch: https://github.com/kamailio/kamailio/commit/4507ed570a881fc6cd9d364624b71b9… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 962fceeb52..61e4b0cbcf 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3064,9 +3064,17 @@ static const char *rpc_dlg_briefing_doc[2] = { */ static void rpc_dlg_briefing(rpc_t *rpc, void *c) { - dlg_cell_t *dlg; - unsigned int i; - void *h; + dlg_cell_t *dlg = NULL; + unsigned int i = 0; + int n = 0; + str fmt = STR_NULL; + void *h = NULL; + + n = rpc->scan(c, "S", &fmt); + if (n < 1) { + fmt.s = "ftcFT"; + fmt.len = 5; + } for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); @@ -3075,22 +3083,81 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) rpc->fault(c, 500, "Failed to create the structure"); return; } - if(rpc->struct_add(h, "ddSSSSSdddd", + if(rpc->struct_add(h, "dd", "h_entry", dlg->h_entry, - "h_id", dlg->h_id, - "from_uri", &dlg->from_uri, - "to_uri", &dlg->to_uri, - "call-id", &dlg->callid, - "from_tag", &dlg->tag[DLG_CALLER_LEG], - "to_tag", &dlg->tag[DLG_CALLER_LEG], - "init_ts", dlg->init_ts, - "start_ts", dlg->start_ts, - "end_ts", dlg->end_ts, - "state", dlg->state) < 0) { + "h_id", dlg->h_id) < 0) { rpc->fault(c, 500, "Failed to add fields"); return; } + for(n=0; n<fmt.len; n++) { + switch(fmt.s[n]) { + case 'f': + if(rpc->struct_add(h, "S", + "from_uri", &dlg->from_uri) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 't': + if(rpc->struct_add(h, "S", + "to_uri", &dlg->to_uri) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'c': + if(rpc->struct_add(h, "S", + "call-id", &dlg->callid) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'F': + if(rpc->struct_add(h, "S", + "from_tag", &dlg->tag[DLG_CALLER_LEG]) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'T': + if(rpc->struct_add(h, "S", + "to_tag", &dlg->tag[DLG_CALLER_LEG]) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'I': + if(rpc->struct_add(h, "d", + "init_ts", dlg->init_ts) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'S': + if(rpc->struct_add(h, "d", + "start_ts", dlg->start_ts) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'E': + if(rpc->struct_add(h, "d", + "end_ts", dlg->end_ts) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 's': + if(rpc->struct_add(h, "d", + "state", dlg->state) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + } + } + } dlg_unlock( d_table, &(d_table->entries[i]) ); }

1 0

High memory consumption during load tests
by Andrey Deykunov 09 Apr '20

09 Apr '20

Hi, I've noticed more than 14 Gb RSS memory consumption during load test (8000 WSS clients send registrations): [image: pic2.png] [image: pic1.png] # ps aux | grep kamailio hpbx 15948 0.0 0.1 2232328 22920 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15949 1.8 3.8 2232460 789212 ? S 01:40 1:23 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15950 1.8 3.8 2232460 790164 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15951 1.7 3.8 2232460 790656 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15952 1.8 3.8 2232460 790180 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15953 1.7 3.8 2232460 788192 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15954 1.8 3.8 2232460 789484 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15955 1.7 3.8 2232460 789640 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15959 1.8 3.8 2232460 788104 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15960 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15961 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15963 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15964 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15966 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15968 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15969 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15971 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15972 0.0 0.0 2232328 8152 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15973 0.0 0.0 2232328 8152 ? S 01:40 0:02 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15975 0.0 0.0 2232328 8156 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15977 4.8 4.0 2232428 835908 ? S 01:40 3:43 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15979 0.0 2.5 2232452 517192 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15980 0.0 2.5 2232328 515344 ? S 01:40 0:03 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15984 0.0 0.0 2232328 8004 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15986 0.0 0.0 2232328 8276 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15987 2.4 3.9 2232492 817888 ? S 01:40 1:50 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15989 2.4 3.9 2232492 816604 ? S 01:40 1:52 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15991 2.4 3.9 2232492 816952 ? S 01:40 1:51 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15992 2.3 3.9 2232492 817236 ? S 01:40 1:49 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15993 2.4 3.9 2232492 818900 ? S 01:40 1:51 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15994 2.4 3.9 2232492 817692 ? S 01:40 1:50 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15996 2.4 3.9 2232492 816832 ? S 01:40 1:50 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15998 2.3 3.9 2232492 814336 ? S 01:40 1:49 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 16001 2.1 3.1 2232328 655908 ? S 01:40 1:37 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg Shared memory consumption is: # /var/lib/ums/sbin/kamcmd -s tcp:localhost:2048 stats.get_statistics shmem: shmem:fragments = 4 shmem:free_size = 1291909000 shmem:max_used_size = 855663448 shmem:real_used_size = 855574648 shmem:total_size = 2147483648 shmem:used_size = 818055392 Also, I don't understand why kamailio maps more than 2 GB per every child process: # pmap -x $(pidof kamailio) | grep total total kB 2232332 659732 653680 total kB 2232496 816132 802908 total kB 2232496 818680 805456 total kB 2232496 818544 805320 total kB 2232496 818900 805676 total kB 2232496 817888 804664 total kB 2232496 818436 805212 total kB 2232496 818124 804900 total kB 2232496 818508 805284 total kB 2232332 8344 3648 total kB 2232332 8072 3580 total kB 2232332 517360 512444 total kB 2232456 519752 514580 total kB 2232432 835996 829552 total kB 2232332 8428 3576 total kB 2232332 8832 3852 total kB 2232332 10380 4604 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232464 789152 777596 total kB 2232464 790128 778484 total kB 2232464 790904 779004 total kB 2232464 788796 777240 total kB 2232464 790284 778384 total kB 2232464 790732 779176 total kB 2232464 790360 778716 total kB 2232464 790512 778612 total kB 2232332 22920 8992 Any ideas what is happening here? Andrey

2 2

← Newer
1
...
28
29
30
31
32
33
34
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020