- 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: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: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: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: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: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: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

[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: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

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

git:master:78c68974: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 78c6897492d7846acdcf5af21c4c8839aff0b09b URL: https://github.com/kamailio/kamailio/commit/78c6897492d7846acdcf5af21c4c883… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-19T19:16:29+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/78c6897492d7846acdcf5af21c4c883… Patch: https://github.com/kamailio/kamailio/commit/78c6897492d7846acdcf5af21c4c883…

1 0

git:master:3c410368: dispatcher: docs - fixed closing tag for xml itemizedlist
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 3c41036806dc1468ecf53b6753dc430df639b02b URL: https://github.com/kamailio/kamailio/commit/3c41036806dc1468ecf53b6753dc430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T19:03:53+02:00 dispatcher: docs - fixed closing tag for xml itemizedlist --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c41036806dc1468ecf53b6753dc430… Patch: https://github.com/kamailio/kamailio/commit/3c41036806dc1468ecf53b6753dc430… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 20512651ca..b113b284fd 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1316,7 +1316,7 @@ if(ds_select("1", "$var(a)")) { a variable holding an integer value. </para> </listitem> - <itemizedlist> + </itemizedlist> <para> If the bit 2 in 'flags' is set, the rest of the addresses from the destination groups are stored in XAVP list (limited with an optional 'limit'

1 0

git:master:1c8d5206: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 1c8d5206c26c4c3897761cdd38341182a143087f URL: https://github.com/kamailio/kamailio/commit/1c8d5206c26c4c3897761cdd3834118… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-19T19:01:38+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/1c8d5206c26c4c3897761cdd3834118… Patch: https://github.com/kamailio/kamailio/commit/1c8d5206c26c4c3897761cdd3834118…

1 0

git:master:8446409d: dispatcher: documentation for ds_select_routes()
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 8446409d77fe82a38eec772bbcf92bea34d44e35 URL: https://github.com/kamailio/kamailio/commit/8446409d77fe82a38eec772bbcf92be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T18:53:13+02:00 dispatcher: documentation for ds_select_routes() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8446409d77fe82a38eec772bbcf92be… Patch: https://github.com/kamailio/kamailio/commit/8446409d77fe82a38eec772bbcf92be… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 19c68bf4b3..20512651ca 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1276,6 +1276,77 @@ if(ds_select("1", "$var(a)")) { exit; } ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_select_routes"> + <title> + <function moreinfo="none">ds_select_routes(rules, mode [, limit])</function> + </title> + <para> + The method selects destinations following the rules combining groups add + algorithms, controlling where the first destination address is pushed, + and optionally setting a limit of selected addresses. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>rules</emphasis> - a string in the format + "grp1=alg1;grp2=alg2;...grpN=algN", where grpX is an integer number + identifying a dispatcher set id and algN is a dispatcher algorithm + identifier. No white spaces should be given in the parameter value. + The parameter can contain pseudo-variables. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - control where to push the first + selected target address. Valid values are: '0', 'd' or 'D' to push + the address in destination URI; '1', 'r' or 'R' to push the address + in R-URI; '2', 'x' or 'X' to push the address only in the XAVP when + failure rerouting is enabled. Note that only first character of the + parameter matters, therefore once case use a more meaningful value + such as 'ruri' instead of 'r'. The parameter can contain pseudo + variables. + </para> + </listitem> + <listitem> + <para><emphasis>limit</emphasis> - a positive integer value to + restrict the number of selected target addresses. If it is 0, then + no limit is considered. The parameter can be a static integer or + a variable holding an integer value. + </para> + </listitem> + <itemizedlist> + <para> + If the bit 2 in 'flags' is set, the rest of the addresses from the + destination groups are stored in XAVP list (limited with an optional 'limit' + parameter). You can execute 'ds_next_domain()' or 'ds_next_dst()' to use + next address to achieve serial forking to all possible destinations. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_select_routes</function> usage</title> + <programlisting format="linespecific"> +... +$var(alg) = 4; +$var(limit) = 8; +if(ds_select_routes("1=4;2=$var(alg)", "ruri", "$var(limit)")) { + t_on_failure("REROUTE"); + t_relay(); + exit; +} +failure_route[REROUTE] { + if(t_check_status("408|5[0-9][0-9]")) { + if(ds_next_domain()) { + t_on_failure("REROUTE"); + t_relay(); + exit; + } + } +} +... </programlisting> </example> </section>

1 0

git:master:6d9ff00f: core: fixup helper for functions with spve, spve and igp params
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 6d9ff00f2dc0a893162b2aa8aa28b0a835b58a2e URL: https://github.com/kamailio/kamailio/commit/6d9ff00f2dc0a893162b2aa8aa28b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T15:48:48+02:00 core: fixup helper for functions with spve, spve and igp params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/6d9ff00f2dc0a893162b2aa8aa28b0a… Patch: https://github.com/kamailio/kamailio/commit/6d9ff00f2dc0a893162b2aa8aa28b0a… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index df3775f6cd..9c8a9535b5 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -641,6 +641,30 @@ int fixup_free_spve_igp(void** param, int param_no) return E_UNSPEC; } +/** + * + */ +int fixup_spve_spve_igp(void** param, int param_no) +{ + if(param_no==1 || param_no==2) + return fixup_spve_null(param, 1); + if(param_no==3) + return fixup_igp_null(param, 1); + return E_UNSPEC; +} + +/** + * + */ +int fixup_free_spve_spve_igp(void** param, int param_no) +{ + if(param_no==1 || param_no==2) + return fixup_free_spve_null(param, 1); + if(param_no==3) + return fixup_free_igp_null(param, 1); + return E_UNSPEC; +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index e78b2d2df0..b3ab9b91ae 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -146,6 +146,9 @@ int fixup_free_spve_igp(void** param, int param_no); int fixup_spve_pvar(void** param, int param_no); int fixup_free_spve_pvar(void** param, int param_no); +int fixup_spve_spve_igp(void** param, int param_no); +int fixup_free_spve_spve_igp(void** param, int param_no); + int fixup_none_spve(void** param, int param_no); int fixup_free_none_spve(void** param, int param_no);

1 0

git:master:3933a64c: dispatcher: new function ds_select_routing(rules, mode, [limit])
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 3933a64c464acfb285ea10175b6ef699ed464543 URL: https://github.com/kamailio/kamailio/commit/3933a64c464acfb285ea10175b6ef69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T18:34:00+02:00 dispatcher: new function ds_select_routing(rules, mode, [limit]) - select target addresses from a combination of groups and algorithms, control where the first destination is pushed and optionally set a limit --- 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/3933a64c464acfb285ea10175b6ef69… Patch: https://github.com/kamailio/kamailio/commit/3933a64c464acfb285ea10175b6ef69…

1 0

git:master:458d40eb: presence: dmq - init jdoc var earlier for proper cleanup in case of errors
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 458d40eb9cb202a18724062ffd0ea455e4d75d6d URL: https://github.com/kamailio/kamailio/commit/458d40eb9cb202a18724062ffd0ea45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T08:22:58+02:00 presence: dmq - init jdoc var earlier for proper cleanup in case of errors --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/458d40eb9cb202a18724062ffd0ea45… Patch: https://github.com/kamailio/kamailio/commit/458d40eb9cb202a18724062ffd0ea45… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 4cba168a55..9ce259eeaa 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -236,6 +236,7 @@ int pres_dmq_handle_msg( } *pres_dmq_recv = 1; + srjson_InitDoc(&jdoc, NULL); if(!msg->content_length) { LM_ERR("no content length header found\n"); @@ -258,7 +259,6 @@ int pres_dmq_handle_msg( /* parse body */ LM_DBG("body: %.*s\n", body.len, body.s); - srjson_InitDoc(&jdoc, NULL); jdoc.buf = body; if(jdoc.root == NULL) {

1 0

git:master:a19a18e3: json: removed obsoleted libsjon macro is_error()
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: a19a18e376a054460eb194d7d5c37687af06d4a5 URL: https://github.com/kamailio/kamailio/commit/a19a18e376a054460eb194d7d5c3768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T08:18:36+02:00 json: removed obsoleted libsjon macro is_error() --- Modified: src/modules/json/json_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a19a18e376a054460eb194d7d5c3768… Patch: https://github.com/kamailio/kamailio/commit/a19a18e376a054460eb194d7d5c3768… --- diff --git a/src/modules/json/json_funcs.c b/src/modules/json/json_funcs.c index 360bfc172c..b99d6f7d9c 100644 --- a/src/modules/json/json_funcs.c +++ b/src/modules/json/json_funcs.c @@ -173,7 +173,7 @@ struct json_object *tr_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:master:4a1293f3: json: free pv in case of failure inside json_tr_eval()
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 4a1293f38b75bcf63fbd2a7ee4410d3b10d1f6a7 URL: https://github.com/kamailio/kamailio/commit/4a1293f38b75bcf63fbd2a7ee4410d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T08:11:44+02:00 json: free pv in case of failure inside json_tr_eval() --- Modified: src/modules/json/json_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/4a1293f38b75bcf63fbd2a7ee4410d3… Patch: https://github.com/kamailio/kamailio/commit/4a1293f38b75bcf63fbd2a7ee4410d3… --- diff --git a/src/modules/json/json_trans.c b/src/modules/json/json_trans.c index 4287d692a3..e200ef7084 100644 --- a/src/modules/json/json_trans.c +++ b/src/modules/json/json_trans.c @@ -282,11 +282,13 @@ int json_tr_eval( LM_ERR("cannot get spve_value from TR_PARAM_STRING : " "%.*s\n", tp->v.s.len, tp->v.s.s); + pkg_free(pv); return -1; } if(fixup_get_svalue(msg, (gparam_p)v1, &v2) != 0) { LM_ERR("cannot get value from TR_PARAM_STRING\n"); fixup_free_spve_null(&v1, 1); + pkg_free(pv); return -1; } fixup_free_spve_null(&v1, 1);

1 0

[kamailio/kamailio] [dialog] stats incremented twice (#1566)
by Julien Chavanton 18 Jun '18

18 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description As you can see looking at the modifications stats counters where increment twice. Hi @oej, If you find a few minutes you could review this MR. Not sure if you remember, this was introduced in a bug fix (see below) I kept some of your modifications, they seem more strait forward anyway. ``` commit b0cd09d2b451005a736396e6f38eac139ec31301 Author: Olle E. Johansson <oej(a)edvina.net> Date: Wed May 11 21:59:44 2016 +0200 dialog Make sure statistics are updated when initializing from database Issue #424 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1566 -- Commit Summary -- * [dialog] stats incremented twice -- File Changes -- M src/modules/dialog/dialog.c (7) M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1566.patch https://github.com/kamailio/kamailio/pull/1566.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/1566

2 5

git:master:9317175c: dialog: dlg stats incremented twice
by Henning Westerholt 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 9317175c71c2c4a613e3b25a401f27c6316fcb34 URL: https://github.com/kamailio/kamailio/commit/9317175c71c2c4a613e3b25a401f27c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-18T23:17:25+02:00 dialog: dlg stats incremented twice --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/9317175c71c2c4a613e3b25a401f27c… Patch: https://github.com/kamailio/kamailio/commit/9317175c71c2c4a613e3b25a401f27c… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 9ae2ce8090..83883a4fac 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -130,8 +130,6 @@ int dlg_h_id_step = 1; /* 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; @@ -768,11 +766,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 eb1d97d7b7..d759140018 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; extern int dlg_h_id_start; extern int dlg_h_id_step; @@ -414,10 +412,8 @@ 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:master:f665c765: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: f665c7651d14442cac10163051ab49166907dd12 URL: https://github.com/kamailio/kamailio/commit/f665c7651d14442cac10163051ab491… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-18T13:01:44+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/f665c7651d14442cac10163051ab491… Patch: https://github.com/kamailio/kamailio/commit/f665c7651d14442cac10163051ab491…

1 0

git:master:4e4053ca: dispatcher: documentation for ds_db_extra_attrs param
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 4e4053ca0312bc856321203613e9a6a026b7a3cd URL: https://github.com/kamailio/kamailio/commit/4e4053ca0312bc856321203613e9a6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T12:53:20+02:00 dispatcher: documentation for ds_db_extra_attrs param --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e4053ca0312bc856321203613e9a6a… Patch: https://github.com/kamailio/kamailio/commit/4e4053ca0312bc856321203613e9a6a… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 501a07d7fb..19c68bf4b3 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -955,6 +955,33 @@ end </example> </section> + <section id="dispatcher.p.ds_db_extra_attrs"> + <title><varname>ds_db_extra_attrs</varname> (str)</title> + <para> + Set a list of column names to be loaded from database dispatcher table + and be concatenated to 'attrs' field. The format is: + 'aname1=cname1;aname2=cname2;...;anameN=cnameN'. + </para> + <para> + The 'anameX' is the attribute name and 'cnameX' is column name. The + additional columns must be added to database dispatcher table and their + type must be VARCHAR (string). + </para> + <para> + <emphasis> + Default value is <quote>empty</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_db_extra_attrs</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:433577dd: dispatcher: new paraemter ds_db_extra_attrs
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 433577ddfca4cbfc1147168297dba611f89a5a00 URL: https://github.com/kamailio/kamailio/commit/433577ddfca4cbfc1147168297dba61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T12:45:19+02:00 dispatcher: new paraemter ds_db_extra_attrs - allow specifying database table columns to be loaded in the attrs field --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/433577ddfca4cbfc1147168297dba61… Patch: https://github.com/kamailio/kamailio/commit/433577ddfca4cbfc1147168297dba61…

1 0

git:master:927ddcf0: db_perlvdb: unref in case of error
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 927ddcf084b637385df103fb489d843e0255f4f8 URL: https://github.com/kamailio/kamailio/commit/927ddcf084b637385df103fb489d843… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T10:00:14+02:00 db_perlvdb: unref in case of error --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/927ddcf084b637385df103fb489d843… Patch: https://github.com/kamailio/kamailio/commit/927ddcf084b637385df103fb489d843… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index 677f09a850..f263774658 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -263,9 +263,9 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { /* Fetch column definitions */ colarrayref = perlvdb_perlmethod(perlres, PERL_VDB_COLDEFSMETHOD, NULL, NULL, NULL, NULL); - if (!(SvROK(colarrayref))) goto error; + if (colarrayref==NULL || !(SvROK(colarrayref))) goto error; colarray = (AV *)SvRV(colarrayref); - if (!(SvTYPE(colarray) == SVt_PVAV)) goto error; + if (colarray==NULL || !(SvTYPE(colarray) == SVt_PVAV)) goto error; colcount = av_len(colarray) + 1; @@ -305,7 +305,7 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { } rowarray = (AV *)SvRV(rowarrayref); - if (!(SvTYPE(rowarray) == SVt_PVAV)) goto error; + if (rowarray == NULL || !(SvTYPE(rowarray) == SVt_PVAV)) goto error; rowcount = av_len(rowarray) + 1; @@ -403,10 +403,12 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { } end: - if (colarray) av_undef(colarray); + if(colarray) av_undef(colarray); if (rowarray) av_undef(rowarray); return retval; error: + if(colarray) av_undef(colarray); + if (rowarray) av_undef(rowarray); LM_CRIT("broken result set. Exiting, leaving Kamailio in unknown state.\n"); return -1; }

1 0

git:master:67d5aac3: tm: t_serial - safety checks for xavp search result
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 67d5aac30d7e44f0d19e41df88fce39f67192483 URL: https://github.com/kamailio/kamailio/commit/67d5aac30d7e44f0d19e41df88fce39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:47:15+02:00 tm: t_serial - safety checks for xavp search result --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/67d5aac30d7e44f0d19e41df88fce39… Patch: https://github.com/kamailio/kamailio/commit/67d5aac30d7e44f0d19e41df88fce39… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 019b35dbb4..8f8ee0646d 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -642,7 +642,11 @@ int ki_t_next_contacts(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -774,8 +778,7 @@ int ki_t_next_contact_flow(struct sip_msg* msg) /* Load Request-URI and branches */ t_get_this_branch_instance(msg, &this_instance); - if (this_instance.len == 0) - { + if (this_instance.len == 0) { LM_DBG("No instance on this branch\n"); return -2; } @@ -792,13 +795,10 @@ int ki_t_next_contact_flow(struct sip_msg* msg) next_xavp = xavp_get_next(xavp); vavp = xavp_get(&instance_name, xavp->val.v.xavp); - if (vavp == NULL) - { + if (vavp == NULL) { /* Does not match this instance */ goto next_xavp; - } - else - { + } else { instance = vavp->val.v.s; if ((instance.len != this_instance.len) || (strncmp(instance.s, this_instance.s, instance.len) != 0)) @@ -807,7 +807,11 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + if (vavp == NULL) { + goto next_xavp; + } else { + uri = vavp->val.v.s; + } vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -842,13 +846,27 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; + if (vavp != NULL) { + ruid = vavp->val.v.s; + } else { + ruid.s = ""; + ruid.len = 0; + } vavp = xavp_get(&ua_name, xavp->val.v.xavp); - location_ua = vavp->val.v.s; + if (vavp != NULL) { + location_ua = vavp->val.v.s; + } else { + location_ua.s = ""; + location_ua.len = 0; + } LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s'" " inst-'%.*s' ruid-'%.*s' location_ua-'%.*s'\n",

1 0

git:master:f8ae1b62: app_ruby: removed wrong assignment
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: f8ae1b6278ade0f1fb73b536774f936e2d66373a URL: https://github.com/kamailio/kamailio/commit/f8ae1b6278ade0f1fb73b536774f936… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:33:23+02:00 app_ruby: removed wrong assignment --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/f8ae1b6278ade0f1fb73b536774f936… Patch: https://github.com/kamailio/kamailio/commit/f8ae1b6278ade0f1fb73b536774f936… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 23246d7f4b..f16b15fe95 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -574,7 +574,6 @@ static VALUE app_ruby_sr_modf(int argc, VALUE* argv, VALUE self) ret = 1; act = NULL; - argc = 0; memset(rbv, 0, MAX_ACTIONS*sizeof(char*)); memset(paramv, 0, MAX_ACTIONS*sizeof(char*)); env_R = app_ruby_sr_env_get(); @@ -1070,4 +1069,4 @@ int app_ruby_kemi_export_libs(void) int app_ruby_init_rpc(void) { return 0; -} \ No newline at end of file +}

1 0

git:master:606a8d69: sipt: use static buffer to avoid pkg leak inside sipt_get_redirection_number()
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 606a8d6915f385460776b0d682b6471d2176db7f URL: https://github.com/kamailio/kamailio/commit/606a8d6915f385460776b0d682b6471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:29:17+02:00 sipt: use static buffer to avoid pkg leak inside sipt_get_redirection_number() --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/606a8d6915f385460776b0d682b6471… Patch: https://github.com/kamailio/kamailio/commit/606a8d6915f385460776b0d682b6471… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index a1f0b348d1..c4b415fa7c 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -337,7 +337,7 @@ static int sipt_get_redirection_number_nai(struct sip_msg *msg, pv_param_t *para static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - char *sb_s_buf = pkg_malloc(sizeof(char) * (26)); + static char sb_s_buf[26]; str body; body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len);

1 0

git:master:5f91017c: log_custom: check return code for udp send
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 5f91017c0393faa02201ccc3693fee6381ea691a URL: https://github.com/kamailio/kamailio/commit/5f91017c0393faa02201ccc3693fee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:22:38+02:00 log_custom: check return code for udp send --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5f91017c0393faa02201ccc3693fee6… Patch: https://github.com/kamailio/kamailio/commit/5f91017c0393faa02201ccc3693fee6… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f88a783b7c..e635baf75e 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -148,7 +148,9 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) n += snprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, "(%d) ", my_pid()); n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); - udp_send(&_lc_udp_dst, obuf, n); + if(udp_send(&_lc_udp_dst, obuf, n)!=0) { + LM_DBG("udp send returned non zero\n"); + } } int ki_log_udp(sip_msg_t *msg, str *txt)

1 0

git:5.0:93539394: core: better protection against invalid name lookup in DNS caching support
by Henning Westerholt 17 Jun '18

17 Jun '18

Module: kamailio Branch: 5.0 Commit: 93539394b22a1c755821b09574b93d72d34d7689 URL: https://github.com/kamailio/kamailio/commit/93539394b22a1c755821b09574b93d7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:25:58+02:00 core: better protection against invalid name lookup in DNS caching support (cherry picked from commit 74847c386f627ba89a0cb282e85d653388d45e24) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/93539394b22a1c755821b09574b93d7… Patch: https://github.com/kamailio/kamailio/commit/93539394b22a1c755821b09574b93d7… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 5d35c52dee..04f230b7cc 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -536,6 +536,13 @@ inline static struct dns_hash_entry* _dns_hash_find(str* name, int type, ret=0; now=get_ticks_raw(); *err=0; + + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!name->s || name->len <= 0)) { + LM_ERR("invalid name, no cache lookup possible\n"); + *err=-1; + return 0; + } again: *h=dns_hash_no(name->s, name->len, type); #ifdef DNS_CACHE_DEBUG

1 0

git:5.1:191d970e: core: better protection against invalid name lookup in DNS caching support
by Henning Westerholt 17 Jun '18

17 Jun '18

Module: kamailio Branch: 5.1 Commit: 191d970eb1815109c6c6d273da3481afc856f396 URL: https://github.com/kamailio/kamailio/commit/191d970eb1815109c6c6d273da3481a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:25:44+02:00 core: better protection against invalid name lookup in DNS caching support (cherry picked from commit 74847c386f627ba89a0cb282e85d653388d45e24) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/191d970eb1815109c6c6d273da3481a… Patch: https://github.com/kamailio/kamailio/commit/191d970eb1815109c6c6d273da3481a… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 43ceb93ff6..ab91a2077a 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -536,6 +536,13 @@ inline static struct dns_hash_entry* _dns_hash_find(str* name, int type, ret=0; now=get_ticks_raw(); *err=0; + + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!name->s || name->len <= 0)) { + LM_ERR("invalid name, no cache lookup possible\n"); + *err=-1; + return 0; + } again: *h=dns_hash_no(name->s, name->len, type); #ifdef DNS_CACHE_DEBUG

1 0

git:master:2f278aa5: dispatcher: fix compile warning - unused variable 'buf' in ds_add_xavp_record
by Henning Westerholt 17 Jun '18

17 Jun '18

Module: kamailio Branch: master Commit: 2f278aa565e2ee991205f109dc887b106d7d9c24 URL: https://github.com/kamailio/kamailio/commit/2f278aa565e2ee991205f109dc887b1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:23:05+02:00 dispatcher: fix compile warning - unused variable 'buf' in ds_add_xavp_record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2f278aa565e2ee991205f109dc887b1… Patch: https://github.com/kamailio/kamailio/commit/2f278aa565e2ee991205f109dc887b1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index f5707c11e2..9caaaca8e8 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1802,7 +1802,6 @@ int ds_add_xavp_record(ds_set_t *dsidx, int pos, int set, int alg, { sr_xavp_t *nxavp=NULL; sr_xval_t nxval; - char buf[2 + 16 + 1]; /* add destination uri field */ memset(&nxval, 0, sizeof(sr_xval_t));

1 0

git:master:74847c38: core: better protection against invalid name lookup in DNS caching support
by Henning Westerholt 17 Jun '18

17 Jun '18

Module: kamailio Branch: master Commit: 74847c386f627ba89a0cb282e85d653388d45e24 URL: https://github.com/kamailio/kamailio/commit/74847c386f627ba89a0cb282e85d653… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:13:51+02:00 core: better protection against invalid name lookup in DNS caching support --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/74847c386f627ba89a0cb282e85d653… Patch: https://github.com/kamailio/kamailio/commit/74847c386f627ba89a0cb282e85d653… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 554c7c9903..d9fc6a21cc 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -510,6 +510,13 @@ inline static struct dns_hash_entry* _dns_hash_find(str* name, int type, ret=0; now=get_ticks_raw(); *err=0; + + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!name->s || name->len <= 0)) { + LM_ERR("invalid name, no cache lookup possible\n"); + *err=-1; + return 0; + } again: *h=dns_hash_no(name->s, name->len, type); LM_DBG("(%.*s(%d), %d), h=%d\n", name->len, name->s, name->len, type, *h);

1 0

git:master:b55b6fa1: dispatcher: added ds_set_dst() and dst_set_domain()
by Daniel-Constantin Mierla 15 Jun '18

15 Jun '18

Module: kamailio Branch: master Commit: b55b6fa199828669e48354c10607541d9ae05184 URL: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T08:54:02+02:00 dispatcher: added ds_set_dst() and dst_set_domain() - unlike the ds_next_...() variants, these functions just push to destination the current xavp_dst, without consuming it --- 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/b55b6fa199828669e48354c10607541… Patch: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541…

2 2

git:master:94385af9: dispatcher: fixed the conflict in the function names and api
by Daniel-Constantin Mierla 15 Jun '18

15 Jun '18

Module: kamailio Branch: master Commit: 94385af9143e4b320f05dad501ccb5c446b5048b URL: https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T13:33:45+02:00 dispatcher: fixed the conflict in the function names and api --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c… Patch: https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 18e4f51bc3..f5707c11e2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1663,7 +1663,7 @@ int ds_load_unset(struct sip_msg *msg) /** * */ -static inline int ds_update_dst( +static inline int ds_push_dst( struct sip_msg *msg, str *uri, struct socket_info *sock, int mode) { struct action act; @@ -2065,7 +2065,7 @@ int ds_select_dst_limit( hash = i; if(mode!=DS_SETOP_XAVP) { - if(ds_update_dst(msg, &idx->dlist[hash].uri, idx->dlist[hash].sock, + if(ds_push_dst(msg, &idx->dlist[hash].uri, idx->dlist[hash].sock, mode) != 0) { LM_ERR("cannot set next hop address with: %.*s\n", idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); @@ -2208,7 +2208,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return -1; } - if(ds_update_dst(msg, &lxavp->val.v.s, sock, mode) != 0) { + if(ds_push_dst(msg, &lxavp->val.v.s, sock, mode) != 0) { LM_ERR("cannot set dst addr: %.*s\n", lxavp->val.v.s.len, lxavp->val.v.s.s); return -1; @@ -3053,6 +3053,11 @@ void ds_ht_timer(unsigned int ticks, void *param) return; } +int ds_next_dst_api(sip_msg_t *msg, int mode) +{ + return ds_update_dst(msg, DS_USE_NEXT, mode); +} + int bind_dispatcher(dispatcher_api_t *api) { if(!api) { @@ -3060,7 +3065,7 @@ int bind_dispatcher(dispatcher_api_t *api) return -1; } api->select = ds_select_dst; - api->next = ds_next_dst; + api->next = ds_next_dst_api; api->mark = ds_mark_dst; api->is_from = ds_is_from_list; return 0;

1 0

git:master:145e3a1e: core: raw sock - reset the rcv_msg and proper test for totlen
by Daniel-Constantin Mierla 15 Jun '18

15 Jun '18

Module: kamailio Branch: master Commit: 145e3a1e461dd53fb1e06bae619d20a09dcffe75 URL: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T11:50:31+02:00 core: raw sock - reset the rcv_msg and proper test for totlen --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a… Patch: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a… --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index a8beb6691e..9dd65d2340 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -228,6 +228,7 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, iov[0].iov_base=buf; iov[0].iov_len=len; + memset(&rcv_msg, 0, sizeof(struct msghdr)); rcv_msg.msg_name=from; rcv_msg.msg_namelen=sockaddru_len(*from); rcv_msg.msg_control=msg_ctrl_buf; @@ -603,7 +604,7 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, int ret; totlen = len + sizeof(hdr); - if (unlikely(totlen) > 65535) + if (unlikely(totlen > 65535)) return -2; memset(&snd_msg, 0, sizeof(snd_msg)); snd_msg.msg_name=&to->sin;

1 0

git:master:d988af9d: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 15 Jun '18

15 Jun '18

Module: kamailio Branch: master Commit: d988af9dcdfd739fe33aa3b381c9668367647b8b URL: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-15T09:01:57+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668… Patch: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668…

1 0

git:master:540450a2: dispatcher: documentation for ds_set_dst() and ds_next_domain()
by Daniel-Constantin Mierla 15 Jun '18

15 Jun '18

Module: kamailio Branch: master Commit: 540450a223a536e0ee8f63ae62c45b5f6c6bb522 URL: https://github.com/kamailio/kamailio/commit/540450a223a536e0ee8f63ae62c45b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T08:55:24+02:00 dispatcher: documentation for ds_set_dst() and ds_next_domain() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/540450a223a536e0ee8f63ae62c45b5… Patch: https://github.com/kamailio/kamailio/commit/540450a223a536e0ee8f63ae62c45b5… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 2706683ed5..501a07d7fb 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1276,6 +1276,30 @@ if(ds_select("1", "$var(a)")) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> </section> + <section id="dispatcher.f.ds_set_dst"> + <title> + <function moreinfo="none">ds_set_dst()</function> + </title> + <para> + Takes the current destination address from the corresponding XAVPs + and sets the dst_uri (outbound proxy address). + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + </section> + <section id="dispatcher.f.ds_set_domain"> + <title> + <function moreinfo="none">ds_set_domain()</function> + </title> + <para> + Takes the current destination address from the corresponding XAVPs + and sets the domain part of the request URI. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + </section> <section id="dispatcher.f.ds_mark_dst"> <title> <function moreinfo="none">ds_mark_dst([state])</function>

1 0

git:master:3b412293: db_redis: Fix memleaks on delete
by Andreas Granig 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 3b412293c559c955bb2447cb24cb3ab27efb9ad9 URL: https://github.com/kamailio/kamailio/commit/3b412293c559c955bb2447cb24cb3ab… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-06-14T15:49:11+02:00 db_redis: Fix memleaks on delete Make sure to release pkg memory on delete operations. Improve error handling to avoid segfault on broken connection. Warn on full table scans to help improve key definition. --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/db_redis_mod.h Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_dbase.h Modified: src/modules/db_redis/redis_table.c Modified: src/modules/db_redis/redis_table.h --- Diff: https://github.com/kamailio/kamailio/commit/3b412293c559c955bb2447cb24cb3ab… Patch: https://github.com/kamailio/kamailio/commit/3b412293c559c955bb2447cb24cb3ab…

1 0

git:master:502d503d: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 502d503d77a6fc0420db1cace84e839c3b593b9e URL: https://github.com/kamailio/kamailio/commit/502d503d77a6fc0420db1cace84e839… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-14T15:31:36+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/502d503d77a6fc0420db1cace84e839… Patch: https://github.com/kamailio/kamailio/commit/502d503d77a6fc0420db1cace84e839… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 40cf564576..a3baacf621 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1941,12 +1941,12 @@ kamcmd dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 Parameters: * callid - callid of dialog to be terminated * from_tag - from tag of the dialog to terminated - * totag - to tag of the dialog to terminated + * to_tag - to tag of the dialog to terminated The command works only for confirmed dialogs. RPC Command Format: - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 9.6. dlg.end_dlg

1 0

git:master:a10d04dd: dialog: docs - fixed example for rpc dlg.terminate_dlg
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: a10d04ddca3a357e8e589a4c3eaba7989dce7de9 URL: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T15:29:16+02:00 dialog: docs - fixed example for rpc dlg.terminate_dlg --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… Patch: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index a1bc8959a1..e1d2bc275d 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2462,7 +2462,7 @@ if(has_totag()) { <emphasis>from_tag</emphasis> - from tag of the dialog to terminated </para></listitem> <listitem><para> - <emphasis>totag</emphasis> - to tag of the dialog to terminated + <emphasis>to_tag</emphasis> - to tag of the dialog to terminated </para></listitem> </itemizedlist> <para> @@ -2470,7 +2470,7 @@ if(has_totag()) { </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 </programlisting> </section> <section>

1 0

git:master:5daba2fa: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 5daba2fad6e757192e7ca4b90f1267f5e4dd0923 URL: https://github.com/kamailio/kamailio/commit/5daba2fad6e757192e7ca4b90f1267f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-14T10:31:49+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/5daba2fad6e757192e7ca4b90f1267f… Patch: https://github.com/kamailio/kamailio/commit/5daba2fad6e757192e7ca4b90f1267f… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index db70cdbad4..b5686cb6b1 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -91,6 +91,7 @@ Carsten Bock 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) 3.47. server_id_filter (int) + 3.48. version_table (integer) 4. RPC Commands @@ -185,6 +186,7 @@ Carsten Bock 1.45. Set db_timer_clean parameter 1.46. Set rm_expired_delay parameter 1.47. Set server_id_filter parameter + 1.48. version_table parameter usage Chapter 1. Admin Guide @@ -248,6 +250,7 @@ Chapter 1. Admin Guide 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) 3.47. server_id_filter (int) + 3.48. version_table (integer) 4. RPC Commands @@ -374,6 +377,7 @@ Chapter 1. Admin Guide 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) 3.47. server_id_filter (int) + 3.48. version_table (integer) 3.1. nat_bflag (integer) @@ -1015,6 +1019,18 @@ modparam("usrloc", "rm_expired_delay", 30) modparam("usrloc", "server_id_filter", 1) ... +3.48. version_table (integer) + + If set to 0, the module will skip checking the version for location + table. + + Default value is “1 (check for table version)”. + + Example 1.48. version_table parameter usage +... +modparam("usrloc", "version_table", 0) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:f20c90e9: usrloc: docs for version_table parameter
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: f20c90e9adb98f3957134ef809dd0be1cac011f9 URL: https://github.com/kamailio/kamailio/commit/f20c90e9adb98f3957134ef809dd0be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T10:29:55+02:00 usrloc: docs for version_table parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f20c90e9adb98f3957134ef809dd0be… Patch: https://github.com/kamailio/kamailio/commit/f20c90e9adb98f3957134ef809dd0be… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 2e9bdb3ff9..5ef4bad77a 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1220,6 +1220,25 @@ modparam("usrloc", "server_id_filter", 1) </example> </section> + <section id="usrloc.p.version_table"> + <title><varname>version_table</varname> (integer)</title> + <para> + If set to 0, the module will skip checking the version + for location table. + </para> + <para> + Default value is <quote>1 (check for table version)</quote>. + </para> + <example> + <title><varname>version_table</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "version_table", 0) +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:da922966: usrloc: new parameter version_table
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: da922966f0576cd500b455bfa3dca792611b14eb URL: https://github.com/kamailio/kamailio/commit/da922966f0576cd500b455bfa3dca79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T10:27:42+02:00 usrloc: new parameter version_table - set it to 0 to disable checking the version for location table --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/da922966f0576cd500b455bfa3dca79… Patch: https://github.com/kamailio/kamailio/commit/da922966f0576cd500b455bfa3dca79… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 77eecc5aed..b236de23ad 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -43,6 +43,8 @@ #include "usrloc_mod.h" +extern int ul_version_table; + /*! \brief Global list of all registered domains */ dlist_t* root = 0; @@ -645,7 +647,8 @@ int register_udomain(const char* _n, udomain_t** _d) goto err; } - if(db_check_table_version(&ul_dbf, con, &s, UL_TABLE_VERSION) < 0) { + if(ul_version_table != 0 + && db_check_table_version(&ul_dbf, con, &s, UL_TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); goto err; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index d0f8d22b6f..21d17e553c 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -112,6 +112,7 @@ int ul_db_ops_ruid = 1; int ul_expires_type = 0; int ul_db_raw_fetch_type = 0; int ul_rm_expired_delay = 0; +int ul_version_table = 1; str ul_xavp_contact_name = {0}; @@ -240,6 +241,7 @@ static param_export_t params[] = { {"server_id_filter", PARAM_INT, &ul_db_srvid}, {"db_timer_clean", PARAM_INT, &ul_db_timer_clean}, {"rm_expired_delay", PARAM_INT, &ul_rm_expired_delay}, + {"version_table", PARAM_INT, &ul_version_table}, {0, 0, 0} };

1 0

git:5.0:6c99d6bf: core: fix Makefile.defs errors to include raw socket support
by Henning Westerholt 14 Jun '18

14 Jun '18

Module: kamailio Branch: 5.0 Commit: 6c99d6bf7c3372fbc5484c5b8664eba988a0edfd URL: https://github.com/kamailio/kamailio/commit/6c99d6bf7c3372fbc5484c5b8664eba… Author: Edwin Fine <edwin(a)2600hz.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-14T08:37:18+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… (cherry picked from commit 1d4ee7720c6f609077e4497189103f9a950f4194) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6c99d6bf7c3372fbc5484c5b8664eba… Patch: https://github.com/kamailio/kamailio/commit/6c99d6bf7c3372fbc5484c5b8664eba… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a0ed23218b..dbf6191e8c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes)

1 0

git:5.1:a04c9310: core: fix Makefile.defs errors to include raw socket support
by Henning Westerholt 14 Jun '18

14 Jun '18

Module: kamailio Branch: 5.1 Commit: a04c931064d1332a7c23264a33268d3ecec793a2 URL: https://github.com/kamailio/kamailio/commit/a04c931064d1332a7c23264a33268d3… Author: Edwin Fine <edwin(a)2600hz.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-14T08:36:14+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… (cherry picked from commit 1d4ee7720c6f609077e4497189103f9a950f4194) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a04c931064d1332a7c23264a33268d3… Patch: https://github.com/kamailio/kamailio/commit/a04c931064d1332a7c23264a33268d3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3b1066da95..9b809b8bfa 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes)

1 0

[kamailio/kamailio] Kamailio 5.1.x builds without raw socket support due to Makefile error (#1565)
by Edwin Fine 14 Jun '18

14 Jun '18

### Description Kamailio compiles without raw sockets support, even though `src/Makefile.defs` should enable that by default, according to the Makefile. ### Troubleshooting Not applicable. #### Reproduction Build kamailio on Debian 8.10 Linux using the standard `Makefile.defs`, and add `udp4_raw = 0` to the config file. You should get the warning shown in the log message provided below. #### Debugging Data Not applicable #### Log Messages ``` kamailio[89847]: WARNING: <core> [core/cfg.y:3427]: warn_at(): warning in config file <redacted>, line 66, column 12: raw socket support not compiled in ``` #### SIP Traffic Not Applicable ### Possible Solutions This is the solution proposed in PR #1564. ``` diff --git a/src/Makefile.defs b/src/Makefile.defs index 428a236..3a2480c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian 8.10 Kernel 3.16.0-4-amd64 #1 SMP Debian 3.16.51-3 (2017-12-13) x86_64 GNU/Linux ``` -- 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/1565

2 2

[kamailio/kamailio] core: fix Makefile.defs error to include raw socket support (#1564)
by Edwin Fine 14 Jun '18

14 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Compiling kamailio on Linux, unless `RAW_SOCKS` is set up otherwise, should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][]: #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above change, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1564 -- Commit Summary -- * core: fix Makefile.defs error to include raw socket support -- File Changes -- M src/Makefile.defs (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1564.patch https://github.com/kamailio/kamailio/pull/1564.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/1564

2 2

git:master:1d4ee772: core: fix Makefile.defs errors to include raw socket support
by Henning Westerholt 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 1d4ee7720c6f609077e4497189103f9a950f4194 URL: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9… Author: Edwin Fine <edwin(a)2600hz.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-14T08:22:49+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9… Patch: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 428a23674a..8e76de7687 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes)

1 0

git:master:5f7eee55: sqlops: increased the length of printed query part in case of errors
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 5f7eee55c648cfa1b5b5662648fc9133daa6d6b6 URL: https://github.com/kamailio/kamailio/commit/5f7eee55c648cfa1b5b5662648fc913… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T08:04:31+02:00 sqlops: increased the length of printed query part in case of errors --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5f7eee55c648cfa1b5b5662648fc913… Patch: https://github.com/kamailio/kamailio/commit/5f7eee55c648cfa1b5b5662648fc913… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 21fbfa950f..b33bc0d0e6 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:master:a57a96f8: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 13 Jun '18

13 Jun '18

Module: kamailio Branch: master Commit: a57a96f8fea3a5f7bff068ab0ea0d4c17c15bb65 URL: https://github.com/kamailio/kamailio/commit/a57a96f8fea3a5f7bff068ab0ea0d4c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-13T09:16:56+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a57a96f8fea3a5f7bff068ab0ea0d4c… Patch: https://github.com/kamailio/kamailio/commit/a57a96f8fea3a5f7bff068ab0ea0d4c… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 74a03703b8..9c42d44698 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -496,10 +496,16 @@ Note 3.12. xavp_dst_mode (int) Control what fields are added to the XAVP specified by xavp_dst - parameter. The addeded fields are: the set id (group id), the URI - address, socket pointer, and destination unique id in case of call load - distribution algorithm. The attributes are added if xavp_dst_mode does - not have the bit 1 set. + parameter. + + The addeded fields are: + * grp - the set id (group id). + * uri - the URI address. + * sock - the socket pointer. + * dstid - the destination unique id (in case of call load + distribution algorithm). + * attrs - the attributes - they are added if xavp_dst_mode does not + have the bit 1 set. Default value is “0” (add all fields). @@ -1529,10 +1535,8 @@ modparam("tm", "fr_inv_timer", 40000) modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) -modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") -modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") -modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") -modparam("dispatcher", "sock_avp", "$avp(AVP_SOCK)") +modparam("dispatcher", "xavp_dst", "_dsdst_") +modparam("dispatcher", "xavp_ctx", "_dsctx_") ####### Routing Logic ######## @@ -1544,25 +1548,27 @@ request_route { # per request initial checks route(REQINIT); - # handle requests within SIP dialogs - route(WITHINDLG); - - ### only initial requests (no To tag) - # CANCEL processing - if (is_method("CANCEL")) - { - if (t_check_trans()) - t_relay(); + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } exit; } # handle retransmissions - if(t_precheck_trans()) { + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } t_check_trans(); - exit; } - t_check_trans(); + + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers @@ -1673,7 +1679,8 @@ route[DISPATCH] { send_reply("404", "No destination"); exit; } - xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); + xdbg("--- SCRIPT: going to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs) +)\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; @@ -1688,6 +1695,8 @@ failure_route[RTF_DISPATCH] { if (t_check_status("500") or (t_branch_timeout() and !t_branch_replied())) { if(ds_next_dst()) { + xdbg("--- SCRIPT: retrying to <$ru> via <$du> (attrs: $x +avp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit;

1 0

git:master:5799e272: dispatcher: detailed the subfields of xavp_dst for xavp_dst_mode param
by Daniel-Constantin Mierla 13 Jun '18

13 Jun '18

Module: kamailio Branch: master Commit: 5799e2722ad1d7df24548a0e19319b56a78a126b URL: https://github.com/kamailio/kamailio/commit/5799e2722ad1d7df24548a0e19319b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-13T09:01:07+02:00 dispatcher: detailed the subfields of xavp_dst for xavp_dst_mode param --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5799e2722ad1d7df24548a0e19319b5… Patch: https://github.com/kamailio/kamailio/commit/5799e2722ad1d7df24548a0e19319b5… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index f0636b4ab3..2706683ed5 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -328,10 +328,27 @@ modparam("dispatcher", "force_dst", 1) <title><varname>xavp_dst_mode</varname> (int)</title> <para> Control what fields are added to the XAVP specified by xavp_dst - parameter. The addeded fields are: the set id (group id), the URI - address, socket pointer, and destination unique id in case of call load - distribution algorithm. The attributes are added if xavp_dst_mode does - not have the bit 1 set. + parameter. + </para> + <para> + The addeded fields are: + <itemizedlist> + <listitem> + grp - the set id (group id). + </listitem> + <listitem> + uri - the URI address. + </listitem> + <listitem> + sock - the socket pointer. + </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. + </listitem> + </itemizedlist> </para> <para> <emphasis>

1 0

[kamailio/kamailio] ims_usrloc_scscf: bugfix Contct is removed when old Contct expires (#1547)
by Christoph VALENTIN 12 Jun '18

12 Jun '18

in function unlink_contact_from_impu() (in file impurecord.c) an assignment "=" is used instead of a comparision operator "==". This leads to mess, when old contact expires.   #### 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 versus release 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This is the pull request for branch 5.1, which has been created by "cherry-pick" from the original commit You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1547 -- Commit Summary -- * ims_usrloc_scscf: bugfix Contct is removed when old Contct expires -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1547.patch https://github.com/kamailio/kamailio/pull/1547.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/1547

3 4

git:master:79378819: dispatcher: docs - updated sample config
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: 793788196669499aa633e2495a372449ba4db4e0 URL: https://github.com/kamailio/kamailio/commit/793788196669499aa633e2495a37244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T11:51:34+02:00 dispatcher: docs - updated sample config --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/793788196669499aa633e2495a37244… Patch: https://github.com/kamailio/kamailio/commit/793788196669499aa633e2495a37244… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index f5634e45a6..7c2610ccf0 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -118,10 +118,8 @@ modparam("tm", "fr_inv_timer", 40000) modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) -modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") -modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") -modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") -modparam("dispatcher", "sock_avp", "$avp(AVP_SOCK)") +modparam("dispatcher", "xavp_dst", "_dsdst_") +modparam("dispatcher", "xavp_ctx", "_dsctx_") ####### Routing Logic ######## @@ -133,25 +131,27 @@ request_route { # per request initial checks route(REQINIT); - # handle requests within SIP dialogs - route(WITHINDLG); - - ### only initial requests (no To tag) - # CANCEL processing - if (is_method("CANCEL")) - { - if (t_check_trans()) - t_relay(); + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } exit; } # handle retransmissions - if(t_precheck_trans()) { + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } t_check_trans(); - exit; } - t_check_trans(); + + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers @@ -259,7 +259,7 @@ route[DISPATCH] { send_reply("404", "No destination"); exit; } - xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); + xdbg("--- SCRIPT: going to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; @@ -274,6 +274,7 @@ failure_route[RTF_DISPATCH] { if (t_check_status("500") or (t_branch_timeout() and !t_branch_replied())) { if(ds_next_dst()) { + xdbg("--- SCRIPT: retrying to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit;

1 0

git:master:c9e5b863: dispatcher: add xavp after the previous one
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: c9e5b863c7f6fa37752a34aab87bca36951a0c9d URL: https://github.com/kamailio/kamailio/commit/c9e5b863c7f6fa37752a34aab87bca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T10:14:49+02:00 dispatcher: add xavp after the previous one - more natural way to add the xapvs and fixes the case when limit was given and destinations with lower priority made it in the xavp --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c9e5b863c7f6fa37752a34aab87bca3… Patch: https://github.com/kamailio/kamailio/commit/c9e5b863c7f6fa37752a34aab87bca3…

1 0

git:master:151299d0: core: xavp - new helper function xavp_add_value_after()
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: 151299d057f858277d32c360221f7a93542c40d3 URL: https://github.com/kamailio/kamailio/commit/151299d057f858277d32c360221f7a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T10:14:26+02:00 core: xavp - new helper function xavp_add_value_after() --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/151299d057f858277d32c360221f7a9… Patch: https://github.com/kamailio/kamailio/commit/151299d057f858277d32c360221f7a9… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e6acefd9c9..e1cf394171 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -195,6 +195,26 @@ sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) return avp; } +sr_xavp_t *xavp_add_value_after(str *name, sr_xval_t *val, sr_xavp_t *pxavp) +{ + sr_xavp_t *avp=0; + + avp = xavp_new_value(name, val); + if (avp==NULL) + return NULL; + + /* link new xavp */ + if(pxavp) { + avp->next = pxavp->next; + pxavp->next = avp; + } else { + avp->next = *_xavp_list_crt; + *_xavp_list_crt = avp; + } + + return avp; +} + sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list) { sr_xavp_t *ravp=0; diff --git a/src/core/xavp.h b/src/core/xavp.h index 2177461d69..83f4f09b15 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -78,6 +78,7 @@ int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp); sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list); +sr_xavp_t *xavp_add_value_after(str *name, sr_xval_t *val, sr_xavp_t *pxavp); sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_get(str *name, sr_xavp_t *start);

1 0

git:master:21addddd: dispatcher: store socket pointer in xavp instead serializing address to string
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: 21addddda9a520f6f1aace3ac3f25de897e60e4d URL: https://github.com/kamailio/kamailio/commit/21addddda9a520f6f1aace3ac3f25de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:48:44+02:00 dispatcher: store socket pointer in xavp instead serializing address to string --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/21addddda9a520f6f1aace3ac3f25de… Patch: https://github.com/kamailio/kamailio/commit/21addddda9a520f6f1aace3ac3f25de… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 15d17b36c0..a63f150308 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1836,9 +1836,8 @@ int ds_add_xavp_record(ds_set_t *dsidx, int pos, int set, int alg) if(dsidx->dlist[pos].sock) { memset(&nxval, 0, sizeof(sr_xval_t)); - nxval.type = SR_XTYPE_STR; - nxval.v.s.len = 1 + sprintf(buf, "%p", dsidx->dlist[pos].sock); - nxval.v.s.s = buf; + nxval.type = SR_XTYPE_VPTR; + nxval.v.vptr = dsidx->dlist[pos].sock; if(xavp_add_value(&ds_xavp_dst_sock, &nxval, &nxavp)==NULL) { xavp_destroy_list(&nxavp); LM_ERR("failed to add destination sock xavp field\n"); @@ -2203,11 +2202,9 @@ int ds_next_dst(struct sip_msg *msg, int mode) } lxavp = xavp_get(&ds_xavp_dst_sock, rxavp); - if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_VPTR) { LM_DBG("socket enforced in next destination record\n"); - if(sscanf(lxavp->val.v.s.s, "%p", (void **)&sock) != 1) { - sock = NULL; - } + sock = lxavp->val.v.vptr; } lxavp = xavp_get(&ds_xavp_dst_addr, rxavp);

1 0

git:master:f056213c: core: xavp - helper functions to get last by name and add after an item
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: f056213ca78c94419450f45fd3b26e9328c1a731 URL: https://github.com/kamailio/kamailio/commit/f056213ca78c94419450f45fd3b26e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:49:38+02:00 core: xavp - helper functions to get last by name and add after an item --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f056213ca78c94419450f45fd3b26e9… Patch: https://github.com/kamailio/kamailio/commit/f056213ca78c94419450f45fd3b26e9… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index c8ff12365f..e6acefd9c9 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -162,6 +162,19 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) return 0; } +int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) +{ + if(pxavp==NULL) { + nxavp->next = *_xavp_list_crt; + *_xavp_list_crt = nxavp; + } else { + nxavp->next = pxavp->next; + pxavp->next = nxavp; + } + + return 0; +} + sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) { sr_xavp_t *avp=0; @@ -305,6 +318,22 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) return NULL; } +sr_xavp_t *xavp_get_last(str *xname, sr_xavp_t **list) +{ + sr_xavp_t *prev; + sr_xavp_t *crt; + + crt = xavp_get_internal(xname, list, 0, 0); + + prev = NULL; + + while(crt) { + prev = crt; + crt = xavp_get_next(prev); + } + + return prev; +} int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head) { diff --git a/src/core/xavp.h b/src/core/xavp.h index 839e486523..2177461d69 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -76,12 +76,14 @@ void xavp_free(sr_xavp_t *xa); int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list); +int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp); sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_get(str *name, sr_xavp_t *start); sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start); sr_xavp_t *xavp_get_next(sr_xavp_t *start); +sr_xavp_t *xavp_get_last(str *xname, sr_xavp_t **list); int xavp_rm_by_name(str *name, int all, sr_xavp_t **head); int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head); int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head);

1 0

git:master:d82ccbd9: core: xavp - extended to hold a bare void pointer value
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: d82ccbd9480c96e12b7fa668a1a950e2873a834c URL: https://github.com/kamailio/kamailio/commit/d82ccbd9480c96e12b7fa668a1a950e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:25:59+02:00 core: xavp - extended to hold a bare void pointer value - useful to link data that doesn't need cloning or freeing --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/d82ccbd9480c96e12b7fa668a1a950e… Patch: https://github.com/kamailio/kamailio/commit/d82ccbd9480c96e12b7fa668a1a950e… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index c9529a02f6..c8ff12365f 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -522,6 +522,9 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); xavp_print_list_content(&avp->val.v.xavp, level+1); break; + case SR_XTYPE_VPTR: + LM_INFO(" XAVP value: <vptr:%p>\n", avp->val.v.vptr); + break; case SR_XTYPE_DATA: LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; diff --git a/src/core/xavp.h b/src/core/xavp.h index 8014bc5694..839e486523 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -35,6 +35,7 @@ typedef enum { SR_XTYPE_LONG, /* long value */ SR_XTYPE_LLONG, /* long long value */ SR_XTYPE_XAVP, /* xavp value */ + SR_XTYPE_VPTR, /* void pointer value */ SR_XTYPE_DATA /* custom data value */ } sr_xtype_t; @@ -57,6 +58,7 @@ typedef struct _sr_xval { long l; long long ll; struct _sr_xavp *xavp; /* must be given in shm (not cloned) */ + void *vptr; /* void pointer - address copied, not freed */ sr_data_t *data; /* must be given in shm (not cloned) */ } v; } sr_xval_t;

1 0

git:master:d445ae6b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: d445ae6bdb9adbf6c35c8518e21c7657dfc6583a URL: https://github.com/kamailio/kamailio/commit/d445ae6bdb9adbf6c35c8518e21c765… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-12T09:16:43+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d445ae6bdb9adbf6c35c8518e21c765… Patch: https://github.com/kamailio/kamailio/commit/d445ae6bdb9adbf6c35c8518e21c765…

1 0

git:master:422e7dbd: dispatcher: docs updated removing avp params and adding xavp params
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: 422e7dbd0bebc14d6a4cc43e7f59326de00f24b0 URL: https://github.com/kamailio/kamailio/commit/422e7dbd0bebc14d6a4cc43e7f59326… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:01:50+02:00 dispatcher: docs updated removing avp params and adding xavp params --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/422e7dbd0bebc14d6a4cc43e7f59326… Patch: https://github.com/kamailio/kamailio/commit/422e7dbd0bebc14d6a4cc43e7f59326…

1 0

git:master:f6960f87: dispatcher: added defines for dst address update operations
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: f6960f8771fc0689f6923c58a3e5d683434a6a11 URL: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:01:50+02:00 dispatcher: added defines for dst address update operations --- 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/f6960f8771fc0689f6923c58a3e5d68… Patch: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68…

1 0

git:master:11ff4226: dispatcher: use xavps instead of avps
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: 11ff4226dea81582fd97661701142abbf5348911 URL: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:01:50+02:00 dispatcher: use xavps instead of avps - removed avp names parameters - new parameters: - xavp_dst - name of the xavp to store destination records - xavp_dst_mode - control the fields added to xavp_dst - xavp_ctx - name of the xavp to store context attributes - xavp_ctx_mode - control the fields added to xavp_ctx --- 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/11ff4226dea81582fd97661701142ab… Patch: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab…

1 0

[kamailio/kamailio] src/Makefile: fix source code revision output (#1560)
by Mikko Lehto 12 Jun '18

12 Jun '18

I noticed that ```kamailio -I``` and ```kamailio -V``` do not give git version hash anymore. This commit fixes at least kamailio -I and -V output, I think. I don't know / remember if further adjustment is needed for other REPO_ constants. # Before ``` #define REPO_VER "" #define REPO_HASH "unknown" #define REPO_STATE "" ``` ``` $ src/kamailio -I|grep Source Source code revision ID: unknown ``` # After ``` #define REPO_VER "5c48b2" #define REPO_HASH "5c48b2" #define REPO_STATE "" ``` ``` $ src/kamailio -I|grep Source Source code revision ID: 5c48b2 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1560 -- Commit Summary -- * src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again -- File Changes -- M src/Makefile (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1560.patch https://github.com/kamailio/kamailio/pull/1560.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/1560

2 2

git:master:7585a570: src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again
by Henning Westerholt 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: 7585a57037f6ef21cda376b16b0077fa981eceac URL: https://github.com/kamailio/kamailio/commit/7585a57037f6ef21cda376b16b0077f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-12T08:19:23+02:00 src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/7585a57037f6ef21cda376b16b0077f… Patch: https://github.com/kamailio/kamailio/commit/7585a57037f6ef21cda376b16b0077f… --- 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:master:ebd207ad: modules: readme files regenerated - mqueue ... [skip ci]
by Kamailio Dev 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: ebd207ade41ccdfec687d85e210c32ffe9a7e6b0 URL: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-11T18:16:43+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README Modified: src/modules/rtpproxy/README Modified: src/modules/sdpops/README Modified: src/modules/tmx/README --- Diff: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f… Patch: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f… --- diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index 118cc534c8..860887af56 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -200,7 +200,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); 5. Exported Variables - * $mqv(mqueue) - the most recent item key fetched from the specified + * $mqk(mqueue) - the most recent item key fetched from the specified mqueue * $mqv(mqueue) - the most recent item value fetched from the specified mqueue diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index 556e93d66b..9b7aa5a818 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -230,7 +230,7 @@ Chapter 1. Admin Guide 4.1. rtpproxy_sock (string) - Used to define the list of RTPPRoxy instances to connect to. These can + Used to define the list of RTPProxy instances to connect to. These can be UNIX sockets or IPv4/IPv6 UDP sockets. Each modparam entry will insert sockets into a single set. If no set ID is given, the default set ID '0' will be used. To define multiple sets add the set number at diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 7e029018f9..ce0e06ec2c 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -482,7 +482,7 @@ if(sdp_with_ice()) { Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. The second - parameter can contain psudeo-variables. + parameter can contain pseudo-variables. This function can be used from ANY_ROUTE. diff --git a/src/modules/tmx/README b/src/modules/tmx/README index 81568f329d..58237382cd 100644 --- a/src/modules/tmx/README +++ b/src/modules/tmx/README @@ -264,7 +264,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { created via t_newtran() and the flags have been altered since. It is not needed to execute this function when using t_relay() (or - similar tm relay functions, flags are synchornized automatically in + similar tm relay functions, flags are synchronized automatically in that case). This function can be used from ANY_ROUTE . @@ -282,7 +282,7 @@ t_flush_flags(); been altered since. It is not needed to execute this function when using t_relay() (or - similar tm relay functions, xflags are synchornized automatically in + similar tm relay functions, xflags are synchronized automatically in that case). This function can be used from ANY_ROUTE .

1 0

git:master:f46fc58f: sdpops: fix documentation typo
by Mikko Lehto 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: f46fc58f88b41563ada32b2abb13cf47161eeb5a URL: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:53+03:00 sdpops: fix documentation typo --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4… Patch: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 37f7f2d5a7..f51dfe0a3c 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -557,7 +557,7 @@ if(sdp_with_ice()) { <para> Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. - The second parameter can contain psudeo-variables. + The second parameter can contain pseudo-variables. </para> <para> This function can be used from ANY_ROUTE.

1 0

git:master:9ba37fd6: mqueue: fix typo in variable name documentation
by Mikko Lehto 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: 9ba37fd602a67066bd49f6959350ea1fd72d5e47 URL: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:38+03:00 mqueue: fix typo in variable name documentation --- Modified: src/modules/mqueue/doc/mqueue_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1… Patch: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index f9c3493aaf..0ab18f0be0 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -207,7 +207,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); <title>Exported Variables</title> <itemizedlist> <listitem> - <emphasis>$mqv(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue + <emphasis>$mqk(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue </listitem> <listitem> <emphasis>$mqv(mqueue)</emphasis> - the most recent item value fetched from the specified mqueue

1 0

git:master:c1d10616: tmx: fix documentation typo
by Mikko Lehto 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: c1d106161819b86427a9ea7a6e6502c1922d4b6f URL: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:38+03:00 tmx: fix documentation typo --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c… Patch: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index fe630d2f76..19c808c931 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -216,7 +216,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { </para> <para> It is not needed to execute this function when using t_relay() (or - similar tm relay functions, flags are synchornized automatically in + similar tm relay functions, flags are synchronized automatically in that case). </para> <para> @@ -242,7 +242,7 @@ t_flush_flags(); </para> <para> It is not needed to execute this function when using t_relay() (or - similar tm relay functions, xflags are synchornized automatically in + similar tm relay functions, xflags are synchronized automatically in that case). </para> <para>

1 0

git:master:21c219bc: rtpproxy: mark RPC call with proper tag and small typo fix
by Mikko Lehto 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: 21c219bcdd3f74a029582cd353c5f91d91a46f3d URL: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:38+03:00 rtpproxy: mark RPC call with proper tag and small typo fix --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91… Patch: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 618f7938ef..d7f9b6de15 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -98,7 +98,7 @@ <section id="rtpproxy.p.rtpproxy_sock"> <title><varname>rtpproxy_sock</varname> (string)</title> <para> - Used to define the list of RTPPRoxy instances to connect to. + Used to define the list of RTPProxy instances to connect to. These can be UNIX sockets or IPv4/IPv6 UDP sockets. Each modparam entry will insert sockets into a single set. If no set ID is given, the default set ID '0' will be used. To define multiple sets add the set number at the beginning of each parameter followed by '=='. @@ -873,7 +873,7 @@ start_recording(); <section> <title>RPC Commands</title> <section id="rtpproxy.r.enable"> - <title>rtpproxy.enable</title> + <title><function>rtpproxy.enable</function></title> <para> Enables a rtp proxy if parameter value is greater than 0. Disables it if a zero value is given. diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 4251a9ac82..b0b7a67fcf 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -169,7 +169,7 @@ static int_str ice_candidate_priority_avp; static str rtp_inst_pv_param = {NULL, 0}; static pv_spec_t *rtp_inst_pvar = NULL; -/* array with the sockets used by rtpporxy (per process)*/ +/* array with the sockets used by rtpproxy (per process)*/ static unsigned int rtpp_no = 0; static int *rtpp_socks = 0;

1 0

git:master:72f5eaee: tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers
by Daniel-Constantin Mierla 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: 72f5eaeeef0239ebd16a2d645b83e83eb1a2b506 URL: https://github.com/kamailio/kamailio/commit/72f5eaeeef0239ebd16a2d645b83e83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-11T12:39:54+02:00 tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers --- 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/72f5eaeeef0239ebd16a2d645b83e83… Patch: https://github.com/kamailio/kamailio/commit/72f5eaeeef0239ebd16a2d645b83e83… --- 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:master:5fe2a1a1: tm: backup and restore T and T_branch in t_continue()
by Daniel-Constantin Mierla 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: 5fe2a1a1c67b550431dcae3c98701073f7edd953 URL: https://github.com/kamailio/kamailio/commit/5fe2a1a1c67b550431dcae3c9870107… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-11T12:39:53+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 --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe2a1a1c67b550431dcae3c9870107… Patch: https://github.com/kamailio/kamailio/commit/5fe2a1a1c67b550431dcae3c9870107… --- 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:e4ff0ab2: ims_registrar_pcscf: fix #1556
by Victor Seva 11 Jun '18

11 Jun '18

Module: kamailio Branch: 5.1 Commit: e4ff0ab2a86c64438251d8de969ac821f8b31309 URL: https://github.com/kamailio/kamailio/commit/e4ff0ab2a86c64438251d8de969ac82… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-11T09:14:05+02:00 ims_registrar_pcscf: fix #1556 (cherry picked from commit cddcdb3db2745ef43b5b892a20c3bd1aae439bae) --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/e4ff0ab2a86c64438251d8de969ac82… Patch: https://github.com/kamailio/kamailio/commit/e4ff0ab2a86c64438251d8de969ac82… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 9c5eba8090..bc4a2a0bec 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -130,9 +130,9 @@ int checkcontact(struct sip_msg* _m, pcontact_t * c) { break; } } else if (c->security_temp) { - switch (c->security->type) { + switch (c->security_temp->type) { case SECURITY_IPSEC: - security_server_port = c->security->data.ipsec->port_uc; + security_server_port = c->security_temp->data.ipsec->port_uc; break; case SECURITY_TLS: case SECURITY_NONE:

1 0

[kamailio/kamailio] P-CSCF crash during login(Boghe IMS client) (#1556)
by uts09 11 Jun '18

11 Jun '18

### Description Kamailio P-CSCF process is crashing during login. This issue is observed only on v5.1.4  ### Troubleshooting #### Reproduction Login using Boghe IMS client. Kamailio P-CSCF crashes and core file is generated. However process is not existing and subsequent login fails.  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [root@osboxes kamailio_pcscf]# kamailio -f /usr/local/etc/kamailio_pcscf/kamailio-pcscf.cfg loading modules under config path: /usr/local/lib64/kamailio/modules/ 0(16002) INFO: <core> [core/sctp_core.c:75]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 192.168.56.101 [192.168.56.101]:4060 Aliases: *: pcscf.ims.mnc001.mcc001.3gppnetwork.org:* WARNING: no fork mode 0(16002) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(16002) INFO: rr [rr_mod.c:175]: mod_init(): outbound module not available 0(16002) INFO: ims_usrloc_pcscf [hslot.c:62]: ul_init_locks(): locks array size 1024 0(16002) INFO: <core> [core/udp_server.c:153]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(16002) INFO: <core> [core/udp_server.c:205]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(16002) INFO: <script>: [REGISTER] from [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] to [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] 0(16002) ERROR: <script>: REGISTER (sip:alice@ims.mnc001.mcc001.3gppnetwork.org (10.0.3.2:49178) to sip:alice@ims.mnc001.mcc001.3gppnetwork.org, d0cb661a-aefd-53b6-dc11-aee832fd7123) 0(16002) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 0(16002) INFO: <script>: [REGISTER] from [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] to [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] 0(16002) ERROR: <script>: REGISTER (sip:alice@ims.mnc001.mcc001.3gppnetwork.org (10.0.3.2:49178) to sip:alice@ims.mnc001.mcc001.3gppnetwork.org, d0cb661a-aefd-53b6-dc11-aee832fd7123) 0(16002) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 0(16002) INFO: <script>: [SUBSCRIBE] from [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] to [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] 0(16002) ERROR: <script>: SUBSCRIBE (sip:alice@ims.mnc001.mcc001.3gppnetwork.org (10.0.3.2:49178) to sip:alice@ims.mnc001.mcc001.3gppnetwork.org, 988b1427-88f8-406d-1454-aeff7304dddb) Segmentation fault (core dumped) ``` #### SIP Traffic  ``` [root@osboxes ~]# tcpdump -i any port 4060 -A -s 0 -nn tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes 06:34:21.504451 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 868 E.......@... .....8e.....l .REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22613780;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Content-Length: 0 Max-Forwards: 70 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path ................ 06:34:21.505544 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, length 549 E..A....@.l...8e ........-.NSIP/2.0 100 Trying Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22613780;rport=49178;received=10.0.3.2 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Server: Kamailio P-CSCF Content-Length: 0 Warning: 392 192.168.56.101:4060 "Noisy feedback tells: pid=16002 req_src_ip=10.0.3.2 req_src_port=49178 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==1" ................ 06:34:21.507267 IP 192.168.56.101.4060 > 192.168.56.101.5060: SIP: REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 E...7f..@.L...8e..8e.....{..REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK9a2b.e288671bc5d681b0a2965b18b9e50542.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Content-Length: 0 Max-Forwards: 69 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Supported: path Require: path P-Visited-Network-ID: ims.mnc001.mcc001.3gppnetwork.org ................ 06:34:21.507486 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 100 Trying E...7g..@.N...8e..8e........SIP/2.0 100 Trying Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK9a2b.e288671bc5d681b0a2965b18b9e50542.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Server: Kamailio I-CSCF Content-Length: 0 Warning: 392 192.168.56.101:5060 "Noisy feedback tells: pid=15608 req_src_ip=192.168.56.101 req_src_port=4060 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==2" ................ 06:34:21.551488 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 401 Unauthorized - Challenging the UE E...7n..@.Np..8e..8e........SIP/2.0 401 Unauthorized - Challenging the UE Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK9a2b.e288671bc5d681b0a2965b18b9e50542.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER WWW-Authenticate: Digest realm="ims.mnc001.mcc001.3gppnetwork.org", nonce="ddae560be0664e9b2cc83c74f84bdc15", algorithm=MD5, qop="auth,auth-int" Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Server: Kamailio S-CSCF Content-Length: 0 ................ 06:34:21.552560 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, length 620 E.......@.l...8e ........t..SIP/2.0 401 Unauthorized - Challenging the UE Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER WWW-Authenticate: Digest realm="ims.mnc001.mcc001.3gppnetwork.org", nonce="ddae560be0664e9b2cc83c74f84bdc15", algorithm=MD5, qop="auth,auth-int" Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Server: Kamailio S-CSCF Content-Length: 0 ................ 06:34:21.557217 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 1194 E.......@... .....8e......5.REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22636944;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Content-Length: 0 Max-Forwards: 70 Authorization: Digest username="alice(a)ims.mnc001.mcc001.3gppnetwork.org",realm="ims.mnc001.mcc001.3gppnetwork.org",nonce="ddae560be0664e9b2cc83c74f84bdc15",uri="sip:ims.mnc001.mcc001.3gppnetwork.org",response="ef718272941cc1e294e1ddcf6023d712",algorithm=MD5,cnonce="5dd7d99b175120b4e1f76ae10320c721",qop=auth-int,nc=00000001 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path ................ 06:34:21.557722 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, length 549 E..A....@.l...8e ........-.NSIP/2.0 100 Trying Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22636944;rport=49178;received=10.0.3.2 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Server: Kamailio P-CSCF Content-Length: 0 Warning: 392 192.168.56.101:4060 "Noisy feedback tells: pid=16002 req_src_ip=10.0.3.2 req_src_port=49178 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==1" ................ 06:34:21.557999 IP 192.168.56.101.4060 > 192.168.56.101.5060: SIP: REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 E...7r..@.K{..8e..8e........REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK7b2b.a496c2fac4d8daef7f1ca3be76dace27.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Content-Length: 0 Max-Forwards: 69 Authorization: Digest username="alice(a)ims.mnc001.mcc001.3gppnetwork.org",realm="ims.mnc001.mcc001.3gppnetwork.org",nonce="ddae560be0664e9b2cc83c74f84bdc15",uri="sip:ims.mnc001.mcc001.3gppnetwork.org",response="ef718272941cc1e294e1ddcf6023d712",algorithm=MD5,cnonce="5dd7d99b175120b4e1f76ae10320c721",qop=auth-int,nc=00000001 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Supported: path Require: path P-Visited-Network-ID: ims.mnc001.mcc001.3gppnetwork.org ................ 06:34:21.558266 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 100 Trying E...7s..@.N...8e..8e........SIP/2.0 100 Trying Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK7b2b.a496c2fac4d8daef7f1ca3be76dace27.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Server: Kamailio I-CSCF Content-Length: 0 Warning: 392 192.168.56.101:5060 "Noisy feedback tells: pid=15608 req_src_ip=192.168.56.101 req_src_port=4060 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==2" ................ 06:34:21.745656 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 200 OK E. 28...@.Fx..8e..8e.... ..JSIP/2.0 200 OK Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK7b2b.a496c2fac4d8daef7f1ca3be76dace27.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Contact: <sip:alice@127.0.0.1:63775;transport=udp>;q=0;expires=536925;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:59735;transport=udp>;q=0;expires=537092;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:51120;transport=udp>;q=0;expires=537528;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:55888;transport=udp>;q=0;expires=537770;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:52925;transport=udp>;q=0;expires=539181;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:53770;transport=udp>;q=0;expires=539363;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:60390;transport=udp>;q=0;expires=539511;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:55181;transport=udp>;expires=539581;+g.3gpp.cs-voice;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";audio;+g.oma.sip-im.large-message;+g.3gpp.smsip;language="en,fr";+g.oma.sip-im, <sip:alice@127.0.0.1:49178;transport=udp>;expires=540000;+g.3gpp.cs-voice;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";audio;+g.oma.sip-im.large-message;+g.3gpp.smsip;language="en,fr";+g.oma.sip-im Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> P-Associated-URI: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Service-Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Server: Kamailio S-CSCF Content-Length: 0 ................ 06:34:21.746512 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, bad length 2490 > 1472 E..... .@.I...8e ....... ...SIP/2.0 200 OK Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Contact: <sip:alice@127.0.0.1:63775;transport=udp>;q=0;expires=536925;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:59735;transport=udp>;q=0;expires=537092;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:51120;transport=udp>;q=0;expires=537528;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:55888;transport=udp>;q=0;expires=537770;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:52925;transport=udp>;q=0;expires=539181;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:53770;transport=udp>;q=0;expires=539363;language="en";+g.3gpp.smsip;+g................. 06:34:21.752187 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 842 E..f....@... .....8e.....R..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22623420;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22629284 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 988b1427-88f8-406d-1454-aeff7304dddb CSeq: 24466 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: reg Accept: application/reginfo+xml Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ser-Agent: IM-cl 06:34:21.758539 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 865 E..}....@... .....8e.....i..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22617074;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22624198 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 58052540-fcaa-cdad-9fde-76450602aa9d CSeq: 32393 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: message-summary Accept: application/simple-message-summary Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:22.253437 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 842 E..f....@... .....8e.....R..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22623420;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22629284 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 988b1427-88f8-406d-1454-aeff7304dddb CSeq: 24466 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: reg Accept: application/reginfo+xml Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:22.259972 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 865 E..}....@... .....8e.....i..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22617074;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22624198 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 58052540-fcaa-cdad-9fde-76450602aa9d CSeq: 32393 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: message-summary Accept: application/simple-message-summary Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:23.255929 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 842 E..f....@... .....8e.....R..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22623420;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22629284 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 988b1427-88f8-406d-1454-aeff7304dddb CSeq: 24466 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: reg Accept: application/reginfo+xml Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:23.261932 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 865 E..}....@... .....8e.....i..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22617074;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22624198 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 58052540-fcaa-cdad-9fde-76450602aa9d CSeq: 32393 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: message-summary Accept: application/simple-message-summary Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@osboxes kamailio_pcscf]# kamailio -v version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 01:00:45 Jun 7 2018 with gcc 4.8.5 ``` * **Operating System**:  ``` [root@osboxes kamailio_pcscf]# uname -a Linux osboxes 3.10.0-862.3.2.el7.x86_64 #1 SMP Mon May 21 23:36:36 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1556

2 3

git:master:cddcdb3d: ims_registrar_pcscf: fix #1556
by Victor Seva 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: cddcdb3db2745ef43b5b892a20c3bd1aae439bae URL: https://github.com/kamailio/kamailio/commit/cddcdb3db2745ef43b5b892a20c3bd1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-11T09:12:43+02:00 ims_registrar_pcscf: fix #1556 --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/cddcdb3db2745ef43b5b892a20c3bd1… Patch: https://github.com/kamailio/kamailio/commit/cddcdb3db2745ef43b5b892a20c3bd1… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 9c5eba8090..bc4a2a0bec 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -130,9 +130,9 @@ int checkcontact(struct sip_msg* _m, pcontact_t * c) { break; } } else if (c->security_temp) { - switch (c->security->type) { + switch (c->security_temp->type) { case SECURITY_IPSEC: - security_server_port = c->security->data.ipsec->port_uc; + security_server_port = c->security_temp->data.ipsec->port_uc; break; case SECURITY_TLS: case SECURITY_NONE:

1 0

git:5.0:6d3c7ba9: core: dns name to IP conversion - actually stop processing in error case
by Henning Westerholt 10 Jun '18

10 Jun '18

Module: kamailio Branch: 5.0 Commit: 6d3c7ba97ef57cb10ae478a1f39ee9da818d827e URL: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-10T22:46:43+02:00 core: dns name to IP conversion - actually stop processing in error case (cherry picked from commit 55d115e255b1d87121922f689b93870b84e1b2b4) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d… Patch: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index 30cce19581..1946d25081 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -232,6 +232,7 @@ static inline struct ip_addr* str2ip(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } s=(unsigned char*)st->s; @@ -288,6 +289,7 @@ static inline struct ip_addr* str2ip6(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } /* init */ if ((st->len) && (st->s[0]=='[')){

1 0

git:5.1:2f63caf7: core: dns name to IP conversion - actually stop processing in error case
by Henning Westerholt 10 Jun '18

10 Jun '18

Module: kamailio Branch: 5.1 Commit: 2f63caf7ac87c1eca9c6f4150dc7418fa9f4fc35 URL: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-10T22:46:15+02:00 core: dns name to IP conversion - actually stop processing in error case (cherry picked from commit 55d115e255b1d87121922f689b93870b84e1b2b4) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418… Patch: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index 30cce19581..1946d25081 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -232,6 +232,7 @@ static inline struct ip_addr* str2ip(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } s=(unsigned char*)st->s; @@ -288,6 +289,7 @@ static inline struct ip_addr* str2ip6(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } /* init */ if ((st->len) && (st->s[0]=='[')){

1 0

git:master:55d115e2: core: dns name to IP conversion - actually stop processing in error case
by Henning Westerholt 10 Jun '18

10 Jun '18

Module: kamailio Branch: master Commit: 55d115e255b1d87121922f689b93870b84e1b2b4 URL: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-10T22:39:35+02:00 core: dns name to IP conversion - actually stop processing in error case --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870… Patch: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index e0089d0a19..6b1e6cff24 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -226,6 +226,7 @@ static inline struct ip_addr* str2ip(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } s=(unsigned char*)st->s; @@ -280,6 +281,7 @@ static inline struct ip_addr* str2ip6(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } /* init */ if ((st->len) && (st->s[0]=='[')){

1 0

git:master:dd4dc536: core: udp server - remove deactivated functionality from 2008, not valid anymore
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: dd4dc5361ae97b743c202360723df3cacac3259f URL: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:58:54+02:00 core: udp server - remove deactivated functionality from 2008, not valid anymore Remove decaticated functionality related zero terminated SIP messages in UPD server. 15 years ago this was a bug, but now with binary payloads its not valid anymore. No change in functionality. --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c… Patch: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index def3ac1861..862bed174d 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -515,19 +515,6 @@ int udp_rcv_loop() continue; } } -/* historically, zero-terminated packets indicated a bug in clients - * that calculated wrongly packet length and included string-terminating - * zero; today clients exist with legitimate binary payloads and we - * shall not check for zero-terminated payloads - */ -#ifdef TRASH_ZEROTERMINATED_PACKETS - if (buf[len-1]==0) { - tmp=ip_addr2a(&ri.src_ip); - LM_WARN("upstream bug - 0-terminated packet from %s %d\n", - tmp, htons(ri.src_port)); - len--; - } -#endif #endif #ifdef DBG_MSG_QA if (!dbg_msg_qa(buf, len)) {

1 0

git:master:1cd6c8da: core: cleanup dns cache DNS_LU_LST define, unchanged since 2007, no function change
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 1cd6c8da2f006a1e46ab573b4168bf2415ed2f69 URL: https://github.com/kamailio/kamailio/commit/1cd6c8da2f006a1e46ab573b4168bf2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:49:32+02:00 core: cleanup dns cache DNS_LU_LST define, unchanged since 2007, no function change Cleanup DNS caching DNS_LU_LST define, unchanged since 2007. The alternative implementation has been not seen any testing. No change in functionality. --- Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/1cd6c8da2f006a1e46ab573b4168bf2… Patch: https://github.com/kamailio/kamailio/commit/1cd6c8da2f006a1e46ab573b4168bf2…

1 0

git:master:3741a8ab: docs: remove documentation about removed dns related defines as well
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 3741a8abb4b867a6a758be11d27b3d6906978b18 URL: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:09:14+02:00 docs: remove documentation about removed dns related defines as well --- Modified: doc/tutorials/dns.txt --- Diff: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6… Patch: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6… --- diff --git a/doc/tutorials/dns.txt b/doc/tutorials/dns.txt index a4243087bf..6112954a5e 100644 --- a/doc/tutorials/dns.txt +++ b/doc/tutorials/dns.txt @@ -170,12 +170,6 @@ DNS Resolver Compile Options NAPTR support still has to be enabled from Kamailio's config file (it's off by default). - RESOLVE_DBG - if defined, the resolver will be very verbose: it will log - a lot of debugging information at L_DBG level. - - NAPTR_DBG - if defined the NAPTR related resolver functions will be very - verbose. - DNS Cache and Failover Config Variables --------------------------------------- @@ -307,9 +301,6 @@ DNS Cache Compile Options If this option is not defined (experimental), everything in the AR section will be added to the cache. - DNS_CACHE_DEBUG - if defined the DNS cache will be very verbose (it will - log lots of messages at the L_DBG levell). - Note: To remove a compile options, edit Kamailio's Makefile.defs and remove it from DEFS list. To add a compile options add it to the make command line, e.g.: make proper; make all extra_defs=-DUSE_DNS_FAILOVER

1 0

git:master:f1bcda4e: core: cleanup dns cache defines, no function change
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: f1bcda4e2e2d37ec2b5556e95b61b03907df6366 URL: https://github.com/kamailio/kamailio/commit/f1bcda4e2e2d37ec2b5556e95b61b03… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:06:23+02:00 core: cleanup dns cache defines, no function change cleanup core dns cache defines, they were set since 2006 for a bit additional debugging, no change in functionality --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/f1bcda4e2e2d37ec2b5556e95b61b03… Patch: https://github.com/kamailio/kamailio/commit/f1bcda4e2e2d37ec2b5556e95b61b03…

1 0

git:master:e963851b: core: cleanup resolver defines, no function change
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: e963851b5391e0f6267788d1bdaf5be576ca7466 URL: https://github.com/kamailio/kamailio/commit/e963851b5391e0f6267788d1bdaf5be… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T23:52:29+02:00 core: cleanup resolver defines, no function change cleanup core resolver defines, they were set since 2007 for a bit additional debugging, no change in functionality --- Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/e963851b5391e0f6267788d1bdaf5be… Patch: https://github.com/kamailio/kamailio/commit/e963851b5391e0f6267788d1bdaf5be…

1 0

[kamailio/kamailio] packaging: Fix typo in kamailio.spec (#1559)
by Edwin Fine 08 Jun '18

08 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: - [x] PR should be backported to stable branches - _probably_ - [ ] Tested changes locally (_not applicable_) - [ ] Related to issue #XXXX (_not applicable_) #### Description There is a number of occurrences in `pkg/kamailio/obs/kamailio.spec` of `%bcond_with|without rebbitmq`. Note the `e` in `rebbitmq`. Since the condition to include the `rabbitmq` package (line 633) is `%if %{with rabbitmq}` (with an `a`), this conditional statement would not have the intended effect. If this was not a deliberate typo for some reason, this commit addresses the issue by changing all `%bcond_with|without` occurrences of `rebbitmq` to `rabbitmq`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1559 -- Commit Summary -- * packaging: Fix typo in kamailio.spec -- File Changes -- M pkg/kamailio/obs/kamailio.spec (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1559.patch https://github.com/kamailio/kamailio/pull/1559.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/1559

2 2

git:master:861c52ca: packaging: Fix typo in kamailio.spec
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 861c52ca6a9ca3bd6be5e89df92c1f65b46002f4 URL: https://github.com/kamailio/kamailio/commit/861c52ca6a9ca3bd6be5e89df92c1f6… Author: Edwin Fine <efine(a)users.noreply.github.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-08T21:26:20+02:00 packaging: Fix typo in kamailio.spec There is a number of occurrences of `%bcond_with|without rebbitmq`. Since the condition to include the `rabbitmq` package (line 633) is `%if %{with rabbitmq}`, this conditional statement would not have the intended effect. If this was not a deliberate typo for some reason, this commit fixes the issue by changing all `%bcond_with|without` occurrences of `rebbitmq` to `rabbitmq`. --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/861c52ca6a9ca3bd6be5e89df92c1f6… Patch: https://github.com/kamailio/kamailio/commit/861c52ca6a9ca3bd6be5e89df92c1f6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d7f27371d3..cc53dc9e30 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -15,7 +15,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -35,7 +35,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -55,7 +55,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -75,7 +75,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_without perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_with redis %bcond_without sctp %bcond_without websocket @@ -96,7 +96,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -116,7 +116,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_without perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -136,7 +136,7 @@ %bcond_with kazoo %bcond_with memcached %bcond_with perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_with redis %bcond_with sctp %bcond_with websocket @@ -156,7 +156,7 @@ %bcond_with kazoo %bcond_with memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket

1 0

git:5.1:538ac2c5: core: make dns name to IP conversion more robust for IPv4 and IPv6
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: 5.1 Commit: 538ac2c5eeb9f2df1d896adf0661e5e35fadb504 URL: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T21:20:54+02:00 core: make dns name to IP conversion more robust for IPv4 and IPv6 (cherry picked from commit 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e… Patch: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index fad783e4e6..30cce19581 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st) static struct ip_addr ip; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } s=(unsigned char*)st->s; /*init*/ @@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st) unsigned char* limit; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } /* init */ if ((st->len) && (st->s[0]=='[')){ /* skip over [ ] */

1 0

git:5.0:11300211: core: make dns name to IP conversion more robust for IPv4 and IPv6
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: 5.0 Commit: 11300211d6562aafc654a778f25657f001a39790 URL: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T21:20:32+02:00 core: make dns name to IP conversion more robust for IPv4 and IPv6 (cherry picked from commit 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f… Patch: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index fad783e4e6..30cce19581 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st) static struct ip_addr ip; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } s=(unsigned char*)st->s; /*init*/ @@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st) unsigned char* limit; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } /* init */ if ((st->len) && (st->s[0]=='[')){ /* skip over [ ] */

1 0

git:master:4a55a2b4: core: make dns name to IP conversion more robust for IPv4 and IPv6
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc URL: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T21:16:51+02:00 core: make dns name to IP conversion more robust for IPv4 and IPv6 --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22… Patch: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index fad783e4e6..30cce19581 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st) static struct ip_addr ip; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } s=(unsigned char*)st->s; /*init*/ @@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st) unsigned char* limit; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } /* init */ if ((st->len) && (st->s[0]=='[')){ /* skip over [ ] */

1 0

git:master:6a478a24: core: bug fix in function reference for full preprocessor defines output
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 6a478a2432e04652f2f5ef5919101dd166d9ee2d URL: https://github.com/kamailio/kamailio/commit/6a478a2432e04652f2f5ef5919101dd… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T18:09:08+02:00 core: bug fix in function reference for full preprocessor defines output --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/6a478a2432e04652f2f5ef5919101dd… Patch: https://github.com/kamailio/kamailio/commit/6a478a2432e04652f2f5ef5919101dd… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index d1ceb88cef..9acc5361b0 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -1072,9 +1072,9 @@ static rpc_export_t core_rpc_methods[] = { 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, - {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, - {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, - {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_doc, RET_ARRAY}, + {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, + {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, + {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_full_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

1 0

git:master:94e7a4d8: modules: readme files regenerated - sdpops ... [skip ci]
by Kamailio Dev 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 94e7a4d862909886ef9ed9426532eee32f0262d9 URL: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-08T11:01:48+02:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee… Patch: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee… --- diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 5986d445e0..7e029018f9 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -481,7 +481,8 @@ if(sdp_with_ice()) { Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error - and -2 if there is no SDP part in the message body. + and -2 if there is no SDP part in the message body. The second + parameter can contain psudeo-variables. This function can be used from ANY_ROUTE.

1 0

[kamailio/kamailio] log_prefix do not work in failure_route (#1531)
by Jurijs Ivolga 08 Jun '18

08 Jun '18

### Description log_prefix do not work in failure_route ### Troubleshooting #### Reproduction log_prefix="{$mt $hdr(CSeq) $ci} " ... ... failure_route[RTF_LCR_ROUTE] { if (t_is_canceled()) { exit; } xlog("L_INFO", "--- SCRIPT: failure_route - RTF_LCR_ROUTE\n"); if (t_check_status("408|50[0-4]") or (t_branch_timeout() and !t_branch_replied())) { if(!next_gw()) { send_reply("503", "No more LCR gateways"); exit; } xlog("L_INFO", "flag $avp(lcr_flag) \n"); t_on_failure("RTF_LCR_ROUTE"); t_set_retr(0, 4000); route(RELAY); exit; } } #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` INFO: <script>: --- SCRIPT: failure_route - RTF_LCR_ROUTE ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.7 (x86_64/linux) 35d8ab flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 35d8ab compiled on 11:55:20 Mar 19 2018 with gcc 6.3.0 ``` * **Operating System**:  ``` Linux kamailio 4.13.0-37-generic #42~16.04.1-Ubuntu SMP Wed Mar 7 16:03:28 UTC 2018 x86_64 GNU/Linux ``` -- 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/1531

2 3

git:master:f34654a2: sdpops: docs - note that second param of ki_sdp_get_line_startswith() can have pv
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: f34654a2a0e7127ac7a2094cb8bc261e4a9c4e50 URL: https://github.com/kamailio/kamailio/commit/f34654a2a0e7127ac7a2094cb8bc261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T10:53:03+02:00 sdpops: docs - note that second param of ki_sdp_get_line_startswith() can have pv --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f34654a2a0e7127ac7a2094cb8bc261… Patch: https://github.com/kamailio/kamailio/commit/f34654a2a0e7127ac7a2094cb8bc261… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 094aaa88ad..37f7f2d5a7 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -557,6 +557,7 @@ if(sdp_with_ice()) { <para> Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. + The second parameter can contain psudeo-variables. </para> <para> This function can be used from ANY_ROUTE.

1 0

git:master:8ba8dcfe: sdpops: allow vars in second parameter for sdp_get_line_startswith()
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 8ba8dcfe425afcbca32a82e0b1fc46124f86f603 URL: https://github.com/kamailio/kamailio/commit/8ba8dcfe425afcbca32a82e0b1fc461… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T10:51:09+02:00 sdpops: allow vars in second parameter for sdp_get_line_startswith() - export sdp_get_line_startswith() to KSR kemi framework --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8ba8dcfe425afcbca32a82e0b1fc461… Patch: https://github.com/kamailio/kamailio/commit/8ba8dcfe425afcbca32a82e0b1fc461…

1 0

git:master:41067694: core: helper fixup function for none and spve parameters
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 4106769466e842f971d8aeab38cb2343cb90efdf URL: https://github.com/kamailio/kamailio/commit/4106769466e842f971d8aeab38cb234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T10:48:59+02:00 core: helper fixup function for none and spve parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/4106769466e842f971d8aeab38cb234… Patch: https://github.com/kamailio/kamailio/commit/4106769466e842f971d8aeab38cb234… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index b07adcfc26..df3775f6cd 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -664,3 +664,23 @@ int fixup_free_spve_pvar(void** param, int param_no) return fixup_free_pvar_null(param, 1); return E_UNSPEC; } + +/** + * + */ +int fixup_none_spve(void** param, int param_no) +{ + if(param_no==2) + return fixup_spve_null(param, 1); + return 0; +} + +/** + * + */ +int fixup_free_none_spve(void** param, int param_no) +{ + if(param_no==2) + return fixup_free_spve_null(param, 1); + return 0; +} \ No newline at end of file diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 869dd78527..e78b2d2df0 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -146,6 +146,9 @@ int fixup_free_spve_igp(void** param, int param_no); int fixup_spve_pvar(void** param, int param_no); int fixup_free_spve_pvar(void** param, int param_no); +int fixup_none_spve(void** param, int param_no); +int fixup_free_none_spve(void** param, int param_no); + /** get the corresp. free fixup function.*/ free_fixup_function mod_fix_get_fixup_free(fixup_function f);

1 0

git:master:7e5e5ca4: topos: docs - added section ids to parameters
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 7e5e5ca4ccf21e2644ed8e82bc5225f4432b1247 URL: https://github.com/kamailio/kamailio/commit/7e5e5ca4ccf21e2644ed8e82bc5225f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T09:20:20+02:00 topos: docs - added section ids to parameters --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e5e5ca4ccf21e2644ed8e82bc5225f… Patch: https://github.com/kamailio/kamailio/commit/7e5e5ca4ccf21e2644ed8e82bc5225f… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index a54c66ece6..857813585b 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

[kamailio/kamailio] Modules: sdpops sdp_get_line_startswith export to kemi (#1557)
by Surendra Tiwari 07 Jun '18

07 Jun '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Export the sdp_get_line_startswith function to KEMI Interface. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1557 -- Commit Summary -- * Modules: sdpops sdp_get_line_startswith export to kemi -- File Changes -- M src/modules/sdpops/sdpops_mod.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1557.patch https://github.com/kamailio/kamailio/pull/1557.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/1557

1 1

git:5.0:6935fb74: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.0 Commit: 6935fb7419d144478f67357551c0e7161639651e URL: https://github.com/kamailio/kamailio/commit/6935fb7419d144478f67357551c0e71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-07T17:46:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/6935fb7419d144478f67357551c0e71… Patch: https://github.com/kamailio/kamailio/commit/6935fb7419d144478f67357551c0e71… --- diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README index 8a098a69dc..03c3bbd61b 100644 --- a/src/modules/cfgt/README +++ b/src/modules/cfgt/README @@ -74,7 +74,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * None. + * pv. 2.2. External Libraries or Applications

1 0

git:5.0:0d9c9785: cfgt: documment that pv module has to be loaded in order to work
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.0 Commit: 0d9c9785b7891ed52eb23d0cb596cd42b4e3153d URL: https://github.com/kamailio/kamailio/commit/0d9c9785b7891ed52eb23d0cb596cd4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:37:10+02:00 cfgt: documment that pv module has to be loaded in order to work (cherry picked from commit 7d21723205ad02374364c3f0143b618d1a649d4d) --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d9c9785b7891ed52eb23d0cb596cd4… Patch: https://github.com/kamailio/kamailio/commit/0d9c9785b7891ed52eb23d0cb596cd4… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index 38490d3d87..9917a13902 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

1 0

git:5.0:adbaeee8: core: unset routename when default_routename is set
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.0 Commit: adbaeee8de57312336df571045001fb1fab259c6 URL: https://github.com/kamailio/kamailio/commit/adbaeee8de57312336df571045001fb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:36:52+02:00 core: unset routename when default_routename is set fix #1536 (cherry picked from commit 92f8fdabcffd84e315d749bae8ded3490f8de014) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/adbaeee8de57312336df571045001fb… Patch: https://github.com/kamailio/kamailio/commit/adbaeee8de57312336df571045001fb… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 53fefd34c8..f7a3f145f1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -556,23 +556,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

1 0

git:5.1:a8bbf774: cfgt: documment that pv module has to be loaded in order to work
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: a8bbf774d0c92e2c177c4a860bb18211d56186dd URL: https://github.com/kamailio/kamailio/commit/a8bbf774d0c92e2c177c4a860bb1821… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:37:19+02:00 cfgt: documment that pv module has to be loaded in order to work (cherry picked from commit 7d21723205ad02374364c3f0143b618d1a649d4d) --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a8bbf774d0c92e2c177c4a860bb1821… Patch: https://github.com/kamailio/kamailio/commit/a8bbf774d0c92e2c177c4a860bb1821… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index 38490d3d87..9917a13902 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

1 0

git:5.1:1ea010dd: core: unset routename when default_routename is set
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: 1ea010dd4db8e6486cf0fa928a2b11ffb0d441fa URL: https://github.com/kamailio/kamailio/commit/1ea010dd4db8e6486cf0fa928a2b11f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:36:15+02:00 core: unset routename when default_routename is set fix #1536 (cherry picked from commit 92f8fdabcffd84e315d749bae8ded3490f8de014) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/1ea010dd4db8e6486cf0fa928a2b11f… Patch: https://github.com/kamailio/kamailio/commit/1ea010dd4db8e6486cf0fa928a2b11f… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index cd6808d063..4d3931d419 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -562,23 +562,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

1 0

git:master:caefbb2c: modules: readme files regenerated - cfgt ... [skip ci]
by Kamailio Dev 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: caefbb2c97eed2313d5cca95fa7a510a96237377 URL: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-07T17:31:39+02:00 modules: readme files regenerated - cfgt ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… Patch: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… --- diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README index eb4ead159c..c237d1e9d1 100644 --- a/src/modules/cfgt/README +++ b/src/modules/cfgt/README @@ -74,7 +74,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * None. + * pv. 2.2. External Libraries or Applications

1 0

[kamailio/kamailio] cfgt: wrong route name if onsend_route is not declared at the beginning (#1536)
by Marco Capetta 07 Jun '18

07 Jun '18

kamailio version: kamailio 5.1.2 (x86_64/linux) If "onsend_route" routing block is defined at the beginning of the kamailio.cfg routing part, the name defined in "src/core/cfg.lex" file (DEFAULT_SEND) is used when printed in the json files. Instead, if this routing block is defined in between the configuration, its name is changed to the previous defined block. For example, if the cfg file looks like the following: route[TEST_1] { ... } onsend_route { ... } route[TEST_2] { ... } then in the output json file, the "onsend_route" block is called TEST_1. The issue doesn't happen for "request_route" block. -- 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/1536

2 2

git:master:7d217232: cfgt: documment that pv module has to be loaded in order to work
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 7d21723205ad02374364c3f0143b618d1a649d4d URL: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:16:16+02:00 cfgt: documment that pv module has to be loaded in order to work --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… Patch: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index ce6fb16c4f..c85cae4335 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

1 0

git:master:92f8fdab: core: unset routename when default_routename is set
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 92f8fdabcffd84e315d749bae8ded3490f8de014 URL: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:15:48+02:00 core: unset routename when default_routename is set fix #1536 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… Patch: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 192b488938..ddef8a03ea 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -569,23 +569,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

1 0

git:master:513a1763: dispatcher: print runtime details in rpc command output
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 513a176394247a3378ee218bf9df611da7296061 URL: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T13:05:04+02:00 dispatcher: print runtime details in rpc command output - contains dialog loads per destination if the call load algorithm is enabled --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… Patch: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index bcb085c624..72aa94d1e2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1282,7 +1282,8 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) void *sh; void *vh; void *wh; - void *lh; // latency stats handle + void *lh; + void *dh; int j; char c[3]; str data = STR_NULL; @@ -1327,23 +1328,22 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) c[1] = 'X'; if(node->dlist[j].attrs.body.s) { - if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, "FLAGS", - c, "PRIORITY", node->dlist[j].priority, "ATTRS", &wh) - < 0) { + if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, + "FLAGS", c, + "PRIORITY", node->dlist[j].priority, + "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddS", "BODY", - &(node->dlist[j].attrs.body), "DUID", - (node->dlist[j].attrs.duid.s) - ? &(node->dlist[j].attrs.duid) - : &data, - "MAXLOAD", node->dlist[j].attrs.maxload, "WEIGHT", - node->dlist[j].attrs.weight, "RWEIGHT", - node->dlist[j].attrs.rweight, "SOCKET", - (node->dlist[j].attrs.socket.s) - ? &(node->dlist[j].attrs.socket) - : &data) + if(rpc->struct_add(wh, "SSdddS", + "BODY", &(node->dlist[j].attrs.body), + "DUID", (node->dlist[j].attrs.duid.s) + ? &(node->dlist[j].attrs.duid) : &data, + "MAXLOAD", node->dlist[j].attrs.maxload, + "WEIGHT", node->dlist[j].attrs.weight, + "RWEIGHT", node->dlist[j].attrs.rweight, + "SOCKET", (node->dlist[j].attrs.socket.s) + ? &(node->dlist[j].attrs.socket) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1; @@ -1371,6 +1371,16 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) return -1; } } + if (ds_hash_size>0) { + if(rpc->struct_add(vh, "{", "RUNTIME", &dh) < 0) { + rpc->fault(ctx, 500, "Internal error creating runtime struct"); + return -1; + } + if (rpc->struct_add(dh, "d", "DLGLOAD", node->dlist[j].dload) < 0) { + rpc->fault(ctx, 500, "Internal error creating runtime attrs"); + return -1; + } + } } return 0;

1 0

git:master:20eb9951: Merge pull request #1555 from sergey-safarov/my-master
by GitHub 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 20eb9951a574a5ef3163d975bd0c360471d09180 URL: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-07T12:44:53+02:00 Merge pull request #1555 from sergey-safarov/my-master pkg/kamailio/centos: Removed not updated packaging files --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360… Patch: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360…

1 0

[kamailio/kamailio] pkg/kamailio/centos: Removed not updated packaging files (#1555)
by sergey-safarov 07 Jun '18

07 Jun '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1555 -- Commit Summary -- * pkg/kamailio/centos: Removed not updated packaging files -- File Changes -- D pkg/kamailio/centos/6/README (29) D pkg/kamailio/centos/6/kamailio.init (134) D pkg/kamailio/centos/6/kamailio.spec (1279) D pkg/kamailio/centos/6/kamailio.sysconfig (30) D pkg/kamailio/centos/7/README (16) D pkg/kamailio/centos/7/kamailio.init (141) D pkg/kamailio/centos/7/kamailio.service (27) D pkg/kamailio/centos/7/kamailio.spec (1468) D pkg/kamailio/centos/7/kamailio.sysconfig (30) D pkg/kamailio/centos/7/kamailio.tmpfiles (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1555.patch https://github.com/kamailio/kamailio/pull/1555.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/1555

2 2

git:master:8a274cb4: pkg/kamailio/centos: Removed not updated packaging files
by Sergey Safarov 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 8a274cb474799428b4ec838da53000fedd16abd8 URL: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-06-07T09:51:19Z pkg/kamailio/centos: Removed not updated packaging files --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f… Patch: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f…

1 0

git:master:f5792d1c: core: new rpc command - core.ppdefines_full
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: f5792d1c61702526f6382d4250c16ba0deacff6f URL: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T12:40:13+02:00 core: new rpc command - core.ppdefines_full - print preprocess defines with their details --- Modified: src/core/cfg.lex Modified: src/core/core_cmd.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… Patch: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 65507e7dfb..192b488938 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1724,6 +1724,13 @@ str* pp_get_define_name(int idx) return &pp_defines[idx].name; } +ksr_ppdefine_t* pp_get_define(int idx) +{ + if(idx<0 || idx>=pp_num_defines) + return NULL; + return &pp_defines[idx]; +} + static int pp_lookup(int len, const char * text) { str var = {(char *)text, len}; @@ -1768,7 +1775,7 @@ int pp_define(int len, const char * text) pp_defines[ppos].value.len = 0; pp_defines[ppos].value.s = NULL; } - pp_defines[ppos].type = pp_define_type; + pp_defines[ppos].dtype = pp_define_type; return 0; } else { LM_CRIT("already defined: %.*s\n", len, text); @@ -1786,7 +1793,7 @@ int pp_define(int len, const char * text) pp_defines[pp_num_defines].name.s[len] = '\0'; pp_defines[pp_num_defines].value.len = 0; pp_defines[pp_num_defines].value.s = NULL; - pp_defines[pp_num_defines].type = pp_define_type; + pp_defines[pp_num_defines].dtype = pp_define_type; pp_define_index = pp_num_defines; pp_num_defines++; diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 4dc5554671..d1ceb88cef 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -998,6 +998,44 @@ static void core_ppdefines(rpc_t* rpc, void* c) } } +/** + * + */ +static const char* core_ppdefines_full_doc[] = { + "List preprocessor defines with full details", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +/** + * list listen sockets for SIP server + */ +static void core_ppdefines_full(rpc_t* rpc, void* c) +{ + ksr_ppdefine_t *ppdef; + void *vp; + int i=0; + + while((ppdef=pp_get_define(i))!=NULL && ppdef->name.s!=NULL) { + if (rpc->add(c, "{", &vp) < 0) { + rpc->fault(c, 500, "Server Failure"); + return; + } + if(ppdef->value.s!=NULL) { + rpc->struct_add(vp, "SdS", + "name", &ppdef->name, + "type", ppdef->dtype, + "value", &ppdef->value); + } else { + rpc->struct_add(vp, "Sds", + "name", &ppdef->name, + "type", ppdef->dtype, + "value", "none"); + } + + i++; + } +} + /* * RPC Methods exported by core */ @@ -1036,6 +1074,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, + {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 }, diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index c28258b71f..5524b9fd58 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -28,10 +28,11 @@ typedef struct ksr_ppdefine { str name; str value; - int type; + int dtype; } ksr_ppdefine_t; str* pp_get_define_name(int idx); +ksr_ppdefine_t* pp_get_define(int idx); int pp_subst_add(char *data); int pp_substdef_add(char *data, int mode);

1 0

git:master:c33cb7af: core: use a structure for preprocessor defines
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: c33cb7afd02b1ee92e462574ba54b671895ee8c0 URL: https://github.com/kamailio/kamailio/commit/c33cb7afd02b1ee92e462574ba54b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T11:58:08+02:00 core: use a structure for preprocessor defines - used to be an array of two str - store type of define operation in structure --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/c33cb7afd02b1ee92e462574ba54b67… Patch: https://github.com/kamailio/kamailio/commit/c33cb7afd02b1ee92e462574ba54b67…

1 0

[kamailio/kamailio] mod kazoo cannot be loaded on latest alpine:edge (#1540)
by sergey-safarov 07 Jun '18

07 Jun '18

When loaded mod kazoo i get error ``` / # kamailio -DD -E 0(178) WARNING: <core> [core/cfg.y:3426]: warn_at(): warning in config file /etc/kamailio/default.cfg, line 67, column 12: raw socket support not compiled in 0(178) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/lib/kamailio/modules/kazoo.so>: Error relocating /usr/lib/kamailio/modules/kazoo.so: is_error: symbol not found 0(178) CRITICAL: <core> [core/cfg.y:3446]: yyerror_at(): parse error in config file /etc/kamailio/default.cfg, line 188, column 12-21: failed to load module 0(178) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <kazoo> found ``` And ldd output ``` / # LD_PRELOAD=/usr/sbin/kamailio ldd /usr/lib/kamailio/modules/kazoo.so ldd (0x5592f5d09000) /usr/sbin/kamailio => /usr/sbin/kamailio (0x7fa6235bc000) libjson-c.so.4 => /usr/lib/libjson-c.so.4 (0x7fa6233ae000) libuuid.so.1 => /lib/libuuid.so.1 (0x7fa6231a8000) librabbitmq.so.4 => /usr/lib/librabbitmq.so.4 (0x7fa622f8c000) libevent-2.1.so.6 => /usr/lib/libevent-2.1.so.6 (0x7fa622d42000) libsrdb1.so.1 => /usr/lib/kamailio//libsrdb1.so.1 (0x7fa622b21000) libc.musl-x86_64.so.1 => ldd (0x5592f5d09000) libssl.so.45 => /lib/libssl.so.45 (0x7fa6228d5000) libcrypto.so.43 => /lib/libcrypto.so.43 (0x7fa62252a000) Error relocating /usr/lib/kamailio/modules/kazoo.so: is_error: symbol not found / # ``` Symbol `is_error` is defined at `/usr/include/json-c/bits.h` ``` /** * @deprecated */ #define is_error(ptr) (ptr == NULL) ``` I not know why this simple definition is not compiled into mod kazoo on latest Alpine:edge. -- 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/1540

2 2

git:master:586566c1: nsq: removed obsolete json is_error() macro
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 586566c19a85a611d389062ca1f1de271e1891c3 URL: https://github.com/kamailio/kamailio/commit/586566c19a85a611d389062ca1f1de2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T10:34:42+02:00 nsq: removed obsolete json is_error() macro --- Modified: src/modules/nsq/nsq_json.c --- Diff: https://github.com/kamailio/kamailio/commit/586566c19a85a611d389062ca1f1de2… Patch: https://github.com/kamailio/kamailio/commit/586566c19a85a611d389062ca1f1de2… --- 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:master:7d376661: kazoo: replaced obsolete json is_error() macro
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 7d3766614832ef22433e36ef0791fa41796829a2 URL: https://github.com/kamailio/kamailio/commit/7d3766614832ef22433e36ef0791fa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T10:33:26+02:00 kazoo: replaced obsolete json is_error() macro --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/7d3766614832ef22433e36ef0791fa4… Patch: https://github.com/kamailio/kamailio/commit/7d3766614832ef22433e36ef0791fa4… --- 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

[kamailio/kamailio] pv_evalx result in destination pv seems wrong (#1551)
by Victor Seva 07 Jun '18

07 Jun '18

### Description ``` xinfo("Send the call to CGRates ci='$ci'"); $var(tmp) = '"event":"CGR_AUTH_REQUEST", "cgr_category":"$dlg_var(cgrCategory)", "cgr_reqtype":"$dlg_var(cgrReqType)", "cgr_tenant":"$dlg_var(tenant)", "cgr_account":"$dlg_var(cgrAccount)", "cgr_destination":"$dlg_var(cgrDestination)", "direction":"$dlg_var(profile)", "source_user":"$dlg_var(source_user)", "recording_url":"", "account_code":"$dlg_var(account_code)", "billing_cli":"$dlg_var(billing_cli)", "cgr_setuptime":"$dlg_var(start_ts)", "reseller_id":"$dlg_var(reseller_id)"'; pv_evalx("$var(msg)", "$var(tmp)"); xinfo("--- $$var(tmp):'$var(tmp)'"); xinfo("--- $$var(msg):'$var(msg)'"); xinfo("++++"); ``` ### Troubleshooting #### Log Messages ``` May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: Send the call to CGRates ci='ynfvvklkkcajrfi(a)slim.torreviejawireless.org' May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: --- $var(tmp):'"event":"CGR_AUTH_REQUEST",#012 "cgr_category":"$dlg_var(cgrCategory)",#012 "cgr_reqtype":"$dlg_var(cgrReqType)",#012 "cgr_tenant":"$dlg_var(tenant)",#012 "cgr_account":"$dlg_var(cgrAccount)",#012 "cgr_destination":"$dlg_var(cgrDestination)",#012 "direction":"$dlg_var(profile)",#012 "source_user":"$dlg_var(source_user)",#012 "recording_url":"",#012 "account_code":"$dlg_var(account_code)",#012 "billing_cli":"$dlg_var(billing_cli)",#012 "cgr_setuptime":"$dlg_var(start_ts)",#012 "reseller_id":"$dlg_var(reseller_id)"' May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: --- $var(msg):'5 May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: ++++ ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.8.2 ``` -- 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/1551

2 7

git:master:c087b1d1: core: pv - default number of buffer slots set to 40
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: c087b1d1dd06a1fd417998fe0a51dedcfe02e8c6 URL: https://github.com/kamailio/kamailio/commit/c087b1d1dd06a1fd417998fe0a51ded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T10:10:36+02:00 core: pv - default number of buffer slots set to 40 - it was 10 - allow handling more chained evaluations in large strings --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/c087b1d1dd06a1fd417998fe0a51ded… Patch: https://github.com/kamailio/kamailio/commit/c087b1d1dd06a1fd417998fe0a51ded… --- 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

git:master:6eedbab9: topos: use method_id to match KDMQ
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 6eedbab99a500d71a1a66cbf8a1a94ae88f47b05 URL: https://github.com/kamailio/kamailio/commit/6eedbab99a500d71a1a66cbf8a1a94a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T09:26:11+02:00 topos: use method_id to match KDMQ --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6eedbab99a500d71a1a66cbf8a1a94a… Patch: https://github.com/kamailio/kamailio/commit/6eedbab99a500d71a1a66cbf8a1a94a… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 5d3e4aec9c..30090b6b16 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -400,12 +400,9 @@ int tps_msg_sent(sr_event_param_t *evp) } if(local==1 && dialog==0) { - if((get_cseq(&msg)->method_id) & (METHOD_OPTIONS|METHOD_NOTIFY)) { - /* skip local out-of-dialog requests (e.g., keepalive) */ - goto done; - } - if(get_cseq(&msg)->method.len==4 - && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)==0) { + if((get_cseq(&msg)->method_id) + & (METHOD_OPTIONS|METHOD_NOTIFY|METHOD_KDMQ)) { + /* skip local out-of-dialog requests (e.g., keepalive, dmq) */ goto done; } }

1 0

[kamailio/kamailio] Memory leak after SIP message fails to be sent due to no socket found (#1554)
by pwakano 07 Jun '18

07 Jun '18

### Description When SIP message fails to be sent due to no socket found, apparently the TM module is not deleting the transaction and so it is causing a memory leak. ### Troubleshooting #### Reproduction The easiest way to reproduce the problem is to setup a dispatcher destination with SIP ping enabled. Kamailio should not be listening to the interface which is used to reach that destination. So this will cause Kamailio to complain about not finding a socket to send the OPTIONS. After this happens, it is possible to see from the **kamcmd tm.stats** command that the "created" has increased by 1, freed has not changed and "delayed_free" also increased by 1. Problem is that the delayed_free never gets freed and after checking the **kamcmd core.shmmem**, for every failed OPTIONS request under this condition, 5808 bits are leaked... This goes on until there is no shared memory left..... #### Debugging Data #### Log Messages ``` /usr/sbin/kamailio[20755]: DEBUG: dispatcher [dispatch.c:2664]: ds_ping_set(): probing set #2, URI sip:10.11.12.13:6060 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:10.11.12.13:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1225]: srv_sip_resolvehost(): 10.11.12.13:6060 proto=0 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1346]: srv_sip_resolvehost(): returning 0xada520 (10.11.12.13:6060 proto=1) /usr/sbin/kamailio[20755]: DEBUG: <core> [core/forward.c:174]: get_out_socket(): socket determined: 0x7f33189ee298 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 8554 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:238]: t_run_local_req(): executing event_route[tm:local-request] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:600]: parse_msg(): SIP Request: /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:602]: parse_msg(): method: <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): uri: <sip:10.11.12.13:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): version: <SIP/2.0> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKa612.f9317e75000000000000000000000000.0>; state=16 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:491]: parse_headers(): Via found, flags=2 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:493]: parse_headers(): this is the first via /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [25]; uri=[sip:10.11.12.13:6060] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:10.11.12.13:6060>#015#012] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <10> <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: pv [pv_trans.c:564]: tr_eval_string(): i=0 j=10 /usr/sbin/kamailio[20755]: NOTICE: <script>: [479309551f] OPTIONS: Local Request to sip:10.11.12.13:6060 - sip:10.11.12.13:6060 /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:115]: dlg_cseq_prepare_new_msg(): prepare new msg for cseq update operations /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:600]: parse_msg(): SIP Request: /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:602]: parse_msg(): method: <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): uri: <sip:10.11.12.13:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): version: <SIP/2.0> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKa612.f9317e75000000000000000000000000.0>; state=16 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:491]: parse_headers(): Via found, flags=2 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:493]: parse_headers(): this is the first via /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:59]: dlg_cseq_prepare_msg(): prepare msg for cseq update operations /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [25]; uri=[sip:10.11.12.13:6060] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:10.11.12.13:6060>#015#012] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <10> <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=744e9d847dad9acc2d5178ac65520eba-8cc2 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:382]: dlg_cseq_msg_sent(): traking cseq updates /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_hash.c:766]: internal_get_dlg(): no dialog callid='479309551fdf88bf-20755(a)55.66.77.88' found /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_hash.c:797]: get_dlg(): no dialog callid='479309551fdf88bf-20755(a)55.66.77.88' found /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_handlers.c:1202]: dlg_lookup_msg_dialog(): dlg with callid '479309551fdf88bf-20755(a)55.66.77.88' not found /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:394]: dlg_cseq_msg_sent(): no dialog for this request /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:638]: send_prepared_request_impl(): uac: 0x7f331184c5f8 branch: 0 to 10.11.12.13:6060 /usr/sbin/kamailio[20755]: DEBUG: tm [../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring /usr/sbin/kamailio[20755]: DEBUG: dispatcher [dispatch.c:2664]: ds_ping_set(): probing set #1, URI sip:12.34.56.78:6060 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:12.34.56.78:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1225]: srv_sip_resolvehost(): 12.34.56.78:6060 proto=0 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1346]: srv_sip_resolvehost(): returning 0xada520 (12.34.56.78:6060 proto=1) /usr/sbin/kamailio[20755]: ERROR: <core> [core/forward.c:181]: get_out_socket(): no socket found /usr/sbin/kamailio[20755]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:12.34.56.78:6060) /usr/sbin/kamailio[20755]: ERROR: tm [ut.h:317]: uri2dst2(): no corresponding socket found for "12.34.56.78" af 2 (udp:12.34.56.78:6060) /usr/sbin/kamailio[20755]: ERROR: tm [uac.c:449]: t_uac_prepare(): no socket found /usr/sbin/kamailio[20755]: ERROR: dispatcher [dispatch.c:2683]: ds_ping_set(): unable to ping [sip:12.34.56.78:6060] ``` Real IPs were replaced, this is their usage: 10.11.12.13 = Kamailio listening IP in local network interface 12.34.56.78 = destination SIP trunk which does not have a matching listened socket by Kamailio 55.66.77.88 = Kamailio listening IP in public network interface #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.0.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 04:19:46 Mar 30 2018 with gcc 4.8.5 ``` * **Operating System**: ``` # cat /etc/redhat-release CentOS Linux release 7.4.1708 (Core) # uname -a Linux dev1-sbcaio-01 3.10.0-693.el7.x86_64 #1 SMP Tue Aug 22 21:09:27 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1554

2 5

git:5.1:3da0bcb4: tm: free new tm cell in case of error if it was not referenced
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: 3da0bcb4b4e27d115a2d6eb47cd0cebc33d34a61 URL: https://github.com/kamailio/kamailio/commit/3da0bcb4b4e27d115a2d6eb47cd0ceb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T08:59:39+02:00 tm: free new tm cell in case of error if it was not referenced - part of t_uac_prepare(), reported by GH #1554 (cherry picked from commit f94770840029c1c73ab129f4b71fcb0cf146d808) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/3da0bcb4b4e27d115a2d6eb47cd0ceb… Patch: https://github.com/kamailio/kamailio/commit/3da0bcb4b4e27d115a2d6eb47cd0ceb… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ff466760dd..9b2f51b5f6 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -583,11 +583,18 @@ static inline int t_uac_prepare(uac_req_t *uac_r, error2: #ifdef TM_DEL_UNREF - if (!is_ack) { - UNREF_FREE(new_cell); - }else -#endif + if (is_ack) { free_cell(new_cell); + } else { + if(atomic_get_int(&new_cell->ref_count)==0) { + free_cell(new_cell); + } else { + UNREF_FREE(new_cell); + } + } +#else + free_cell(new_cell); +#endif error3: return ret; }

1 0

git:5.1:cce9bab1: topos: fix condition to match KDMQ method
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: cce9bab16ed607041a9849234e6b26fca72319e9 URL: https://github.com/kamailio/kamailio/commit/cce9bab16ed607041a9849234e6b26f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T08:58:57+02:00 topos: fix condition to match KDMQ method (cherry picked from commit e9be20215b8e995bac698b54b7960cdaa9b60798) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cce9bab16ed607041a9849234e6b26f… Patch: https://github.com/kamailio/kamailio/commit/cce9bab16ed607041a9849234e6b26f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 9d43877af6..0368ae8299 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -404,7 +404,7 @@ int tps_msg_sent(sr_event_param_t *evp) goto done; } if(get_cseq(&msg)->method.len==4 - && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)) { + && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)==0) { goto done; } }

1 0

git:5.1:6bff7a41: examples: remove execute mode from text file
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: 6bff7a4172df898483dfc928c19a26ec1c6a6f0f URL: https://github.com/kamailio/kamailio/commit/6bff7a4172df898483dfc928c19a26e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T08:59:27+02:00 examples: remove execute mode from text file (cherry picked from commit 226a6aa06fc46ead24e262afd382af64452ae080) --- Modified: misc/examples/ims/pcscf/dispatcher.list.sample --- Diff: https://github.com/kamailio/kamailio/commit/6bff7a4172df898483dfc928c19a26e… Patch: https://github.com/kamailio/kamailio/commit/6bff7a4172df898483dfc928c19a26e… --- diff --git a/misc/examples/ims/pcscf/dispatcher.list.sample b/misc/examples/ims/pcscf/dispatcher.list.sample old mode 100755 new mode 100644

1 0

RFC: dispatcher refactoring to use xavp and options for attributes
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Hello, I am starting a discussion here about my plans to do a bit of refactoring to dispatcher module and gather some feedback if people think of other improvements. 1) First is about moving from using avps to xavps. It should simplify at least the config in terms of modparams, but also makes it more coherent in storing the details of destination record for serial forking. Practically, from a bunch of avp parameters, there will be one to set the root xavp name, and the old "avps" will be fields inside the xavp. 2) The second is about the attributes field. I am considering to add the option to load additional attributes from dedicated columns when using database. So besides the attrs column, one can specify via a mod param additional columns to be loaded and added to attributes, like: modparam("dispatcher", "xattrs", "weight,socket,maxload") The attributes string will be the value of "attrs" column concatenated with "weight=val1;socket=val2;maxload=val3" (the valX being the corresponding values in those columns). This should make easier the management of the database records. For the option with a text file, no changes will be done. 3) Anything else that one thinks would be good to add to dispatcher? Cheers, Daniel PS. I wrote to both sr-dev and sr-users, to get the attention of the two communities. However, you can reply only to sr-users (larger community) if you are not on sr-dev, because this discussion is about features of the module, not technical aspects of coding. -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

2 2

git:master:d7469674: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: d746967485b17d2530418e059da0cd31f10d9396 URL: https://github.com/kamailio/kamailio/commit/d746967485b17d2530418e059da0cd3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-06T18:16:40+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d746967485b17d2530418e059da0cd3… Patch: https://github.com/kamailio/kamailio/commit/d746967485b17d2530418e059da0cd3…

1 0

git:master:a9c89c4b: dispatcher: docs for ds_attrs_none param
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: a9c89c4b437cf9a7bda2233f050bde702704c82e URL: https://github.com/kamailio/kamailio/commit/a9c89c4b437cf9a7bda2233f050bde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T18:01:56+02:00 dispatcher: docs for ds_attrs_none param --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9c89c4b437cf9a7bda2233f050bde7… Patch: https://github.com/kamailio/kamailio/commit/a9c89c4b437cf9a7bda2233f050bde7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 8037184273..19e74978fd 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -975,6 +975,28 @@ end </example> </section> + <section id="dispatcher.p.ds_attrs_none"> + <title><varname>ds_attrs_none</varname> (int)</title> + <para> + If set to 1, "none=yes" is set in the attrs for those records that + have no attrs value, to ensure that corresponding avps for records do + not get mixed up. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_attrs_none</quote> parameter</title> + <programlisting format="linespecific"> + ... + modparam("dispatcher", "ds_attrs_none", 1) + ... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:d1cb2644: dispatcher: new param ds_attrs_none
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: d1cb26446742d1734eb8aac1b970e8128a1db041 URL: https://github.com/kamailio/kamailio/commit/d1cb26446742d1734eb8aac1b970e81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T17:56:46+02:00 dispatcher: new param ds_attrs_none - if set to 1, "none=yes" is set in the attrs for those records that have no attrs value, to ensure that corresponding avps for records don't get mixed up --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/d1cb26446742d1734eb8aac1b970e81… Patch: https://github.com/kamailio/kamailio/commit/d1cb26446742d1734eb8aac1b970e81… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 740b678e51..fb095becea 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -89,6 +89,7 @@ extern int ds_force_dst; extern str ds_event_callback; extern int ds_ping_latency_stats; extern float ds_latency_estimator_alpha; +extern int ds_attrs_none; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -241,27 +242,35 @@ int init_data(void) /** * */ -int ds_set_attrs(ds_dest_t *dest, str *attrs) +int ds_set_attrs(ds_dest_t *dest, str *vattrs) { param_t *params_list = NULL; param_hooks_t phooks; param_t *pit = NULL; str param; int tmp_rweight = 0; + str sattrs; - if(attrs == NULL || attrs->len <= 0) - return 0; - if(attrs->s[attrs->len - 1] == ';') - attrs->len--; + if(vattrs == NULL || vattrs->len <= 0) { + if(ds_attrs_none==0) { + return 0; + } + sattrs.s = "none=yes"; + sattrs.len = 8; + } else { + sattrs = *vattrs; + } + if(sattrs.s[sattrs.len - 1] == ';') + sattrs.len--; /* clone in shm */ - dest->attrs.body.s = (char *)shm_malloc(attrs->len + 1); + dest->attrs.body.s = (char *)shm_malloc(sattrs.len + 1); if(dest->attrs.body.s == NULL) { LM_ERR("no more shm\n"); return -1; } - memcpy(dest->attrs.body.s, attrs->s, attrs->len); - dest->attrs.body.s[attrs->len] = '\0'; - dest->attrs.body.len = attrs->len; + memcpy(dest->attrs.body.s, sattrs.s, sattrs.len); + dest->attrs.body.s[sattrs.len] = '\0'; + dest->attrs.body.len = sattrs.len; param = dest->attrs.body; if(parse_params(&param, CLASS_ANY, &phooks, &params_list) < 0) diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index f6ab6b1d70..bcb085c624 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,6 +120,7 @@ int ds_hash_expire = 7200; int ds_hash_initexpire = 7200; int ds_hash_check_interval = 30; int ds_timer_mode = 0; +int ds_attrs_none = 0; str ds_outbound_proxy = STR_NULL; @@ -259,6 +260,7 @@ static param_export_t params[]={ {"ds_default_socket", PARAM_STR, &ds_default_socket}, {"ds_timer_mode", PARAM_INT, &ds_timer_mode}, {"event_callback", PARAM_STR, &ds_event_callback}, + {"ds_attrs_none", PARAM_INT, &ds_attrs_none}, {0,0,0} };

1 0

git:master:f3f14c6d: dispatcher: safety check for null value of attrs field in database
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: f3f14c6d85a7055c3a729ec46b83ff2a179ac397 URL: https://github.com/kamailio/kamailio/commit/f3f14c6d85a7055c3a729ec46b83ff2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T14:34:56+02:00 dispatcher: safety check for null value of attrs field in database --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f3f14c6d85a7055c3a729ec46b83ff2… Patch: https://github.com/kamailio/kamailio/commit/f3f14c6d85a7055c3a729ec46b83ff2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cbda9731e6..740b678e51 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -962,9 +962,9 @@ int ds_load_db(void) attrs.s = 0; attrs.len = 0; - if(nrcols >= 5) { + if(nrcols >= 5 && !VAL_NULL(values + 4)) { attrs.s = VAL_STR(values + 4).s; - attrs.len = strlen(attrs.s); + if(attrs.s) attrs.len = strlen(attrs.s); } if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) != 0) {

1 0

git:master:f9477084: tm: free new tm cell in case of error if it was not referenced
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: f94770840029c1c73ab129f4b71fcb0cf146d808 URL: https://github.com/kamailio/kamailio/commit/f94770840029c1c73ab129f4b71fcb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T10:25:27+02:00 tm: free new tm cell in case of error if it was not referenced - part of t_uac_prepare(), reported by GH #1554 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f94770840029c1c73ab129f4b71fcb0… Patch: https://github.com/kamailio/kamailio/commit/f94770840029c1c73ab129f4b71fcb0… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ff466760dd..9b2f51b5f6 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -583,11 +583,18 @@ static inline int t_uac_prepare(uac_req_t *uac_r, error2: #ifdef TM_DEL_UNREF - if (!is_ack) { - UNREF_FREE(new_cell); - }else -#endif + if (is_ack) { free_cell(new_cell); + } else { + if(atomic_get_int(&new_cell->ref_count)==0) { + free_cell(new_cell); + } else { + UNREF_FREE(new_cell); + } + } +#else + free_cell(new_cell); +#endif error3: return ret; }

1 0

git:master:226a6aa0: examples: remove execute mode from text file
by Victor Seva 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: 226a6aa06fc46ead24e262afd382af64452ae080 URL: https://github.com/kamailio/kamailio/commit/226a6aa06fc46ead24e262afd382af6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-06T09:45:54+02:00 examples: remove execute mode from text file --- Modified: misc/examples/ims/pcscf/dispatcher.list.sample --- Diff: https://github.com/kamailio/kamailio/commit/226a6aa06fc46ead24e262afd382af6… Patch: https://github.com/kamailio/kamailio/commit/226a6aa06fc46ead24e262afd382af6… --- diff --git a/misc/examples/ims/pcscf/dispatcher.list.sample b/misc/examples/ims/pcscf/dispatcher.list.sample old mode 100755 new mode 100644

1 0

git:master:657d2699: core: kemi - is_method_in() support for kdmq, get, post, put, delete
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: 657d2699784d9fc35f66382f9f137f0b80301018 URL: https://github.com/kamailio/kamailio/commit/657d2699784d9fc35f66382f9f137f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T09:02:15+02:00 core: kemi - is_method_in() support for kdmq, get, post, put, delete --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/657d2699784d9fc35f66382f9f137f0… Patch: https://github.com/kamailio/kamailio/commit/657d2699784d9fc35f66382f9f137f0… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ac31b1beb0..9b1d0050a5 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -814,6 +814,36 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'G': + case 'g': + if(imethod==METHOD_GET) { + return SR_KEMI_TRUE; + } + break; + case 'K': + case 'k': + if(imethod==METHOD_KDMQ) { + return SR_KEMI_TRUE; + } + break; + case 'D': + case 'd': + if(imethod==METHOD_DELETE) { + return SR_KEMI_TRUE; + } + break; + case 'T': + case 't': + if(imethod==METHOD_POST) { + return SR_KEMI_TRUE; + } + break; + case 'V': + case 'v': + if(imethod==METHOD_PUT) { + return SR_KEMI_TRUE; + } + break; } } return SR_KEMI_FALSE;

1 0

Fwd: Sharing static variables in external library across child proceses
by User 721 06 Jun '18

06 Jun '18

Hi, I am adding a kamailio module that references an external C library that maintains a hashtable in global scope. I am wondering what practice I should follow so that: - This hashtable (which I don't control directly) is shared by all child processes - The hashtable is changed by one child process at a time Thanks in advance

2 1

git:master:e9be2021: topos: fix condition to match KDMQ method
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: e9be20215b8e995bac698b54b7960cdaa9b60798 URL: https://github.com/kamailio/kamailio/commit/e9be20215b8e995bac698b54b7960cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T08:10:15+02:00 topos: fix condition to match KDMQ method --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e9be20215b8e995bac698b54b7960cd… Patch: https://github.com/kamailio/kamailio/commit/e9be20215b8e995bac698b54b7960cd… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 408c964e62..5d3e4aec9c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -405,7 +405,7 @@ int tps_msg_sent(sr_event_param_t *evp) goto done; } if(get_cseq(&msg)->method.len==4 - && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)) { + && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)==0) { goto done; } }

1 0

git:master:f8acb422: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: f8acb422cc909227ec4bd40c324d25c9a1cee1c6 URL: https://github.com/kamailio/kamailio/commit/f8acb422cc909227ec4bd40c324d25c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-05T17:16:45+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/f8acb422cc909227ec4bd40c324d25c… Patch: https://github.com/kamailio/kamailio/commit/f8acb422cc909227ec4bd40c324d25c…

1 0

git:5.1:827bb9c8: pkg/kamailio/deb: remove app_java from sid/buster
by Victor Seva 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: 827bb9c8a868d58a92fc9dd24d8f43179ec0c99d URL: https://github.com/kamailio/kamailio/commit/827bb9c8a868d58a92fc9dd24d8f431… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-05T16:40:41+02:00 pkg/kamailio/deb: remove app_java from sid/buster See #1487 (cherry picked from commit 66e36e75a855e8170dd788a312061aff71991e18) --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules --- Diff: https://github.com/kamailio/kamailio/commit/827bb9c8a868d58a92fc9dd24d8f431… Patch: https://github.com/kamailio/kamailio/commit/827bb9c8a868d58a92fc9dd24d8f431…

1 1

[kamailio/kamailio] dispatcher: congestion detection load balancing (#1533)
by Julien Chavanton 05 Jun '18

05 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  Presented at Kamailio World 2018, load balancing doing congestion detection More information can be found http://www.castmm.com/KW2018.pdf https://github.com/jchavanton/kam_load_balancing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1533 -- Commit Summary -- * dispatcher: congestion detection load balancing -- File Changes -- M src/modules/dispatcher/dispatch.c (103) M src/modules/dispatcher/dispatch.h (2) M src/modules/dispatcher/doc/dispatcher.xml (2) M src/modules/dispatcher/doc/dispatcher_admin.xml (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1533.patch https://github.com/kamailio/kamailio/pull/1533.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/1533

2 5

git:master:3b72de3f: Merge pull request #1533 from jchavanton/congestion_lb
by GitHub 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 3b72de3fb66bc7162771887502b420b3ce0179fb URL: https://github.com/kamailio/kamailio/commit/3b72de3fb66bc7162771887502b420b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-05T17:08:33+02:00 Merge pull request #1533 from jchavanton/congestion_lb dispatcher: congestion detection load balancing --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3b72de3fb66bc7162771887502b420b… Patch: https://github.com/kamailio/kamailio/commit/3b72de3fb66bc7162771887502b420b…

1 0

git:master:1d304002: dispatcher: congestion detection load balancing
by Julien Chavanton 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 1d3040028ce84b62cc7a5d5beb82b6c72f02fe82 URL: https://github.com/kamailio/kamailio/commit/1d3040028ce84b62cc7a5d5beb82b6c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-05-23T14:04:48-07:00 dispatcher: congestion detection load balancing Thanks to Amy Meyers for her help ! --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d3040028ce84b62cc7a5d5beb82b6c… Patch: https://github.com/kamailio/kamailio/commit/1d3040028ce84b62cc7a5d5beb82b6c…

1 0

git:master:aec8c5f8: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: aec8c5f8d2b06fb96621aa881652d19a266d4e3d URL: https://github.com/kamailio/kamailio/commit/aec8c5f8d2b06fb96621aa881652d19… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-05T16:46:41+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/aec8c5f8d2b06fb96621aa881652d19… Patch: https://github.com/kamailio/kamailio/commit/aec8c5f8d2b06fb96621aa881652d19… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 478eaff3bb..77c62a7563 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -52,7 +52,7 @@ Richard Fuchs 1. Admin Guide 1. Overview - 2. Multiple RTP proxy usage + 2. Usage With Multiple RTPEngine Instances 3. Dependencies 3.1. Kamailio Modules @@ -249,7 +249,7 @@ Chapter 1. Admin Guide Table of Contents 1. Overview - 2. Multiple RTP proxy usage + 2. Usage With Multiple RTPEngine Instances 3. Dependencies 3.1. Kamailio Modules @@ -362,19 +362,19 @@ Chapter 1. Admin Guide however due to the incompatible control protocol, it only works with RTP proxies which specifically support it. -2. Multiple RTP proxy usage +2. Usage With Multiple RTPEngine Instances - The rtpengine module can support multiple RTP proxies for + The rtpengine module can support multiple RTPEngine instances for balancing/distribution and control/selection purposes. - The module allows definition of several sets of rtpproxies. + The module allows definition of several sets of RTPEngines. Load-balancing will be performed over a set and the admin has the ability to choose what set should be used. The set is selected via its id - the id being defined with the set. Refer to the “rtpengine_sock” module parameter definition for syntax description. The balancing inside a set is done automatically by the module based on - the weight of each RTP proxy from the set. + the weight of each RTPEngine from the set. The selection of the set is done from script prior using rtpengine_delete(), rtpengine_offer() or rtpengine_answer() functions - @@ -395,11 +395,11 @@ Chapter 1. Admin Guide the set was selected using setid_avp, the avp needs to be set only once before rtpengine_offer() or rtpengine_manage() call. - From the current implementation point of view, the sets of rtpproxy - nodes are shared memory(shm), so all processes can see a common list of - nodes. There is no locking when setting the nodes enabled/disabled (to - keep the memory access as fast as possible). Thus, problems related to - node state might appear for concurrent processes that might set the + From the current implementation point of view, the sets of rtpengine + nodes are in shared memory(shm), so all processes can see a common list + of nodes. There is no locking when setting the nodes enabled/disabled + (to keep the memory access as fast as possible). Thus, problems related + to node state might appear for concurrent processes that might set the nodes enabled/disabled(e.g. by fifo command). This robustness problems are overcome as follows. @@ -809,12 +809,12 @@ mysql> describe rtpengine; +----------+------------------+------+-----+---------------------+-------+ mysql> select * from rtpengine; -+-------+---------------------------+--------+----------+---------------------+ -| setid | url | weight | disabled | stamp | -+-------+---------------------------+--------+----------+---------------------+ -| 0 | udp:rtpproxy1.domain:8800 | 1 | 0 | 2016-03-10 10:30:54 | -| 0 | udp:rtpproxy2.domain:8800 | 1 | 1 | 2016-03-10 10:30:54 | -+-------+---------------------------+--------+----------+---------------------+ ++-------+----------------------------+--------+----------+---------------------+ +| setid | url | weight | disabled | stamp | ++-------+----------------------------+--------+----------+---------------------+ +| 0 | udp:rtpengine1.domain:8800 | 1 | 0 | 2016-03-10 10:30:54 | +| 0 | udp:rtpengine2.domain:8800 | 1 | 1 | 2016-03-10 10:30:54 | ++-------+----------------------------+--------+----------+---------------------+ mysql> select * from version; +---------------------------+---------------+

1 0

git:master:9383174b: rtpengine: docs - updated some of rtpproxy occurences to rtpengine
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 9383174b32b6b49dd9f0757450abadb45690515f URL: https://github.com/kamailio/kamailio/commit/9383174b32b6b49dd9f0757450abadb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T16:34:48+02:00 rtpengine: docs - updated some of rtpproxy occurences to rtpengine --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9383174b32b6b49dd9f0757450abadb… Patch: https://github.com/kamailio/kamailio/commit/9383174b32b6b49dd9f0757450abadb… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index ae875cfc4a..a43b8d8264 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -31,13 +31,13 @@ </section> <section> - <title>Multiple &rtp; proxy usage</title> + <title>Usage With Multiple RTPEngine Instances</title> <para> - The rtpengine module can support multiple &rtp; proxies for + The rtpengine module can support multiple RTPEngine instances for balancing/distribution and control/selection purposes. </para> <para> - The module allows definition of several sets of rtpproxies. + The module allows definition of several sets of RTPEngines. Load-balancing will be performed over a set and the admin has the ability to choose what set should be used. The set is selected via its id - the id being defined with the set. Refer to the @@ -46,7 +46,7 @@ </para> <para> The balancing inside a set is done automatically by the module based on - the weight of each &rtp; proxy from the set. + the weight of each RTPEngine from the set. </para> <para> The selection of the set is done from script prior using @@ -74,8 +74,8 @@ set only once before rtpengine_offer() or rtpengine_manage() call. </para> <para> - From the current implementation point of view, the sets of rtpproxy nodes - are shared memory(shm), so all processes can see a common list of nodes. + From the current implementation point of view, the sets of rtpengine nodes + are in shared memory(shm), so all processes can see a common list of nodes. There is no locking when setting the nodes enabled/disabled (to keep the memory access as fast as possible). Thus, problems related to node state might appear for concurrent processes that might set the nodes @@ -573,12 +573,12 @@ mysql> describe rtpengine; +----------+------------------+------+-----+---------------------+-------+ mysql> select * from rtpengine; -+-------+---------------------------+--------+----------+---------------------+ -| setid | url | weight | disabled | stamp | -+-------+---------------------------+--------+----------+---------------------+ -| 0 | udp:rtpproxy1.domain:8800 | 1 | 0 | 2016-03-10 10:30:54 | -| 0 | udp:rtpproxy2.domain:8800 | 1 | 1 | 2016-03-10 10:30:54 | -+-------+---------------------------+--------+----------+---------------------+ ++-------+----------------------------+--------+----------+---------------------+ +| setid | url | weight | disabled | stamp | ++-------+----------------------------+--------+----------+---------------------+ +| 0 | udp:rtpengine1.domain:8800 | 1 | 0 | 2016-03-10 10:30:54 | +| 0 | udp:rtpengine2.domain:8800 | 1 | 1 | 2016-03-10 10:30:54 | ++-------+----------------------------+--------+----------+---------------------+ mysql> select * from version; +---------------------------+---------------+

1 0

Kamailio v5.1.4 Released
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Hello, Kamailio SIP Server v5.1.4 stable release is out. This is a maintenance release of the latest stable branch, 5.1, that includes fixes since the release of v5.1.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.4. For more details about version 5.1.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2018/06/kamailio-v5-1-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

git:5.1:b7547543: ChangeLog: content updated for v5.1.4
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: b7547543f64511ca7103f21e24c839127b01a3f4 URL: https://github.com/kamailio/kamailio/commit/b7547543f64511ca7103f21e24c8391… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T13:03:24+02:00 ChangeLog: content updated for v5.1.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b7547543f64511ca7103f21e24c8391… Patch: https://github.com/kamailio/kamailio/commit/b7547543f64511ca7103f21e24c8391…

1 0

git:5.1:35b0e388: Makefile.defs: version set to 5.1.4
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: 35b0e3887935d9702fb3e704f07699508f823e1b URL: https://github.com/kamailio/kamailio/commit/35b0e3887935d9702fb3e704f076995… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T12:52:27+02:00 Makefile.defs: version set to 5.1.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/35b0e3887935d9702fb3e704f076995… Patch: https://github.com/kamailio/kamailio/commit/35b0e3887935d9702fb3e704f076995… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 86b57216b8..3b1066da95 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:574a0d24: pv: debug message with intermediate message to evaluate by pv_evalx()
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: 574a0d245bf1864ca6b855081fd76c721fd19532 URL: https://github.com/kamailio/kamailio/commit/574a0d245bf1864ca6b855081fd76c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T11:39:07+02:00 pv: debug message with intermediate message to evaluate by pv_evalx() (cherry picked from commit 03698a4b2ec49896c08a3989403d7e33ff9fb844) --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/574a0d245bf1864ca6b855081fd76c7… Patch: https://github.com/kamailio/kamailio/commit/574a0d245bf1864ca6b855081fd76c7… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 5743dd6d4d..63c158680b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -933,6 +933,7 @@ int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt) goto error; } + LM_DBG("preparing to evaluate: [%.*s]\n", tstr.len, tstr.s); if(pv_eval_str(msg, &val.rs, &tstr)<0){ LM_ERR("cannot eval reparsed value of second parameter\n"); return -1;

1 0

git:5.1:c3eec978: pkg/rpm: version set to 5.1.4
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: c3eec978f6456eb238d446686e1db3b5b6de4b7b URL: https://github.com/kamailio/kamailio/commit/c3eec978f6456eb238d446686e1db3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T12:11:28+02:00 pkg/rpm: version set to 5.1.4 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/c3eec978f6456eb238d446686e1db3b… Patch: https://github.com/kamailio/kamailio/commit/c3eec978f6456eb238d446686e1db3b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 5ba6f7398e..b71a44de05 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.3 +pkgver=5.1.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 1a5f233217..49fbef81e3 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d857e53cbf..3b938428b9 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index b274092cd1..b9313c520b 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 333b4cc6ef..27744a2f72 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index f578cd6723..8177b7d92a 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 2b05409df5..9f9c2ef023 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 93b0c933b8..df70f8a0aa 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index a2ac6bdf06..745ca62e00 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index ad2e21fcae..ee3a58c647 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.1:12ddd127: dialog: check CSeq careful with track_cseq_updates
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: 12ddd127343f1be98a4556aadd9ccfeafc3fbdc7 URL: https://github.com/kamailio/kamailio/commit/12ddd127343f1be98a4556aadd9ccfe… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T11:38:39+02:00 dialog: check CSeq careful with track_cseq_updates to avoid null pointer access for malformed messages (cherry picked from commit 59c7bf4f43a8cd5dcb0555835a064d88679956c5) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/12ddd127343f1be98a4556aadd9ccfe… Patch: https://github.com/kamailio/kamailio/commit/12ddd127343f1be98a4556aadd9ccfe… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 1e343c9981..b97e8f7123 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -73,7 +73,8 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) return 1; } - if (parse_headers(msg, HDR_CSEQ_F, 0)==-1) { + if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) + || !msg->cseq->parsed){ LM_DBG("parsing cseq header failed\n"); return 2; }

1 0

Releasing Kamailio v5.1.4
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Hello, I am considering to release a new minor version out of branch 5.1, respectively the v5.1.4, sometime next week, likely on Tuesday, June 5, 2018. As usual, if there is any issue not yet reported on github tracker, do it as soon as possible to give it a chance to be fixed. Soon I am going to do the backports of commits with fixes in master that apply in branch 5.1, so keep a close eye and if someone is missing, let me know to push it in the stable branch. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

3 3

git:5.1:fa87c0be: pkg/kamailio/deb: version set to 5.1.4
by Victor Seva 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: fa87c0be79e7e12f3ec57c8ec532f0240b7cdb31 URL: https://github.com/kamailio/kamailio/commit/fa87c0be79e7e12f3ec57c8ec532f02… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-05T11:16:16+02:00 pkg/kamailio/deb: version set to 5.1.4 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/fa87c0be79e7e12f3ec57c8ec532f02… Patch: https://github.com/kamailio/kamailio/commit/fa87c0be79e7e12f3ec57c8ec532f02… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3

1 0

[kamailio/kamailio] change ims_diameter_server to allow binary data transcoding (#1528)
by Sergey Zyrianov 05 Jun '18

05 Jun '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Diameter request MAR and corresponding response MAA both contain authentication vectors in binary form. Ims_diameter_server lacks functionality to convert binary arrays to json and back. This pr is a couple of minor fixes to rectify the issue: * when converting Diameter binary vector to json use %02x in sprintf() to form a proper hexdump which is possible to decode on json side. The hexdump is sent in "data" key value pair as string. * introduce new key value pair "hexdump" in json which will contain hex dump of binary vector formed on json side. ims_diameter_server converts it to Diameter AVP using hex dump to binary transcoding. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1528 -- Commit Summary -- * use hexdump type of string to send binary data in json * duplicate before giving it to cdp * converting binary data to hex dump requires fixed width lenght in snprintf -- File Changes -- M src/modules/ims_diameter_server/avp_helper.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1528.patch https://github.com/kamailio/kamailio/pull/1528.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/1528

3 6

git:master:97fa06d8: Merge pull request #1528 from omnicate/master
by GitHub 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 97fa06d85ebb4a512ae6d6a35ab0e8189a397226 URL: https://github.com/kamailio/kamailio/commit/97fa06d85ebb4a512ae6d6a35ab0e81… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-05T06:33:46+02:00 Merge pull request #1528 from omnicate/master ims_diameter_server: Allow binary data transcoding --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/97fa06d85ebb4a512ae6d6a35ab0e81… Patch: https://github.com/kamailio/kamailio/commit/97fa06d85ebb4a512ae6d6a35ab0e81… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 3cd878f7d2..9f6b67cf2e 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -42,6 +42,7 @@ #include "../../core/basex.h" #define STRSIZE 8*1024 +#define HEXDUMP "hexdump" // ID of current message static unsigned int current_msg_id = 0; @@ -109,7 +110,7 @@ cJSON * avp2json(AAA_AVP *avp_t) { case AAA_AVP_DATA_TYPE: l = 0; for (i=0; i < avp_t->data.len; i++) { - l+=snprintf(dest+l,STRSIZE-l-1,"%x", ((unsigned char*)avp_t->data.s)[i]); + l+=snprintf(dest+l,STRSIZE-l-1,"%02x", ((unsigned char*)avp_t->data.s)[i]); } cJSON_AddStringToObject(avp, "data", dest); if (avp_t->data.len == 4) { @@ -250,6 +251,34 @@ int diameterserver_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_co return 1; } +unsigned int parse_hex_half_digit(const char * str) { + if (*str>='0' && *str<='9') { + return (*str)-'0'; + } else if (*str>='A' && *str<='F') { + return 10+(*str)-'A'; + } else if (*str>='a' && *str<='f') { + return 10+(*str)-'a'; + } + return 0; + +} + +char* parse_hexdump(const char * hexdump) { + const char *src = hexdump; + char *hexdump_copy = strdup(hexdump); + unsigned char *dst = (unsigned char*)hexdump_copy; + while (*src) { + unsigned h=parse_hex_half_digit(src++); + h=h<<4; + if (!*src) { + return hexdump_copy; + } + h+=parse_hex_half_digit(src++); + *dst++ = (unsigned char) h; + } + return hexdump_copy; +} + void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level) { int flags; char x[4]; @@ -274,13 +303,16 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level if (cJSON_GetObjectItem(item,"string")) { LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,"string")->valuestring); } + if (cJSON_GetObjectItem(item,HEXDUMP)) { + LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + } if (cJSON_GetObjectItem(item,"int32")) { LM_DBG("%i) Integer: %i\n", level, cJSON_GetObjectItem(item,"int32")->valueint); } if (!cJSON_GetObjectItem(item,"avpCode")) { LM_WARN("mandatory field missing: avpCode\n"); - return; + return; } if (!cJSON_GetObjectItem(item,"vendorId")) { LM_WARN("mandatory field missing: vendorId (avpCode %i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint); @@ -327,8 +359,20 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level strlen(cJSON_GetObjectItem(item,"string")->valuestring), cJSON_GetObjectItem(item,"avpCode")->valueint, flags, cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); } + } else if (cJSON_GetObjectItem(item,HEXDUMP)) { + char * binary_form = parse_hexdump(cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + if (list) { + diameterserver_add_avp_list(list, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } else { + diameterserver_add_avp(response, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } + free(binary_form); } else { - LM_WARN("Not a string, int32, list? Invalid field definition... (%i:%i)\n", + LM_WARN("Not a string, int32, list, hexdump? Invalid field definition... (%i:%i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint, cJSON_GetObjectItem(item,"vendorId")->valueint); } }

1 0

git:master:0d0fb3aa: change to ims_diameter_server module to allow binary data transcoding
by sergey 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 0d0fb3aae63ec4e05506b5dbeaea97f199e0400a URL: https://github.com/kamailio/kamailio/commit/0d0fb3aae63ec4e05506b5dbeaea97f… Author: sergey <sergey(a)comoyo.com> Committer: sergey <sergey(a)comoyo.com> Date: 2018-05-11T12:40:14+02:00 change to ims_diameter_server module to allow binary data transcoding ims_diameter_server: handle binary data in json/Diameter - parselist() added 'hexdump' key to receive binary array in json - avp2json() added width parameter to snprintf to make proper hexdump which is sent in json as 'data' --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/0d0fb3aae63ec4e05506b5dbeaea97f… Patch: https://github.com/kamailio/kamailio/commit/0d0fb3aae63ec4e05506b5dbeaea97f… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 3cd878f7d2..9f6b67cf2e 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -42,6 +42,7 @@ #include "../../core/basex.h" #define STRSIZE 8*1024 +#define HEXDUMP "hexdump" // ID of current message static unsigned int current_msg_id = 0; @@ -109,7 +110,7 @@ cJSON * avp2json(AAA_AVP *avp_t) { case AAA_AVP_DATA_TYPE: l = 0; for (i=0; i < avp_t->data.len; i++) { - l+=snprintf(dest+l,STRSIZE-l-1,"%x", ((unsigned char*)avp_t->data.s)[i]); + l+=snprintf(dest+l,STRSIZE-l-1,"%02x", ((unsigned char*)avp_t->data.s)[i]); } cJSON_AddStringToObject(avp, "data", dest); if (avp_t->data.len == 4) { @@ -250,6 +251,34 @@ int diameterserver_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_co return 1; } +unsigned int parse_hex_half_digit(const char * str) { + if (*str>='0' && *str<='9') { + return (*str)-'0'; + } else if (*str>='A' && *str<='F') { + return 10+(*str)-'A'; + } else if (*str>='a' && *str<='f') { + return 10+(*str)-'a'; + } + return 0; + +} + +char* parse_hexdump(const char * hexdump) { + const char *src = hexdump; + char *hexdump_copy = strdup(hexdump); + unsigned char *dst = (unsigned char*)hexdump_copy; + while (*src) { + unsigned h=parse_hex_half_digit(src++); + h=h<<4; + if (!*src) { + return hexdump_copy; + } + h+=parse_hex_half_digit(src++); + *dst++ = (unsigned char) h; + } + return hexdump_copy; +} + void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level) { int flags; char x[4]; @@ -274,13 +303,16 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level if (cJSON_GetObjectItem(item,"string")) { LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,"string")->valuestring); } + if (cJSON_GetObjectItem(item,HEXDUMP)) { + LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + } if (cJSON_GetObjectItem(item,"int32")) { LM_DBG("%i) Integer: %i\n", level, cJSON_GetObjectItem(item,"int32")->valueint); } if (!cJSON_GetObjectItem(item,"avpCode")) { LM_WARN("mandatory field missing: avpCode\n"); - return; + return; } if (!cJSON_GetObjectItem(item,"vendorId")) { LM_WARN("mandatory field missing: vendorId (avpCode %i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint); @@ -327,8 +359,20 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level strlen(cJSON_GetObjectItem(item,"string")->valuestring), cJSON_GetObjectItem(item,"avpCode")->valueint, flags, cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); } + } else if (cJSON_GetObjectItem(item,HEXDUMP)) { + char * binary_form = parse_hexdump(cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + if (list) { + diameterserver_add_avp_list(list, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } else { + diameterserver_add_avp(response, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } + free(binary_form); } else { - LM_WARN("Not a string, int32, list? Invalid field definition... (%i:%i)\n", + LM_WARN("Not a string, int32, list, hexdump? Invalid field definition... (%i:%i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint, cJSON_GetObjectItem(item,"vendorId")->valueint); } }

1 0

[kamailio/kamailio] cfgutils route_if_exists causing leak (#1503)
by Julien Chavanton 04 Jun '18

04 Jun '18

### Description cfgutils route_if_exists can leak when 1: using a $var or $avp 2: some functions are called within the called route ### Troubleshooting #### Reproduction Note the route is executed from `rtimer` in case this is part of the problem somehow. ``` modparam("rtimer", "timer", "name=tmetrics;interval=9;mode=1;") modparam("rtimer", "exec", "timer=tmetrics;route=test") ``` example : ``` route[dummy] { xinfo("[dummy]"); statsd_gauge("dummy_1xx", $stat(1xx_replies)); } route[test] { $var(route_name) = "dummy"; route_if_exists($var(route_name)); ] ``` working alternative ``` route[dummy] { xinfo("[dummy]"); statsd_gauge("dummy_1xx", $stat(1xx_replies)); } route[test] { $var(route_name) = "dummy"; if (check_route_exists($var(route_name))) { route($var(route_name)); } } ``` #### Debugging Data ``` kamcmd pkg.stats you can see the `real_used` of the timer process with leak every time the route is called ``` -- 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/1503

2 5

git:5.1:942445c2: ims_isc: initial fix of issue #1168
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: 5.1 Commit: 942445c2c3844ae5d2692d7c734cb1375caed849 URL: https://github.com/kamailio/kamailio/commit/942445c2c3844ae5d2692d7c734cb13… Author: valentin <christoph.valentin(a)kapsch.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T15:06:15+02:00 ims_isc: initial fix of issue #1168 Function isc_match_filter() got a new local variable firstflag in order to handle the case where a FAILURE_ROUTE callback is received before the first AS has been contacted. The firstflag is also forwarded to function isc_forward() as parameter. --- Modified: src/modules/ims_isc/ims_isc_mod.c Modified: src/modules/ims_isc/isc.c Modified: src/modules/ims_isc/isc.h --- Diff: https://github.com/kamailio/kamailio/commit/942445c2c3844ae5d2692d7c734cb13… Patch: https://github.com/kamailio/kamailio/commit/942445c2c3844ae5d2692d7c734cb13… --- diff --git a/src/modules/ims_isc/ims_isc_mod.c b/src/modules/ims_isc/ims_isc_mod.c index e0f7b940ee..4618ca7db1 100644 --- a/src/modules/ims_isc/ims_isc_mod.c +++ b/src/modules/ims_isc/ims_isc_mod.c @@ -224,6 +224,8 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { //sometimes s is populated by an ims_getter method cscf_get_terminating_user that alloc memory that must be free-ed at the end int free_s = 0; + //the callback from the Cx interface in case of unreg terminating initial message is a FAILURE_ROUTE. Hence we need an addl. flag + int firstflag = 0; int ret = ISC_RETURN_FALSE; isc_mark new_mark, old_mark; @@ -245,9 +247,10 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { LM_DBG("Message returned s=%d;h=%d;d=%d;a=%.*s\n", old_mark.skip, old_mark.handling, old_mark.direction, old_mark.aor.len, old_mark.aor.s); } else { LM_DBG("Starting triggering\n"); + firstflag = 1; } - if (is_route_type(FAILURE_ROUTE)) { + if (is_route_type(FAILURE_ROUTE) && !firstflag) { /* need to find the handling for the failed trigger */ if (dir == DLG_MOBILE_ORIGINATING) { k = cscf_get_originating_user(msg, &s); @@ -345,7 +348,7 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { new_mark.skip = m->index + 1; new_mark.handling = m->default_handling; new_mark.aor = s; - ret = isc_forward(msg, m, &new_mark); + ret = isc_forward(msg, m, &new_mark, firstflag); isc_free_match(m); goto done; } @@ -383,7 +386,7 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { new_mark.skip = m->index + 1; new_mark.handling = m->default_handling; new_mark.aor = s; - ret = isc_forward(msg, m, &new_mark); + ret = isc_forward(msg, m, &new_mark, firstflag); isc_free_match(m); goto done; } diff --git a/src/modules/ims_isc/isc.c b/src/modules/ims_isc/isc.c index 3d1fdf5c46..a095e054e7 100644 --- a/src/modules/ims_isc/isc.c +++ b/src/modules/ims_isc/isc.c @@ -56,7 +56,7 @@ * @param mark - the isc_mark that should be used to mark the message * @returns #ISC_RETURN_TRUE if OK, #ISC_RETURN_ERROR if not */ -int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { +int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark, int firstflag) { struct cell *t; unsigned int hash, label; ticks_t fr_timeout, fr_inv_timeout; @@ -75,7 +75,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { memcpy(msg->dst_uri.s, m->server_name.s, m->server_name.len); /* append branch if last trigger failed */ - if (is_route_type(FAILURE_ROUTE)) + if (is_route_type(FAILURE_ROUTE) && !firstflag) append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); // Determines the tm transaction identifiers. diff --git a/src/modules/ims_isc/isc.h b/src/modules/ims_isc/isc.h index 8c3715e347..ac012162fd 100644 --- a/src/modules/ims_isc/isc.h +++ b/src/modules/ims_isc/isc.h @@ -66,7 +66,7 @@ extern int isc_fr_inv_timeout; /**< default ISC INVITE response timeout in ms * /** SIP Status Code to send to client on Session Termination because AS did not respond */ -int isc_forward( struct sip_msg *msg, isc_match *m,isc_mark *mark); +int isc_forward( struct sip_msg *msg, isc_match *m,isc_mark *mark, int firstflag); #endif

1 0

[kamailio/kamailio] ims_isc: initial fix of issue #1168 (#1553)
by Christoph VALENTIN 04 Jun '18

04 Jun '18

Function isc_match_filter() got a new local variable firstflag in order to handle the case where a FAILURE_ROUTE callback is received before the first AS has been contacted. The firstflag is also forwarded to function isc_forward() as parameter.   #### 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 - [x] Related to issue #1168 (replace XXXX with an open issue number) #### Description  This is the 5.1 pull request, which was created by cherry-pick from the master pull request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1553 -- Commit Summary -- * ims_isc: initial fix of issue #1168 -- File Changes -- M src/modules/ims_isc/ims_isc_mod.c (9) M src/modules/ims_isc/isc.c (4) M src/modules/ims_isc/isc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1553.patch https://github.com/kamailio/kamailio/pull/1553.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/1553

2 2

git:master:ae22ba7e: core: msg translator - skip last ; from xavp serialized in via params
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: ae22ba7eb41259f9def7e1e0e30b755214e26234 URL: https://github.com/kamailio/kamailio/commit/ae22ba7eb41259f9def7e1e0e30b755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T11:27:08+02:00 core: msg translator - skip last ; from xavp serialized in via params --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/ae22ba7eb41259f9def7e1e0e30b755… Patch: https://github.com/kamailio/kamailio/commit/ae22ba7eb41259f9def7e1e0e30b755… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 2e649ac6c6..88019b869b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2945,7 +2945,7 @@ char* create_via_hf( unsigned int *len, xparams.len = xavp_serialize_fields(&_ksr_xavp_via_params, xparams.s, pv_get_buffer_size()); if(xparams.len>0) { - via = (char*)pkg_malloc(extra_params.len+xparams.len+1); + via = (char*)pkg_malloc(extra_params.len+xparams.len+2); if(via==0) { LM_ERR("building xavps params failed\n"); if (extra_params.s) pkg_free(extra_params.s); @@ -2955,7 +2955,10 @@ char* create_via_hf( unsigned int *len, memcpy(via, extra_params.s, extra_params.len); pkg_free(extra_params.s); } - memcpy(via + extra_params.len, xparams.s, xparams.len); + /* add ';' between via parameters */ + via[extra_params.len] = ';'; + /* skip last ';' from xavp serialized output */ + memcpy(via + extra_params.len + 1, xparams.s, xparams.len - 1); extra_params.s = via; extra_params.len += xparams.len; extra_params.s[extra_params.len] = '\0';

1 0

git:master:2c6dae75: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 2c6dae75628f5e426e81e71c203765f9c4bb5633 URL: https://github.com/kamailio/kamailio/commit/2c6dae75628f5e426e81e71c203765f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-04T08:31:55+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/2c6dae75628f5e426e81e71c203765f… Patch: https://github.com/kamailio/kamailio/commit/2c6dae75628f5e426e81e71c203765f…

1 0

git:master:f5422833: corex: docs - send() updated to send_udp()
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: f5422833fbb42149d3a47450d863f0e5e1d29c6b URL: https://github.com/kamailio/kamailio/commit/f5422833fbb42149d3a47450d863f0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: docs - send() updated to send_udp() - example for send_tcp() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5422833fbb42149d3a47450d863f0e… Patch: https://github.com/kamailio/kamailio/commit/f5422833fbb42149d3a47450d863f0e… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index bee0ec4791..346ecf2019 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -205,9 +205,9 @@ modparam("corex", "msg_avp", "$avp(msg)") </example> </section> - <section id="corex.f.send"> + <section id="corex.f.send_udp"> <title> - <function moreinfo="none">send([ host [ :port ] ])</function> + <function moreinfo="none">send_udp([ host [ :port ] ])</function> </title> <para> Send the original SIP message to a specific destination in stateless @@ -228,13 +228,13 @@ modparam("corex", "msg_avp", "$avp(msg)") This function can be used from REQUEST_ROUTE or FAILURE_ROUTE. </para> <example> - <title><function>send</function> usage</title> + <title><function>send_udp</function> usage</title> <programlisting format="linespecific"> ... - send(); - send("10.20.15.10"); - send("sip.example.com:5070"); - send("$var(res)"); + send_udp(); + send_udp("10.20.15.10"); + send_udp("sip.example.com:5070"); + send_udp("$var(res)"); ... </programlisting> </example> @@ -245,10 +245,21 @@ modparam("corex", "msg_avp", "$avp(msg)") <function moreinfo="none">send_tcp([ host [ :port ] ])</function> </title> <para> - This function is identical to <emphasis>send()</emphasis> + This function is identical to <emphasis>send_udp()</emphasis> described above, except that it sends the SIP message using the TCP protocol instead of UDP. </para> + <example> + <title><function>send_tcp</function> usage</title> + <programlisting format="linespecific"> +... + send_tcp(); + send_tcp("10.20.15.10"); + send_tcp("sip.example.com:5070"); + send_tcp("$var(res)"); +... +</programlisting> + </example> </section> <section id="corex.f.send_data">

1 0

git:master:e19f6f23: corex: send_data() and sendx() exported to kemi framework
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: e19f6f23f942ffbd940cbd194c405cae45dd38e0 URL: https://github.com/kamailio/kamailio/commit/e19f6f23f942ffbd940cbd194c405ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: send_data() and sendx() exported to kemi framework --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e19f6f23f942ffbd940cbd194c405ca… Patch: https://github.com/kamailio/kamailio/commit/e19f6f23f942ffbd940cbd194c405ca… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index ee1d506b69..4831535f67 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -245,6 +245,13 @@ static int w_send_data(sip_msg_t *msg, char *suri, char *sdata) return 1; } +static int ki_send_data(sip_msg_t *msg, str *uri, str *data) +{ + if(corex_send_data(uri, NULL, data) < 0) + return -1; + return 1; +} + static int w_sendx(sip_msg_t *msg, char *suri, char *ssock, char *sdata) { str uri; @@ -271,6 +278,13 @@ static int w_sendx(sip_msg_t *msg, char *suri, char *ssock, char *sdata) return 1; } +static int ki_sendx(sip_msg_t *msg, str *uri, str *sock, str *data) +{ + if(corex_send_data(uri, sock, data) < 0) + return -1; + return 1; +} + int corex_alias_subdomains_param(modparam_t type, void *val) { if(val==NULL) @@ -898,6 +912,16 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("send_data"), + SR_KEMIP_INT, ki_send_data, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("sendx"), + SR_KEMIP_INT, ki_sendx, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:3f2e41af: corex: send() renamed to send_udp()
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 3f2e41aff06f7e158e0a1547f1413eaca3f4b9c6 URL: https://github.com/kamailio/kamailio/commit/3f2e41aff06f7e158e0a1547f1413ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: send() renamed to send_udp() - reflect better that it uses UDP always, similar to send_tcp() --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3f2e41aff06f7e158e0a1547f1413ea… Patch: https://github.com/kamailio/kamailio/commit/3f2e41aff06f7e158e0a1547f1413ea… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index f95aaf46c7..ee1d506b69 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -41,7 +41,7 @@ MODULE_VERSION static int nio_intercept = 0; static int w_append_branch(sip_msg_t *msg, char *su, char *sq); -static int w_send(sip_msg_t *msg, char *su, char *sq); +static int w_send_udp(sip_msg_t *msg, char *su, char *sq); static int w_send_tcp(sip_msg_t *msg, char *su, char *sq); static int w_send_data(sip_msg_t *msg, char *suri, char *sdata); static int w_sendx(sip_msg_t *msg, char *suri, char *ssock, char *sdata); @@ -81,9 +81,9 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"send", (cmd_function)w_send, 0, 0, + {"send_udp", (cmd_function)w_send_udp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"send", (cmd_function)w_send, 1, fixup_spve_spve, + {"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, @@ -206,14 +206,18 @@ static int w_append_branch(sip_msg_t *msg, char *su, char *sq) } /** - * config wrapper for send() and send_tcp() + * config wrapper for send_udp() */ -static int w_send(sip_msg_t *msg, char *su, char *sq) +static int w_send_udp(sip_msg_t *msg, char *su, char *sq) { if(corex_send(msg, (gparam_t*)su, PROTO_UDP) < 0) return -1; return 1; } + +/** + * config wrapper for send_tcp() + */ static int w_send_tcp(sip_msg_t *msg, char *su, char *sq) { if(corex_send(msg, (gparam_t*)su, PROTO_TCP) < 0)

1 0

git:master:706a72f1: corex: documentation for sendx() function
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 706a72f14362d4bfb609ec45856de6b4339c9563 URL: https://github.com/kamailio/kamailio/commit/706a72f14362d4bfb609ec45856de6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: documentation for sendx() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/706a72f14362d4bfb609ec45856de6b… Patch: https://github.com/kamailio/kamailio/commit/706a72f14362d4bfb609ec45856de6b… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index bada400b9f..bee0ec4791 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -272,7 +272,32 @@ modparam("corex", "msg_avp", "$avp(msg)") </programlisting> </example> </section> - <section id="corex.f.is_incoming"> + + <section id="corex.f.sendx"> + <title> + <function moreinfo="none">sendx(uri, sock, data)</function> + </title> + <para> + Send the data to address specified by uri using a specific local + socket. All parameters can contain pseudo-variables. The uri + parameter has to be a valid SIP URI. The sock parameter has to be + a valid socket specifier (like values assigned to $fs). The data + parameter can by any arbitrary content. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sendx</function> usage</title> + <programlisting format="linespecific"> +... +sendx("sip:example.com:5070;transport=sctp", "sctp:2.3.4.5:5060", "Message at $Ts"); +... +</programlisting> + </example> + </section> + + <section id="corex.f.is_incoming"> <title> <function moreinfo="none">is_incoming()</function> </title>

1 0

git:master:b8ab2db0: core: parse methods recognize more by id
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: b8ab2db0480cf584a1e838aea3740547441bf639 URL: https://github.com/kamailio/kamailio/commit/b8ab2db0480cf584a1e838aea374054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 core: parse methods recognize more by id --- Modified: src/core/parser/parse_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/b8ab2db0480cf584a1e838aea374054… Patch: https://github.com/kamailio/kamailio/commit/b8ab2db0480cf584a1e838aea374054… --- diff --git a/src/core/parser/parse_methods.c b/src/core/parser/parse_methods.c index 5823a48a10..6242e88667 100644 --- a/src/core/parser/parse_methods.c +++ b/src/core/parser/parse_methods.c @@ -106,6 +106,14 @@ int parse_method_name(const str* const s, enum request_method* const method) *method = METHOD_PUBLISH; return 0; } + if (likely((s->len==4) && !strncasecmp(s->s + 1, "ost", 3))) { + *method = METHOD_POST; + return 0; + } + if (likely((s->len==3) && !strncasecmp(s->s + 1, "ut", 2))) { + *method = METHOD_PUT; + return 0; + } break; case 'C': case 'c': @@ -156,6 +164,27 @@ int parse_method_name(const str* const s, enum request_method* const method) return 0; } break; + case 'D': + case 'd': + if (likely((s->len==6) && !strncasecmp(s->s + 1, "elete", 5))){ + *method = METHOD_DELETE; + return 0; + } + break; + case 'G': + case 'g': + if (likely((s->len==3) && !strncasecmp(s->s + 1, "et", 2))){ + *method = METHOD_GET; + return 0; + } + break; + case 'K': + case 'k': + if (likely((s->len==4) && !strncasecmp(s->s + 1, "dmq", 3))){ + *method = METHOD_KDMQ; + return 0; + } + break; default: break; } @@ -287,6 +316,18 @@ static int parse_method_advance(str* const _next, enum request_method* const _me _next->s += 7; goto found; } + if ((_next->len > 3) && !strncasecmp(_next->s + 1, "ost", 3)) { + *_method = METHOD_POST; + _next->len -= 4; + _next->s += 4; + goto found; + } + if ((_next->len > 2) && !strncasecmp(_next->s + 1, "ut", 2)) { + *_method = METHOD_PUT; + _next->len -= 3; + _next->s += 3; + goto found; + } goto unknown; case 'R': @@ -330,7 +371,36 @@ static int parse_method_advance(str* const _next, enum request_method* const _me } else { goto unknown; } - + case 'D': + case 'd': + if ((_next->len>5) && !strncasecmp(_next->s + 1, "elete", 5)){ + *_method = METHOD_DELETE; + _next->len -= 6; + _next->s += 6; + goto found; + } else { + goto unknown; + } + case 'G': + case 'g': + if ((_next->len>2) && !strncasecmp(_next->s + 1, "et", 2)){ + *_method = METHOD_GET; + _next->len -= 3; + _next->s += 3; + goto found; + } else { + goto unknown; + } + case 'K': + case 'k': + if ((_next->len>3) && !strncasecmp(_next->s + 1, "dmq", 3)){ + *_method = METHOD_KDMQ; + _next->len -= 4; + _next->s += 4; + goto found; + } else { + goto unknown; + } default: goto unknown; }

1 0

git:master:cf11f16c: corex: added sendx(uri, socket, data)
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: cf11f16c605ae83af5f1683a066db4340012b0c6 URL: https://github.com/kamailio/kamailio/commit/cf11f16c605ae83af5f1683a066db43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: added sendx(uri, socket, data) - send data to destination uri by using local socket --- Modified: src/modules/corex/corex_lib.c Modified: src/modules/corex/corex_lib.h Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf11f16c605ae83af5f1683a066db43… Patch: https://github.com/kamailio/kamailio/commit/cf11f16c605ae83af5f1683a066db43…

1 0

git:master:4fe95ab7: core: parser - assign ids for more methods
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 4fe95ab7db7f3fca83578bb7e2b2f478828793d3 URL: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 core: parser - assign ids for more methods - KDMQ and HTTP method types GET, POST, PUT and DELETE --- Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… Patch: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 9d9d73a36e..5922cfc1cc 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -74,7 +74,12 @@ typedef enum request_method { METHOD_UPDATE=2048, /*!< 2048 - 2^11 */ METHOD_REFER=4096, /*!< 4096 - 2^12 */ METHOD_PUBLISH=8192, /*!< 8192 - 2^13 */ - METHOD_OTHER=16384 /*!< 16384 - 2^14 */ + METHOD_KDMQ=16384, /*!< 16384 - 2^14 */ + METHOD_GET=32768, /*!< 32768 - 2^15 */ + METHOD_POST=65536, /*!< 65536 - 2^16 */ + METHOD_PUT=131072, /*!< 131072 - 2^17 */ + METHOD_DELETE=262144, /*!< 262144 - 2^18 */ + METHOD_OTHER=524288 /*!< 524288 - 2^19 */ } request_method_t; #define FL_FORCE_RPORT (1 << 0) /*!< force rport */ diff --git a/src/core/parser/parse_methods.c b/src/core/parser/parse_methods.c index de36d602c1..5823a48a10 100644 --- a/src/core/parser/parse_methods.c +++ b/src/core/parser/parse_methods.c @@ -65,7 +65,7 @@ int parse_method_name(const str* const s, enum request_method* const method) } switch ((s->s)[0]) { - /* ordered after probability of aparition on a normal proxy */ + /* ordered after probability of apparition on a normal proxy */ case 'R': case 'r': if (likely((s->len == 8) &&

1 0

git:5.0:f07dabff: core: improve header safe guards for Via handling
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: 5.0 Commit: f07dabffef98c7088cdbc2bd695a4ae7a241b159 URL: https://github.com/kamailio/kamailio/commit/f07dabffef98c7088cdbc2bd695a4ae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T21:03:15+02:00 core: improve header safe guards for Via handling (cherry picked from commit ad68e402ece8089f133c10de6ce319f9e28c0692) --- Modified: src/core/crc.c Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/f07dabffef98c7088cdbc2bd695a4ae… Patch: https://github.com/kamailio/kamailio/commit/f07dabffef98c7088cdbc2bd695a4ae… --- diff --git a/src/core/crc.c b/src/core/crc.c index 4628463245..23b2876ecf 100644 --- a/src/core/crc.c +++ b/src/core/crc.c @@ -231,6 +231,8 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = 0xFFFF; str_len=CRC16_LEN; for (i=0; i<size; i++ ) { + /* invalid str with positive length and null char pointer */ + if( unlikely(src[i].s==NULL)) break; c=src[i].s; len=src[i].len; while(len) { diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 201e3a5e1d..58978f958c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -168,12 +168,17 @@ static int check_via_address(struct ip_addr* ip, str *name, (name->s[name->len-1]==']')&& (strncasecmp(name->s+1, s, len)==0)) ) - ) + ) { return 0; - else - + } + else { + if (unlikely(name->s==NULL)) { + LM_CRIT("invalid Via host name\n"); + return -1; + } if (strncmp(name->s, s, name->len)==0) return 0; + } }else{ LM_CRIT("could not convert ip address\n"); return -1;

1 0

git:5.1:d67b2f98: core: improve header safe guards for Via handling
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: 5.1 Commit: d67b2f9874ca23bd69f18df71b8f53b1b6151f6d URL: https://github.com/kamailio/kamailio/commit/d67b2f9874ca23bd69f18df71b8f53b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T21:02:35+02:00 core: improve header safe guards for Via handling (cherry picked from commit ad68e402ece8089f133c10de6ce319f9e28c0692) --- Modified: src/core/crc.c Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/d67b2f9874ca23bd69f18df71b8f53b… Patch: https://github.com/kamailio/kamailio/commit/d67b2f9874ca23bd69f18df71b8f53b… --- diff --git a/src/core/crc.c b/src/core/crc.c index 4628463245..23b2876ecf 100644 --- a/src/core/crc.c +++ b/src/core/crc.c @@ -231,6 +231,8 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = 0xFFFF; str_len=CRC16_LEN; for (i=0; i<size; i++ ) { + /* invalid str with positive length and null char pointer */ + if( unlikely(src[i].s==NULL)) break; c=src[i].s; len=src[i].len; while(len) { diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 201e3a5e1d..58978f958c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -168,12 +168,17 @@ static int check_via_address(struct ip_addr* ip, str *name, (name->s[name->len-1]==']')&& (strncasecmp(name->s+1, s, len)==0)) ) - ) + ) { return 0; - else - + } + else { + if (unlikely(name->s==NULL)) { + LM_CRIT("invalid Via host name\n"); + return -1; + } if (strncmp(name->s, s, name->len)==0) return 0; + } }else{ LM_CRIT("could not convert ip address\n"); return -1;

1 0

git:master:ad68e402: core: improve header safe guards for Via handling
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: master Commit: ad68e402ece8089f133c10de6ce319f9e28c0692 URL: https://github.com/kamailio/kamailio/commit/ad68e402ece8089f133c10de6ce319f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T20:59:32+02:00 core: improve header safe guards for Via handling --- Modified: src/core/crc.c Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/ad68e402ece8089f133c10de6ce319f… Patch: https://github.com/kamailio/kamailio/commit/ad68e402ece8089f133c10de6ce319f… --- diff --git a/src/core/crc.c b/src/core/crc.c index 4628463245..23b2876ecf 100644 --- a/src/core/crc.c +++ b/src/core/crc.c @@ -231,6 +231,8 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = 0xFFFF; str_len=CRC16_LEN; for (i=0; i<size; i++ ) { + /* invalid str with positive length and null char pointer */ + if( unlikely(src[i].s==NULL)) break; c=src[i].s; len=src[i].len; while(len) { diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4dd648e874..2e649ac6c6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -170,12 +170,17 @@ static int check_via_address(struct ip_addr* ip, str *name, (name->s[name->len-1]==']')&& (strncasecmp(name->s+1, s, len)==0)) ) - ) + ) { return 0; - else - + } + else { + if (unlikely(name->s==NULL)) { + LM_CRIT("invalid Via host name\n"); + return -1; + } if (strncmp(name->s, s, name->len)==0) return 0; + } }else{ LM_CRIT("could not convert ip address\n"); return -1;

1 0

git:master:07f710bd: core: small formatting fix - if has no brackets
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: master Commit: 07f710bdbbf99ff2bc75218b6d972481eaaba1e4 URL: https://github.com/kamailio/kamailio/commit/07f710bdbbf99ff2bc75218b6d97248… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T19:01:26+02:00 core: small formatting fix - if has no brackets --- Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/07f710bdbbf99ff2bc75218b6d97248… Patch: https://github.com/kamailio/kamailio/commit/07f710bdbbf99ff2bc75218b6d97248… --- diff --git a/src/core/tags.h b/src/core/tags.h index 192fdc3b1d..ddfdaae411 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -52,7 +52,7 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) suffix_source[1]=msg->via1->port_str; if (msg->via1->branch) suffix_source[ss_nr++]=msg->via1->branch->value; - crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + crcitt_string_array( tag_suffix, suffix_source, ss_nr ); } static void inline init_tags( char *tag, char **suffix,

1 0

[kamailio/kamailio] Bugfix issue 1168 - Unregistered Terminating Services (PSI) Configured at HSS (#1538)
by Christoph VALENTIN 02 Jun '18

02 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally against Version 5.1.0 - [x] Related to issue #1168 (replace XXXX with an open issue number) #### Description  The ims_isc module cannot cope with the fact that asynchronous Response from HSS (Diameter SAA message) is received as "FAILURE_ROUTE". ims_isc module erroneously assumes, it is an answer from the AS. Change: added a "firstflag", which makes a difference between first call (SAA from HSS) and subsequent call (FAILURE ROUTE from AS). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1538 -- Commit Summary -- * ims_isc: initial fix of issue #1168 * ims_isc: implement regexec for isc_checker_find() for wildcarded PSIs * ims_isc: fix: use null terminated strings for regex functions * ims_isc: delete regexec for wildcarded PSIs from isc_checker_find() * ims_isc: remove KCCVICT tagging * Merge branch 'devel_rewi_psi' into bugfix_issue_1168 -- File Changes -- M src/modules/ims_isc/ims_isc_mod.c (9) M src/modules/ims_isc/isc.c (4) M src/modules/ims_isc/isc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1538.patch https://github.com/kamailio/kamailio/pull/1538.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/1538

4 10

git:master:e7ee14f0: topos: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: e7ee14f0d168c36c62cd6bef58334db1f0871470 URL: https://github.com/kamailio/kamailio/commit/e7ee14f0d168c36c62cd6bef58334db… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:46:37+02:00 topos: fix warning about uninitialized variable --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e7ee14f0d168c36c62cd6bef58334db… Patch: https://github.com/kamailio/kamailio/commit/e7ee14f0d168c36c62cd6bef58334db… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index da141888c3..66169f7b02 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -371,7 +371,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) */ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) { - int ret; + int ret = -1; /* error if dialog == 0 */ str suid; if(dialog==0) {

1 0

git:master:5aa636bc: ss7ops: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 5aa636bc94728db1284ac90e922d0a222d20d7c5 URL: https://github.com/kamailio/kamailio/commit/5aa636bc94728db1284ac90e922d0a2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:46:23+02:00 ss7ops: fix warning about uninitialized variable --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5aa636bc94728db1284ac90e922d0a2… Patch: https://github.com/kamailio/kamailio/commit/5aa636bc94728db1284ac90e922d0a2… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index 9a6b000e1b..54017381f4 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -327,6 +327,7 @@ static int ki_isup_to_json(sip_msg_t *_m, int proto) srjson_DeleteDoc(isup_json); isup_last = NULL; isup_json = NULL; + mtp_type = 0; data = fetch_payload(_m, "$var(payload)", &int_len); if (!data) @@ -744,4 +745,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ss7ops_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:b07d4d0e: cfgutils: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: b07d4d0e5c9c5db07d4d0806e6a1540b73b6c333 URL: https://github.com/kamailio/kamailio/commit/b07d4d0e5c9c5db07d4d0806e6a1540… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:45:26+02:00 cfgutils: fix warning about uninitialized variable --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/b07d4d0e5c9c5db07d4d0806e6a1540… Patch: https://github.com/kamailio/kamailio/commit/b07d4d0e5c9c5db07d4d0806e6a1540… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index c0872ec33c..b2fe2bd4bd 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -208,7 +208,7 @@ struct module_exports exports = { /**************************** fixup functions ******************************/ static int fixup_prob( void** param, int param_no) { - unsigned int myint; + unsigned int myint = 1000; /* stop if str2int later fail */ str param_str; /* we only fix the parameter #1 */

1 0

git:master:42265d01: sipt: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 42265d011f40f4f8ec90799489db120b156ef6e1 URL: https://github.com/kamailio/kamailio/commit/42265d011f40f4f8ec90799489db120… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:46:03+02:00 sipt: fix warning about uninitialized variable --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/42265d011f40f4f8ec90799489db120… Patch: https://github.com/kamailio/kamailio/commit/42265d011f40f4f8ec90799489db120… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 8c7f3f03a8..a1f0b348d1 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -689,7 +689,7 @@ static int sipt_destination2(struct sip_msg *msg, char *_destination, char *_hop unsigned int int_nai = 0; str2int(nai, &int_nai); str * terminator = (str*)_terminator; - unsigned int int_terminator; + unsigned int int_terminator = 0; /* if the str2int later fail */ str2int(terminator, &int_terminator); str * destination = (str*)_destination; struct sdp_mangler mangle;

1 0

git:master:03698a4b: pv: debug message with intermediate message to evaluate by pv_evalx()
by Daniel-Constantin Mierla 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 03698a4b2ec49896c08a3989403d7e33ff9fb844 URL: https://github.com/kamailio/kamailio/commit/03698a4b2ec49896c08a3989403d7e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-01T18:49:07+02:00 pv: debug message with intermediate message to evaluate by pv_evalx() --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/03698a4b2ec49896c08a3989403d7e3… Patch: https://github.com/kamailio/kamailio/commit/03698a4b2ec49896c08a3989403d7e3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index d03a52409a..096b253b30 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1001,6 +1001,7 @@ int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt) goto error; } + LM_DBG("preparing to evaluate: [%.*s]\n", tstr.len, tstr.s); if(pv_eval_str(msg, &val.rs, &tstr)<0){ LM_ERR("cannot eval reparsed value of second parameter\n"); return -1;

1 0

sip_msg structure and memory free
by Konstantin Polyakov 01 Jun '18

01 Jun '18

Hello All, There is a structure sip_msg which is passed into a module and represents a received sip message. It contains number of pointers to hdr_field members. In its turn hdr_field contains member void* parsed In the sanity module we assign to parsed member a pointer to newly allocated memory and we don't free that memory at the end. Do we need to free explicitly or this memory will be deallocated later together with sip_msg ? In other words is it memory leak or not? Best regards, Konstantin

2 4

git:master:02aa4892: modules: readme files regenerated - sipt ... [skip ci]
by Kamailio Dev 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 02aa489232a4683e21a918f5621cd7ccaf4ed981 URL: https://github.com/kamailio/kamailio/commit/02aa489232a4683e21a918f5621cd7c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-01T10:17:07+02:00 modules: readme files regenerated - sipt ... [skip ci] --- Modified: src/modules/sipt/README --- Diff: https://github.com/kamailio/kamailio/commit/02aa489232a4683e21a918f5621cd7c… Patch: https://github.com/kamailio/kamailio/commit/02aa489232a4683e21a918f5621cd7c…

1 0

git:5.1:7de9b687: ims_usrloc_scscf: bugfix Contct is removed when old Contct expires
by Daniel-Constantin Mierla 01 Jun '18

01 Jun '18

Module: kamailio Branch: 5.1 Commit: 7de9b687355f714d327b3c74a0fc63c85c9d1aee URL: https://github.com/kamailio/kamailio/commit/7de9b687355f714d327b3c74a0fc63c… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-01T10:13:20+02:00 ims_usrloc_scscf: bugfix Contct is removed when old Contct expires in function unlink_contact_from_impu() (in file impurecord.c) an assignment "=" is used instead of a comparision operator "==". This leads to mess, when old contact expires. --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/7de9b687355f714d327b3c74a0fc63c… Patch: https://github.com/kamailio/kamailio/commit/7de9b687355f714d327b3c74a0fc63c… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 9cee5bc765..6510d85aa1 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1239,7 +1239,7 @@ int unlink_contact_from_impu(impurecord_t* impu, ucontact_t* contact, int write_ impucontact = impu->linked_contacts.head; while (impucontact) { - if ((contact = impucontact->contact)) { + if ((contact == impucontact->contact)) { remove_impucontact_from_list(impu, impucontact); if (write_to_db && db_mode == WRITE_THROUGH && (db_unlink_contact_from_impu(impu, contact) != 0)) { LM_ERR("Failed to un-link DB contact [%.*s] from IMPU [%.*s]...continuing but db will be out of sync!\n", contact->c.len, contact->c.s, impu->public_identity.len, impu->public_identity.s);

1 0

git:master:53a52f9b: ims_isc: initial fix of issue #1168
by Daniel-Constantin Mierla 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 53a52f9b2caa1fd04e30747ce46f8a22834991a0 URL: https://github.com/kamailio/kamailio/commit/53a52f9b2caa1fd04e30747ce46f8a2… Author: valentin <christoph.valentin(a)kapsch.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-01T10:12:50+02:00 ims_isc: initial fix of issue #1168 Function isc_match_filter() got a new local variable firstflag in order to handle the case where a FAILURE_ROUTE callback is received before the first AS has been contacted. The firstflag is also forwarded to function isc_forward() as parameter. --- Modified: src/modules/ims_isc/ims_isc_mod.c Modified: src/modules/ims_isc/isc.c Modified: src/modules/ims_isc/isc.h --- Diff: https://github.com/kamailio/kamailio/commit/53a52f9b2caa1fd04e30747ce46f8a2… Patch: https://github.com/kamailio/kamailio/commit/53a52f9b2caa1fd04e30747ce46f8a2… --- diff --git a/src/modules/ims_isc/ims_isc_mod.c b/src/modules/ims_isc/ims_isc_mod.c index e0f7b940ee..4618ca7db1 100644 --- a/src/modules/ims_isc/ims_isc_mod.c +++ b/src/modules/ims_isc/ims_isc_mod.c @@ -224,6 +224,8 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { //sometimes s is populated by an ims_getter method cscf_get_terminating_user that alloc memory that must be free-ed at the end int free_s = 0; + //the callback from the Cx interface in case of unreg terminating initial message is a FAILURE_ROUTE. Hence we need an addl. flag + int firstflag = 0; int ret = ISC_RETURN_FALSE; isc_mark new_mark, old_mark; @@ -245,9 +247,10 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { LM_DBG("Message returned s=%d;h=%d;d=%d;a=%.*s\n", old_mark.skip, old_mark.handling, old_mark.direction, old_mark.aor.len, old_mark.aor.s); } else { LM_DBG("Starting triggering\n"); + firstflag = 1; } - if (is_route_type(FAILURE_ROUTE)) { + if (is_route_type(FAILURE_ROUTE) && !firstflag) { /* need to find the handling for the failed trigger */ if (dir == DLG_MOBILE_ORIGINATING) { k = cscf_get_originating_user(msg, &s); @@ -345,7 +348,7 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { new_mark.skip = m->index + 1; new_mark.handling = m->default_handling; new_mark.aor = s; - ret = isc_forward(msg, m, &new_mark); + ret = isc_forward(msg, m, &new_mark, firstflag); isc_free_match(m); goto done; } @@ -383,7 +386,7 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { new_mark.skip = m->index + 1; new_mark.handling = m->default_handling; new_mark.aor = s; - ret = isc_forward(msg, m, &new_mark); + ret = isc_forward(msg, m, &new_mark, firstflag); isc_free_match(m); goto done; } diff --git a/src/modules/ims_isc/isc.c b/src/modules/ims_isc/isc.c index 3d1fdf5c46..a095e054e7 100644 --- a/src/modules/ims_isc/isc.c +++ b/src/modules/ims_isc/isc.c @@ -56,7 +56,7 @@ * @param mark - the isc_mark that should be used to mark the message * @returns #ISC_RETURN_TRUE if OK, #ISC_RETURN_ERROR if not */ -int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { +int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark, int firstflag) { struct cell *t; unsigned int hash, label; ticks_t fr_timeout, fr_inv_timeout; @@ -75,7 +75,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { memcpy(msg->dst_uri.s, m->server_name.s, m->server_name.len); /* append branch if last trigger failed */ - if (is_route_type(FAILURE_ROUTE)) + if (is_route_type(FAILURE_ROUTE) && !firstflag) append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); // Determines the tm transaction identifiers. diff --git a/src/modules/ims_isc/isc.h b/src/modules/ims_isc/isc.h index 8c3715e347..ac012162fd 100644 --- a/src/modules/ims_isc/isc.h +++ b/src/modules/ims_isc/isc.h @@ -66,7 +66,7 @@ extern int isc_fr_inv_timeout; /**< default ISC INVITE response timeout in ms * /** SIP Status Code to send to client on Session Termination because AS did not respond */ -int isc_forward( struct sip_msg *msg, isc_match *m,isc_mark *mark); +int isc_forward( struct sip_msg *msg, isc_match *m,isc_mark *mark, int firstflag); #endif

1 0

[kamailio/kamailio] sipt: Add functions to work with forwarding info (#1498)
by sergey-vb 01 Jun '18

01 Jun '18

#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 This commits adding some new functions to Get and Change forwarding info in ISUP part of SIP-I/SIP-T messages. sipt_forwarding(origin, nai) - updates the IAM in the body if it exists, setting (or adding) the forwarding number to origin with the nature address specified in nai $sipt_redirection_info - Returns "Redirecting reason" or -1 if no redirection info found. $sipt_redirection_number - Returns number to which redirection will trigered sipt_redirection_number_nai - Returns NAI for redirection number from ISUP You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1498 -- Commit Summary -- * sipt: Add functions to work with forwarding info (#18) -- File Changes -- M src/modules/sipt/doc/sipt_admin.xml (72) M src/modules/sipt/sipt.c (149) M src/modules/sipt/ss7.h (6) M src/modules/sipt/ss7_parser.c (138) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1498.patch https://github.com/kamailio/kamailio/pull/1498.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/1498

3 11

git:master:21b9694d: sipt: added functions to work with forwarding info
by Daniel-Constantin Mierla 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 21b9694d4eb18e146692dedc2a2337216d58b5c2 URL: https://github.com/kamailio/kamailio/commit/21b9694d4eb18e146692dedc2a23372… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-01T10:09:53+02:00 sipt: added functions to work with forwarding info - new variables as part of $sipt(...) --- Modified: src/modules/sipt/doc/sipt_admin.xml Modified: src/modules/sipt/sipt.c Modified: src/modules/sipt/ss7.h Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/21b9694d4eb18e146692dedc2a23372… Patch: https://github.com/kamailio/kamailio/commit/21b9694d4eb18e146692dedc2a23372…

1 0

[kamailio/kamailio] dialog: check CSeq careful with track_cseq_updates (#1552)
by Dmitri Savolainen 01 Jun '18

01 Jun '18

to avoid null pointer access for malformed messages #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description after adding modparam("dialog", "track_cseq_updates", 1) and getting some malformed SIP kamailio crushed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1552 -- Commit Summary -- * dialog: check CSeq careful with track_cseq_updates -- File Changes -- M src/modules/dialog/dlg_cseq.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1552.patch https://github.com/kamailio/kamailio/pull/1552.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/1552

2 2

git:master:59c7bf4f: dialog: check CSeq careful with track_cseq_updates
by Dmitri Savolainen 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 59c7bf4f43a8cd5dcb0555835a064d88679956c5 URL: https://github.com/kamailio/kamailio/commit/59c7bf4f43a8cd5dcb0555835a064d8… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-06-01T10:38:40+03:00 dialog: check CSeq careful with track_cseq_updates to avoid null pointer access for malformed messages --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/59c7bf4f43a8cd5dcb0555835a064d8… Patch: https://github.com/kamailio/kamailio/commit/59c7bf4f43a8cd5dcb0555835a064d8… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 1e343c9981..b97e8f7123 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -73,7 +73,8 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) return 1; } - if (parse_headers(msg, HDR_CSEQ_F, 0)==-1) { + if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) + || !msg->cseq->parsed){ LM_DBG("parsing cseq header failed\n"); return 2; }

1 0

git:master:ca2b8117: Merge pull request #1552 from snen/dlg_cseq_nullpointer_fix
by GitHub 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: ca2b8117d20ba507f698990cf1bbbd908882ea71 URL: https://github.com/kamailio/kamailio/commit/ca2b8117d20ba507f698990cf1bbbd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-01T10:00:38+02:00 Merge pull request #1552 from snen/dlg_cseq_nullpointer_fix dialog: check CSeq careful with track_cseq_updates --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/ca2b8117d20ba507f698990cf1bbbd9… Patch: https://github.com/kamailio/kamailio/commit/ca2b8117d20ba507f698990cf1bbbd9… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 1e343c9981..b97e8f7123 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -73,7 +73,8 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) return 1; } - if (parse_headers(msg, HDR_CSEQ_F, 0)==-1) { + if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) + || !msg->cseq->parsed){ LM_DBG("parsing cseq header failed\n"); return 2; }

1 0

git:master:618eb74a: app_ruby: exported kemi KSR::X.modf(...)
by Daniel-Constantin Mierla 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 618eb74ae930c43353e53314d432de789a236168 URL: https://github.com/kamailio/kamailio/commit/618eb74ae930c43353e53314d432de7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-01T09:50:52+02:00 app_ruby: exported kemi KSR::X.modf(...) --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/618eb74ae930c43353e53314d432de7… Patch: https://github.com/kamailio/kamailio/commit/618eb74ae930c43353e53314d432de7…

1 0

git:master:1f2dbe7d: modules: readme files regenerated - app_ruby ... [skip ci]
by Kamailio Dev 31 May '18

31 May '18

Module: kamailio Branch: master Commit: 1f2dbe7d0f21dbe405787d32e48e8a59583ab679 URL: https://github.com/kamailio/kamailio/commit/1f2dbe7d0f21dbe405787d32e48e8a5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-31T12:46:39+02:00 modules: readme files regenerated - app_ruby ... [skip ci] --- Modified: src/modules/app_ruby/README --- Diff: https://github.com/kamailio/kamailio/commit/1f2dbe7d0f21dbe405787d32e48e8a5… Patch: https://github.com/kamailio/kamailio/commit/1f2dbe7d0f21dbe405787d32e48e8a5… --- diff --git a/src/modules/app_ruby/README b/src/modules/app_ruby/README index 40490ad75b..56b7731e4a 100644 --- a/src/modules/app_ruby/README +++ b/src/modules/app_ruby/README @@ -76,9 +76,10 @@ Chapter 1. Admin Guide available within the Ruby module 'KSR'. IMPORTANT: because of Ruby language policy (which require that a public - submodule name has to start with an uppercase leter), the KSR submodule - names are with all leters uppercase. For example, what is documented as - KSR.sl in KEMI docs, must be used as KSR::SL in Ruby scripts. + submodule name has to start with an uppercase letter), the KSR + submodule names are with all letters uppercase. For example, what is + documented as KSR.sl in KEMI docs, must be used as KSR::SL in Ruby + scripts. 2. Dependencies

1 0

git:master:ba26117d: app_ruby: small spelling fix in docs
by Henning Westerholt 31 May '18

31 May '18

Module: kamailio Branch: master Commit: ba26117dc22d29913dcf48a15c097829b3892a6f URL: https://github.com/kamailio/kamailio/commit/ba26117dc22d29913dcf48a15c09782… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-31T12:35:07+02:00 app_ruby: small spelling fix in docs --- Modified: src/modules/app_ruby/doc/app_ruby_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba26117dc22d29913dcf48a15c09782… Patch: https://github.com/kamailio/kamailio/commit/ba26117dc22d29913dcf48a15c09782… --- diff --git a/src/modules/app_ruby/doc/app_ruby_admin.xml b/src/modules/app_ruby/doc/app_ruby_admin.xml index bbebe1d6e3..8a2c311bc2 100644 --- a/src/modules/app_ruby/doc/app_ruby_admin.xml +++ b/src/modules/app_ruby/doc/app_ruby_admin.xml @@ -25,8 +25,8 @@ </para> <para> IMPORTANT: because of Ruby language policy (which require that a public - submodule name has to start with an uppercase leter), the KSR submodule - names are with all leters uppercase. For example, what is documented as + submodule name has to start with an uppercase letter), the KSR submodule + names are with all letters uppercase. For example, what is documented as KSR.sl in KEMI docs, must be used as KSR::SL in Ruby scripts. </para> </section>

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 31 May '18

31 May '18

- URL: https://github.com/kamailio/kamailio/commit/f42886f1ab9bb61610fca462ee6dc56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:45:16+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the string "<<null>>" if it is $null - useful to use in building log messages without testing if the variable is set, otherwise lua throws error while trying to concatenate null value (cherry picked from commit c3e36a1eb2ff70f94b83a42de3e901f4ba142813) - URL: https://github.com/kamailio/kamailio/commit/0c04b6f8b7f532147e03c1c4bb706e4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-31T09:45:31+02:00 db_perlvdb: fix compilation warning > db_perlvdb.c: In function 'db_perlvdb_bind_api': > db_perlvdb.c:98:24: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] > dbb->replace = perlvdb_db_replace; > ^ (cherry picked from commit dbae2561720c97200d8e58e1e6c408a943e3c07b) - URL: https://github.com/kamailio/kamailio/commit/91649cd46bf88d80f4fbcaccecb03e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-31T09:46:04+02:00 db2_ldap: fix compilation warning > ld_fld.c:831:19: warning: unused function 'db_double2ldap_str' [-Wunused-function] > static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) > ^ > 1 warning generated. (cherry picked from commit 5b1355aa3d9404a5165b0afbfdac384fe9cf785a) - URL: https://github.com/kamailio/kamailio/commit/8f3d8495297d459e5802a5dc86dab4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:46:14+02:00 app_python: added KSR.pv.getw(...) (cherry picked from commit 115fa38f427b1bc3730add9078c44219b25960cb) - URL: https://github.com/kamailio/kamailio/commit/e62762cb657912f22c7a0e97f9a43b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:46:23+02:00 app_python: added KSR.pv.getw() to kemi expors - wrapper function for returning the value (cherry picked from commit e8b434f13f56b2f34d5b30bf728c4685c488e63c) - URL: https://github.com/kamailio/kamailio/commit/b8602fc0f3ea9f3e7bba593c2d8486e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:46:34+02:00 app_sqlang: added KSR.pv.getw(...) (cherry picked from commit cb97be77664625a4fb454bdd6d5c84c8a2c7adb3) - URL: https://github.com/kamailio/kamailio/commit/44a31db68237ca3a43382a20a75e95e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:46:43+02:00 app_jsdt: implemented kemi KSR.pv.getw(...) (cherry picked from commit 3647cc1a9b2e85e71657ba3dd3bba21c6bdc5ff5) - URL: https://github.com/kamailio/kamailio/commit/4cf03cdac8f4f31dbc5fa716ac9b541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:46:56+02:00 core: cfg.lex - removed redundant token defining max_branches (cherry picked from commit 420fa5e581af5668cdecd0c97b555f4d673105f7) - URL: https://github.com/kamailio/kamailio/commit/ad9817f9d6df0aabe4888b8b2d489a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:47:08+02:00 topoh: more verbose debug messages when decoding r-uri (cherry picked from commit 5a0086fb5d54cf0411180a8426ea49ad440f147a) - URL: https://github.com/kamailio/kamailio/commit/0cd09d42878ed0125bfad480e9706a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:47:27+02:00 core: qm malloc - wrapper to print execution file and line for qm_debug_frag() (cherry picked from commit f3109d4dcdc4ef810ccf4a8d17f28f7fce42271c) - URL: https://github.com/kamailio/kamailio/commit/cc1ff15335a81971aa891231cbea7c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:47:41+02:00 tm: set msg for log_prefix before running failure_route - reported by GH #1531 (cherry picked from commit eb2f25ca0810f966d089da3aa1e32e3e98a4ab16) - URL: https://github.com/kamailio/kamailio/commit/5fc19fd9159c649a6a21ad20193f69e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:47:53+02:00 topos_redis: proper length value when comparing to insert INVITE branch (cherry picked from commit 2a3ca5942291d29de05b14338a36cecbec11f129) - URL: https://github.com/kamailio/kamailio/commit/a1a397bbf6cd6a01ccd505b7b85d448… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:48:07+02:00 sanity: updated docs to reflect default value for default_checks param - reported by GH #1542 (cherry picked from commit 6ff985605b3fbb6aa350af4c21fc73afb8cf122f) - URL: https://github.com/kamailio/kamailio/commit/dace75ab9a294c34bec07d07b328be9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:48:27+02:00 core: kemi - more combinations for function prototypes (cherry picked from commit 6528c9cbc5a89128d4892f1a526c76747b42448c) - URL: https://github.com/kamailio/kamailio/commit/f1fbf3d6d6e4461e6f0440b042121fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:48:38+02:00 app_lua: fix for running kemi functions with 4 or more parameters - added new combinations for 4 params case - reported by GH #1544 (cherry picked from commit 52f246fbcc9097f77b6a64d15a4ff74e03577ba8) - URL: https://github.com/kamailio/kamailio/commit/b25d7002fe58fff7e876fa3e9818ec0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:48:49+02:00 app_jsdt: fix for executing kemi functions with 4 or more params - more combinations for 4 params (cherry picked from commit 81d517f0a3dcd769dc84ff019c58e248ef7eb466) - URL: https://github.com/kamailio/kamailio/commit/7999ddc6b9b7289cd1f1fe620719e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:48:59+02:00 app_python: fix for executing kemi functions with 4 or more params - more combinations for 4 params (cherry picked from commit 551e4d372892d1d5c7803c3812d0bd4613efaf36) - URL: https://github.com/kamailio/kamailio/commit/71f328f8ab2f41ed83749c77eb4b9c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:49:12+02:00 app_sqlang: fix for executing kemi functions with 4 or more params - more combinations for 4 params (cherry picked from commit d86b67bbde300e4aa1be7ea7c5bdb21469ece03c) - URL: https://github.com/kamailio/kamailio/commit/96eec5f5aaa99288ef59097cc39c632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:49:26+02:00 rls: allocate size for normalized uri for cloning buffer - it can be longer than pres uri, when proto prefix needs to be added (cherry picked from commit 93932a4ff18760d8fc8c59bd08984fd00cfd7759) - URL: https://github.com/kamailio/kamailio/commit/7e763c727076af3a3a35db4fc840e85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:49:41+02:00 lib/srdb1: increased the safety check for max db url to 1023 - was 255, too small for large connection strings needed for no-sql - reported by GH #1545 (cherry picked from commit 0a9ebbbdfe0cd4c137338adbacf5c5890222708a) - URL: https://github.com/kamailio/kamailio/commit/7d6dddfbf2ccadaf749496a4288f176… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:49:51+02:00 stun: catch udp ping 0000 when trying to parse stun headers - avoid useless debug message - info message made debug if the size of received packet is too small for a stun header (cherry picked from commit 7e08fc8d2b74657d6e6171effbab2770482d693e) - URL: https://github.com/kamailio/kamailio/commit/fd163baf20ab28354bb7cbf92ffd7e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:50:02+02:00 app_jsdt: exported KSR.pv.getw(...) (cherry picked from commit 616b68904e0741ebcdb70e3c7f66b3b6d1254a8d) - URL: https://github.com/kamailio/kamailio/commit/4cf3f3e84bcd45eb32545de9fa71d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:50:15+02:00 core: kemi - more log-level message shortcut functions (cherry picked from commit f854f2c27bee1b1e4f43565ff1865b88c27387c9) - URL: https://github.com/kamailio/kamailio/commit/0c17c1c8ba43967025f13a87507e687… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2018-05-31T09:50:26+02:00 db_cluster remove old svn ID tags (cherry picked from commit be82892a68342287d37de90ddb74c1f66a37e28f) - URL: https://github.com/kamailio/kamailio/commit/e3a78848857ee4a12211f10e091209e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:50:47+02:00 topos: skip handling local DMQ messages (cherry picked from commit 7ff8d4284f20763e8e47f9b24e4604867a242e4a) - URL: https://github.com/kamailio/kamailio/commit/9aee0374e1db8733a220d37fbc53517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:51:01+02:00 carrierroute: rename boolean type conflicting with clang sdtbool In file included from carrierroute.c:51: ./cr_db.h:92:2: error: expected identifier false = 0, ^ /usr/lib/clang/9.1.0/include/stdbool.h:33:15: note: expanded from macro 'false' #define false 0 (cherry picked from commit 0a14914fc1f98c18b9b75f66fe2e71f15147c9bf)

1 0

git:master:a557e628: modules: readme files regenerated - app_ruby ... [skip ci]
by Kamailio Dev 31 May '18

31 May '18

Module: kamailio Branch: master Commit: a557e628ac9d06488c0818da4e94d09ecd93170b URL: https://github.com/kamailio/kamailio/commit/a557e628ac9d06488c0818da4e94d09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-31T09:46:42+02:00 modules: readme files regenerated - app_ruby ... [skip ci] --- Modified: src/modules/app_ruby/README --- Diff: https://github.com/kamailio/kamailio/commit/a557e628ac9d06488c0818da4e94d09… Patch: https://github.com/kamailio/kamailio/commit/a557e628ac9d06488c0818da4e94d09… --- diff --git a/src/modules/app_ruby/README b/src/modules/app_ruby/README index 5b706bb915..40490ad75b 100644 --- a/src/modules/app_ruby/README +++ b/src/modules/app_ruby/README @@ -175,7 +175,7 @@ kamcmd app_ruby.api_list '/usr/local/etc/kamailio/ruby/myscript.rb'. ... def ksr_sl_reply() - KSR.dbg("==== from ruby\n") + KSR.dbg("==== from ruby - src ip: " + KSR::PV.get("$si") + "\n") KSR::SL.sl_send_reply(200, "OK-Ruby") end ...

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev