June 2018 - sr-dev - kamailio.org

git:5.1:9459e4ae: sqlops: increased the length of printed query part in case of errors
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 9459e4ae1d9599b04ca67f88191cc9a73106965b URL: https://github.com/kamailio/kamailio/commit/9459e4ae1d9599b04ca67f88191cc9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:29:10+02:00 sqlops: increased the length of printed query part in case of errors (cherry picked from commit 5f7eee55c648cfa1b5b5662648fc9133daa6d6b6) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9459e4ae1d9599b04ca67f88191cc9a… Patch: https://github.com/kamailio/kamailio/commit/9459e4ae1d9599b04ca67f88191cc9a… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 16492300bc..0e239fb339 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -262,7 +262,7 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { LM_ERR("cannot do the query [%.*s]\n", - (query->len>32)?32:query->len, query->s); + (query->len>64)?64:query->len, query->s); return -1; }

1 0

git:5.1:a0268561: src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: a026856140a66d9edf4f81c133431d93c2e3392e URL: https://github.com/kamailio/kamailio/commit/a026856140a66d9edf4f81c133431d9… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:28:19+02:00 src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again (cherry picked from commit 7585a57037f6ef21cda376b16b0077fa981eceac) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a026856140a66d9edf4f81c133431d9… Patch: https://github.com/kamailio/kamailio/commit/a026856140a66d9edf4f81c133431d9… --- diff --git a/src/Makefile b/src/Makefile index d0faa5d473..5b67d7ad67 100644 --- a/src/Makefile +++ b/src/Makefile @@ -348,7 +348,7 @@ modules-cfg modules-list modules-lst: rm -f modules.lst $(MAKE) modules.lst -ifneq ($(wildcard .git),) +ifneq ($(wildcard ../.git),) # if .git/ exists repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ [ -n "$$RV" ] && \ @@ -358,7 +358,7 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ RV="$$RV"-dirty; echo "$$RV") repo_hash=$(subst -dirty,,$(repo_ver)) repo_state=$(subst %-dirty,dirty,$(findstring -dirty,$(repo_ver))) -autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) core/cfg.y core/cfg.lex Makefile +autover_h_dep=../.git $(filter-out $(auto_gen), $(sources)) core/cfg.y core/cfg.lex Makefile else # else if .git/ does not exist repo_ver=

1 0

git:5.1:8aebe3b9: tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 8aebe3b9009cc682ed1d1fefb599bef190b47a09 URL: https://github.com/kamailio/kamailio/commit/8aebe3b9009cc682ed1d1fefb599bef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:27:32+02:00 tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers (cherry picked from commit 72f5eaeeef0239ebd16a2d645b83e83eb1a2b506) --- Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/8aebe3b9009cc682ed1d1fefb599bef… Patch: https://github.com/kamailio/kamailio/commit/8aebe3b9009cc682ed1d1fefb599bef… --- diff --git a/src/modules/tm/t_funcs.h b/src/modules/tm/t_funcs.h index bbab42482f..5c219ca02f 100644 --- a/src/modules/tm/t_funcs.h +++ b/src/modules/tm/t_funcs.h @@ -96,13 +96,18 @@ int send_pr_buffer( struct retr_buf *rb, void *buf, int len); #ifdef TM_DEL_UNREF -#define UNREF_FREE(_T_cell) \ +#define UNREF_FREE(_T_cell, _T_unlinked) \ do{\ if (atomic_dec_and_test(&(_T_cell)->ref_count)){ \ unlink_timers((_T_cell)); \ free_cell((_T_cell)); \ - }else \ - t_stats_delayed_free(); \ + }else{ \ + if(_T_unlinked){ \ + free_cell((_T_cell)); \ + }else{ \ + t_stats_delayed_free(); \ + } \ + } \ }while(0) #define UNREF_NOSTATS(_T_cell) \ diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 996efbc21c..b5e4325929 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -648,7 +648,11 @@ ticks_t wait_handler(ticks_t ti, struct timer_ln *wait_tl, void *data) remove_from_hash_table_unsafe(p_cell); UNLOCK_HASH(p_cell->hash_index); p_cell->flags |= T_IN_AGONY; - UNREF_FREE(p_cell); + if(t_linked_timers(p_cell)) { + UNREF_FREE(p_cell, 0); + } else { + UNREF_FREE(p_cell, 1); + } ret = 0; #else /* TM_DEL_UNREF */ if(p_cell->flags & T_IN_AGONY) { diff --git a/src/modules/tm/timer.h b/src/modules/tm/timer.h index 3bdb16a65a..5cb6c736a6 100644 --- a/src/modules/tm/timer.h +++ b/src/modules/tm/timer.h @@ -375,5 +375,24 @@ inline static void unlink_timers(struct cell *t) cleanup_localcancel_timers(t); } +inline static int t_linked_timers(tm_cell_t *t) +{ + int i; + + if(t->uas.response.timer.next!=NULL || t->uas.response.timer.prev!=NULL) { + return 1; + } + for(i = 0; i < t->nr_of_outgoings; i++) { + if(t->uac[i].request.timer.next!=NULL + || t->uac[i].request.timer.prev!=NULL) { + return 1; + } + if(t->uac[i].local_cancel.timer.next!=NULL + || t->uac[i].local_cancel.timer.prev!=NULL) { + return 1; + } + } + return 0; +} #endif diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9b2f51b5f6..42e25762d2 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -589,7 +589,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, if(atomic_get_int(&new_cell->ref_count)==0) { free_cell(new_cell); } else { - UNREF_FREE(new_cell); + UNREF_FREE(new_cell, 0); } } #else

1 0

git:5.1:155b7871: tm: backup and restore T and T_branch in t_continue()
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 155b78716101fc0c288fe0473c60e5fbb57838f1 URL: https://github.com/kamailio/kamailio/commit/155b78716101fc0c288fe0473c60e5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:27:18+02:00 tm: backup and restore T and T_branch in t_continue() - it may be required to cleanup old T states after t_continue() is finished (cherry picked from commit 5fe2a1a1c67b550431dcae3c98701073f7edd953) --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/155b78716101fc0c288fe0473c60e5f… Patch: https://github.com/kamailio/kamailio/commit/155b78716101fc0c288fe0473c60e5f… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index a150829699..205c945d4c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -166,7 +166,9 @@ int t_suspend(struct sip_msg *msg, int t_continue_helper(unsigned int hash_index, unsigned int label, struct action *rtact, str *cbname, str *cbparam) { - struct cell *t; + tm_cell_t *t; + tm_cell_t *backup_T = T_UNDEFINED; + int backup_T_branch = T_BR_UNDEFINED; sip_msg_t *faked_req; sip_msg_t *brpl; void *erpl; @@ -187,13 +189,18 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, cfg_update(); + backup_T = get_t(); + backup_T_branch = get_t_branch(); + if (t_lookup_ident(&t, hash_index, label) < 0) { + set_t(backup_T, backup_T_branch); LM_ERR("transaction not found\n"); return -1; } if (!(t->flags & T_ASYNC_SUSPENDED)) { LM_WARN("transaction is not suspended [%u:%u]\n", hash_index, label); + set_t(backup_T, backup_T_branch); return -2; } @@ -203,7 +210,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, * needless to continue */ UNREF(t); /* t_unref would kill the transaction */ /* reset T as we have no working T anymore */ - set_t(T_UNDEFINED, T_BR_UNDEFINED); + set_t(backup_T, backup_T_branch); return 1; } @@ -248,6 +255,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, t->flags &= ~T_ASYNC_CONTINUE; UNLOCK_ASYNC_CONTINUE(t); UNREF(t); /* t_unref would kill the transaction */ + set_t(backup_T, backup_T_branch); return 1; } @@ -387,7 +395,6 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, if(keng->froute(t->uac[branch].reply, TM_ONREPLY_ROUTE, cbname, &evname)<0) { LM_ERR("error running event route kemi callback\n"); - return -1; } } else { LM_DBG("event callback (%.*s) set, but no cfg engine\n", @@ -539,7 +546,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, sip_msg_free(brpl); } - + set_t(backup_T, backup_T_branch); return 0; kill_trans: @@ -566,6 +573,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, /* response handling */ t_unref(t->uac[branch].reply); } + set_t(backup_T, backup_T_branch); return ret; }

1 0

git:5.1:75f19a66: topos: docs - added section ids to parameters
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 75f19a666dde2e6264ef12c7a4d9f40fcb0f739b URL: https://github.com/kamailio/kamailio/commit/75f19a666dde2e6264ef12c7a4d9f40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:26:37+02:00 topos: docs - added section ids to parameters (cherry picked from commit 7e5e5ca4ccf21e2644ed8e82bc5225f4432b1247) --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/75f19a666dde2e6264ef12c7a4d9f40… Patch: https://github.com/kamailio/kamailio/commit/75f19a666dde2e6264ef12c7a4d9f40… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 1732b77724..bb3c44c9c5 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -66,7 +66,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="topoh.p.mask_key"> <title><varname>mask_key</varname> (str)</title> <para> Keyword to mask the headers. @@ -85,7 +85,7 @@ modparam("topoh", "mask_key", "some secret here") </programlisting> </example> </section> - <section> + <section id="topoh.p.mask_ip"> <title><varname>mask_ip</varname> (str)</title> <para> IP address to be used in masked headers to build valid @@ -108,7 +108,7 @@ modparam("topoh", "mask_ip", "192.168.0.1") </programlisting> </example> </section> - <section> + <section id="topoh.p.mask_callid"> <title><varname>mask_callid</varname> (integer)</title> <para> Whether to encode the Call-id: header. Some SIP extensions include @@ -136,7 +136,7 @@ modparam("topoh", "mask_callid", 1) </programlisting> </example> </section> - <section> + <section id="topoh.p.uparam_name"> <title><varname>uparam_name</varname> (str)</title> <para> Name of URI parameter where to store encoded value. @@ -155,7 +155,7 @@ modparam("topoh", "uparam_name", "myparam") </programlisting> </example> </section> - <section> + <section id="topoh.p.uparam_prefix"> <title><varname>uparam_prefix</varname> (str)</title> <para> Prefix to be added in encoded URI parameters. @@ -174,7 +174,7 @@ modparam("topoh", "uparam_prefix", "xyz") </programlisting> </example> </section> - <section> + <section id="topoh.p.vparam_name"> <title><varname>vparam_name</varname> (str)</title> <para> Name of Via: parameter used to store encoded value. @@ -193,7 +193,7 @@ modparam("topoh", "vparam_name", "myv") </programlisting> </example> </section> - <section> + <section id="topoh.p.vparam_prefix"> <title><varname>vparam_prefix</varname> (str)</title> <para> Prefix to be added in encoded Via: parameters. @@ -212,7 +212,7 @@ modparam("topoh", "vparam_prefix", "xyz") </programlisting> </example> </section> - <section> + <section id="topoh.p.callid_prefix"> <title><varname>callid_prefix</varname> (str)</title> <para> Prefix to be added in encoded Call-ID: headers. @@ -231,7 +231,7 @@ modparam("topoh", "callid_prefix", "***") </programlisting> </example> </section> - <section> + <section id="topoh.p.sanity_checks"> <title><varname>sanity_checks</varname> (integer)</title> <para> If set to 1, topoh module will bind to sanity module in order @@ -253,7 +253,7 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> - <section> + <section id="topoh.p.uri_prefix_checks"> <title><varname>uri_prefix_checks</varname> (integer)</title> <para> If set to 1, topoh module will check if URIs to be decoded match

1 0

git:5.1:8d8fec64: nsq: removed obsolete json is_error() macro
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 8d8fec6496617ddad92b98acbcc2d6be4ef192e7 URL: https://github.com/kamailio/kamailio/commit/8d8fec6496617ddad92b98acbcc2d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:25:57+02:00 nsq: removed obsolete json is_error() macro (cherry picked from commit 586566c19a85a611d389062ca1f1de271e1891c3) --- Modified: src/modules/nsq/nsq_json.c --- Diff: https://github.com/kamailio/kamailio/commit/8d8fec6496617ddad92b98acbcc2d6b… Patch: https://github.com/kamailio/kamailio/commit/8d8fec6496617ddad92b98acbcc2d6b… --- diff --git a/src/modules/nsq/nsq_json.c b/src/modules/nsq/nsq_json.c index 85b817364a..a817b70ecd 100644 --- a/src/modules/nsq/nsq_json.c +++ b/src/modules/nsq/nsq_json.c @@ -110,7 +110,7 @@ struct json_object * nsq_json_get_field_object(str* json, str* field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

1 0

git:5.1:53f46ab7: kazoo: replaced obsolete json is_error() macro
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 53f46ab7b6eb311137033f6cdb27ef73d87cb3f2 URL: https://github.com/kamailio/kamailio/commit/53f46ab7b6eb311137033f6cdb27ef7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:25:47+02:00 kazoo: replaced obsolete json is_error() macro (cherry picked from commit 7d3766614832ef22433e36ef0791fa41796829a2) --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/53f46ab7b6eb311137033f6cdb27ef7… Patch: https://github.com/kamailio/kamailio/commit/53f46ab7b6eb311137033f6cdb27ef7… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 3e161839dc..36e7ea0843 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1241,7 +1241,7 @@ int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char struct json_object *j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); return -1; } @@ -1304,7 +1304,7 @@ int kz_amqp_async_query(struct sip_msg* msg, char* _exchange, char* _routing_key json_obj = json_tokener_parse(json_s.s); - if (is_error(json_obj)) { + if (json_obj==NULL) { LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); goto error; } @@ -1457,7 +1457,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha struct json_object *j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); return -1; } diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 7911489eaf..4fd30998f6 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -132,7 +132,7 @@ struct json_object * kz_json_get_field_object(str* json, str* field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

1 0

git:5.1:352af1b5: core: pv - default number of buffer slots set to 40
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 352af1b5a878daf90e16f5ae012f5ecb87fabbff URL: https://github.com/kamailio/kamailio/commit/352af1b5a878daf90e16f5ae012f5ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:25:36+02:00 core: pv - default number of buffer slots set to 40 - it was 10 - allow handling more chained evaluations in large strings (cherry picked from commit c087b1d1dd06a1fd417998fe0a51dedcfe02e8c6) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/352af1b5a878daf90e16f5ae012f5ec… Patch: https://github.com/kamailio/kamailio/commit/352af1b5a878daf90e16f5ae012f5ec… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index dac770a0f3..841b1801fe 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2025,7 +2025,7 @@ static char **_pv_print_buffer = NULL; static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; static int _pv_print_buffer_size_active = 0; /* 6 mod params + 4 direct usage from mods */ -#define PV_DEFAULT_PRINT_BUFFER_SLOTS 10 +#define PV_DEFAULT_PRINT_BUFFER_SLOTS 40 static int _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; static int _pv_print_buffer_slots_active = 0; static int _pv_print_buffer_index = 0;

1 0

[kamailio/kamailio] TLS module: different TLS parameters based on domain names for server role (#1570)
by VolodyaIvanets 20 Jun '18

20 Jun '18

Sorry for not being specific in [#1567](https://github.com/kamailio/kamailio/issues/1567). I had to clarify that I was talking about server role only. >From what I understood server role configurations can be distinguish one from another only by socket, provided in their configuration. TLS module documentation says: > "... different TLS parameters can be specified on a per role (server or client) and domain basis (for now only IPs)". Which hints that additional tests for matching incoming connections against configured server profiles were in mind. I would like to request a feature which could allow matching them against domain name if that's possible. One of the options may be checking client's certificate CN if _require_certificate_ parameter is set to yes. Thank you! -- 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/1570

2 2

git:master:04fffc77: pdbt and pdb_server: add version output to help and as a dedicated switch
by Henning Westerholt 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: 04fffc77bb0dba4c13d76347a3352894b2821846 URL: https://github.com/kamailio/kamailio/commit/04fffc77bb0dba4c13d76347a335289… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-20T17:43:43+02:00 pdbt and pdb_server: add version output to help and as a dedicated switch --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/04fffc77bb0dba4c13d76347a335289… Patch: https://github.com/kamailio/kamailio/commit/04fffc77bb0dba4c13d76347a335289… --- diff --git a/utils/pdbt/pdb_server.c b/utils/pdbt/pdb_server.c index 4dac0ce13a..7f25cb01ae 100644 --- a/utils/pdbt/pdb_server.c +++ b/utils/pdbt/pdb_server.c @@ -40,8 +40,8 @@ void print_usage(char *program) { set_log_level(LOG_INFO); - LINFO("Listens on a UDP port for queries and sends answer UDP\n"); - LINFO("packets back.\n"); + LINFO("version: pdb_server %d\n", PDB_VERSION); + LINFO("Listens on a UDP port for queries and sends answer UDP packets back.\n"); LINFO("\n"); LINFO("Usage: %s [<option>...]\n", program); LINFO(" %s -m <data file> [-i <bind addr>] [-p <port>] [-d <log level>]\n", program); @@ -62,6 +62,7 @@ void print_usage(char *program) { LINFO(" %ld for emergency level.\n", LOG_EMERG); LINFO(" %ld to disable all messages.\n", LOG_EMERG-1); LINFO(" Default is warning level.\n"); + LINFO(" -v: Print the version\n"); LINFO(" -h: Print this help.\n"); } @@ -212,7 +213,7 @@ int main(int argc, char *argv[]) { int so; struct sockaddr_in sa; - while ((opt = getopt(argc, argv, "m:i:p:hdl:")) != -1) { + while ((opt = getopt(argc, argv, "m:i:p:vhdl:")) != -1) { switch (opt) { case 'm': backend_data_filename = optarg; @@ -229,6 +230,11 @@ int main(int argc, char *argv[]) { } bind_port=ret; break; + case 'v': + set_log_level(LOG_INFO); + LINFO("version: pdb_server %d\n", PDB_VERSION); + return 0; + break; case 'h': init_log("pdb_server", use_syslog); print_usage(argv[0]); diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index afd36956b2..6521985b2b 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -50,6 +50,7 @@ typedef int (*query_func_t)(char *number, char *comment, void *data); void print_usage(char *program) { set_log_level(LOG_INFO); + LINFO("version: pdbt %d\n", PDB_VERSION); LINFO("Usage: %s [<option>...] <command> [<param>...]\n", program); LINFO(" %s -s <csv file> -m <mmap file> [-k <ids>] [-o] [-u <tree file>] [-l <log level>] build\n", program); LINFO(" %s (-m <mmap file>|-r <host>:<port>) [-q <timeout>] [-f <query file>] [-t <carrier text file>] [-l <log level>] query <number>...\n", program); @@ -93,6 +94,7 @@ void print_usage(char *program) { LINFO(" %ld for emergency level.\n", LOG_EMERG); LINFO(" %ld to disable all messages.\n", LOG_EMERG-1); LINFO(" Default is info level.\n"); + LINFO(" -v: Print the version\n"); LINFO(" -h: Print this help.\n"); } @@ -678,7 +680,7 @@ int main(int argc, char *argv[]) { init_log("pdbt", 0); - while ((opt = getopt(argc, argv, "s:m:f:u:t:r:q:k:ol:h")) != -1) { + while ((opt = getopt(argc, argv, "s:m:f:u:t:r:q:k:ol:vh")) != -1) { switch (opt) { case 's': csv_file = optarg; @@ -752,6 +754,11 @@ int main(int argc, char *argv[]) { } log_level=ret; break; + case 'v': + set_log_level(LOG_INFO); + LINFO("version: pdbt %d\n", PDB_VERSION); + return 0; + break; case 'h': print_usage(argv[0]); return 0;

1 0

[kamailio/kamailio] TLS module: different TLS parameters based on domain names (#1567)
by VolodyaIvanets 20 Jun '18

20 Jun '18

TLS module documentation says: "different TLS parameters can be specified on a per role (server or client) and domain basis (for now only IPs)". It would be nice feature if it could use same socket and distinguish connections by domain name. -- 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/1567

2 3

[kamailio/kamailio] ims_charging unlink_unsafe_ro_session (#1549)
by thulasizwe-n 20 Jun '18

20 Jun '18

Apologies if i have not kept with the reporting standard. Insertion attempts of out-of-credit replies from resume_on_initial_ccr callback, are corrupting the ro_session list. i.e. they nullify the first and last fields, which under certain conditions the first entry gets restored but not the last.This then crashes the process at ro_session_hash.c (link_ro_session), where the first entry has a valid address but the last does not. Solution: ro_session_hash.h - unlink_unsafe_ro_session - check if the session to be linked is actually part of list i.e if ((ro_session->next == 0x00) && (ro_session->prev == 0x00) && (ro_session != ro_session_entry->first) ) { ro_session, &(ro_session->ro_tl), ro_session->callid.len, ro_session->callid.len, ro_session->callid.s); return; } rest of the code .... -- 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/1549

3 7

git:master:f42e5420: ims_charging: check if the session to be linked is actually part of list
by Daniel-Constantin Mierla 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: f42e5420f5f761bd08952b221a3f60ac925d6c99 URL: https://github.com/kamailio/kamailio/commit/f42e5420f5f761bd08952b221a3f60a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:32:00+02:00 ims_charging: check if the session to be linked is actually part of list - issue reported and patch suggested by GH #1549 --- Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/f42e5420f5f761bd08952b221a3f60a… Patch: https://github.com/kamailio/kamailio/commit/f42e5420f5f761bd08952b221a3f60a… --- diff --git a/src/modules/ims_charging/ro_session_hash.h b/src/modules/ims_charging/ro_session_hash.h index 4b677b3c0a..b81e843245 100644 --- a/src/modules/ims_charging/ro_session_hash.h +++ b/src/modules/ims_charging/ro_session_hash.h @@ -158,6 +158,13 @@ extern struct ro_session_table *ro_session_table; * \param ro_session unlinked ro_session */ static inline void unlink_unsafe_ro_session(struct ro_session_entry *ro_session_entry, struct ro_session *ro_session) { + if ((ro_session->next == 0x00) && + (ro_session->prev == 0x00) && + (ro_session != ro_session_entry->first) ) + { + return; + } + if (ro_session->next) ro_session->next->prev = ro_session->prev; else

1 0

git:master:a0594f0e: Merge pull request #1562 from christoph-v/bugfix_prm18_0001045_contact_remove
by GitHub 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: a0594f0e70dd860a22e94733f965b151ff99e641 URL: https://github.com/kamailio/kamailio/commit/a0594f0e70dd860a22e94733f965b15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-20T08:27:49+02:00 Merge pull request #1562 from christoph-v/bugfix_prm18_0001045_contact_remove ims_usrloc_scscf: bugfix erraneous unlinking of deleted contact --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/a0594f0e70dd860a22e94733f965b15… Patch: https://github.com/kamailio/kamailio/commit/a0594f0e70dd860a22e94733f965b15… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 6510d85aa1..20c8a64154 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1102,10 +1102,11 @@ int remove_impucontact_from_list(impurecord_t* impu, impu_contact_t *impucontact } else if (contact == impu->linked_contacts.tail->contact) { LM_DBG("deleting tail\n"); impu->linked_contacts.tail = impu->linked_contacts.tail->prev; + impu->linked_contacts.tail->next = 0; } else { LM_DBG("deleting mid list\n"); impucontact->prev->next = impucontact->next; - impucontact->prev = impucontact->next->prev; + impucontact->next->prev = impucontact->prev; } impu->linked_contacts.numcontacts--;

1 0

git:master:f2db229a: ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact
by frie 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: f2db229ae450d6443da51950976e92d5eaa7ecd0 URL: https://github.com/kamailio/kamailio/commit/f2db229ae450d6443da51950976e92d… Author: frie <peter.friedrich(a)kapsch.net> Committer: frie <peter.friedrich(a)kapsch.net> Date: 2018-06-12T16:44:06+02:00 ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact impurecord.c: corrected small bug in remove_impucontact_from_list() --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/f2db229ae450d6443da51950976e92d… Patch: https://github.com/kamailio/kamailio/commit/f2db229ae450d6443da51950976e92d… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 6510d85aa1..20c8a64154 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1102,10 +1102,11 @@ int remove_impucontact_from_list(impurecord_t* impu, impu_contact_t *impucontact } else if (contact == impu->linked_contacts.tail->contact) { LM_DBG("deleting tail\n"); impu->linked_contacts.tail = impu->linked_contacts.tail->prev; + impu->linked_contacts.tail->next = 0; } else { LM_DBG("deleting mid list\n"); impucontact->prev->next = impucontact->next; - impucontact->prev = impucontact->next->prev; + impucontact->next->prev = impucontact->prev; } impu->linked_contacts.numcontacts--;

1 0

[kamailio/kamailio] ims_usrloc_scscf: bugfix erraneous unlinking of deleted contact (#1562)
by Christoph VALENTIN 20 Jun '18

20 Jun '18

impurecord.c: corrected small bug in remove_impucontact_from_list()   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally against Version 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  corrected 2 small bugs in function remove_impucontact_from_list: nullify tail->next if tail removed in remove mid-list the pointer to previous contact was not set correctly These issues were brought up by https://github.com/thulasizwe-n at another pull request: https://github.com/kamailio/kamailio/pull/1547#issuecomment-395767031 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1562 -- Commit Summary -- * ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1562.patch https://github.com/kamailio/kamailio/pull/1562.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/1562

2 2

git:master:9a72a8ab: Merge pull request #1561 from tdimitrov/pcscf-secagree-dealloc
by GitHub 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: 9a72a8ab26b281102bd6813d6c80adac6aecb88b URL: https://github.com/kamailio/kamailio/commit/9a72a8ab26b281102bd6813d6c80ada… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-20T08:26:29+02:00 Merge pull request #1561 from tdimitrov/pcscf-secagree-dealloc Proper deallocation for the ipsec parameters in contact for IMS PCSCF modules --- Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/9a72a8ab26b281102bd6813d6c80ada… Patch: https://github.com/kamailio/kamailio/commit/9a72a8ab26b281102bd6813d6c80ada… --- diff --git a/src/modules/ims_registrar_pcscf/sec_agree.c b/src/modules/ims_registrar_pcscf/sec_agree.c index bc72272189..099dbbfff3 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.c +++ b/src/modules/ims_registrar_pcscf/sec_agree.c @@ -69,7 +69,7 @@ static int process_sec_agree_param(str name, str value, ipsec_t *ret) SEC_COPY_STR_PARAM(ret->mod, value); } else if(strncasecmp(name.s, "ealg", name.len) == 0) { - SEC_COPY_STR_PARAM(ret->r_alg, value); + SEC_COPY_STR_PARAM(ret->r_ealg, value); } else if(strncasecmp(name.s, "spi-c", name.len) == 0) { ret->spi_uc = parse_digits(value); @@ -201,20 +201,27 @@ static security_t* parse_sec_agree(struct hdr_field* h) return params; cleanup: - if(params) { + // The same piece of code also lives in modules/ims_usrloc_pcscf/pcontact.c + // Function - free_security() + // Keep them in sync! + if (params) { shm_free(params->sec_header.s); - if(params->data.ipsec) { + if(params->type == SECURITY_IPSEC && params->data.ipsec) { + shm_free(params->data.ipsec->ealg.s); + shm_free(params->data.ipsec->r_ealg.s); + shm_free(params->data.ipsec->ck.s); + shm_free(params->data.ipsec->alg.s); shm_free(params->data.ipsec->r_alg.s); + shm_free(params->data.ipsec->ik.s); shm_free(params->data.ipsec->prot.s); shm_free(params->data.ipsec->mod.s); - shm_free(params->data.ipsec->ealg.s); - shm_free(params->data.ipsec); } shm_free(params); } + return NULL; } diff --git a/src/modules/ims_registrar_pcscf/sec_agree.h b/src/modules/ims_registrar_pcscf/sec_agree.h index 421f30075b..958a79ca3b 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.h +++ b/src/modules/ims_registrar_pcscf/sec_agree.h @@ -32,6 +32,4 @@ */ security_t* cscf_get_security(struct sip_msg *msg); -void free_security_t(security_t *params); - #endif // SEC_AGREE_H diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 60d6b28132..76297bf1d9 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -112,6 +112,11 @@ void free_ppublic(ppublic_t* _p) shm_free(_p); } + +// The same piece of code also lives in modules/ims_registrar_pcscf/sec_agree.c +// Function - parse_sec_agree() +// goto label - cleanup +// Keep them in sync! void free_security(security_t* _p) { if (!_p) @@ -137,8 +142,9 @@ void free_security(security_t* _p) case SECURITY_TLS: shm_free(_p->data.tls); break; - - default: // Nothing to deallocate + + case SECURITY_NONE: + //Nothing to deallocate break; }

1 0

git:master:18f7771a: ims_usrloc_pcscf: Update comment for free_security()
by Tsvetomir Dimitrov 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: 18f7771a8ce74e03b942a41095c6325f43ddb32f URL: https://github.com/kamailio/kamailio/commit/18f7771a8ce74e03b942a41095c6325… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-06-11T17:19:22+03:00 ims_usrloc_pcscf: Update comment for free_security() --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/18f7771a8ce74e03b942a41095c6325… Patch: https://github.com/kamailio/kamailio/commit/18f7771a8ce74e03b942a41095c6325… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 60d6b28132..76297bf1d9 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -112,6 +112,11 @@ void free_ppublic(ppublic_t* _p) shm_free(_p); } + +// The same piece of code also lives in modules/ims_registrar_pcscf/sec_agree.c +// Function - parse_sec_agree() +// goto label - cleanup +// Keep them in sync! void free_security(security_t* _p) { if (!_p) @@ -137,8 +142,9 @@ void free_security(security_t* _p) case SECURITY_TLS: shm_free(_p->data.tls); break; - - default: // Nothing to deallocate + + case SECURITY_NONE: + //Nothing to deallocate break; }

1 0

git:master:2a0bef40: ims_registrar_pcscf: Updated security_t deallocation in sec_agree.c. Fix parsing of ealg parameter.
by Tsvetomir Dimitrov 20 Jun '18

20 Jun '18

Module: kamailio Branch: master Commit: 2a0bef409ddd9d8e29963553bb3c4e2e77d36ffb URL: https://github.com/kamailio/kamailio/commit/2a0bef409ddd9d8e29963553bb3c4e2… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-06-11T17:08:42+03:00 ims_registrar_pcscf: Updated security_t deallocation in sec_agree.c. Fix parsing of ealg parameter. --- Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h --- Diff: https://github.com/kamailio/kamailio/commit/2a0bef409ddd9d8e29963553bb3c4e2… Patch: https://github.com/kamailio/kamailio/commit/2a0bef409ddd9d8e29963553bb3c4e2… --- diff --git a/src/modules/ims_registrar_pcscf/sec_agree.c b/src/modules/ims_registrar_pcscf/sec_agree.c index bc72272189..099dbbfff3 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.c +++ b/src/modules/ims_registrar_pcscf/sec_agree.c @@ -69,7 +69,7 @@ static int process_sec_agree_param(str name, str value, ipsec_t *ret) SEC_COPY_STR_PARAM(ret->mod, value); } else if(strncasecmp(name.s, "ealg", name.len) == 0) { - SEC_COPY_STR_PARAM(ret->r_alg, value); + SEC_COPY_STR_PARAM(ret->r_ealg, value); } else if(strncasecmp(name.s, "spi-c", name.len) == 0) { ret->spi_uc = parse_digits(value); @@ -201,20 +201,27 @@ static security_t* parse_sec_agree(struct hdr_field* h) return params; cleanup: - if(params) { + // The same piece of code also lives in modules/ims_usrloc_pcscf/pcontact.c + // Function - free_security() + // Keep them in sync! + if (params) { shm_free(params->sec_header.s); - if(params->data.ipsec) { + if(params->type == SECURITY_IPSEC && params->data.ipsec) { + shm_free(params->data.ipsec->ealg.s); + shm_free(params->data.ipsec->r_ealg.s); + shm_free(params->data.ipsec->ck.s); + shm_free(params->data.ipsec->alg.s); shm_free(params->data.ipsec->r_alg.s); + shm_free(params->data.ipsec->ik.s); shm_free(params->data.ipsec->prot.s); shm_free(params->data.ipsec->mod.s); - shm_free(params->data.ipsec->ealg.s); - shm_free(params->data.ipsec); } shm_free(params); } + return NULL; } diff --git a/src/modules/ims_registrar_pcscf/sec_agree.h b/src/modules/ims_registrar_pcscf/sec_agree.h index 421f30075b..958a79ca3b 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.h +++ b/src/modules/ims_registrar_pcscf/sec_agree.h @@ -32,6 +32,4 @@ */ security_t* cscf_get_security(struct sip_msg *msg); -void free_security_t(security_t *params); - #endif // SEC_AGREE_H

1 0

[kamailio/kamailio] Proper deallocation for the ipsec parameters in contact for IMS PCSCF modules (#1561)
by Tsvetomir Dimitrov 20 Jun '18

20 Jun '18

#### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [ X] Commits are split per component (core, individual modules, libs, utils, ...) - [ X] Each component has a single commit (if not, squash them into one commit) - [ X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The patch contains two fixes for sec-agree parameters handling in: - module ims_registar_pcscf: ealg is read in wrong field of struct ipsec_t (was in r_alg, shoud be in r_ealg) - modules ims_registar_pcscf and ims_userloc_pcscf: struct ipsec_t is correctly deallocated from contact. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1561 -- Commit Summary -- * ims_registrar_pcscf: Updated security_t deallocation in sec_agree.c. Fix parsing of ealg parameter. * ims_usrloc_pcscf: Update comment for free_security() -- File Changes -- M src/modules/ims_registrar_pcscf/sec_agree.c (17) M src/modules/ims_registrar_pcscf/sec_agree.h (2) M src/modules/ims_usrloc_pcscf/pcontact.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1561.patch https://github.com/kamailio/kamailio/pull/1561.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/1561

2 2

[kamailio] set_contact_alias is not applied (#445)
by Olle E. Johansson 20 Jun '18

20 Jun '18

If I run set_contact_alias nothing happens - the contact remains the same on the outbound message There's no error returned and debug logs indicate a proper header However, if I add "msg_apply_changes()" on the line after set_contact_alias the Contact sent to next hop has the alias content No other changes --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/445

3 19

git:5.1:af57a5a9: dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..)
by Henning Westerholt 19 Jun '18

19 Jun '18

Module: kamailio Branch: 5.1 Commit: af57a5a9c19c6e8a26248a97c05d8e9de95a2691 URL: https://github.com/kamailio/kamailio/commit/af57a5a9c19c6e8a26248a97c05d8e9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:36:20+02:00 dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..) (cherry picked from commit 60fc36982d804466dd2a38f8c47e05e3cbf20ad9) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/af57a5a9c19c6e8a26248a97c05d8e9… Patch: https://github.com/kamailio/kamailio/commit/af57a5a9c19c6e8a26248a97c05d8e9… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 1a27842254..8ed9dce1d3 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -35,7 +35,7 @@ dmq_api_t dlg_dmqb; dmq_peer_t* dlg_dmq_peer = NULL; dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; -int dmq_send_all_dlgs(); +int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync();

1 0

git:5.0:941097d8: dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..)
by Henning Westerholt 19 Jun '18

19 Jun '18

Module: kamailio Branch: 5.0 Commit: 941097d8faa5974d87587187d7725460106846b8 URL: https://github.com/kamailio/kamailio/commit/941097d8faa5974d87587187d772546… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:35:59+02:00 dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..) (cherry picked from commit 60fc36982d804466dd2a38f8c47e05e3cbf20ad9) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/941097d8faa5974d87587187d772546… Patch: https://github.com/kamailio/kamailio/commit/941097d8faa5974d87587187d772546… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 1a27842254..8ed9dce1d3 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -35,7 +35,7 @@ dmq_api_t dlg_dmqb; dmq_peer_t* dlg_dmq_peer = NULL; dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; -int dmq_send_all_dlgs(); +int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync();

1 0

git:5.0:89585896: dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613)
by Henning Westerholt 19 Jun '18

19 Jun '18

Module: kamailio Branch: 5.0 Commit: 89585896ed388f492b357218d66abf6b2c42e496 URL: https://github.com/kamailio/kamailio/commit/89585896ed388f492b357218d66abf6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:34:31+02:00 dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613) (cherry picked from commit d8800d458386a7e35a523f33886f3b148697fa46) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/89585896ed388f492b357218d66abf6… Patch: https://github.com/kamailio/kamailio/commit/89585896ed388f492b357218d66abf6… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 56ef5a473a..6baf7ddaf4 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -121,8 +121,6 @@ str empty_str = STR_NULL; /* statistic variables */ int dlg_enable_stats = 1; -int active_dlgs_cnt = 0; -int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; int dlg_timeout_noreset = 0; @@ -733,11 +731,6 @@ static int child_init(int rank) } } - if (rank==1) { - if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt); - if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); - } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index f4f7448327..0b9d77ce89 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -80,8 +80,6 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; -extern int active_dlgs_cnt; -extern int early_dlgs_cnt; #define SET_STR_VALUE(_val, _str)\ @@ -376,10 +374,8 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) dlg->state = VAL_INT(values+8); if (dlg->state==DLG_STATE_CONFIRMED_NA || dlg->state==DLG_STATE_CONFIRMED) { - active_dlgs_cnt++; if_update_stat(dlg_enable_stats, active_dlgs, 1); } else if (dlg->state==DLG_STATE_EARLY) { - early_dlgs_cnt++; if_update_stat(dlg_enable_stats, early_dlgs, 1); }

1 0

git:5.1:d8800d45: dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613)
by Henning Westerholt 19 Jun '18

19 Jun '18

Module: kamailio Branch: 5.1 Commit: d8800d458386a7e35a523f33886f3b148697fa46 URL: https://github.com/kamailio/kamailio/commit/d8800d458386a7e35a523f33886f3b1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:33:05+02:00 dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/d8800d458386a7e35a523f33886f3b1… Patch: https://github.com/kamailio/kamailio/commit/d8800d458386a7e35a523f33886f3b1… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7fb5013afb..1cf14fce07 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -126,8 +126,6 @@ str empty_str = STR_NULL; /* statistic variables */ int dlg_enable_stats = 1; -int active_dlgs_cnt = 0; -int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; int dlg_timeout_noreset = 0; @@ -745,11 +743,6 @@ static int child_init(int rank) } } - if (rank==1) { - if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt); - if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); - } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index f4f7448327..0b9d77ce89 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -80,8 +80,6 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; -extern int active_dlgs_cnt; -extern int early_dlgs_cnt; #define SET_STR_VALUE(_val, _str)\ @@ -376,10 +374,8 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) dlg->state = VAL_INT(values+8); if (dlg->state==DLG_STATE_CONFIRMED_NA || dlg->state==DLG_STATE_CONFIRMED) { - active_dlgs_cnt++; if_update_stat(dlg_enable_stats, active_dlgs, 1); } else if (dlg->state==DLG_STATE_EARLY) { - early_dlgs_cnt++; if_update_stat(dlg_enable_stats, early_dlgs, 1); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018