sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

git:master:e3fe8e7f: acc: adding CDR engine functionality
by Lucian Balaceanu 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: e3fe8e7f88c53e8ce69d776e21b78531d604783d URL: https://github.com/kamailio/kamailio/commit/e3fe8e7f88c53e8ce69d776e21b7853… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2019-11-07T15:46:13+02:00 acc: adding CDR engine functionality - the engine allows the extension of the acc module for anyone wanting to add another format (e.g. JSON) or another backend for CDRs --- Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_logic.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e3fe8e7f88c53e8ce69d776e21b7853… Patch: https://github.com/kamailio/kamailio/commit/e3fe8e7f88c53e8ce69d776e21b7853…

1 0

git:master:6389c98d: dispatcher: docs for xavp_dst_mode to store socket string in dst xavp
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 6389c98d29eeb7f61547bb68ec9d59e4f47b7552 URL: https://github.com/kamailio/kamailio/commit/6389c98d29eeb7f61547bb68ec9d59e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:58:31+01:00 dispatcher: docs for xavp_dst_mode to store socket string in dst xavp --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6389c98d29eeb7f61547bb68ec9d59e… Patch: https://github.com/kamailio/kamailio/commit/6389c98d29eeb7f61547bb68ec9d59e… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 94e7062705..79da1e8b07 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -344,10 +344,15 @@ modparam("dispatcher", "force_dst", 1) sock - the socket pointer. </listitem> <listitem> + socket - the socket string - it iadded only if xavp_dst_mode has bit 2 set + (value 2). + </listitem> + <listitem> dstid - the destination unique id (in case of call load distribution algorithm). </listitem> <listitem> - attrs - the attributes - they are added if xavp_dst_mode does not have the bit 1 set. + attrs - the attributes - they are added if xavp_dst_mode does not have + the bit 1 set (value 1). </listitem> </itemizedlist> </para> @@ -358,11 +363,13 @@ modparam("dispatcher", "force_dst", 1) </para> <example> <title>Set the <quote>xavp_dst_mode</quote> parameter</title> - <programlisting format="linespecific"> - ... - modparam("dispatcher", "xavp_dst_mode", 1) - ... - </programlisting> +<programlisting format="linespecific"> +... + modparam("dispatcher", "xavp_dst_mode", 1) +... + modparam("dispatcher", "xavp_dst_mode", 2) +... +</programlisting> </example> </section> <section id="dispatcher.p.xavp_ctx">

1 0

git:master:8507efe8: dispatcher: option to set add socket as string in the dst xavp
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 8507efe8644c43a5f3b5d4dc27d557596b3b2f2c URL: https://github.com/kamailio/kamailio/commit/8507efe8644c43a5f3b5d4dc27d5575… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:52:02+01:00 dispatcher: option to set add socket as string in the dst xavp - bit 2 has to be set for xavp_dst_mode modparam --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/8507efe8644c43a5f3b5d4dc27d5575… Patch: https://github.com/kamailio/kamailio/commit/8507efe8644c43a5f3b5d4dc27d5575… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 75b3b56f3a..67cbce1feb 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1925,6 +1925,17 @@ int ds_add_xavp_record(ds_set_t *dsidx, int pos, int set, int alg, LM_ERR("failed to add destination sock xavp field\n"); return -1; } + if((ds_xavp_dst_mode & DS_XAVP_DST_ADD_SOCKSTR) + && (dsidx->dlist[pos].attrs.socket.len > 0)) { + memset(&nxval, 0, sizeof(sr_xval_t)); + nxval.type = SR_XTYPE_STR; + nxval.v.s = dsidx->dlist[pos].attrs.socket; + if(xavp_add_value(&ds_xavp_dst_socket, &nxval, &nxavp)==NULL) { + xavp_destroy_list(&nxavp); + LM_ERR("failed to add destination attrs xavp field\n"); + return -1; + } + } } if(alg == DS_ALG_CALLLOAD) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index e4a54944aa..24ebeeeea3 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -67,6 +67,7 @@ #define DS_USE_NEXT 1 #define DS_XAVP_DST_SKIP_ATTRS 1 +#define DS_XAVP_DST_ADD_SOCKSTR (1<<1) #define DS_XAVP_CTX_SKIP_CNT 1 @@ -95,6 +96,7 @@ extern str ds_xavp_dst_grp; extern str ds_xavp_dst_dstid; extern str ds_xavp_dst_attrs; extern str ds_xavp_dst_sock; +extern str ds_xavp_dst_socket; extern str ds_xavp_ctx_cnt; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 0be0968ac2..06d1081ff1 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -85,6 +85,7 @@ str ds_xavp_dst_grp = str_init("grp"); str ds_xavp_dst_dstid = str_init("dstid"); str ds_xavp_dst_attrs = str_init("attrs"); str ds_xavp_dst_sock = str_init("sock"); +str ds_xavp_dst_socket = str_init("socket"); str ds_xavp_ctx_cnt = str_init("cnt");

1 0

git:master:686daa57: pkg/kamailio: removed netbsd unmaintained specs
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 686daa57309b6dc5c32caf75e65a130dfd09d523 URL: https://github.com/kamailio/kamailio/commit/686daa57309b6dc5c32caf75e65a130… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:32:27+01:00 pkg/kamailio: removed netbsd unmaintained specs --- Removed: pkg/kamailio/netbsd/COMMENT Removed: pkg/kamailio/netbsd/DESCR Removed: pkg/kamailio/netbsd/Makefile Removed: pkg/kamailio/netbsd/PLIST Removed: pkg/kamailio/netbsd/distinfo --- Diff: https://github.com/kamailio/kamailio/commit/686daa57309b6dc5c32caf75e65a130… Patch: https://github.com/kamailio/kamailio/commit/686daa57309b6dc5c32caf75e65a130…

1 0

git:master:87fc2ef7: pkg/kamailio: removed long time unmaintained specs for solaris and *bsd
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 87fc2ef7adb7813fe36be40e9813ab28cc82404c URL: https://github.com/kamailio/kamailio/commit/87fc2ef7adb7813fe36be40e9813ab2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:25:24+01:00 pkg/kamailio: removed long time unmaintained specs for solaris and *bsd - removed packaging specs for freebsd, openbsd, netbsd and solaris - no updates from v1.x - some of the bsd variants have the up-to-date specs in the official distro repository --- Removed: pkg/kamailio/freebsd/Makefile Removed: pkg/kamailio/freebsd/distinfo Removed: pkg/kamailio/freebsd/files/patch-Makefile Removed: pkg/kamailio/freebsd/files/patch-Makefile-mysql Removed: pkg/kamailio/freebsd/files/patch-Makefile.defs Removed: pkg/kamailio/freebsd/files/pkg-deinstall.in Removed: pkg/kamailio/freebsd/files/pkg-install.in Removed: pkg/kamailio/freebsd/pkg-descr Removed: pkg/kamailio/openbsd/Makefile Removed: pkg/kamailio/openbsd/distinfo Removed: pkg/kamailio/openbsd/patches/patch-etc_kamailio_cfg Removed: pkg/kamailio/openbsd/patches/patch-modules_perl_Makefile Removed: pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc Removed: pkg/kamailio/openbsd/pkg/COMMENT Removed: pkg/kamailio/openbsd/pkg/DESCR Removed: pkg/kamailio/openbsd/pkg/DESCR-berkeleydb Removed: pkg/kamailio/openbsd/pkg/DESCR-carrierroute Removed: pkg/kamailio/openbsd/pkg/DESCR-ldap Removed: pkg/kamailio/openbsd/pkg/DESCR-main Removed: pkg/kamailio/openbsd/pkg/DESCR-mysql Removed: pkg/kamailio/openbsd/pkg/DESCR-perl Removed: pkg/kamailio/openbsd/pkg/DESCR-postgresql Removed: pkg/kamailio/openbsd/pkg/DESCR-radius Removed: pkg/kamailio/openbsd/pkg/DESCR-snmpstats Removed: pkg/kamailio/openbsd/pkg/DESCR-xcap_client Removed: pkg/kamailio/openbsd/pkg/DESCR-xmlrpc Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-berkeleydb Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-carrierroute Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-ldap Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-main Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-mysql Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-perl Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-postgresql Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-radius Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-snmpstats Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-xcap_client Removed: pkg/kamailio/openbsd/pkg/PFRAG.shared-xmlrpc Removed: pkg/kamailio/openbsd/pkg/PLIST Removed: pkg/kamailio/openbsd/pkg/PLIST-berkeleydb Removed: pkg/kamailio/openbsd/pkg/PLIST-carrierroute Removed: pkg/kamailio/openbsd/pkg/PLIST-ldap Removed: pkg/kamailio/openbsd/pkg/PLIST-main Removed: pkg/kamailio/openbsd/pkg/PLIST-mysql Removed: pkg/kamailio/openbsd/pkg/PLIST-perl Removed: pkg/kamailio/openbsd/pkg/PLIST-postgresql Removed: pkg/kamailio/openbsd/pkg/PLIST-radius Removed: pkg/kamailio/openbsd/pkg/PLIST-snmpstats Removed: pkg/kamailio/openbsd/pkg/PLIST-xcap_client Removed: pkg/kamailio/openbsd/pkg/PLIST-xmlrpc Removed: pkg/kamailio/solaris/kamailio-manifest.xml Removed: pkg/kamailio/solaris/pkginfo Removed: pkg/kamailio/solaris/prototype --- Diff: https://github.com/kamailio/kamailio/commit/87fc2ef7adb7813fe36be40e9813ab2… Patch: https://github.com/kamailio/kamailio/commit/87fc2ef7adb7813fe36be40e9813ab2…

1 0

git:master:66313927: presence: docs for pres_subs_mode parameter
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 66313927181e6252f6f3807c607f143c88183c17 URL: https://github.com/kamailio/kamailio/commit/66313927181e6252f6f3807c607f143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:20:54+01:00 presence: docs for pres_subs_mode parameter --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/66313927181e6252f6f3807c607f143… Patch: https://github.com/kamailio/kamailio/commit/66313927181e6252f6f3807c607f143… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index c518503f09..3eb1c1e942 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -929,6 +929,28 @@ modparam("presence", "enable_dmq", 1) </example> </section> +<section id="presence.p.pres_subs_mode"> + <title><varname>pres_subs_mode</varname> (integer)</title> + <para> + Allow disabling cloning subscription structure for pv $subs(...), saving the + pkg memory and copy operations for all its fields. If 1 the cloning is done; + if 0, no cloning and $subs(...) returns $null. + </para> + <para> + <emphasis> + Default value is 1. + </emphasis> + </para> + <example> + <title>Set <varname>pres_subs_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "pres_subs_mode", 0) +... +</programlisting> + </example> +</section> + </section> <section>

1 0

git:master:fb9351aa: presence: new parameter pres_subs_mode
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: fb9351aa02137faa4c64998fd385b62dd034cddd URL: https://github.com/kamailio/kamailio/commit/fb9351aa02137faa4c64998fd385b62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:14:33+01:00 presence: new parameter pres_subs_mode - allow disabling cloning subscription structure for pv use, saving the pkg memory and copy operations for all its fields - default 1 - clone, like so far; 0 - disable --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/fb9351aa02137faa4c64998fd385b62… Patch: https://github.com/kamailio/kamailio/commit/fb9351aa02137faa4c64998fd385b62… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 85b74261b9..3bc1d0dc52 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -56,6 +56,7 @@ int goto_on_notify_reply = -1; extern int pres_local_log_level; extern int pres_local_log_facility; extern subs_t *_pres_subs_last_sub; +extern int _pres_subs_mode; c_back_param *shm_dup_cbparam(subs_t *); void free_cbparam(c_back_param *cb_param); @@ -1507,13 +1508,17 @@ int send_notify_request( LM_DBG("expires %d status %d\n", subs->expires, subs->status); cb_param = mem_copy_subs(subs, SHM_MEM_TYPE); - backup_subs = _pres_subs_last_sub; - _pres_subs_last_sub = subs; + if(_pres_subs_mode==1) { + backup_subs = _pres_subs_last_sub; + _pres_subs_last_sub = subs; + } set_uac_req(&uac_r, &met, &str_hdr, notify_body, td, TMCB_LOCAL_COMPLETED, p_tm_callback, (void *)cb_param); result = tmb.t_request_within(&uac_r); - _pres_subs_last_sub = backup_subs; + if(_pres_subs_mode==1) { + _pres_subs_last_sub = backup_subs; + } if(result < 0) { LM_ERR("in function tmb.t_request_within\n"); if(cb_param) @@ -1705,8 +1710,10 @@ void run_notify_reply_event(struct cell *t, struct tmcb_params *ps) _pres_subs_notify_reply_msg = ps->rpl; } - backup_subs = _pres_subs_last_sub; - _pres_subs_last_sub = mem_copy_subs((subs_t *)(*ps->param), PKG_MEM_TYPE); + if(_pres_subs_mode==1) { + backup_subs = _pres_subs_last_sub; + _pres_subs_last_sub = mem_copy_subs((subs_t *)(*ps->param), PKG_MEM_TYPE); + } backup_route_type = get_route_type(); set_route_type(LOCAL_ROUTE); @@ -1715,8 +1722,10 @@ void run_notify_reply_event(struct cell *t, struct tmcb_params *ps) _pres_subs_notify_reply_msg = NULL; _pres_subs_notify_reply_code = 0; - pkg_free(_pres_subs_last_sub); - _pres_subs_last_sub = backup_subs; + if(_pres_subs_mode==1) { + pkg_free(_pres_subs_last_sub); + _pres_subs_last_sub = backup_subs; + } free_sip_msg(&msg); } diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 26e91970a2..a8f781c4be 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -102,6 +102,7 @@ int library_mode = 0; str server_address = {0, 0}; evlist_t *EvList = NULL; int pres_subs_remove_match = 0; +int _pres_subs_mode = 1; /* sip uri match */ sip_uri_match_f presence_sip_uri_match; @@ -243,6 +244,7 @@ static param_export_t params[]={ { "sip_uri_match", PARAM_INT, &pres_uri_match}, { "cseq_offset", PARAM_INT, &pres_cseq_offset}, { "enable_dmq", PARAM_INT, &pres_enable_dmq}, + { "pres_subs_mode", PARAM_INT, &_pres_subs_mode}, {0,0,0} }; /* clang-format on */ diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 1ab693109e..7d27a76d75 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -731,6 +731,7 @@ void msg_watchers_clean(unsigned int ticks, void *param) LM_ERR("cleaning pending subscriptions\n"); } +extern int _pres_subs_mode; subs_t *_pres_subs_last_sub = NULL; /* @@ -1036,9 +1037,11 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) str reply_str; int sent_reply = 0; - if(_pres_subs_last_sub) { - pkg_free(_pres_subs_last_sub); - _pres_subs_last_sub = NULL; + if(_pres_subs_mode==1) { + if(_pres_subs_last_sub) { + pkg_free(_pres_subs_last_sub); + _pres_subs_last_sub = NULL; + } } /* ??? rename to avoid collisions with other symbols */ @@ -1188,7 +1191,9 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) } } - _pres_subs_last_sub = mem_copy_subs(&subs, PKG_MEM_TYPE); + if(_pres_subs_mode==1) { + _pres_subs_last_sub = mem_copy_subs(&subs, PKG_MEM_TYPE); + } /* check if correct status */ if(get_status_str(subs.status) == NULL) {

1 0

git:master:72d3230c: presence: remove double extern declaration of _pres_subs_last_sub
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 72d3230ca5d22724b061f3ac11d16b50cee1340c URL: https://github.com/kamailio/kamailio/commit/72d3230ca5d22724b061f3ac11d16b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T20:06:14+01:00 presence: remove double extern declaration of _pres_subs_last_sub - set some global variables static --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/72d3230ca5d22724b061f3ac11d16b5… Patch: https://github.com/kamailio/kamailio/commit/72d3230ca5d22724b061f3ac11d16b5… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 245c2b95c0..85b74261b9 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1623,9 +1623,8 @@ int notify(subs_t *subs, subs_t *watcher_subs, str *n_body, int force_null_body, return 0; } -extern subs_t *_pres_subs_last_sub; -sip_msg_t *_pres_subs_notify_reply_msg = NULL; -int _pres_subs_notify_reply_code = 0; +static sip_msg_t *_pres_subs_notify_reply_msg = NULL; +static int _pres_subs_notify_reply_code = 0; int pv_parse_notify_reply_var_name(pv_spec_p sp, str *in) {

1 0

DB_REDIS Doesn't Seem to Work With Unfiltered Deletes
by Robert Boisvert 15 Nov '19

15 Nov '19

Greetings, I'm using the delete record feature as described in section 9.2.9 <http://www.asipto.com/pub/kamailio-devel-guide/#c09f_delete> of the Kamailio SIP Server v3.2.0 Development Guide. When I try to delete the entire table without any filtering, as shown in the code below, DB_REDIS fails. Is this a bug? Thank you in advance for your help, Bob *Log* DEBUG: db_redis [redis_connection.c:118]: db_redis_connect(): connecting to redis at 127.0.0.1:6379 DEBUG: db_redis [redis_connection.c:171]: db_redis_connect(): connection opened to redis://127.0.0.1:6379/5 DEBUG: db_redis [redis_connection.c:232]: db_redis_new_connection(): connection opened to redis://127.0.0.1:6379/5 DEBUG: db_redis [redis_dbase.c:2019]: db_redis_delete(): deleting from prefix (table) 'mohqcalls' DEBUG: db_redis [redis_dbase.c:524]: db_redis_build_query_keys(): build query keys DEBUG: db_redis [redis_dbase.c:295]: db_redis_find_query_key(): checking for existence of entry key 'call_id' in query DEBUG: db_redis [redis_dbase.c:306]: db_redis_find_query_key(): found key in entry key DEBUG: db_redis [redis_dbase.c:123]: db_redis_val2str(): converting string value 'a1960c88-640f2e0f-bf639d1a(a)10.197.126.143' with len 41 to str DEBUG: db_redis [redis_dbase.c:338]: db_redis_find_query_key(): entry key so far is 'mohqcalls:entry::a1960c88-640f2e0f-bf639d1a@10.197.126.143' DEBUG: db_redis [redis_dbase.c:543]: db_redis_build_query_keys(): found suitable entry key ' mohqcalls:entry::a1960c88-640f2e0f-bf639d1a@10.197.126.143' for query DEBUG: db_redis [redis_dbase.c:617]: db_redis_build_query_keys(): building manual keys DEBUG: db_redis [redis_dbase.c:254]: db_redis_build_entry_manual_keys(): checking for existence of entry key 'call_id' in query to get manual key DEBUG: db_redis [redis_dbase.c:259]: db_redis_build_entry_manual_keys(): found key in entry key DEBUG: db_redis [redis_dbase.c:1297]: db_redis_perform_delete(): delete all keys DEBUG: db_redis [redis_dbase.c:1303]: db_redis_perform_delete(): delete key 'mohqcalls:entry::a1960c88-640f2e0f-bf639d1a@10.197.126.143' DEBUG: db_redis [redis_connection.c:32]: print_query(): Query dump: DEBUG: db_redis [redis_connection.c:34]: print_query(): EXISTS DEBUG: db_redis [redis_connection.c:34]: print_query(): mohqcalls:entry::a1960c88-640f2e0f-bf639d1a@10.197.126.143 DEBUG: db_redis [redis_table.c:154]: db_redis_key_list2arr(): returning 2 entries DEBUG: db_redis [redis_connection.c:279]: db_redis_command_argv(): query has 2 args DEBUG: db_redis [redis_connection.c:32]: print_query(): Query dump: DEBUG: db_redis [redis_connection.c:34]: print_query(): HMGET DEBUG: db_redis [redis_connection.c:34]: print_query(): mohqcalls:entry::a1960c88-640f2e0f-bf639d1a@10.197.126.143 DEBUG: db_redis [redis_table.c:154]: db_redis_key_list2arr(): returning 2 entries DEBUG: db_redis [redis_connection.c:279]: db_redis_command_argv(): query has 2 args ERROR: db_redis [redis_dbase.c:1352]: db_redis_perform_delete(): Failed to fetch type entry: ERR wrong number of arguments for 'hmget' command ERROR: db_redis [redis_dbase.c:1460]: db_redis_perform_delete(): failed to perform the delete ERROR: db_redis [redis_dbase.c:2076]: db_redis_delete(): failed to do the query WARNING: mohqueue [mohq_db.c:278]: delete_call_rec(): delete_call_rec: Unable to delete row from mohqcalls *Code* db_func_t *pdb = pmod_data->pdb; pdb->use_table (pconn, &pmod_data->pcfg->db_ctable); if (pdb->delete (pconn, 0, 0, 0, 0) < 0) { LM_WARN ("%sUnable to delete all rows from %s\n", pfncname, pmod_data->pcfg->db_ctable.s); }

2 1

git:master:72d56337: core: use snprintf() instead of sprintf() in hash testing function
by Daniel-Constantin Mierla 15 Nov '19

15 Nov '19

Module: kamailio Branch: master Commit: 72d56337b49b1bfdeb74773edc9a973cfcdefe70 URL: https://github.com/kamailio/kamailio/commit/72d56337b49b1bfdeb74773edc9a973… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-15T18:33:38+01:00 core: use snprintf() instead of sprintf() in hash testing function --- Modified: src/core/hash_func.c --- Diff: https://github.com/kamailio/kamailio/commit/72d56337b49b1bfdeb74773edc9a973… Patch: https://github.com/kamailio/kamailio/commit/72d56337b49b1bfdeb74773edc9a973… --- diff --git a/src/core/hash_func.c b/src/core/hash_func.c index 71d12f0d25..67b2934e33 100644 --- a/src/core/hash_func.c +++ b/src/core/hash_func.c @@ -125,7 +125,7 @@ void hashtest_cycle( int hits[TABLE_ENTRIES+5], char *ip ) int hashv; static char buf1[1024]; static char buf2[1024]; - str call_id; + str call_id; str cseq; call_id.s=buf1; @@ -135,11 +135,11 @@ void hashtest_cycle( int hits[TABLE_ENTRIES+5], char *ip ) for (j=85296341;j<85296341+10;j++) for (k=987654;k<=987654+10;k++) for (l=101;l<201;l++) { - call_id.len=sprintf( buf1, "%d-%d-%d@%s",(int)i,(int)j, - (int)k, ip ); - cseq.len=sprintf( buf2, "%d", (int)l ); + call_id.len=snprintf(buf1, 1024, "%d-%d-%d@%s",(int)i,(int)j, + (int)k, ip); + cseq.len=snprintf(buf2, 1024, "%d", (int)l ); /* printf("%s\t%s\n", buf1, buf2 ); */ - hashv=hash( call_id, cseq ); + hashv=hash(call_id, cseq); hits[ hashv ]++; } }

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019