Re: [sr-dev] [kamailio/kamailio] tr_lookup(): error parsing [{param.count, , }] (#1041)
Closed #1041. -- 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/1041#event-1022119231___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation Fault in Kamailio v4.4.5 Git-Rev. e9d576 (#1040)
Reopen if still an issue there. -- 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/1040#issuecomment-290196344___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation Fault in Kamailio v4.4.5 Git-Rev. e9d576 (#1040)
Closed #1040. -- 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/1040#event-1021050699___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_postgress: insert_update() with DO UPDATE (#1047)
Merged #1047. -- 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/1047#event-1020875565___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_postgress: insert_update() with DO UPDATE (#1047)
Thanks, it will be merged! -- 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/1047#issuecomment-290164374___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:088c2f7d: Makefile.groups: added call_obj module to group extra
Module: kamailio Branch: master Commit: 088c2f7d70eb3b8861b3f8f2dc03d9e01a68198f URL: https://github.com/kamailio/kamailio/commit/088c2f7d70eb3b8861b3f8f2dc03d9e01a68198f Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-29T16:16:26+02:00 Makefile.groups: added call_obj module to group extra --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/088c2f7d70eb3b8861b3f8f2dc03d9e01a68198f.diff Patch: https://github.com/kamailio/kamailio/commit/088c2f7d70eb3b8861b3f8f2dc03d9e01a68198f.patch --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4080a69..74065b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -18,8 +18,8 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ auth_xkeys smsops tsilo cfgt statsc topos # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \ -qos sca seas sms sst timer tmrec uac_redirect xhttp \ +mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ +pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom ss7ops ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_postgres insert_update and usrloc params (#1044)
I would prefer to have two pull requests, each for the two different features. In this way one or the other can be merged separately. For example, the db_load addition may need to be adjusted to detect conflicts with db_mode, because db_mode=4 is supposed to only load from db. -- 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/1044#issuecomment-290096973___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Keepalive module - prototype (#1045)
Thanks for contributing! Can you make a pull request only with the new module as a single commit? It will be easier to review and see if anything needs to be adjusted. Also, add xml docbook files with the documentation of the module, as the other modules have. We are not merging new modules without having the documentation written. For drouting make another pull request because it may need dedicated review process to get the integration with keepalive. -- 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/1045#issuecomment-290095885___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)
I am not sure if removing the lock/mutex is the proper solution here, as I didn't analyze the module properly, so it might be better to make it optional via modparam to run in old mode with locks and new mode with sleep. I guess it should not be that complex, given that the new patch is rather small. -- 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/822#issuecomment-290094750___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d8fa1ae3: pv: new variable - $hdrc(HName)
Module: kamailio
Branch: master
Commit: d8fa1ae396305f6f05607f5bc0914913adc6bf7d
URL:
https://github.com/kamailio/kamailio/commit/d8fa1ae396305f6f05607f5bc0914913adc6bf7d
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-29T12:41:41+02:00
pv: new variable - $hdrc(HName)
- return the number of headers matching the name with HName
- e.g., $hdrc(Via)
---
Modified: src/modules/pv/pv.c
Modified: src/modules/pv/pv_core.c
Modified: src/modules/pv/pv_core.h
---
Diff:
https://github.com/kamailio/kamailio/commit/d8fa1ae396305f6f05607f5bc0914913adc6bf7d.diff
Patch:
https://github.com/kamailio/kamailio/commit/d8fa1ae396305f6f05607f5bc0914913adc6bf7d.patch
---
diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c
index f1e1f41..4d0df10 100644
--- a/src/modules/pv/pv.c
+++ b/src/modules/pv/pv.c
@@ -97,6 +97,8 @@ static pv_export_t mod_pvs[] = {
pv_parse_avp_name, pv_parse_index, 0, 0},
{{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name,
pv_parse_index, 0, 0},
+ {{"hdrc", (sizeof("hdrc")-1)}, PVT_HDRC, pv_get_hdrc, 0,
pv_parse_hdr_name,
+ 0, 0, 0},
{{"var", (sizeof("var")-1)}, PVT_SCRIPTVAR, pv_get_scriptvar,
pv_set_scriptvar, pv_parse_scriptvar_name, 0, 0, 0},
{{"vz", (sizeof("vz")-1)}, PVT_SCRIPTVAR, pv_get_scriptvar,
diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c
index f1d264b..40a9952 100644
--- a/src/modules/pv/pv_core.c
+++ b/src/modules/pv/pv_core.c
@@ -1797,6 +1797,70 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res)
}
+/**
+ *
+ */
+int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)
+{
+ int idx;
+ int idxf;
+ pv_value_t tv;
+ struct hdr_field *hf;
+ struct hdr_field *hf0;
+ char *p, *p_ini;
+ int n, p_size;
+ int hcount;
+
+ if(msg==NULL || res==NULL || param==NULL)
+ return -1;
+
+ hcount = 0;
+
+ /* get the name */
+ if(param->pvn.type == PV_NAME_PVAR)
+ {
+ if(pv_get_spec_name(msg, param, )!=0 ||
(!(tv.flags_VAL_STR)))
+ {
+ LM_ERR("invalid name\n");
+ return pv_get_sintval(msg, param, res, hcount);
+ }
+ } else {
+ if(param->pvn.u.isname.type == AVP_NAME_STR)
+ {
+ tv.flags = PV_VAL_STR;
+ tv.rs = param->pvn.u.isname.name.s;
+ } else {
+ tv.flags = 0;
+ tv.ri = param->pvn.u.isname.name.n;
+ }
+ }
+ /* we need to be sure we have parsed all headers */
+ if(parse_headers(msg, HDR_EOH_F, 0)<0)
+ {
+ LM_ERR("error parsing headers\n");
+ return pv_get_sintval(msg, param, res, hcount);
+ }
+
+
+ for (hf=msg->headers; hf; hf=hf->next)
+ {
+ if(tv.flags == 0)
+ {
+ if (tv.ri==hf->type) {
+ hcount++;
+ }
+ } else {
+ if (cmp_hdrname_str(>name, )==0) {
+ hcount++;
+ }
+ }
+ }
+ return pv_get_sintval(msg, param, res, hcount);
+}
+
+/**
+ *
+ */
int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res)
{
diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h
index 27c13bb..98e6b56 100644
--- a/src/modules/pv/pv_core.h
+++ b/src/modules/pv/pv_core.h
@@ -14,8 +14,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
@@ -28,10 +28,10 @@
int pv_get_msgid(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res);
-int pv_get_udp(struct sip_msg *msg, pv_param_t *param,
+int pv_get_udp(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res);
-int pv_get_5060(struct sip_msg *msg, pv_param_t *param,
+int pv_get_5060(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res);
int pv_get_return_code(struct sip_msg *msg, pv_param_t *param,
@@ -203,6 +203,8 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res);
int pv_get_hdr(struct sip_msg *msg, pv_param_t *param,
[sr-dev] git:master:2d9a016e: core: new pv type for header count
Module: kamailio
Branch: master
Commit: 2d9a016ede219c2f2731e09ca45281d8ef711d50
URL:
https://github.com/kamailio/kamailio/commit/2d9a016ede219c2f2731e09ca45281d8ef711d50
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-29T12:41:16+02:00
core: new pv type for header count
---
Modified: src/core/pvar.h
---
Diff:
https://github.com/kamailio/kamailio/commit/2d9a016ede219c2f2731e09ca45281d8ef711d50.diff
Patch:
https://github.com/kamailio/kamailio/commit/2d9a016ede219c2f2731e09ca45281d8ef711d50.patch
---
diff --git a/src/core/pvar.h b/src/core/pvar.h
index 68955ad..b82198d 100644
--- a/src/core/pvar.h
+++ b/src/core/pvar.h
@@ -77,7 +77,8 @@ enum _pv_type {
PVT_DSTURI, PVT_COLOR, PVT_BRANCH,
PVT_FROM, PVT_TO,PVT_OURI,
PVT_SCRIPTVAR,PVT_MSG_BODY, PVT_CONTEXT,
- PVT_XAVP, PVT_OTHER, PVT_EXTRA /* keep it last
*/
+ PVT_XAVP, PVT_HDRC, PVT_OTHER,
+ PVT_EXTRA /* keep it last */
};
typedef enum _pv_type pv_type_t;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] tr_lookup(): error parsing [{param.count, , }] (#1041)
Can you try with latest 4.4 branch? I pushed some commits to fix the use of variable for separator. -- 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/1041#issuecomment-289781516___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:26080154: pv: proper evaluation of pv param for param.count transformation
Module: kamailio
Branch: 5.0
Commit: 26080154471b41198b1bd1df40fe5f1a0f461c8c
URL:
https://github.com/kamailio/kamailio/commit/26080154471b41198b1bd1df40fe5f1a0f461c8c
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T16:02:27+02:00
pv: proper evaluation of pv param for param.count transformation
- reported by GH #1041
(cherry picked from commit 964557553fd39fca1de35cf7d2f9e64134da7495)
---
Modified: src/modules/pv/pv_trans.c
---
Diff:
https://github.com/kamailio/kamailio/commit/26080154471b41198b1bd1df40fe5f1a0f461c8c.diff
Patch:
https://github.com/kamailio/kamailio/commit/26080154471b41198b1bd1df40fe5f1a0f461c8c.patch
---
diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c
index f15975e..6ad9a97 100644
--- a/src/modules/pv/pv_trans.c
+++ b/src/modules/pv/pv_trans.c
@@ -1294,6 +1294,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t
*tp, int subtype,
pv_value_t *val)
{
pv_value_t v;
+ pv_value_t vs;
str sv;
int n, i;
char separator = ';';
@@ -1307,17 +1308,23 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t
*tp, int subtype,
{
if (subtype == TR_PL_COUNT)
{
- if(tp->type != TR_PARAM_STRING || tp->v.s.len != 1)
- return -1;
-
- separator = tp->v.s.s[0];
- }
- else if (tp->next != NULL)
- {
+ if(tp->type != TR_PARAM_STRING) {
+ if(pv_get_spec_value(msg,
(pv_spec_t*)tp->v.data, )!=0
+ || (!(vs.flags_VAL_STR)) ||
vs.rs.len<=0)
+ {
+ LM_ERR("value cannot get p1\n");
+ return -1;
+ }
+ separator = vs.rs.s[0];
+ } else {
+ if(tp->v.s.len != 1)
+ return -1;
+ separator = tp->v.s.s[0];
+ }
+ } else if (tp->next != NULL) {
if(tp->next->type != TR_PARAM_STRING
|| tp->next->v.s.len != 1)
return -1;
-
separator = tp->next->v.s.s[0];
}
}
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:96455755: pv: proper evaluation of pv param for param.count transformation
Module: kamailio
Branch: master
Commit: 964557553fd39fca1de35cf7d2f9e64134da7495
URL:
https://github.com/kamailio/kamailio/commit/964557553fd39fca1de35cf7d2f9e64134da7495
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T15:59:50+02:00
pv: proper evaluation of pv param for param.count transformation
- reported by GH #1041
---
Modified: src/modules/pv/pv_trans.c
---
Diff:
https://github.com/kamailio/kamailio/commit/964557553fd39fca1de35cf7d2f9e64134da7495.diff
Patch:
https://github.com/kamailio/kamailio/commit/964557553fd39fca1de35cf7d2f9e64134da7495.patch
---
diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c
index f15975e..6ad9a97 100644
--- a/src/modules/pv/pv_trans.c
+++ b/src/modules/pv/pv_trans.c
@@ -1294,6 +1294,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t
*tp, int subtype,
pv_value_t *val)
{
pv_value_t v;
+ pv_value_t vs;
str sv;
int n, i;
char separator = ';';
@@ -1307,17 +1308,23 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t
*tp, int subtype,
{
if (subtype == TR_PL_COUNT)
{
- if(tp->type != TR_PARAM_STRING || tp->v.s.len != 1)
- return -1;
-
- separator = tp->v.s.s[0];
- }
- else if (tp->next != NULL)
- {
+ if(tp->type != TR_PARAM_STRING) {
+ if(pv_get_spec_value(msg,
(pv_spec_t*)tp->v.data, )!=0
+ || (!(vs.flags_VAL_STR)) ||
vs.rs.len<=0)
+ {
+ LM_ERR("value cannot get p1\n");
+ return -1;
+ }
+ separator = vs.rs.s[0];
+ } else {
+ if(tp->v.s.len != 1)
+ return -1;
+ separator = tp->v.s.s[0];
+ }
+ } else if (tp->next != NULL) {
if(tp->next->type != TR_PARAM_STRING
|| tp->next->v.s.len != 1)
return -1;
-
separator = tp->next->v.s.s[0];
}
}
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:eede8862: pv: fix for param.count transformation with pv parameter
Module: kamailio
Branch: 4.4
Commit: eede8862900030f195ef31f476cea50ab1b56230
URL:
https://github.com/kamailio/kamailio/commit/eede8862900030f195ef31f476cea50ab1b56230
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T15:43:00+02:00
pv: fix for param.count transformation with pv parameter
- reported by GH #1041
(cherry picked from commit f151c26b49d483efbbb27acbb72950d79b8c563d)
(cherry picked from commit a032c4c630ea8eae8fc717bc8d2f5aec956e69e3)
---
Modified: modules/pv/pv_trans.c
---
Diff:
https://github.com/kamailio/kamailio/commit/eede8862900030f195ef31f476cea50ab1b56230.diff
Patch:
https://github.com/kamailio/kamailio/commit/eede8862900030f195ef31f476cea50ab1b56230.patch
---
diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c
index 942803d..dfccc75 100644
--- a/modules/pv/pv_trans.c
+++ b/modules/pv/pv_trans.c
@@ -2624,13 +2624,13 @@ char* tr_parse_paramlist(str* in, trans_t *t)
start_pos = ++p;
_tr_parse_sparam(p, p0, tp, spec, ps, in, s);
t->params = tp;
- tp = 0;
- if (p - start_pos != 1)
+ if (tp->type != TR_PARAM_SPEC && p - start_pos != 1)
{
LM_ERR("invalid separator in transformation: "
"%.*s\n", in->len, in->s);
goto error;
}
+ tp = 0;
while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++;
if(*p!=TR_RBRACKET)
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:a032c4c6: pv: fix for param.count transformation with pv parameter
Module: kamailio
Branch: 5.0
Commit: a032c4c630ea8eae8fc717bc8d2f5aec956e69e3
URL:
https://github.com/kamailio/kamailio/commit/a032c4c630ea8eae8fc717bc8d2f5aec956e69e3
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T15:40:20+02:00
pv: fix for param.count transformation with pv parameter
- reported by GH #1041
(cherry picked from commit f151c26b49d483efbbb27acbb72950d79b8c563d)
---
Modified: src/modules/pv/pv_trans.c
---
Diff:
https://github.com/kamailio/kamailio/commit/a032c4c630ea8eae8fc717bc8d2f5aec956e69e3.diff
Patch:
https://github.com/kamailio/kamailio/commit/a032c4c630ea8eae8fc717bc8d2f5aec956e69e3.patch
---
diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c
index 70c684a..f15975e 100644
--- a/src/modules/pv/pv_trans.c
+++ b/src/modules/pv/pv_trans.c
@@ -2662,13 +2662,13 @@ char* tr_parse_paramlist(str* in, trans_t *t)
start_pos = ++p;
_tr_parse_sparam(p, p0, tp, spec, ps, in, s);
t->params = tp;
- tp = 0;
- if (p - start_pos != 1)
+ if (tp->type != TR_PARAM_SPEC && p - start_pos != 1)
{
LM_ERR("invalid separator in transformation: "
"%.*s\n", in->len, in->s);
goto error;
}
+ tp = 0;
while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++;
if(*p!=TR_RBRACKET)
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f151c26b: pv: fix for param.count transformation with pv parameter
Module: kamailio
Branch: master
Commit: f151c26b49d483efbbb27acbb72950d79b8c563d
URL:
https://github.com/kamailio/kamailio/commit/f151c26b49d483efbbb27acbb72950d79b8c563d
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T15:37:59+02:00
pv: fix for param.count transformation with pv parameter
- reported by GH #1041
---
Modified: src/modules/pv/pv_trans.c
---
Diff:
https://github.com/kamailio/kamailio/commit/f151c26b49d483efbbb27acbb72950d79b8c563d.diff
Patch:
https://github.com/kamailio/kamailio/commit/f151c26b49d483efbbb27acbb72950d79b8c563d.patch
---
diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c
index 70c684a..f15975e 100644
--- a/src/modules/pv/pv_trans.c
+++ b/src/modules/pv/pv_trans.c
@@ -2662,13 +2662,13 @@ char* tr_parse_paramlist(str* in, trans_t *t)
start_pos = ++p;
_tr_parse_sparam(p, p0, tp, spec, ps, in, s);
t->params = tp;
- tp = 0;
- if (p - start_pos != 1)
+ if (tp->type != TR_PARAM_SPEC && p - start_pos != 1)
{
LM_ERR("invalid separator in transformation: "
"%.*s\n", in->len, in->s);
goto error;
}
+ tp = 0;
while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++;
if(*p!=TR_RBRACKET)
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Problem with topos together with track_cseq_updates (#1038)
I think I found a lead to the issue, need a bit of time to push the fix. Would you be able to test with master branch or version 5.0? There were more changes to topos and backporting them to 4.4 might not be straightforward. -- 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/1038#issuecomment-289743120___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:e20b38e0: core: safety check for retrying dns cache find
Module: kamailio
Branch: 4.4
Commit: e20b38e0084c1f89c43a921a8a2affbea060aaa5
URL:
https://github.com/kamailio/kamailio/commit/e20b38e0084c1f89c43a921a8a2affbea060aaa5
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T13:35:11+02:00
core: safety check for retrying dns cache find
(cherry picked from commit 9a56b88c1438e2d4f0c5b57c71bbe4e904b1a8e4)
(cherry picked from commit 3883a3174707bbaa3ce836faca035bae9c90c456)
---
Modified: dns_cache.c
---
Diff:
https://github.com/kamailio/kamailio/commit/e20b38e0084c1f89c43a921a8a2affbea060aaa5.diff
Patch:
https://github.com/kamailio/kamailio/commit/e20b38e0084c1f89c43a921a8a2affbea060aaa5.patch
---
diff --git a/dns_cache.c b/dns_cache.c
index 4273d2f..39bed3d 100644
--- a/dns_cache.c
+++ b/dns_cache.c
@@ -597,8 +597,10 @@ inline static struct dns_hash_entry* _dns_hash_find(str*
name, int type,
cname_chain++;
cname.s=((struct cname_rdata*)e->rr_lst->rdata)->name;
cname.len= ((struct
cname_rdata*)e->rr_lst->rdata)->name_len;
- name=
- goto again;
+ if(cname.s!=NULL && cname.len>0) {
+ name=
+ goto again;
+ }
}
}
return ret;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:3883a317: core: safety check for retrying dns cache find
Module: kamailio
Branch: 5.0
Commit: 3883a3174707bbaa3ce836faca035bae9c90c456
URL:
https://github.com/kamailio/kamailio/commit/3883a3174707bbaa3ce836faca035bae9c90c456
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-28T13:34:11+02:00
core: safety check for retrying dns cache find
(cherry picked from commit 9a56b88c1438e2d4f0c5b57c71bbe4e904b1a8e4)
---
Modified: src/core/dns_cache.c
---
Diff:
https://github.com/kamailio/kamailio/commit/3883a3174707bbaa3ce836faca035bae9c90c456.diff
Patch:
https://github.com/kamailio/kamailio/commit/3883a3174707bbaa3ce836faca035bae9c90c456.patch
---
diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c
index 4273d2f..39bed3d 100644
--- a/src/core/dns_cache.c
+++ b/src/core/dns_cache.c
@@ -597,8 +597,10 @@ inline static struct dns_hash_entry* _dns_hash_find(str*
name, int type,
cname_chain++;
cname.s=((struct cname_rdata*)e->rr_lst->rdata)->name;
cname.len= ((struct
cname_rdata*)e->rr_lst->rdata)->name_len;
- name=
- goto again;
+ if(cname.s!=NULL && cname.len>0) {
+ name=
+ goto again;
+ }
}
}
return ret;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] Planning Kamailio v5.0.1
On 28/03/2017 09:43, Olle E. Johansson wrote: >> On 28 Mar 2017, at 09:40, Daniel-Constantin Mierla <mico...@gmail.com> wrote: >> >> Hello, >> >> I am considering to release Kamailio v5.0.1 sometime next week, likely >> on Wednesday, April 5, 2017. Should anyone be aware of issues not listed >> yet on bug tracker, report them there as soon as possible to try to fix. >> >> Soon after, we should release a new version from branch 4.4 and the last >> one from branch 4.3. > I personally have no issues. I just want to say Thank You Daniel for all your > hard work getting releases out of the door! Thanks Olle, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:bcb11726: ims_diameter_server: added readme file
Module: kamailio Branch: master Commit: bcb11726c01ab720e7d89482711701509327a14b URL: https://github.com/kamailio/kamailio/commit/bcb11726c01ab720e7d89482711701509327a14b Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-28T13:11:43+02:00 ims_diameter_server: added readme file - required only first time after module is imported in source tree --- Added: src/modules/ims_diameter_server/README --- Diff: https://github.com/kamailio/kamailio/commit/bcb11726c01ab720e7d89482711701509327a14b.diff Patch: https://github.com/kamailio/kamailio/commit/bcb11726c01ab720e7d89482711701509327a14b.patch ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Planning Kamailio v5.0.1
Hello, I am considering to release Kamailio v5.0.1 sometime next week, likely on Wednesday, April 5, 2017. Should anyone be aware of issues not listed yet on bug tracker, report them there as soon as possible to try to fix. Soon after, we should release a new version from branch 4.4 and the last one from branch 4.3. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:9a56b88c: core: safety check for retrying dns cache find
Module: kamailio
Branch: master
Commit: 9a56b88c1438e2d4f0c5b57c71bbe4e904b1a8e4
URL:
https://github.com/kamailio/kamailio/commit/9a56b88c1438e2d4f0c5b57c71bbe4e904b1a8e4
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-27T21:00:08+02:00
core: safety check for retrying dns cache find
---
Modified: src/core/dns_cache.c
---
Diff:
https://github.com/kamailio/kamailio/commit/9a56b88c1438e2d4f0c5b57c71bbe4e904b1a8e4.diff
Patch:
https://github.com/kamailio/kamailio/commit/9a56b88c1438e2d4f0c5b57c71bbe4e904b1a8e4.patch
---
diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c
index 4273d2f..39bed3d 100644
--- a/src/core/dns_cache.c
+++ b/src/core/dns_cache.c
@@ -597,8 +597,10 @@ inline static struct dns_hash_entry* _dns_hash_find(str*
name, int type,
cname_chain++;
cname.s=((struct cname_rdata*)e->rr_lst->rdata)->name;
cname.len= ((struct
cname_rdata*)e->rr_lst->rdata)->name_len;
- name=
- goto again;
+ if(cname.s!=NULL && cname.len>0) {
+ name=
+ goto again;
+ }
}
}
return ret;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] uri_db: rework the possibiltiy to use any sip uri (#1034)
Merged #1034. -- 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/1034#event-1017157461___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:fbe1ed25: uri_db: rework the possibiltiy to use any sip uri (#1034)
Module: kamailio Branch: master Commit: fbe1ed25ee1b783a99e9ac1ac46347f526e2b356 URL: https://github.com/kamailio/kamailio/commit/fbe1ed25ee1b783a99e9ac1ac46347f526e2b356 Author: Rick <dun...@users.noreply.github.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-27T19:58:18+02:00 uri_db: rework the possibiltiy to use any sip uri (#1034) * uri_db: added subscriber and realm param to check_uri * uri_db: fix whitespace bevor tab * uri_db: last fix for log macros * uri_db: removed change from log macros --- Modified: src/modules/uri_db/checks.c Modified: src/modules/uri_db/checks.h Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/fbe1ed25ee1b783a99e9ac1ac46347f526e2b356.diff Patch: https://github.com/kamailio/kamailio/commit/fbe1ed25ee1b783a99e9ac1ac46347f526e2b356.patch ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] uri_db: rework the possibiltiy to use any sip uri (#1034)
Thanks! -- 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/1034#issuecomment-289533238___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] tr_lookup(): error parsing [{param.count, , }] (#1041)
OK, it seems this needs more investigation. Meanwhile, maybe you can use other function or transformation to replace the `,` with another character and the count. On the other hand, if you just want to count those headers, probably you can do a while loop to check how many headers are. -- 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/1041#issuecomment-289466890___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] tr_lookup(): error parsing [{param.count, , }] (#1041)
Is there a whitespace before the variable? -- 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/1041#issuecomment-288959707___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] avp and topoh questions
Hello,
the avps are not available when the callbacks used by topos are executed.
An option would be to store in a hash table using from-tag/call-id as a key
(requiring to bind to htable, ...).
The alternative, if you will develop a solution that requires to mark only the
initial request, could be to add a custom header in request_route, then match
it in the topos callback when the request is sent out and remove the header.
Cheers,
Daniel
March 23, 2017 2:50 PM, "Paul Claudiu Boriga" <paul.bor...@1and1.ro> wrote:
> Hello all,
>
> My name is Claudiu and I am a new developer in the 1&1 team, also new to
> SIP and Kamailio.
>
> I am having some issues trying to change the way topoh module works,
> could you help me with some avp and topoh related issues?
>
> The idea is to modify how the topoh module works by introducing a per
> message/transaction parameter to mark which messages/transactions should
> be hidden. I am using an avp parameter, which I define in the config
> like this: "modparam("topoh","hide_avp", "$avp(hide)")"
> and later use as this "$avp(hide)=1;". I intend to modify the
> th_msg_sent and th_msg_received, to read the value of the avp, using
> "search_first_avp" function, and only mask the headears if the avp is set.
> These functions are registered as callbacks for the SREV_NET_DATA_IN and
> SREV_NET_DATA_OUT events:
> sr_event_register_cb(SREV_NET_DATA_IN, th_msg_received);
> sr_event_register_cb(SREV_NET_DATA_OUT, th_msg_sent);
> I encountered the following issues:
> - apparently the avp is never seen as being set in the th_msg_received
> function, even though if I print in from the config with xlog, it
> appears to be set.
> - for some messages (180 ringing, and 200 ok), the avp is not seen as
> set in the th_msg_sent, but is seen on other requests (invite,bye) and
> replies (100 trying) messages. If I print it with xlog form config, on
> the onreply_route is appears set.
>
> Is the function th_msg_received always called before avps are seen in
> the code?
> Any idea why for the 180 and 200 messages the avp is not seen in the
> code inside th_msg_sent function?
>
> Thanks and regards,
> Claudiu Boriga
>
> ___
> sr-dev mailing list
> sr-dev@lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
--
Daniel-Constantin Mierla
www.kamailio.org -- www.asipto.com
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] tr_lookup(): error parsing [{param.count, , }] (#1041)
Can you try storing the delimiter in a variable (eg. $var(...)) and provide the variable to the transformation? It could be a quick around for now. -- 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/1041#issuecomment-288812309___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_postgress: insert_update() with DO NOTHING (#1039)
Traveling during the past week, didn't have time to follow up on this. You can close it if you plan another patch. -- 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/1039#issuecomment-288717300___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Problem with topos together with track_cseq_updates (#1038)
What version of kamailio are you using (get the output of `kamailio -v`)? -- 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/1038#issuecomment-288368158___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation Fault in Kamailio v4.4.5 Git-Rev. e9d576 (#1040)
Ported! To see what is executed from config, you can enabled cfgtrace from debugger module. I think you should add another character in between # and ! as whitespace is skipped in many cases by the parser, like `#-!`. -- 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/1040#issuecomment-288144781___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:fc4cfe98: siptrace: avoid creating proxy structure twice in trace_send_duplicate()
Module: kamailio
Branch: 4.4
Commit: fc4cfe984ef160db96e206c45610b05fe32aa455
URL:
https://github.com/kamailio/kamailio/commit/fc4cfe984ef160db96e206c45610b05fe32aa455
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-21T13:19:30+01:00
siptrace: avoid creating proxy structure twice in trace_send_duplicate()
- can happen when dst parameter is given, resulting in mem leak
- related to GH #1040
(cherry picked from commit 8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359)
(cherry picked from commit 97c6e811814e85b9845993a6b41994f70c57d2c4)
---
Modified: modules/siptrace/siptrace.c
---
Diff:
https://github.com/kamailio/kamailio/commit/fc4cfe984ef160db96e206c45610b05fe32aa455.diff
Patch:
https://github.com/kamailio/kamailio/commit/fc4cfe984ef160db96e206c45610b05fe32aa455.patch
---
diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c
index 4594e25..29bd60d 100644
--- a/modules/siptrace/siptrace.c
+++ b/modules/siptrace/siptrace.c
@@ -1594,19 +1594,9 @@ static int trace_send_duplicate(char *buf, int len,
struct dest_info *dst2)
return 0;
init_dest_info();
- /* create a temporary proxy*/
- dst.proto = PROTO_UDP;
- p=mk_proxy(_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
- dst.proto);
- if (p==0)
- {
- LM_ERR("bad host name in uri\n");
- return -1;
- }
if (!dst2){
- init_dest_info();
- /* create a temporary proxy*/
+ /* create a temporary proxy from dst param */
dst.proto = PROTO_UDP;
p=mk_proxy(_uri->host,
(dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
dst.proto);
@@ -1622,6 +1612,16 @@ static int trace_send_duplicate(char *buf, int len,
struct dest_info *dst2)
" listening socket\n",
dst.to.s.sa_family, dst.proto);
goto error;
}
+ } else {
+ /* create a temporary proxy to dup uri */
+ dst.proto = PROTO_UDP;
+ p=mk_proxy(_uri->host,
(dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
+ dst.proto);
+ if (p==0)
+ {
+ LM_ERR("bad host name in uri\n");
+ return -1;
+ }
}
if (msg_send((dst2)?dst2:, buf, len)<0)
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:97c6e811: siptrace: avoid creating proxy structure twice in trace_send_duplicate()
Module: kamailio
Branch: 5.0
Commit: 97c6e811814e85b9845993a6b41994f70c57d2c4
URL:
https://github.com/kamailio/kamailio/commit/97c6e811814e85b9845993a6b41994f70c57d2c4
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-21T13:16:20+01:00
siptrace: avoid creating proxy structure twice in trace_send_duplicate()
- can happen when dst parameter is given, resulting in mem leak
- related to GH #1040
(cherry picked from commit 8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359)
---
Modified: src/modules/siptrace/siptrace.c
---
Diff:
https://github.com/kamailio/kamailio/commit/97c6e811814e85b9845993a6b41994f70c57d2c4.diff
Patch:
https://github.com/kamailio/kamailio/commit/97c6e811814e85b9845993a6b41994f70c57d2c4.patch
---
diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c
index cfe281d..dae72d7 100644
--- a/src/modules/siptrace/siptrace.c
+++ b/src/modules/siptrace/siptrace.c
@@ -1617,19 +1617,9 @@ static int trace_send_duplicate(char *buf, int len,
struct dest_info *dst2)
return 0;
init_dest_info();
- /* create a temporary proxy*/
- dst.proto = PROTO_UDP;
- p=mk_proxy(_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
- dst.proto);
- if (p==0)
- {
- LM_ERR("bad host name in uri\n");
- return -1;
- }
if (!dst2){
- init_dest_info();
- /* create a temporary proxy*/
+ /* create a temporary proxy from dst param */
dst.proto = PROTO_UDP;
p=mk_proxy(_uri->host,
(dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
dst.proto);
@@ -1645,6 +1635,16 @@ static int trace_send_duplicate(char *buf, int len,
struct dest_info *dst2)
" listening socket\n",
dst.to.s.sa_family, dst.proto);
goto error;
}
+ } else {
+ /* create a temporary proxy to dup uri */
+ dst.proto = PROTO_UDP;
+ p=mk_proxy(_uri->host,
(dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
+ dst.proto);
+ if (p==0)
+ {
+ LM_ERR("bad host name in uri\n");
+ return -1;
+ }
}
if (msg_send((dst2)?dst2:, buf, len)<0)
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:8cd0f0be: siptrace: avoid creating proxy structure twice in trace_send_duplicate()
Module: kamailio
Branch: master
Commit: 8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359
URL:
https://github.com/kamailio/kamailio/commit/8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-21T12:28:47+01:00
siptrace: avoid creating proxy structure twice in trace_send_duplicate()
- can happen when dst parameter is given, resulting in mem leak
- related to GH #1040
---
Modified: src/modules/siptrace/siptrace.c
---
Diff:
https://github.com/kamailio/kamailio/commit/8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359.diff
Patch:
https://github.com/kamailio/kamailio/commit/8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359.patch
---
diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c
index fbddf23..c4b1076 100644
--- a/src/modules/siptrace/siptrace.c
+++ b/src/modules/siptrace/siptrace.c
@@ -1619,19 +1619,9 @@ static int trace_send_duplicate(char *buf, int len,
struct dest_info *dst2)
return 0;
init_dest_info();
- /* create a temporary proxy*/
- dst.proto = PROTO_UDP;
- p=mk_proxy(_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
- dst.proto);
- if (p==0)
- {
- LM_ERR("bad host name in uri\n");
- return -1;
- }
if (!dst2){
- init_dest_info();
- /* create a temporary proxy*/
+ /* create a temporary proxy from dst param */
dst.proto = PROTO_UDP;
p=mk_proxy(_uri->host,
(dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
dst.proto);
@@ -1647,6 +1637,16 @@ static int trace_send_duplicate(char *buf, int len,
struct dest_info *dst2)
" listening socket\n",
dst.to.s.sa_family, dst.proto);
goto error;
}
+ } else {
+ /* create a temporary proxy to dup uri */
+ dst.proto = PROTO_UDP;
+ p=mk_proxy(_uri->host,
(dup_uri->port_no)?dup_uri->port_no:SIP_PORT,
+ dst.proto);
+ if (p==0)
+ {
+ LM_ERR("bad host name in uri\n");
+ return -1;
+ }
}
if (msg_send((dst2)?dst2:, buf, len)<0)
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation Fault in Kamailio v4.4.5 Git-Rev. e9d576 (#1040)
Do you set a value for $avp(traced_user)? -- 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/1040#issuecomment-288043135___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation Fault in Kamailio v4.4.5 Git-Rev. e9d576 (#1040)
Do you have trace_mode parameter for siptrace set to 1? -- 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/1040#issuecomment-287960310___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:eb67c0ad: textops: safety check of allocated memory inside append_time_request_f()
Module: kamailio
Branch: 4.4
Commit: eb67c0ada2934f2d212645e8a7315eec6e368c4f
URL:
https://github.com/kamailio/kamailio/commit/eb67c0ada2934f2d212645e8a7315eec6e368c4f
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-21T02:52:58+01:00
textops: safety check of allocated memory inside append_time_request_f()
- reported by GH #1040
(cherry picked from commit a51a32633429d761f8bc742386b6f6bcb6b38522)
(cherry picked from commit 0ff6b710d0a5729778b3de1a15666e29d73aec56)
---
Modified: modules/textops/textops.c
---
Diff:
https://github.com/kamailio/kamailio/commit/eb67c0ada2934f2d212645e8a7315eec6e368c4f.diff
Patch:
https://github.com/kamailio/kamailio/commit/eb67c0ada2934f2d212645e8a7315eec6e368c4f.patch
---
diff --git a/modules/textops/textops.c b/modules/textops/textops.c
index b209e36..2fc341c 100644
--- a/modules/textops/textops.c
+++ b/modules/textops/textops.c
@@ -1214,6 +1214,10 @@ static int append_time_request_f(struct sip_msg* msg,
char* p1, char *p2)
}
time_str.s = pkg_malloc(MAX_TIME);
+ if(time_str.s==NULL) {
+ LM_ERR("no more pkg memory\n");
+ goto error;
+ }
time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time);
if (time_str.len>MAX_TIME-2 || time_str.len==0) {
LM_ERR("unexpected time length\n");
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:0ff6b710: textops: safety check of allocated memory inside append_time_request_f()
Module: kamailio
Branch: 5.0
Commit: 0ff6b710d0a5729778b3de1a15666e29d73aec56
URL:
https://github.com/kamailio/kamailio/commit/0ff6b710d0a5729778b3de1a15666e29d73aec56
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-21T02:43:06+01:00
textops: safety check of allocated memory inside append_time_request_f()
- reported by GH #1040
(cherry picked from commit a51a32633429d761f8bc742386b6f6bcb6b38522)
---
Modified: src/modules/textops/textops.c
---
Diff:
https://github.com/kamailio/kamailio/commit/0ff6b710d0a5729778b3de1a15666e29d73aec56.diff
Patch:
https://github.com/kamailio/kamailio/commit/0ff6b710d0a5729778b3de1a15666e29d73aec56.patch
---
diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c
index 9338fac..1ebc20d 100644
--- a/src/modules/textops/textops.c
+++ b/src/modules/textops/textops.c
@@ -1214,6 +1214,10 @@ static int append_time_request_f(struct sip_msg* msg,
char* p1, char *p2)
}
time_str.s = pkg_malloc(MAX_TIME);
+ if(time_str.s==NULL) {
+ LM_ERR("no more pkg memory\n");
+ goto error;
+ }
time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time);
if (time_str.len>MAX_TIME-2 || time_str.len==0) {
LM_ERR("unexpected time length\n");
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:a51a3263: textops: safety check of allocated memory inside append_time_request_f()
Module: kamailio
Branch: master
Commit: a51a32633429d761f8bc742386b6f6bcb6b38522
URL:
https://github.com/kamailio/kamailio/commit/a51a32633429d761f8bc742386b6f6bcb6b38522
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-21T02:39:00+01:00
textops: safety check of allocated memory inside append_time_request_f()
- reported by GH #1040
---
Modified: src/modules/textops/textops.c
---
Diff:
https://github.com/kamailio/kamailio/commit/a51a32633429d761f8bc742386b6f6bcb6b38522.diff
Patch:
https://github.com/kamailio/kamailio/commit/a51a32633429d761f8bc742386b6f6bcb6b38522.patch
---
diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c
index 9338fac..1ebc20d 100644
--- a/src/modules/textops/textops.c
+++ b/src/modules/textops/textops.c
@@ -1214,6 +1214,10 @@ static int append_time_request_f(struct sip_msg* msg,
char* p1, char *p2)
}
time_str.s = pkg_malloc(MAX_TIME);
+ if(time_str.s==NULL) {
+ LM_ERR("no more pkg memory\n");
+ goto error;
+ }
time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time);
if (time_str.len>MAX_TIME-2 || time_str.len==0) {
LM_ERR("unexpected time length\n");
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_perl.so: undefined symbol: sv2int_str (#1012)
Fixed by 42d3b93f838d1c2eeb009894422fe016a6572520. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1012#issuecomment-287618870___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_perl.so: undefined symbol: sv2int_str (#1012)
Closed #1012. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1012#event-1005858852___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Problem with topos together with track_cseq_updates (#1038)
Attach the logs file here or make it available on some web site/pastebin -- they are useful to investigate. Also, can you grab ngrep output for such situation (all sip messages passing through the server: `ngrep -d any -qt -W byline port 5060`). -- 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/1038#issuecomment-287618699___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] erlang: allow user to set ERLANG_xxxDIR (#1037)
Merged #1037. -- 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/1037#event-1005856917___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_postgress: insert_update() with DO NOTHING (#1039)
Is this patch useful in existing code base? If the function doesn't exist in the db connector module, it should be not used by the modules, but do an alternative solution. Can you give some example where this is useful now? Anyhow, as I could understand from the patch, it doesn't do an update on an insert conflict. This can mislead, by seeing the function exported by postgres module, but not fully implemented. Regarding the commit message, it must be strictly related to what the patch adds/changes to Kamailio sources, not the story of doing the patch. Such details can be in the pull requests description or comments of PR. -- 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/1039#issuecomment-287618378___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] availability of commits in master
Hello, yes, you can create PR for backporting, it would be the easiest way to review and see if anything gets broken. As we just released 5.0, I expect that 5.1 will be sometime in autumn or later. Cheers, Daniel On Thu, Mar 16, 2017 at 12:53 PM, Luis Azedo <l...@2600hz.com> wrote: > Hi Daniel, > > > thanks for the reply. > > > i made some fixes myself to presence and db_text. should i create a PR for > 5.0 branch ? > > about the small additions like pres_has_subscribers, since they are new > features, when do you think we can have a 5.1 ? > > just trying to figure out if we should build it or just wait. > > > Thanks > -- > *From:* sr-dev <sr-dev-boun...@lists.sip-router.org> on behalf of > Daniel-Constantin Mierla <mico...@gmail.com> > *Sent:* Friday, March 10, 2017 3:35:25 PM > *To:* Kamailio (SER) - Development Mailing List > *Subject:* Re: [sr-dev] availability of commits in master > > > Hello, > > > I don't think there 160 are mostly fixes. v5.0.0 was released like 12 days > before, I haven't noticed so many fixes since then. I am aware of few I did > in master and not backported yet, but I will do it soon -- typically I wait > few days to be sure there is no side effect reported by others. > > > If you are aware of commits that should be backported and were not done in > the past 12 days (or since the release of v5.0.0), list the commit ids here > (or commit urls to github) and of course will be backported if they are > fixes. > > > I also expect that a developer doing a fix for its module to request the > backport (or even do it directly or via pull request) if not done by others > meanwhile. > > > Personally I am not touching a lot of modules that I am not using, unless > it is a clear fix from my point of view. A PR comment mentioning that > backport should be done probably it would be a good information for such > cases. > > > Cheers, > Daniel > > On 10/03/2017 16:17, Luis Azedo wrote: > > Hi, > > > when is it expected that recent commits to master will go into stable ? > > > there are 162 commits to master since 5.0.0 mostly fixes > > > Thanks > > > > > > ___ > sr-dev mailing > listsr-...@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev > > > -- > Daniel-Constantin Mierlawww.twitter.com/miconda -- www.linkedin.com/in/miconda > Kamailio Advanced Training - Mar 6-8 (Europe) and Mar 20-22 (USA) - > www.asipto.com > Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com > > -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/micond <http://www.linkedin.com/in/miconda> ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] Forking and Call-ID Hiding in TOPOS
Hello, my (long term) plans were to add a way to obfuscate the Call-ID (more for the cases when it includes an IP address), no plans for the moment to generate new call-id for each branch in B-side. But contributions are welcome, of course... Cheers, Daniel On Fri, Mar 17, 2017 at 10:29 AM, Carsten Bock <cars...@ng-voice.com> wrote: > Hi, > > quick question (most likely to Daniel) about Topos. > > The documentation on topos says about masking Call-ID: > > "Note: this functionality is not implemented yet - the parameter is > present in order to be in pair with topoh module." > > Two questions: > - Is there a timeline, when masking Call-ID's will be added? > - will it also work for forking scenarios? Is it possible, to get a > different Call-ID per branch? > > I'm considering replacing SEMS with FreeSwitch in one of our IMS > deployments, so as soon as I have forking, I may have different > Requests with the same Call-ID but different Request-URI's. > Unfortunately, Forked requests are currently not properly supported on > FreeSwitch... :-( > > When using Topoh, it would change the Call-ID, but with the same input > parameter (old Call-ID) it would always result in the same new > call-id. > > Thanks, > Carsten > > > > -- > Carsten Bock > CEO (Geschäftsführer) > > ng-voice GmbH > Millerntorplatz 1 > 20359 Hamburg / Germany > > http://www.ng-voice.com > mailto:cars...@ng-voice.com > > Office +49 40 5247593-40 > Fax +49 40 5247593-99 > > Sitz der Gesellschaft: Hamburg > Registergericht: Amtsgericht Hamburg, HRB 120189 > Geschäftsführer: Carsten Bock > Ust-ID: DE279344284 > > Hier finden Sie unsere handelsrechtlichen Pflichtangaben: > http://www.ng-voice.com/imprint/ > > _______ > sr-dev mailing list > sr-dev@lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev > -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/micond <http://www.linkedin.com/in/miconda> ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5 coredump 11 (SEGV) upcon receiving MESSAGE via jsonrpcs (#1030)
It was a good catch after all, indeed it should not segfault and now should be fixed. Yesterday I didn't have time to add here the comments about it, but as jsonrpcs replaced the mi_fifo, its default transports were changed in 5.0, given that xhttp is not loaded by default. I also added a note in the upgrade guide from 4.4 to 5.0. Thanks for assisting with troubleshooting. -- 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/1030#issuecomment-287521722___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:f81c128d: jsonrpcs: safety check to see if xhttp transport was initialized
Module: kamailio
Branch: 5.0
Commit: f81c128dd3bf11fc52af308f36dabc926cc8ad70
URL:
https://github.com/kamailio/kamailio/commit/f81c128dd3bf11fc52af308f36dabc926cc8ad70
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-17T07:55:30+01:00
jsonrpcs: safety check to see if xhttp transport was initialized
- reported by GH #1030
(cherry picked from commit 7ae5210a7b9fb2d9a61cef496e9abe0da9860bee)
---
Modified: src/modules/jsonrpcs/jsonrpcs_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/f81c128dd3bf11fc52af308f36dabc926cc8ad70.diff
Patch:
https://github.com/kamailio/kamailio/commit/f81c128dd3bf11fc52af308f36dabc926cc8ad70.patch
---
diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c
b/src/modules/jsonrpcs/jsonrpcs_mod.c
index e639ab9..34f5f64 100644
--- a/src/modules/jsonrpcs/jsonrpcs_mod.c
+++ b/src/modules/jsonrpcs/jsonrpcs_mod.c
@@ -1050,11 +1050,12 @@ static void jsonrpc_delayed_ctx_close(struct
rpc_delayed_ctx* dctx)
static int mod_init(void)
{
+ memset(_api, 0, sizeof(xhttp_api_t));
/* bind the XHTTP API */
if(jsonrpc_transport==0 || (jsonrpc_transport&1)) {
if (xhttp_load_api(_api) < 0) {
- if(jsonrpc_transport==1) {
+ if(jsonrpc_transport&1) {
LM_ERR("cannot bind to XHTTP API\n");
return -1;
} else {
@@ -1169,6 +1170,11 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1,
char* s2)
return NONSIP_MSG_PASS;
}
+ if(xhttp_api.reply==NULL) {
+ LM_ERR("jsonrpc over http not initialized - check transport
param\n");
+ return NONSIP_MSG_ERROR;
+ }
+
/* initialize jsonrpc context */
ctx = &_jsonrpc_ctx;
memset(ctx, 0, sizeof(jsonrpc_ctx_t));
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:72330a60: xhttp: more debug messages for sending the response
Module: kamailio
Branch: 5.0
Commit: 72330a606ecca7dc0cf9bde0b6939ad67c0751d2
URL:
https://github.com/kamailio/kamailio/commit/72330a606ecca7dc0cf9bde0b6939ad67c0751d2
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-16T11:00:56+01:00
xhttp: more debug messages for sending the response
(cherry picked from commit 0350885c076fa691de6106eb821ec5890572cee6)
---
Modified: src/modules/xhttp/xhttp_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/72330a606ecca7dc0cf9bde0b6939ad67c0751d2.diff
Patch:
https://github.com/kamailio/kamailio/commit/72330a606ecca7dc0cf9bde0b6939ad67c0751d2.patch
---
diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c
index ca8ab32..2443de1 100644
--- a/src/modules/xhttp/xhttp_mod.c
+++ b/src/modules/xhttp/xhttp_mod.c
@@ -399,6 +399,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str
*reason,
return -1;
}
pkg_free(tbuf.s);
+ LM_DBG("response with content-type: %.*s\n", ctype->len,
ctype->s);
}
if(body!=NULL && body->len>0)
@@ -408,7 +409,9 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str
*reason,
LM_ERR("Error while adding reply lump\n");
return -1;
}
+ LM_DBG("response with body: %.*s\n", body->len, body->s);
}
+ LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s);
if (slb.freply(msg, code, reason) < 0)
{
LM_ERR("Error while sending reply\n");
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:74978801: jsonrpcs: extra debug messages when rpc response is sent
Module: kamailio
Branch: 5.0
Commit: 74978801e2687dc43f4a017f1669360fd2c7f318
URL:
https://github.com/kamailio/kamailio/commit/74978801e2687dc43f4a017f1669360fd2c7f318
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-16T11:01:07+01:00
jsonrpcs: extra debug messages when rpc response is sent
(cherry picked from commit fa50c85a9e61dd6b91ce88f3f74c433af5d414e2)
---
Modified: src/modules/jsonrpcs/jsonrpcs_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/74978801e2687dc43f4a017f1669360fd2c7f318.diff
Patch:
https://github.com/kamailio/kamailio/commit/74978801e2687dc43f4a017f1669360fd2c7f318.patch
---
diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c
b/src/modules/jsonrpcs/jsonrpcs_mod.c
index f44fb9e..e639ab9 100644
--- a/src/modules/jsonrpcs/jsonrpcs_mod.c
+++ b/src/modules/jsonrpcs/jsonrpcs_mod.c
@@ -391,6 +391,8 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx)
rbuf.len = strlen(rbuf.s);
}
if (rbuf.s!=NULL) {
+ LM_DBG("sending response with body: %p - %d %.*s\n", ctx->msg,
+ ctx->http_code, ctx->http_text.len,
ctx->http_text.s);
if(ctx->msg) {
xhttp_api.reply(ctx->msg, ctx->http_code,
>http_text,
_CONTENT_TYPE_HTML, );
@@ -400,6 +402,8 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx)
rbuf.s=NULL;
}
} else {
+ LM_DBG("sending response without body: %p - %d %.*s\n",
ctx->msg,
+ ctx->http_code, ctx->http_text.len,
ctx->http_text.s);
if(ctx->msg) {
xhttp_api.reply(ctx->msg, ctx->http_code,
>http_text,
NULL, NULL);
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:76176130: xhttp: use stateless reply for sending http response
Module: kamailio
Branch: 5.0
Commit: 76176130ee60ee819cd7850b7a7e433dc5c4f8cc
URL:
https://github.com/kamailio/kamailio/commit/76176130ee60ee819cd7850b7a7e433dc5c4f8cc
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-16T11:01:17+01:00
xhttp: use stateless reply for sending http response
(cherry picked from commit a97701575863993f8a19f9dd611156b37ffca247)
---
Modified: src/modules/xhttp/xhttp_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/76176130ee60ee819cd7850b7a7e433dc5c4f8cc.diff
Patch:
https://github.com/kamailio/kamailio/commit/76176130ee60ee819cd7850b7a7e433dc5c4f8cc.patch
---
diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c
index 2443de1..05b45c3 100644
--- a/src/modules/xhttp/xhttp_mod.c
+++ b/src/modules/xhttp/xhttp_mod.c
@@ -412,7 +412,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str
*reason,
LM_DBG("response with body: %.*s\n", body->len, body->s);
}
LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s);
- if (slb.freply(msg, code, reason) < 0)
+ if (slb.sreply(msg, code, reason) < 0)
{
LM_ERR("Error while sending reply\n");
return -1;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:7ae5210a: jsonrpcs: safety check to see if xhttp transport was initialized
Module: kamailio
Branch: master
Commit: 7ae5210a7b9fb2d9a61cef496e9abe0da9860bee
URL:
https://github.com/kamailio/kamailio/commit/7ae5210a7b9fb2d9a61cef496e9abe0da9860bee
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-17T07:52:57+01:00
jsonrpcs: safety check to see if xhttp transport was initialized
- reported by GH #1030
---
Modified: src/modules/jsonrpcs/jsonrpcs_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/7ae5210a7b9fb2d9a61cef496e9abe0da9860bee.diff
Patch:
https://github.com/kamailio/kamailio/commit/7ae5210a7b9fb2d9a61cef496e9abe0da9860bee.patch
---
diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c
b/src/modules/jsonrpcs/jsonrpcs_mod.c
index e639ab9..34f5f64 100644
--- a/src/modules/jsonrpcs/jsonrpcs_mod.c
+++ b/src/modules/jsonrpcs/jsonrpcs_mod.c
@@ -1050,11 +1050,12 @@ static void jsonrpc_delayed_ctx_close(struct
rpc_delayed_ctx* dctx)
static int mod_init(void)
{
+ memset(_api, 0, sizeof(xhttp_api_t));
/* bind the XHTTP API */
if(jsonrpc_transport==0 || (jsonrpc_transport&1)) {
if (xhttp_load_api(_api) < 0) {
- if(jsonrpc_transport==1) {
+ if(jsonrpc_transport&1) {
LM_ERR("cannot bind to XHTTP API\n");
return -1;
} else {
@@ -1169,6 +1170,11 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1,
char* s2)
return NONSIP_MSG_PASS;
}
+ if(xhttp_api.reply==NULL) {
+ LM_ERR("jsonrpc over http not initialized - check transport
param\n");
+ return NONSIP_MSG_ERROR;
+ }
+
/* initialize jsonrpc context */
ctx = &_jsonrpc_ctx;
memset(ctx, 0, sizeof(jsonrpc_ctx_t));
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5 coredump 11 (SEGV) upcon receiving MESSAGE via jsonrpcs (#1030)
The log messages are not from syslog, so they are missing date/time and which PID printed them. Can you redo the test and grab via syslog? You can also test with a977015 . -- 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/1030#issuecomment-287201871___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] core: enable reuse of tcp sockets (#1024)
Thanks, it can be merged. -- 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/1024#issuecomment-287086658___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Fix for no cdr after Kamailio 5.0 restart (#1036)
Maybe DLGCB_LOADED callback can be used for this situation -- I guess it is no need populate again the variables in the dlg structure as they were already done when the dialog was effectively created. If you create a new solution, make a commit per module and prefix the first log message with the module name: * https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md#commit-message-format -- 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/1036#issuecomment-287086206___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] core: enable reuse of tcp sockets (#1024)
I think ifdef can be used to check if SO_REUSEPORT is defined, on macos: ``` /usr/include/sys/socket.h:136:#define SO_REUSEPORT0x0200 /* allow local address & port reuse */ ``` On Linux: ``` /usr/include/asm-generic/socket.h:25:#define SO_REUSEPORT 15 ``` So it appears it is a define when available. The two use cases you listed are also important, I haven't thought of them, so I think that if we can get it enabled at compile time based on availability (can be a follow up commit), the PR can be merged. -- 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/1024#issuecomment-287013367___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5 coredump 11 (SEGV) upcon receiving MESSAGE via jsonrpcs (#1030)
Can you try with latest branch 5.0 and grab again the log messages with the debug=3 in case the issue is still there. -- 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/1030#issuecomment-287010991___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:a9770157: xhttp: use stateless reply for sending http response
Module: kamailio
Branch: master
Commit: a97701575863993f8a19f9dd611156b37ffca247
URL:
https://github.com/kamailio/kamailio/commit/a97701575863993f8a19f9dd611156b37ffca247
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-16T10:58:14+01:00
xhttp: use stateless reply for sending http response
---
Modified: src/modules/xhttp/xhttp_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/a97701575863993f8a19f9dd611156b37ffca247.diff
Patch:
https://github.com/kamailio/kamailio/commit/a97701575863993f8a19f9dd611156b37ffca247.patch
---
diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c
index 2443de1..05b45c3 100644
--- a/src/modules/xhttp/xhttp_mod.c
+++ b/src/modules/xhttp/xhttp_mod.c
@@ -412,7 +412,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str
*reason,
LM_DBG("response with body: %.*s\n", body->len, body->s);
}
LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s);
- if (slb.freply(msg, code, reason) < 0)
+ if (slb.sreply(msg, code, reason) < 0)
{
LM_ERR("Error while sending reply\n");
return -1;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:fa50c85a: jsonrpcs: extra debug messages when rpc response is sent
Module: kamailio
Branch: master
Commit: fa50c85a9e61dd6b91ce88f3f74c433af5d414e2
URL:
https://github.com/kamailio/kamailio/commit/fa50c85a9e61dd6b91ce88f3f74c433af5d414e2
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-16T10:54:25+01:00
jsonrpcs: extra debug messages when rpc response is sent
---
Modified: src/modules/jsonrpcs/jsonrpcs_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/fa50c85a9e61dd6b91ce88f3f74c433af5d414e2.diff
Patch:
https://github.com/kamailio/kamailio/commit/fa50c85a9e61dd6b91ce88f3f74c433af5d414e2.patch
---
diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c
b/src/modules/jsonrpcs/jsonrpcs_mod.c
index f44fb9e..e639ab9 100644
--- a/src/modules/jsonrpcs/jsonrpcs_mod.c
+++ b/src/modules/jsonrpcs/jsonrpcs_mod.c
@@ -391,6 +391,8 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx)
rbuf.len = strlen(rbuf.s);
}
if (rbuf.s!=NULL) {
+ LM_DBG("sending response with body: %p - %d %.*s\n", ctx->msg,
+ ctx->http_code, ctx->http_text.len,
ctx->http_text.s);
if(ctx->msg) {
xhttp_api.reply(ctx->msg, ctx->http_code,
>http_text,
_CONTENT_TYPE_HTML, );
@@ -400,6 +402,8 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx)
rbuf.s=NULL;
}
} else {
+ LM_DBG("sending response without body: %p - %d %.*s\n",
ctx->msg,
+ ctx->http_code, ctx->http_text.len,
ctx->http_text.s);
if(ctx->msg) {
xhttp_api.reply(ctx->msg, ctx->http_code,
>http_text,
NULL, NULL);
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0350885c: xhttp: more debug messages for sending the response
Module: kamailio
Branch: master
Commit: 0350885c076fa691de6106eb821ec5890572cee6
URL:
https://github.com/kamailio/kamailio/commit/0350885c076fa691de6106eb821ec5890572cee6
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-16T10:53:51+01:00
xhttp: more debug messages for sending the response
---
Modified: src/modules/xhttp/xhttp_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/0350885c076fa691de6106eb821ec5890572cee6.diff
Patch:
https://github.com/kamailio/kamailio/commit/0350885c076fa691de6106eb821ec5890572cee6.patch
---
diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c
index ca8ab32..2443de1 100644
--- a/src/modules/xhttp/xhttp_mod.c
+++ b/src/modules/xhttp/xhttp_mod.c
@@ -399,6 +399,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str
*reason,
return -1;
}
pkg_free(tbuf.s);
+ LM_DBG("response with content-type: %.*s\n", ctype->len,
ctype->s);
}
if(body!=NULL && body->len>0)
@@ -408,7 +409,9 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str
*reason,
LM_ERR("Error while adding reply lump\n");
return -1;
}
+ LM_DBG("response with body: %.*s\n", body->len, body->s);
}
+ LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s);
if (slb.freply(msg, code, reason) < 0)
{
LM_ERR("Error while sending reply\n");
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Makefile.defs: default locks review (#1035)
Very likely the ports system set the ARCH variable in environment or command line for building kamailio, that's why a simple assignment didn't work. Also, the Makefile should have done the amd64=>x86_64 even without my changes if the ARCH was not enforced from outside. -- 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/1035#issuecomment-286994922___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:65891fa1: Makefile.defs: override the ARCH for amd64 to x86_64
Module: kamailio Branch: 4.4 Commit: 65891fa1051a08a261846db8926937dfcad9f518 URL: https://github.com/kamailio/kamailio/commit/65891fa1051a08a261846db8926937dfcad9f518 Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-16T08:51:55+01:00 Makefile.defs: override the ARCH for amd64 to x86_64 (cherry picked from commit 1adf88e7211400b8d56a6dc7c463e60a2b697b80) (cherry picked from commit f5889fcc9e42cae01c58357a622d2270f994b8d7) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/65891fa1051a08a261846db8926937dfcad9f518.diff Patch: https://github.com/kamailio/kamailio/commit/65891fa1051a08a261846db8926937dfcad9f518.patch --- diff --git a/Makefile.defs b/Makefile.defs index 80ebf6ea..cb49ad1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -372,7 +372,7 @@ endif # retarget amd64 to x86_64 ifeq ($(ARCH), amd64) - ARCH=x86_64 + override ARCH=x86_64 endif $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:f5889fcc: Makefile.defs: override the ARCH for amd64 to x86_64
Module: kamailio Branch: 5.0 Commit: f5889fcc9e42cae01c58357a622d2270f994b8d7 URL: https://github.com/kamailio/kamailio/commit/f5889fcc9e42cae01c58357a622d2270f994b8d7 Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-16T08:50:55+01:00 Makefile.defs: override the ARCH for amd64 to x86_64 (cherry picked from commit 1adf88e7211400b8d56a6dc7c463e60a2b697b80) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f5889fcc9e42cae01c58357a622d2270f994b8d7.diff Patch: https://github.com/kamailio/kamailio/commit/f5889fcc9e42cae01c58357a622d2270f994b8d7.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8c20bd8..8b4bccd 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -377,7 +377,7 @@ endif # retarget amd64 to x86_64 ifeq ($(ARCH), amd64) - ARCH=x86_64 + override ARCH=x86_64 endif $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:1adf88e7: Makefile.defs: override the ARCH for amd64 to x86_64
Module: kamailio Branch: master Commit: 1adf88e7211400b8d56a6dc7c463e60a2b697b80 URL: https://github.com/kamailio/kamailio/commit/1adf88e7211400b8d56a6dc7c463e60a2b697b80 Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-16T08:49:36+01:00 Makefile.defs: override the ARCH for amd64 to x86_64 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1adf88e7211400b8d56a6dc7c463e60a2b697b80.diff Patch: https://github.com/kamailio/kamailio/commit/1adf88e7211400b8d56a6dc7c463e60a2b697b80.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index eb6993a..c7d970e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -377,7 +377,7 @@ endif # retarget amd64 to x86_64 ifeq ($(ARCH), amd64) - ARCH=x86_64 + override ARCH=x86_64 endif $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:d797574e: Makefile.defs: explicit retarget of amd64 arch to x86_64
Module: kamailio Branch: 4.4 Commit: d797574e8f2b152dd2b7f6a1db51724cc4461797 URL: https://github.com/kamailio/kamailio/commit/d797574e8f2b152dd2b7f6a1db51724cc4461797 Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-15T13:31:35+01:00 Makefile.defs: explicit retarget of amd64 arch to x86_64 - it is supposed to be done by the arch detection scripts, but it may fail on various systems having a different output than expected (cherry picked from commit 2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c) (cherry picked from commit ae2b828b49cd3aaa771a81b4c6b8893d9bad619f) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d797574e8f2b152dd2b7f6a1db51724cc4461797.diff Patch: https://github.com/kamailio/kamailio/commit/d797574e8f2b152dd2b7f6a1db51724cc4461797.patch --- diff --git a/Makefile.defs b/Makefile.defs index 4083234..80ebf6ea 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -369,6 +369,12 @@ ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) endif + +# retarget amd64 to x86_64 +ifeq ($(ARCH), amd64) + ARCH=x86_64 +endif + $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) LIBDIR ?= @@ -783,10 +789,6 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif -ifeq ($(ARCH), amd64) - use_fast_lock=yes -endif - ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:ae2b828b: Makefile.defs: explicit retarget of amd64 arch to x86_64
Module: kamailio Branch: 5.0 Commit: ae2b828b49cd3aaa771a81b4c6b8893d9bad619f URL: https://github.com/kamailio/kamailio/commit/ae2b828b49cd3aaa771a81b4c6b8893d9bad619f Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-15T13:30:51+01:00 Makefile.defs: explicit retarget of amd64 arch to x86_64 - it is supposed to be done by the arch detection scripts, but it may fail on various systems having a different output than expected (cherry picked from commit 2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ae2b828b49cd3aaa771a81b4c6b8893d9bad619f.diff Patch: https://github.com/kamailio/kamailio/commit/ae2b828b49cd3aaa771a81b4c6b8893d9bad619f.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 442e05d..8c20bd8 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -374,6 +374,12 @@ ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) endif + +# retarget amd64 to x86_64 +ifeq ($(ARCH), amd64) + ARCH=x86_64 +endif + $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) LIBDIR ?= @@ -788,10 +794,6 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif -ifeq ($(ARCH), amd64) - use_fast_lock=yes -endif - ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:2bea7f5a: Makefile.defs: explicit retarget of amd64 arch to x86_64
Module: kamailio Branch: master Commit: 2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c URL: https://github.com/kamailio/kamailio/commit/2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-15T13:28:44+01:00 Makefile.defs: explicit retarget of amd64 arch to x86_64 - it is supposed to be done by the arch detection scripts, but it may fail on various systems having a different output than expected --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c.diff Patch: https://github.com/kamailio/kamailio/commit/2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index aed65b6..eb6993a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -374,6 +374,12 @@ ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) endif + +# retarget amd64 to x86_64 +ifeq ($(ARCH), amd64) + ARCH=x86_64 +endif + $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) LIBDIR ?= @@ -788,10 +794,6 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif -ifeq ($(ARCH), amd64) - use_fast_lock=yes -endif - ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] uri_db: rework the possibiltiy to use any sip uri and log macros updates (#1034)
The commits for new features should not be mixed with changes for formatting or renaming of functions/macros in existing code, because it is not easy to review what are the actual new additions. Please rework the changes and make a commit dedicated only to the new feature. Moreover, LM_* macros are also new ones that prefix the log messages with function name, etc... no need to change those macros at all. If we decide to replace/remove them, then it will be easier to do substituttion on a LM_XYZ than on XYZ. -- 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/1034#issuecomment-286726974___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:e525cbc7: Makefile.defs: enabled fast locks for amd64
Module: kamailio Branch: 4.4 Commit: e525cbc7a9b4321b6a91feb82b9b91322c6f0b98 URL: https://github.com/kamailio/kamailio/commit/e525cbc7a9b4321b6a91feb82b9b91322c6f0b98 Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-15T12:27:10+01:00 Makefile.defs: enabled fast locks for amd64 (cherry picked from commit e6a84b43e06f081e53bf60df137d4262f36c3c7a) (cherry picked from commit f5e2f30fbef15d4310dd20828a70613971e67c28) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e525cbc7a9b4321b6a91feb82b9b91322c6f0b98.diff Patch: https://github.com/kamailio/kamailio/commit/e525cbc7a9b4321b6a91feb82b9b91322c6f0b98.patch --- diff --git a/Makefile.defs b/Makefile.defs index 2800cc1..4083234 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -783,6 +783,10 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif +ifeq ($(ARCH), amd64) + use_fast_lock=yes +endif + ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:f5e2f30f: Makefile.defs: enabled fast locks for amd64
Module: kamailio Branch: 5.0 Commit: f5e2f30fbef15d4310dd20828a70613971e67c28 URL: https://github.com/kamailio/kamailio/commit/f5e2f30fbef15d4310dd20828a70613971e67c28 Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-15T12:23:04+01:00 Makefile.defs: enabled fast locks for amd64 (cherry picked from commit e6a84b43e06f081e53bf60df137d4262f36c3c7a) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f5e2f30fbef15d4310dd20828a70613971e67c28.diff Patch: https://github.com/kamailio/kamailio/commit/f5e2f30fbef15d4310dd20828a70613971e67c28.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b64e4bd..442e05d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -788,6 +788,10 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif +ifeq ($(ARCH), amd64) + use_fast_lock=yes +endif + ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:e6a84b43: Makefile.defs: enabled fast locks for amd64
Module: kamailio Branch: master Commit: e6a84b43e06f081e53bf60df137d4262f36c3c7a URL: https://github.com/kamailio/kamailio/commit/e6a84b43e06f081e53bf60df137d4262f36c3c7a Author: Daniel-Constantin Mierla <mico...@gmail.com> Committer: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-15T12:22:06+01:00 Makefile.defs: enabled fast locks for amd64 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e6a84b43e06f081e53bf60df137d4262f36c3c7a.diff Patch: https://github.com/kamailio/kamailio/commit/e6a84b43e06f081e53bf60df137d4262f36c3c7a.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0226115..aed65b6 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -788,6 +788,10 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif +ifeq ($(ARCH), amd64) + use_fast_lock=yes +endif + ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Makefile.defs: default locks review (#1035)
Apparently the default locks are set to PTHREAD mutex, when the architecture is not handled explicitely. It should be reviewed and eventually switch to standard POSIX, they should work everywhere while PTHREAD are targeting threads and work only in few cases for processes. -- 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/1035___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio core dumped (#1021)
Closed #1021. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1021#event-1000680948___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio core dumped (#1021)
I see that PTHREAD_MUTEX are set as default instead of POSIX, if fast locks are not used. Maybe someone itried to see when they work very long time ago and eventually it was left like this (I tried to track the change quickly, but couldn't find it easy, too many changes in the file). Pthread mutex doesn't work for processes in most of the cases. I am closing this one and open a new item to review the default locking option. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1021#issuecomment-286710430___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio Crashes 11 times: Malloc (#1026)
Did you get the chance to investigate the corefile as per previous comment? -- 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/1026#issuecomment-286680892___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio crashes when it receives a 404 reply to an INVITE originated after a 302. (#875)
Can you try with latest master or version 5.0? There were some changes related to TM transaction structure when handling replies that may have been the reason for your issue as well. -- 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/875#issuecomment-286680180___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio core dumped (#1021)
I cloned the git repository inside `/usr/local/src`, then compiled it with `gmake`. You can run `kamailio -I` to see some of the compile time flags. It is a difference between the one printed by `/usr/local/sbin/kamailio` and the one cloned by me in `/usr/local/src`. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1021#issuecomment-286679473___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] could not make ul_rm_contact work (#1027)
Have you had the chance to test it as per previous comment? -- 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/1027#issuecomment-286678655___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing (#1033)
Merged #1033. -- 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/1033#event-1000483084___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing (#1033)
Thanks! -- 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/1033#issuecomment-286678393___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] core: enable reuse of tcp sockets (#1024)
The patch is not that complex, so it can be merged, but I think there are few things to add afterwards: * find a way to have the option compiled always and enabled if available. Very unlikely someone will re-compile with other define options. With a quick search, maybe uname() (https://linux.die.net/man/2/uname) can be used to detect if the kernel is at least version 3.9.0. Then still have the global kamailio.cfg parameter to enable/disable per kamailio instance. * make actual use of this capability -- probably that means ability to create more than one tcp manager process that can listen on the same port and accept new connections -- 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/1024#issuecomment-286535098___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] presence : fix fast_notify usage (#1031)
Merged #1031. -- 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/1031#event-999668003___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] presence : fix fast_notify usage (#1031)
Thanks! -- 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/1031#issuecomment-286530059___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Fix execinfo error in ims_dialog module (#996)
Thanks! -- 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/996#issuecomment-286529672___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] 4.4 dmqfix backport (#1029)
Merged #1029. -- 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/1029#event-999664879___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:074f52de: app_perl: Make sv2int_str() static
Module: kamailio
Branch: 5.0
Commit: 074f52de88f473945628f81740a87e5f6bc072ea
URL:
https://github.com/kamailio/kamailio/commit/074f52de88f473945628f81740a87e5f6bc072ea
Author: James Cloos <cl...@jhcloos.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-14T20:11:29+01:00
app_perl: Make sv2int_str() static
- The function is only called from the xs file, and C11âÂÂs inline
semantics mean that gcc-5 and later miscompile this file when
no optimization is specified.
Signed-off-by: James Cloos <cl...@jhcloos.com>
(cherry picked from commit 42d3b93f838d1c2eeb009894422fe016a6572520)
---
Modified: src/modules/app_perl/kamailioxs.xs
---
Diff:
https://github.com/kamailio/kamailio/commit/074f52de88f473945628f81740a87e5f6bc072ea.diff
Patch:
https://github.com/kamailio/kamailio/commit/074f52de88f473945628f81740a87e5f6bc072ea.patch
---
diff --git a/src/modules/app_perl/kamailioxs.xs
b/src/modules/app_perl/kamailioxs.xs
index 02fb5a5..8d2604c 100644
--- a/src/modules/app_perl/kamailioxs.xs
+++ b/src/modules/app_perl/kamailioxs.xs
@@ -402,7 +402,7 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) {
* - strflag: flag mask to be or-applied for string match
*/
-inline int sv2int_str(SV *val, int_str *is,
+static inline int sv2int_str(SV *val, int_str *is,
unsigned short *flags, unsigned short strflag) {
char *s;
STRLEN len;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Dialog: Core dump when using dlg_set_timeout (#1011)
I pushed some commits with safety checks back to 4.4. If the issue is still there, reopen. -- 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/1011#issuecomment-286528720___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Dialog: Core dump when using dlg_set_timeout (#1011)
Closed #1011. -- 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/1011#event-999660339___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:ab580223: core: more safety checks for getting int values from cfg function params
Module: kamailio
Branch: 4.4
Commit: ab5802239d850010b2f33a7b0a627232cd15e3b9
URL:
https://github.com/kamailio/kamailio/commit/ab5802239d850010b2f33a7b0a627232cd15e3b9
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-14T20:06:14+01:00
core: more safety checks for getting int values from cfg function params
- related to GH #1011
(cherry picked from commit 97b3ce7c8991774f42c013122704f32e2822ac58)
(cherry picked from commit fb859b9388ddfa82e7c6cf098940d920fead055b)
---
Modified: sr_module.c
---
Diff:
https://github.com/kamailio/kamailio/commit/ab5802239d850010b2f33a7b0a627232cd15e3b9.diff
Patch:
https://github.com/kamailio/kamailio/commit/ab5802239d850010b2f33a7b0a627232cd15e3b9.patch
---
diff --git a/sr_module.c b/sr_module.c
index 25da9cd..c72c6ff 100644
--- a/sr_module.c
+++ b/sr_module.c
@@ -1723,6 +1723,7 @@ int get_int_fparam(int* dst, struct sip_msg* msg,
fparam_t* param)
case FPARAM_UNSPEC:
case FPARAM_STRING:
case FPARAM_STR:
+ LM_ERR("Unsupported param type for int value: %d\n",
param->type);
return -1;
case FPARAM_AVP:
avp = search_first_avp(param->v.avp.flags,
param->v.avp.name,
@@ -1759,6 +1760,10 @@ int get_int_fparam(int* dst, struct sip_msg* msg,
fparam_t* param)
}
break;
case FPARAM_PVE:
+ LM_ERR("Unsupported param type for int value: %d\n",
param->type);
+ return -1;
+ default:
+ LM_ERR("Unexpected param type: %d\n", param->type);
return -1;
}
return 0;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:4.4:99c0c6ea: dialog: more checks for dlg_set_timeout() params
Module: kamailio
Branch: 4.4
Commit: 99c0c6ea153ca4299b22c3639cfd3613d0711f43
URL:
https://github.com/kamailio/kamailio/commit/99c0c6ea153ca4299b22c3639cfd3613d0711f43
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-14T20:06:37+01:00
dialog: more checks for dlg_set_timeout() params
- related to GH #1011
(cherry picked from commit 61cc9497ae5c478c41d7b0efc27731b42b22)
(cherry picked from commit 943a5b2c12426b5b6d3839ae899411f4e1a42414)
---
Modified: modules/dialog/dialog.c
---
Diff:
https://github.com/kamailio/kamailio/commit/99c0c6ea153ca4299b22c3639cfd3613d0711f43.diff
Patch:
https://github.com/kamailio/kamailio/commit/99c0c6ea153ca4299b22c3639cfd3613d0711f43.patch
---
diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c
index ceaf08a..591a8ec 100644
--- a/modules/dialog/dialog.c
+++ b/modules/dialog/dialog.c
@@ -1142,8 +1142,16 @@ static int w_dlg_set_timeout(struct sip_msg *msg, char
*pto, char *phe, char *ph
LM_ERR("no timeout value\n");
return -1;
}
+ if(to<=0) {
+ LM_ERR("invalid timeout value: %d\n", to);
+ return -1;
+ }
if(phe!=NULL)
{
+ if(phi==NULL) {
+ LM_ERR("invalid number of parameters\n");
+ return -1;
+ }
if(fixup_get_ivalue(msg, (gparam_p)phe, (int*))!=0)
{
LM_ERR("no hash entry value value\n");
@@ -1165,7 +1173,7 @@ static int w_dlg_set_timeout(struct sip_msg *msg, char
*pto, char *phe, char *ph
return -1;
}
- if(update_dlg_timeout(dlg, to) != 0)
+ if(update_dlg_timeout(dlg, to) != 0)
return -1;
return 1;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio core dumped (#1021)
How did you compile kamailio? It uses pthread mutexes, which should not happen, there is no proper synchronization done there, so crashing can happen at any time. I cloned kamailio and compiled it as usual and it uses the default FAST_LOCK for sync, not PTHREAD_MUTEX. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1021#issuecomment-286470865___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5 coredump 11 (SEGV) upcon receiving MESSAGE via jsonrpcs (#1030)
Couldn't spot anything relevant wrong for sending the response. Can you grab all the log messages with debug=3 in kamailio.cfg? Hopefully it will show more leads about what frame 0 can be. -- 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/1030#issuecomment-286417462___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:40112765: topos: fix for names of parameters
Module: kamailio
Branch: 5.0
Commit: 4011276557e3658f84885d03cf7db0277f60e590
URL:
https://github.com/kamailio/kamailio/commit/4011276557e3658f84885d03cf7db0277f60e590
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-13T19:05:51+01:00
topos: fix for names of parameters
(cherry picked from commit 4e9bea70b6701405925eb40c14e58b5b1383f827)
---
Modified: src/modules/topos/doc/topos_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/4011276557e3658f84885d03cf7db0277f60e590.diff
Patch:
https://github.com/kamailio/kamailio/commit/4011276557e3658f84885d03cf7db0277f60e590.patch
---
diff --git a/src/modules/topos/doc/topos_admin.xml
b/src/modules/topos/doc/topos_admin.xml
index a0e7af4..76ee18f 100644
--- a/src/modules/topos/doc/topos_admin.xml
+++ b/src/modules/topos/doc/topos_admin.xml
@@ -134,8 +134,8 @@ modparam("topoh", "sanity_checks", 1)
-
- branch_expires (int)
+
+ branch_expire (int)
Interval in seconds after which the branch records are
deleted.
@@ -145,16 +145,16 @@ modparam("topoh", "sanity_checks", 1)
- Set branch_expires parameter
+ Set branch_expire parameter
...
-modparam("topos", "branch_expires", 300)
+modparam("topos", "branch_expire", 300)
...
-
- branch_dialog (int)
+
+ dialog_expire (int)
Interval in seconds after which the dialog records are
deleted.
@@ -164,10 +164,10 @@ modparam("topos", "branch_expires", 300)
- Set branch_dialog parameter
+ Set dialog_expire parameter
...
-modparam("topos", "branch_dialog", 3600)
+modparam("topos", "dialog_expire", 3600)
...
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:4e9bea70: topos: fix for names of parameters
Module: kamailio
Branch: master
Commit: 4e9bea70b6701405925eb40c14e58b5b1383f827
URL:
https://github.com/kamailio/kamailio/commit/4e9bea70b6701405925eb40c14e58b5b1383f827
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-13T19:05:15+01:00
topos: fix for names of parameters
---
Modified: src/modules/topos/doc/topos_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/4e9bea70b6701405925eb40c14e58b5b1383f827.diff
Patch:
https://github.com/kamailio/kamailio/commit/4e9bea70b6701405925eb40c14e58b5b1383f827.patch
---
diff --git a/src/modules/topos/doc/topos_admin.xml
b/src/modules/topos/doc/topos_admin.xml
index a0e7af4..76ee18f 100644
--- a/src/modules/topos/doc/topos_admin.xml
+++ b/src/modules/topos/doc/topos_admin.xml
@@ -134,8 +134,8 @@ modparam("topoh", "sanity_checks", 1)
-
- branch_expires (int)
+
+ branch_expire (int)
Interval in seconds after which the branch records are
deleted.
@@ -145,16 +145,16 @@ modparam("topoh", "sanity_checks", 1)
- Set branch_expires parameter
+ Set branch_expire parameter
...
-modparam("topos", "branch_expires", 300)
+modparam("topos", "branch_expire", 300)
...
-
- branch_dialog (int)
+
+ dialog_expire (int)
Interval in seconds after which the dialog records are
deleted.
@@ -164,10 +164,10 @@ modparam("topos", "branch_expires", 300)
- Set branch_dialog parameter
+ Set dialog_expire parameter
...
-modparam("topos", "branch_dialog", 3600)
+modparam("topos", "dialog_expire", 3600)
...
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git: new commits in branch 5.0
- URL: https://github.com/kamailio/kamailio/commit/1c7d33a9a9c169cdd55be00f30a5af1e5525c915 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:50:03+01:00 Makefile: make tar updated to skip obsolete folder - paths updated to run with src folder (cherry picked from commit 7ecd9dfb37b3b4a9770265c7a846d3224be98d84) - URL: https://github.com/kamailio/kamailio/commit/fe22bef294f2d6bbb9ef20cf39691c5fbb391b1f Author: Olle E. Johansson <o...@edvina.net> Date: 2017-03-13T18:50:39+01:00 manpage Add proper web address to the project (include https) (cherry picked from commit 1f3884ce4cd08c6b7b52c2dd15bb2a5ac1905a63) - URL: https://github.com/kamailio/kamailio/commit/0d1f93bb5406ce74de50dee2ad71493b98e765c9 Author: Olle E. Johansson <o...@edvina.net> Date: 2017-03-13T18:50:54+01:00 dialog Add missing ka_failed_limit parameter to README (cherry picked from commit 307ad0a3e1084a7a03c045dc563421829b46c3e2) - URL: https://github.com/kamailio/kamailio/commit/3959d25e8f6f709d081cb47e67066de96d6b5153 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:51:24+01:00 topos: new parameter storage - specify the storage type to be used - default value is "db", to use database connectors (cherry picked from commit 4fa7a93fb60d8e8468b0f98272c1661d4913c463) - URL: https://github.com/kamailio/kamailio/commit/40359c7318b0e61219e460160d2e26c0fef551c0 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:51:34+01:00 topos: restrict storage value to db and redis (cherry picked from commit 58c1ab8fa03c992d201f226eab06d2fbeee5) - URL: https://github.com/kamailio/kamailio/commit/274c7d27d340fbc7874d47323eb3b8b4cdae5569 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:53:14+01:00 topos: group storage function in an api structure (cherry picked from commit d40635aa946d2d9e49227ab87cba4e045bcc5ebd) - URL: https://github.com/kamailio/kamailio/commit/c628bbf9f08f0714f32f3fb0c3271bf6a42a477b Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:53:30+01:00 topos: export intermodule api to set storage functions (cherry picked from commit 9e6f94e0ed3845f5da0c548e04f549906f58456e) - URL: https://github.com/kamailio/kamailio/commit/9f9832c53c68da14eecfad75b518f9cb3980e04d Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:53:55+01:00 topos: unique id per dialog reused for both local contacts - relocated safety checks for storage update (cherry picked from commit 0aaeed773316d4763471e723cfdc8d1230dfd5c1) - URL: https://github.com/kamailio/kamailio/commit/3adcdf863de38518366a99ae15321204b0555457 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:54:19+01:00 topos: proper detection of direction for requests within dialog - related to GH #1005 (cherry picked from commit a43d8460f4caca20f42f0eb44ec4bd9e22cb1513) - URL: https://github.com/kamailio/kamailio/commit/e341821cacef7ef6c70e5e2c098cff644fca0ef5 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:54:37+01:00 topos: api functions to get dialog and branch expire values (cherry picked from commit 83a8c97798d9dbac7e67203e4a246b6013503c01) - URL: https://github.com/kamailio/kamailio/commit/9e0fd2ebada61e59a17d8558e1746192a3761f5d Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:57:07+01:00 db_mongodb: re-init iterator and search again if fails to find from crt position (cherry picked from commit 501c41dd35fb9f15fdf96f4f3778860395e37a84) - URL: https://github.com/kamailio/kamailio/commit/9e9fc9a31dce58108c4430cbe0af41b31d02 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:57:20+01:00 db_mongodb: re-init iterator for bson covert search failure (cherry picked from commit 6bd32088de1d7ae816643aea4a60c70911e46b5e) - URL: https://github.com/kamailio/kamailio/commit/944961ecc9a83785e9fc9f86985ef42873f969b3 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:57:56+01:00 websocket: proper parameters for rpc response building of ws dump - reported by GH #1022 (cherry picked from commit 679febf10e325ddbb90d6070b5599478fb858d75) - URL: https://github.com/kamailio/kamailio/commit/f714655a4e13f6b0d57d0a9a6a5b227f6edc753d Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:58:15+01:00 topos: reworked dialog update in order to refresh contact values - related to GH #1005 (cherry picked from commit 639013a14d46790dd5605f58f683317eb6b9f3f4) - URL: https://github.com/kamailio/kamailio/commit/bde35f20f26993cdccf546aeb7f84568e9b6a6d6 Author: Daniel-Constantin Mierla <mico...@gmail.com> Date: 2017-03-13T18:58:28+01:00 websocket: split the addition of info structure for ws.dump rpc - related to GH #1022 (cherry picked from co
[sr-dev] git:master:618888cc: dialog: more checks for dlg_set_timeout() params
Module: kamailio
Branch: master
Commit: 61cc9497ae5c478c41d7b0efc27731b42b22
URL:
https://github.com/kamailio/kamailio/commit/61cc9497ae5c478c41d7b0efc27731b42b22
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Committer: Daniel-Constantin Mierla <mico...@gmail.com>
Date: 2017-03-13T18:13:51+01:00
dialog: more checks for dlg_set_timeout() params
- related to GH #1011
---
Modified: src/modules/dialog/dialog.c
---
Diff:
https://github.com/kamailio/kamailio/commit/61cc9497ae5c478c41d7b0efc27731b42b22.diff
Patch:
https://github.com/kamailio/kamailio/commit/61cc9497ae5c478c41d7b0efc27731b42b22.patch
---
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index c572deb..add899c 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -1133,8 +1133,16 @@ static int w_dlg_set_timeout(struct sip_msg *msg, char
*pto, char *phe, char *ph
LM_ERR("no timeout value\n");
return -1;
}
+ if(to<=0) {
+ LM_ERR("invalid timeout value: %d\n", to);
+ return -1;
+ }
if(phe!=NULL)
{
+ if(phi==NULL) {
+ LM_ERR("invalid number of parameters\n");
+ return -1;
+ }
if(fixup_get_ivalue(msg, (gparam_p)phe, (int*))!=0)
{
LM_ERR("no hash entry value value\n");
@@ -1156,7 +1164,7 @@ static int w_dlg_set_timeout(struct sip_msg *msg, char
*pto, char *phe, char *ph
return -1;
}
- if(update_dlg_timeout(dlg, to) != 0)
+ if(update_dlg_timeout(dlg, to) != 0)
return -1;
return 1;
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] substr transformation error does not include config line number (#1019)
Closed #1019. -- 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/1019#event-997601441___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
