sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:master: dialog: set lower limit for dlg_ka_interval parameter to 30 sec

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5c5b587d44a46b3a4d48c7e7926c42a44cd4d8c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c5b587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 17 15:49:36 2014 +0200 dialog: set lower limit for dlg_ka_interval parameter to 30 sec - avoid many keepalives in shorter interval than retransmission timeout could be - an improvement would be to export the fr_timer value from tm and have condition based on it - reported by FS#417, Bill Radis --- modules/dialog/dialog.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 9c824f3..a655c57 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -452,6 +452,12 @@ static int mod_init(void) { unsigned int n; + if(dlg_ka_interval!=0 && dlg_ka_interval<30) { + LM_ERR("ka interval too low (%d), has to be at least 30\n", + dlg_ka_interval); + return -1; + } + dlg_event_rt[DLG_EVENTRT_START] = route_lookup(&event_rt, "dialog:start"); dlg_event_rt[DLG_EVENTRT_END] = route_lookup(&event_rt, "dialog:end"); dlg_event_rt[DLG_EVENTRT_FAILED] = route_lookup(&event_rt, "dialog:failed");

10 years, 6 months

[tracker] Comment added: Crash in msrp module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#419 - Crash in msrp module User who did this - Luis Martin (lmartin) ---------- Done. https://github.com/kamailio/kamailio/commits/4.0 https://github.com/kamailio/kamailio/commit/577d0a83bab49e723a0be8b1ef8f300… https://github.com/kamailio/kamailio/commits/4.1 https://github.com/kamailio/kamailio/commit/943a9ac9031aa69f7743accd68ab126… ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=419#comment1396 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 6 months

git:4.1: Merge branch 'luismartingil/msrp_crash'

by Luis Martin Gil

Module: sip-router Branch: 4.1 Commit: 943a9ac9031aa69f7743accd68ab1268b3df1160 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=943a9ac… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Thu Apr 17 12:56:11 2014 +0000 Merge branch 'luismartingil/msrp_crash' (cherry picked from commit 4a9a98a07869a2415b82b70b23907ccd490d6c12) --- modules/msrp/msrp_parser.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index d7a2ced..fc81798 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -81,7 +81,7 @@ int msrp_parse_frame(msrp_frame_t *mf) } if(msrp_parse_headers(mf)<0) { - LM_ERR("unable to parse first line\n"); + LM_ERR("unable to parse headers\n"); return -1; } return 0; @@ -220,6 +220,9 @@ int msrp_parse_headers(msrp_frame_t *mf) char *s; /* start for search */ msrp_hdr_t *hdr; msrp_hdr_t *last; + int fpath = 0; /* From path set */ + int tpath = 0; /* To path set */ + int any = 0; /* Any header set */ /* already parsed?!? */ if(mf->headers != NULL) @@ -290,13 +293,48 @@ int msrp_parse_headers(msrp_frame_t *mf) last = hdr; } msrp_hdr_set_type(hdr); - + + /* Checking for well-formed MSRP rfc4975 messages */ + if (hdr->htype == MSRP_HDR_TO_PATH) { + if (tpath) { + LM_ERR("broken msrp frame message, Multiple To-Path not allowed.\n"); + return -1; + } else if (fpath || any) { + LM_ERR("broken msrp frame message, To-Path must be the first header.\n"); + return -1; + } else { + tpath = 1; + } + } else if (hdr->htype == MSRP_HDR_FROM_PATH) { + if (fpath) { + LM_ERR("broken msrp frame message, Multiple From-Path not allowed.\n"); + return -1; + } else if (!tpath || any) { + LM_ERR("broken msrp frame message, From-Path must be after To-Path.\n"); + return -1; + } else { + fpath = 1; + } + } else { + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n"); + return -1; + } else { + any = 1; + } + } + LM_DBG("MSRP Header: (%p) [%.*s] [%d] [%.*s]\n", hdr, hdr->name.len, hdr->name.s, hdr->htype, hdr->body.len, hdr->body.s); s = l + 1; } + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n"); + return -1; + } + ateoh: if(mf->mbody.s!=NULL) {

10 years, 6 months

git:4.0: Merge branch 'luismartingil/msrp_crash'

by Luis Martin Gil

Module: sip-router Branch: 4.0 Commit: 577d0a83bab49e723a0be8b1ef8f3005e039bad6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=577d0a8… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Thu Apr 17 12:56:11 2014 +0000 Merge branch 'luismartingil/msrp_crash' (cherry picked from commit 4a9a98a07869a2415b82b70b23907ccd490d6c12) --- modules/msrp/msrp_parser.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index d7a2ced..fc81798 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -81,7 +81,7 @@ int msrp_parse_frame(msrp_frame_t *mf) } if(msrp_parse_headers(mf)<0) { - LM_ERR("unable to parse first line\n"); + LM_ERR("unable to parse headers\n"); return -1; } return 0; @@ -220,6 +220,9 @@ int msrp_parse_headers(msrp_frame_t *mf) char *s; /* start for search */ msrp_hdr_t *hdr; msrp_hdr_t *last; + int fpath = 0; /* From path set */ + int tpath = 0; /* To path set */ + int any = 0; /* Any header set */ /* already parsed?!? */ if(mf->headers != NULL) @@ -290,13 +293,48 @@ int msrp_parse_headers(msrp_frame_t *mf) last = hdr; } msrp_hdr_set_type(hdr); - + + /* Checking for well-formed MSRP rfc4975 messages */ + if (hdr->htype == MSRP_HDR_TO_PATH) { + if (tpath) { + LM_ERR("broken msrp frame message, Multiple To-Path not allowed.\n"); + return -1; + } else if (fpath || any) { + LM_ERR("broken msrp frame message, To-Path must be the first header.\n"); + return -1; + } else { + tpath = 1; + } + } else if (hdr->htype == MSRP_HDR_FROM_PATH) { + if (fpath) { + LM_ERR("broken msrp frame message, Multiple From-Path not allowed.\n"); + return -1; + } else if (!tpath || any) { + LM_ERR("broken msrp frame message, From-Path must be after To-Path.\n"); + return -1; + } else { + fpath = 1; + } + } else { + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n"); + return -1; + } else { + any = 1; + } + } + LM_DBG("MSRP Header: (%p) [%.*s] [%d] [%.*s]\n", hdr, hdr->name.len, hdr->name.s, hdr->htype, hdr->body.len, hdr->body.s); s = l + 1; } + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n"); + return -1; + } + ateoh: if(mf->mbody.s!=NULL) {

10 years, 6 months

[tracker] Comment added: Crash in msrp module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#419 - Crash in msrp module User who did this - Daniel-Constantin Mierla (miconda) ---------- Both would be good, I think they should be easy to cherry pick. Maybe from master to 4.1 and from 4.1 to 4.0 is safer to avoid conflicts. I use usually: <code>git cherry-pick -x _COMMIT_HEX_HASHID_</code> ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=419#comment1395 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 6 months

[tracker] Comment added: Crash in msrp module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#419 - Crash in msrp module User who did this - Luis Martin (lmartin) ---------- Merged to master (https://github.com/kamailio/kamailio/commit/4a9a98a07869a2415b82b70b23907cc…) Daniel, which stable versions do you want it to be back ported? 4.0 and 4.1? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=419#comment1394 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 6 months

git:master: Merge branch 'luismartingil/msrp_crash'

by Luis Martin Gil

Module: sip-router Branch: master Commit: 4a9a98a07869a2415b82b70b23907ccd490d6c12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a9a98a… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Thu Apr 17 12:56:11 2014 +0000 Merge branch 'luismartingil/msrp_crash' ---

10 years, 6 months

git:luismartingil/msrp_crash: msrp: improved parser

by Luis Martin Gil

Module: sip-router Branch: luismartingil/msrp_crash Commit: 31469a0541874b1b0a5dda89aec0eed4ad94d97e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31469a0… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Thu Apr 17 12:49:52 2014 +0000 msrp: improved parser - Added more logic to the parser: Not allowing multiple To-Paths or From-Paths --- modules/msrp/msrp_parser.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index b23c5a1..fc81798 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -293,24 +293,34 @@ int msrp_parse_headers(msrp_frame_t *mf) last = hdr; } msrp_hdr_set_type(hdr); - + + /* Checking for well-formed MSRP rfc4975 messages */ if (hdr->htype == MSRP_HDR_TO_PATH) { - tpath = 1; - if (fpath || any) { + if (tpath) { + LM_ERR("broken msrp frame message, Multiple To-Path not allowed.\n"); + return -1; + } else if (fpath || any) { LM_ERR("broken msrp frame message, To-Path must be the first header.\n"); - return -1; + return -1; + } else { + tpath = 1; } } else if (hdr->htype == MSRP_HDR_FROM_PATH) { - fpath = 1; - if (!tpath || any) { - LM_ERR("broken msrp frame message, From-Path must be the second header.\n"); + if (fpath) { + LM_ERR("broken msrp frame message, Multiple From-Path not allowed.\n"); return -1; + } else if (!tpath || any) { + LM_ERR("broken msrp frame message, From-Path must be after To-Path.\n"); + return -1; + } else { + fpath = 1; } } else { - any = 1; if (!tpath || !fpath) { LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n"); return -1; + } else { + any = 1; } }

10 years, 6 months

[tracker] Comment added: Dialog never times-out when ka_timer < 10, even on 481 or 408(fake) response

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#417 - Dialog never times-out when ka_timer < 10, even on 481 or 408(fake) response User who did this - Daniel-Constantin Mierla (miconda) ---------- Detecting interrupted network connections is not for normal operation cases. Beware that in mobile networks are bid delays, you may get false-positive cases if you have lower timeout. If you look at the option of detecting inactivity via RTP, all applications capable of doing that by handing RTP (e.g., Asterisk, Freeswitch) allow 90sec or more. Now, you can contribute various enhancements on this part, but have in mind that the main role is to be able to handle lots of calls, most of them being ok. You may get 0.1% calls interrupted due to network. If you make a very complex detection system for the 0.1%, then you affect the performances for the other 99.9%. Try to imagine you have 10000active calls, you send keepalives every second, that is 20000 OPTIONS transactions every second. Perhaps many phones will get stuck. Therefore, such contribution must include an option to turn on/off (module parameter). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=417#comment1393 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 6 months

git:luismartingil/msrp_crash: msrp: improved parser

by Luis Martin Gil

Module: sip-router Branch: luismartingil/msrp_crash Commit: 164435ab191964bc9f0054874536c022dcf11063 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=164435a… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Thu Apr 17 12:29:47 2014 +0000 msrp: improved parser - changed indentation as required by Daniel http://sip-router.org/tracker/index.php?do=details&task_id=419#comment1390 --- modules/msrp/msrp_parser.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index 8df1a92..b23c5a1 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -220,7 +220,6 @@ int msrp_parse_headers(msrp_frame_t *mf) char *s; /* start for search */ msrp_hdr_t *hdr; msrp_hdr_t *last; - int fpath = 0; /* From path set */ int tpath = 0; /* To path set */ int any = 0; /* Any header set */ @@ -296,23 +295,23 @@ int msrp_parse_headers(msrp_frame_t *mf) msrp_hdr_set_type(hdr); if (hdr->htype == MSRP_HDR_TO_PATH) { - tpath = 1; - if (fpath || any) { - LM_ERR("broken msrp frame message, To-Path must be the first header.\n"); - return -1; - } + tpath = 1; + if (fpath || any) { + LM_ERR("broken msrp frame message, To-Path must be the first header.\n"); + return -1; + } } else if (hdr->htype == MSRP_HDR_FROM_PATH) { - fpath = 1; - if (!tpath || any) { - LM_ERR("broken msrp frame message, From-Path must be the second header.\n"); - return -1; - } + fpath = 1; + if (!tpath || any) { + LM_ERR("broken msrp frame message, From-Path must be the second header.\n"); + return -1; + } } else { - any = 1; - if (!tpath || !fpath) { - LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n"); - return -1; - } + any = 1; + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n"); + return -1; + } } LM_DBG("MSRP Header: (%p) [%.*s] [%d] [%.*s]\n", @@ -322,8 +321,8 @@ int msrp_parse_headers(msrp_frame_t *mf) } if (!tpath || !fpath) { - LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n"); - return -1; + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n"); + return -1; } ateoh:

10 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014