sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

git:master:4dd53abf: tm: info log message if attempting to create transaction for faked request
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 4dd53abf13f9a98272af625f2a6591669730b374 URL: https://github.com/kamailio/kamailio/commit/4dd53abf13f9a98272af625f2a65916… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T12:48:48+01:00 tm: info log message if attempting to create transaction for faked request --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/4dd53abf13f9a98272af625f2a65916… Patch: https://github.com/kamailio/kamailio/commit/4dd53abf13f9a98272af625f2a65916… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index dde02343cb..19f7979ee8 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -47,6 +47,7 @@ #include "../../core/parser/parser_f.h" #include "../../core/parser/parse_from.h" #include "../../core/ut.h" +#include "../../core/fmsg.h" #include "../../core/timer.h" #include "../../core/timer_ticks.h" #include "../../core/hash_func.h" @@ -1319,6 +1320,10 @@ int t_newtran( struct sip_msg* p_msg ) LM_DBG("msg id=%d , global msg id=%d ," " T on entrance=%p\n",p_msg->id,global_msg_id,T); + if(faked_msg_match(p_msg)) { + LM_INFO("attempt to create transaction for a faked request" + " - try to avoid it\n"); + } if ( T && T!=T_UNDEFINED ) { /* ERROR message moved to w_t_newtran */ LM_DBG("transaction already in process %p\n", T );

1 0

git:master:24c92c4f: htable: safety checks for values replicated via dmq
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 24c92c4f25e758fcd2265d824ca39b5f1ac2dcdd URL: https://github.com/kamailio/kamailio/commit/24c92c4f25e758fcd2265d824ca39b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T12:34:15+01:00 htable: safety checks for values replicated via dmq --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/24c92c4f25e758fcd2265d824ca39b5… Patch: https://github.com/kamailio/kamailio/commit/24c92c4f25e758fcd2265d824ca39b5… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index d5ff1af645..986c2c769a 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -575,15 +575,18 @@ int ht_dmq_handle_sync(srjson_doc_t* jdoc) { } } - ht = ht_get_table(&htname); - if(ht==NULL) { - LM_WARN("unable to get table %.*s\n", - htname.len, (htname.s)?htname.s:""); - } + if(htname.s!=NULL && htname.len>0 && cname.s!=NULL + && cname.len>0) { + ht = ht_get_table(&htname); + if(ht==NULL) { + LM_WARN("unable to get table %.*s\n", + htname.len, (htname.s)?htname.s:""); + } - if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { - LM_WARN("unable to set cell %.*s in table %.*s\n", - cname.len, cname.s, ht->name.len, ht->name.s); + if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { + LM_WARN("unable to set cell %.*s in table %.*s\n", + cname.len, cname.s, ht->name.len, ht->name.s); + } } cell = cell->next;

1 0

git:master:3436104c: textops: fixed get_body_part function for non-multipart contents error
by root 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 3436104cce943f055e0a33aa26692265185502bf URL: https://github.com/kamailio/kamailio/commit/3436104cce943f055e0a33aa2669226… Author: root <root(a)localhost.localdomain> Committer: root <root(a)localhost.localdomain> Date: 2018-11-19T11:27:33+03:00 textops: fixed get_body_part function for non-multipart contents error get_body_part functions gives error even if content is not multipart. Fixed for non-multipart contents and set all contents for non-boundary params --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3436104cce943f055e0a33aa2669226… Patch: https://github.com/kamailio/kamailio/commit/3436104cce943f055e0a33aa2669226… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 40827baeae..ff784642e5 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2761,7 +2761,7 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) } if(get_boundary(msg, &boundary)!=0) { - LM_ERR("Cannot get boundary. Is body multipart?\n"); + LM_ERR("Cannot get boundary from Content type header. Is body multipart?\n"); return -1; } @@ -2851,18 +2851,23 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, body.s = get_body(msg); if (body.s == 0) { - LM_ERR("failed to get the message body\n"); + LM_ERR("failed to get the content message body\n"); return -1; } body.len = msg->len - (int)(body.s - msg->buf); if (body.len == 0) { - LM_DBG("message body has zero length\n"); + LM_DBG("Content body has zero length\n"); return -1; } if(get_boundary(msg, &boundary)!=0) { - LM_ERR("Cannot get boundary. Is body multipart?\n"); - return -1; + LM_DBG("Content is not multipart so return all content body as string\n"); + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_STR; + val.rs.s = body.s; + val.rs.len =body.len; + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + return 1; } start = body.s; @@ -2968,7 +2973,7 @@ static int get_body_part_helper(sip_msg_t* msg, char* ctype, char* ovar, int mod str content_type; if(ctype==0) { - LM_ERR("invalid parameters\n"); + LM_ERR("invalid Content-type parameters\n"); return -1; } @@ -3680,7 +3685,7 @@ int ki_in_list_prefix(sip_msg_t* _m, str* subject, str* list, str* vsep) { int sep; char *at, *past, *next_sep, *s; - + if(subject==NULL || subject->len<=0 || list==NULL || list->len<=0 || vsep==NULL || vsep->len<=0) return -1;

2 1

[kamailio/kamailio] textops: fixed get_body_part function for non-multipart contents error (#1730)
by Yasin CANER 20 Nov '18

20 Nov '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  get_body_part functions gives error even if content is not multipart. Fixed for non-multipart contents and set all contents for non-boundary params You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1730 -- Commit Summary -- * core : add word to log get_boundary function * textops: fixed get_body_part function for non-multipart contents error -- File Changes -- M src/core/msg_translator.c (2) M src/modules/textops/textops.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1730.patch https://github.com/kamailio/kamailio/pull/1730.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/1730

3 3

git:5.0:0965f585: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: 5.0 Commit: 0965f58554f5917efecbc9e3329789a9f7c4472f URL: https://github.com/kamailio/kamailio/commit/0965f58554f5917efecbc9e3329789a… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-20T10:56:31+01:00 dialog: fix typo in warn message (#1731) - GH #1731 (cherry picked from commit df6152fd69469eb340078535a3cf8b28e901ea7d) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/0965f58554f5917efecbc9e3329789a… Patch: https://github.com/kamailio/kamailio/commit/0965f58554f5917efecbc9e3329789a… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 0b9d77ce89..8e8b5b088b 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -565,11 +565,11 @@ static int load_dialog_vars_from_db(int fetch_num_rows) } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

git:5.2:2a42aebc: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: 5.2 Commit: 2a42aebc8d6905989f21ec21459a1cd368632b6f URL: https://github.com/kamailio/kamailio/commit/2a42aebc8d6905989f21ec21459a1cd… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-20T10:52:57+01:00 dialog: fix typo in warn message (#1731) - GH #1731 (cherry picked from commit df6152fd69469eb340078535a3cf8b28e901ea7d) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2a42aebc8d6905989f21ec21459a1cd… Patch: https://github.com/kamailio/kamailio/commit/2a42aebc8d6905989f21ec21459a1cd… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index d759140018..1b9d704cf6 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -643,14 +643,14 @@ static int load_dialog_vars_from_db(int fetch_num_rows, int mode, } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } if(mode==1 && mval!=NULL) { dlg_unlock(d_table, &(d_table->entries[VAL_INT(values)])); } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

git:5.1:7fd9d125: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: 5.1 Commit: 7fd9d125ef3d0ee41fc054176e3eb56c2e1a4094 URL: https://github.com/kamailio/kamailio/commit/7fd9d125ef3d0ee41fc054176e3eb56… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-20T10:53:33+01:00 dialog: fix typo in warn message (#1731) - GH #1731 (cherry picked from commit df6152fd69469eb340078535a3cf8b28e901ea7d) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd9d125ef3d0ee41fc054176e3eb56… Patch: https://github.com/kamailio/kamailio/commit/7fd9d125ef3d0ee41fc054176e3eb56… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 0b9d77ce89..8e8b5b088b 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -565,11 +565,11 @@ static int load_dialog_vars_from_db(int fetch_num_rows) } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

[kamailio/kamailio] dialog: fix typo in warn message (#1731)
by Dmitri Savolainen 20 Nov '18

20 Nov '18

- [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) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1731 -- Commit Summary -- * dialog: fix typo in warn message -- File Changes -- M src/modules/dialog/dlg_db_handler.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1731.patch https://github.com/kamailio/kamailio/pull/1731.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/1731

2 2

git:master:df6152fd: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: df6152fd69469eb340078535a3cf8b28e901ea7d URL: https://github.com/kamailio/kamailio/commit/df6152fd69469eb340078535a3cf8b2… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-11-20T10:42:05+01:00 dialog: fix typo in warn message (#1731) Thank you! --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/df6152fd69469eb340078535a3cf8b2… Patch: https://github.com/kamailio/kamailio/commit/df6152fd69469eb340078535a3cf8b2… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index d759140018..1b9d704cf6 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -643,14 +643,14 @@ static int load_dialog_vars_from_db(int fetch_num_rows, int mode, } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } if(mode==1 && mval!=NULL) { dlg_unlock(d_table, &(d_table->entries[VAL_INT(values)])); } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

git:master:416d79b4: topos: allow various replies for INVITE without contact
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 416d79b462986317f2c3a3ed8aa30a502d116095 URL: https://github.com/kamailio/kamailio/commit/416d79b462986317f2c3a3ed8aa30a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T08:11:18+01:00 topos: allow various replies for INVITE without contact - GH #1720 --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/416d79b462986317f2c3a3ed8aa30a5… Patch: https://github.com/kamailio/kamailio/commit/416d79b462986317f2c3a3ed8aa30a5… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 69d5c7c2b5..83d81172dd 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -353,6 +353,18 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) /* no mandatory contact unless is INVITE - done */ return 0; } + if(msg->first_line.type==SIP_REPLY) { + if(msg->first_line.u.reply.statuscode>=100 + && msg->first_line.u.reply.statuscode<200 + && msg->first_line.u.reply.statuscode!=183) { + /* provisional response with no mandatory contact header */ + return 0; + } + if(msg->first_line.u.reply.statuscode>=400) { + /* failure response with no mandatory contact header */ + return 0; + } + } LM_ERR("bad sip message or missing Contact hdr\n"); goto error; }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018