sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:69f9b0a4: core: parse - validity check for contact uri size and more verbose log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 69f9b0a4d5261ec5b6d8d7163b3809a9bb24916d URL: https://github.com/kamailio/kamailio/commit/69f9b0a4d5261ec5b6d8d7163b3809a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-11T09:38:49+02:00 core: parse - validity check for contact uri size and more verbose log message --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/69f9b0a4d5261ec5b6d8d7163b3809a… Patch: https://github.com/kamailio/kamailio/commit/69f9b0a4d5261ec5b6d8d7163b3809a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 61a40e3bd8..650740b1a1 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -182,6 +182,9 @@ int parse_contacts(str* _s, contact_t** _c) { contact_t* c; param_hooks_t hooks; + str sv; + + sv = *_s; while(1) { /* Allocate and clear contact structure */ @@ -220,6 +223,10 @@ int parse_contacts(str* _s, contact_t** _c) } trim(&c->uri); + if((c->uri.len <= 0) || (c->uri.s + c->uri.len > sv.s + sv.len)) { + LM_ERR("invlid contact uri\n"); + goto error; + } if (_s->len == 0) goto ok; @@ -265,6 +272,8 @@ int parse_contacts(str* _s, contact_t** _c) } error: + LM_ERR("failure parsing '%.*s' (%d) [%p/%p/%d]\n", sv.len, sv.s, sv.len, + sv.s, _s->s, (int)(_s->s - sv.s)); if (c) pkg_free(c); free_contacts(_c); /* Free any contacts created so far */ return -1;

5 years, 5 months

git:5.2:50296edb: core: don't abort() Kamailio in case of invalid lump parameters, return an error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 50296edbd3a546a00bf3f0b14850bc003b22a360 URL: https://github.com/kamailio/kamailio/commit/50296edbd3a546a00bf3f0b14850bc0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T09:23:26+02:00 core: don't abort() Kamailio in case of invalid lump parameters, return an error (cherry picked from commit 853f65454d1a77b0145e80b006699fa1048045ac) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/50296edbd3a546a00bf3f0b14850bc0… Patch: https://github.com/kamailio/kamailio/commit/50296edbd3a546a00bf3f0b14850bc0… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index e033b4e794..bb181ef2d9 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -288,14 +288,14 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (offset+len>msg->len){ LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", offset, len, msg->len); - abort(); + return 0; } if (len==0){ LM_WARN("0 len (offset=%d)\n", offset); @@ -344,9 +344,9 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len); @@ -404,9 +404,9 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len);

5 years, 5 months

git:5.1:e723cc97: core: don't abort() Kamailio in case of invalid lump parameters, return an error

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: e723cc9730a039a24f6fdb969c3259b2d4935be4 URL: https://github.com/kamailio/kamailio/commit/e723cc9730a039a24f6fdb969c3259b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T09:23:36+02:00 core: don't abort() Kamailio in case of invalid lump parameters, return an error (cherry picked from commit 853f65454d1a77b0145e80b006699fa1048045ac) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/e723cc9730a039a24f6fdb969c3259b… Patch: https://github.com/kamailio/kamailio/commit/e723cc9730a039a24f6fdb969c3259b… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index e033b4e794..bb181ef2d9 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -288,14 +288,14 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (offset+len>msg->len){ LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", offset, len, msg->len); - abort(); + return 0; } if (len==0){ LM_WARN("0 len (offset=%d)\n", offset); @@ -344,9 +344,9 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len); @@ -404,9 +404,9 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len);

5 years, 5 months

git:master:853f6545: core: don't abort() Kamailio in case of invalid lump parameters, return an error

by Henning Westerholt

Module: kamailio Branch: master Commit: 853f65454d1a77b0145e80b006699fa1048045ac URL: https://github.com/kamailio/kamailio/commit/853f65454d1a77b0145e80b006699fa… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T09:21:44+02:00 core: don't abort() Kamailio in case of invalid lump parameters, return an error --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/853f65454d1a77b0145e80b006699fa… Patch: https://github.com/kamailio/kamailio/commit/853f65454d1a77b0145e80b006699fa… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 007c5de2cc..a15f3e30e6 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -291,14 +291,14 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (offset+len>msg->len){ LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", offset, len, msg->len); - abort(); + return 0; } if (len==0){ LM_WARN("0 len (offset=%d)\n", offset); @@ -348,9 +348,9 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len); @@ -408,9 +408,9 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len);

5 years, 5 months

Releasing Kamailio v5.1.8

by Daniel-Constantin Mierla

Hello, I am considering to release v5.1.8, an minor version to be built from branch 5.1, on Thursday, this week (April 11, 2019). As usual, check that at least the patches for issues you reported were backported in order to be sure they were not missed during the typical backporting done by developers so far. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com

5 years, 5 months

git:5.1:a09a57cd: topoh: execute the kemi event route callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: a09a57cd6fca6790c496435794fab02695782596 URL: https://github.com/kamailio/kamailio/commit/a09a57cd6fca6790c496435794fab02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:34:52+02:00 topoh: execute the kemi event route callbacks with context - manual backport for: 121282ac4986d6389a6dd64c35b77337a4ca256b --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a09a57cd6fca6790c496435794fab02… Patch: https://github.com/kamailio/kamailio/commit/a09a57cd6fca6790c496435794fab02… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 1362f4cd7a..853140ff21 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -556,7 +556,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) run_top_route(event_rt.rlist[_th_eventrt_outgoing], fmsg, &ctx); } else { if(keng!=NULL) { - if(keng->froute(fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &_th_eventrt_callback, &_th_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

5 years, 5 months

git:5.1:25987949: topos: set context when executing event route

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 259879497ae9557256c4599811ffa142b088b101 URL: https://github.com/kamailio/kamailio/commit/259879497ae9557256c4599811ffa14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:32:10+02:00 topos: set context when executing event route - manual backporting for: 403da8e8dcc2e4986595f183f0ac37a6bb41ab86 d82a6cd45c1486f767b7fec2a02161f7314c9071 --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/259879497ae9557256c4599811ffa14… Patch: https://github.com/kamailio/kamailio/commit/259879497ae9557256c4599811ffa14… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 9dff909fee..2a13d51a49 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -495,10 +495,10 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); if(_tps_eventrt_outgoing>=0) { - run_top_route(event_rt.rlist[_tps_eventrt_outgoing], fmsg, &ctx); + run_top_route(event_rt.rlist[_tps_eventrt_outgoing], (msg)?msg:fmsg, &ctx); } else { if(keng!=NULL) { - if(keng->froute(fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, &_tps_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL; @@ -533,4 +533,4 @@ int bind_topos(topos_api_t *api) api->get_branch_expire = tps_get_branch_expire; return 0; -} \ No newline at end of file +}

5 years, 5 months

git:5.1:30e2399d: core: kemi - backpup and restore old context inside sr_kemi_ctx_route()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 30e2399d7bbad05b1d4967056d869d8e46b33165 URL: https://github.com/kamailio/kamailio/commit/30e2399d7bbad05b1d4967056d869d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:07:32+02:00 core: kemi - backpup and restore old context inside sr_kemi_ctx_route() (cherry picked from commit 0689ac5976121d5a8edf815c0cee51da1098530f) (cherry picked from commit cb1b346f6b815ed0fdd9644e5c208f7c2a0d9f14) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/30e2399d7bbad05b1d4967056d869d8… Patch: https://github.com/kamailio/kamailio/commit/30e2399d7bbad05b1d4967056d869d8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f42005061b..e7a74f77d3 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1685,6 +1685,12 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, int rtype, str *ename, str *edata) { + run_act_ctx_t *bctx; + int ret; + + bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(ctx); - return sr_kemi_route(keng, msg, rtype, ename, edata); + ret = sr_kemi_route(keng, msg, rtype, ename, edata); + sr_kemi_act_ctx_set(bctx); + return ret; }

5 years, 5 months

git:5.1:381926e9: core: kemi - wrapper function to run callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 381926e96f9ab9f38e920b5a0e9c29afdd7480f0 URL: https://github.com/kamailio/kamailio/commit/381926e96f9ab9f38e920b5a0e9c29a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:07:02+02:00 core: kemi - wrapper function to run callbacks with context (cherry picked from commit 395cae83da4d83920dd038d299c30ffa97b6c272) (cherry picked from commit d63b21f1b52861a31555f63b2d8d88c0c2a672ba) --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/381926e96f9ab9f38e920b5a0e9c29a… Patch: https://github.com/kamailio/kamailio/commit/381926e96f9ab9f38e920b5a0e9c29a… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 37b8ee795a..f42005061b 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1678,3 +1678,13 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, setsflagsval(sfbk); return ret; } + +/** + * + */ +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata) +{ + sr_kemi_act_ctx_set(ctx); + return sr_kemi_route(keng, msg, rtype, ename, edata); +} diff --git a/src/core/kemi.h b/src/core/kemi.h index d5fe64d451..9358dd1262 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -142,5 +142,7 @@ int sr_kemi_core_drop(sip_msg_t *msg); int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, str *ename, str *edata); +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata); #endif

5 years, 5 months

git:5.1:547f3dfa: Merge pull request #1925 from sergey-safarov/pg_make

by GitHub

Module: kamailio Branch: 5.1 Commit: 547f3dfaa6536f0e768b89844aa287d8de478b77 URL: https://github.com/kamailio/kamailio/commit/547f3dfaa6536f0e768b89844aa287d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-10T10:54:40+02:00 Merge pull request #1925 from sergey-safarov/pg_make [5.1] Fixed packaging in opensuse/tumbleweed --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/547f3dfaa6536f0e768b89844aa287d… Patch: https://github.com/kamailio/kamailio/commit/547f3dfaa6536f0e768b89844aa287d… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index d780467f27..26a76d8ebc 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -9,6 +9,19 @@ NAME=db_postgres.so # the autodetection # CROSS_COMPILE=true +ifeq ($(CROSS_COMPILE),) +LIBPQ_BUILDER = $(shell \ + if pkg-config --exists libpq; then \ + echo 'pkg-config libpq'; \ + fi) +ifneq ($(LIBPQ_BUILDER),) + DEFS += $(shell $(LIBPQ_BUILDER) --cflags) + LIBS += $(shell $(LIBPQ_BUILDER) --libs) +endif +endif + +ifeq ($(LIBPQ_BUILDER),) + ifeq ($(CROSS_COMPILE),) PGCFG=$(shell which pg_config) endif @@ -27,6 +40,8 @@ else -L$(LOCALBASE)/lib/pgsql -lpq endif +endif + #DEFS += -DPG_TEST DEFS += -DSER_MOD_INTERFACE

5 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019