sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

[kamailio/kamailio] [5.1] Fixed packaging in opensuse/tumbleweed (#1925)

by sergey-safarov

two commits backported from master You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1925 -- Commit Summary -- * db_postgres: try to use pkg-config for lib paths * db_postgres: Makefile - fixed name of variable used to detect pkg-config -- File Changes -- M src/modules/db_postgres/Makefile (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1925.patch https://github.com/kamailio/kamailio/pull/1925.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1925

5 years, 8 months

git:5.1:631ea0b8: db_postgres: Makefile - fixed name of variable used to detect pkg-config

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 631ea0b80ee1c95b0362668a67ba0001c8070a2c URL: https://github.com/kamailio/kamailio/commit/631ea0b80ee1c95b0362668a67ba000… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-09T10:44:46+03:00 db_postgres: Makefile - fixed name of variable used to detect pkg-config (cherry picked from commit 49a34c863335e6b0b09e397d7962395306506c00) --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/631ea0b80ee1c95b0362668a67ba000… Patch: https://github.com/kamailio/kamailio/commit/631ea0b80ee1c95b0362668a67ba000… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index ca99b66b7b..26a76d8ebc 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -10,13 +10,13 @@ NAME=db_postgres.so # CROSS_COMPILE=true ifeq ($(CROSS_COMPILE),) -LIBPQL_BUILDER = $(shell \ +LIBPQ_BUILDER = $(shell \ if pkg-config --exists libpq; then \ echo 'pkg-config libpq'; \ fi) ifneq ($(LIBPQ_BUILDER),) - DEFS += $(shell $(LIBPQL_BUILDER) --cflags) - LIBS += $(shell $(LIBPQL_BUILDER) --libs) + DEFS += $(shell $(LIBPQ_BUILDER) --cflags) + LIBS += $(shell $(LIBPQ_BUILDER) --libs) endif endif

5 years, 8 months

git:5.1:2664b6ed: db_postgres: try to use pkg-config for lib paths

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 2664b6ed8001f356ce2076433e858f807d237962 URL: https://github.com/kamailio/kamailio/commit/2664b6ed8001f356ce2076433e858f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-09T10:41:09+03:00 db_postgres: try to use pkg-config for lib paths - GH #1915 (cherry picked from commit b23e8e47474d9c25c6de0f6c3da07ae43b85ad8a) --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2664b6ed8001f356ce2076433e858f8… Patch: https://github.com/kamailio/kamailio/commit/2664b6ed8001f356ce2076433e858f8… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index d780467f27..ca99b66b7b 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),) +LIBPQL_BUILDER = $(shell \ + if pkg-config --exists libpq; then \ + echo 'pkg-config libpq'; \ + fi) +ifneq ($(LIBPQ_BUILDER),) + DEFS += $(shell $(LIBPQL_BUILDER) --cflags) + LIBS += $(shell $(LIBPQL_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, 8 months

git:5.2:ccedfaba: tls: set execution context for kemi callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: ccedfabab2d5fb9888842f36f45c8505597ea74e URL: https://github.com/kamailio/kamailio/commit/ccedfabab2d5fb9888842f36f45c850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:51+02:00 tls: set execution context for kemi callbacks (cherry picked from commit 7f20200c9e0bca5c4ed16c55b9db162922a51e76) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ccedfabab2d5fb9888842f36f45c850… Patch: https://github.com/kamailio/kamailio/commit/ccedfabab2d5fb9888842f36f45c850… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 812015f622..5d3bc94522 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1477,7 +1477,7 @@ int tls_run_event_routes(struct tcp_connection *c) } else { keng = sr_kemi_eng_get(); if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &sr_tls_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

5 years, 8 months

git:5.2:0c78f5d0: msrp: set the context to kemi callback function execution

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 0c78f5d026202031d2d2cdd21049805559b5e1f2 URL: https://github.com/kamailio/kamailio/commit/0c78f5d026202031d2d2cdd21049805… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:40+02:00 msrp: set the context to kemi callback function execution (cherry picked from commit 501c2b88e8e0bf16f2be0b0255d35d449467a60d) --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0c78f5d026202031d2d2cdd21049805… Patch: https://github.com/kamailio/kamailio/commit/0c78f5d026202031d2d2cdd21049805… --- diff --git a/src/modules/msrp/msrp_mod.c b/src/modules/msrp/msrp_mod.c index d69beea133..dfe7056f39 100644 --- a/src/modules/msrp/msrp_mod.c +++ b/src/modules/msrp/msrp_mod.c @@ -531,16 +531,13 @@ static int msrp_frame_received(sr_event_param_t *evp) fmsg->rcv = *tev->rcv; rtb = get_route_type(); set_route_type(EVENT_ROUTE); + init_run_actions_ctx(&ctx); if(msrp_event_callback.s == NULL || msrp_event_callback.len <= 0) { /* native cfg script execution */ rt = route_get(&event_rt, evname.s); LM_DBG("executing event_route[msrp:frame-in] (%d)\n", rt); if(rt >= 0 && event_rt.rlist[rt] != NULL) { - init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, &ctx); - if(ctx.run_flags & DROP_R_F) { - LM_DBG("exit due to 'drop' in event route\n"); - } } else { LM_ERR("empty event route block for msrp handling\n"); } @@ -551,12 +548,15 @@ static int msrp_frame_received(sr_event_param_t *evp) LM_ERR("event callback (%s) set, but no cfg engine\n", msrp_event_callback.s); } else { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &msrp_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); } } } + if(ctx.run_flags & DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + } set_route_type(rtb); if(fmsg != NULL) free_sip_msg(fmsg);

5 years, 8 months

git:5.2:3300632c: htable: execute the kemi event route callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 3300632cb397d49725fcd702b56a56229ed21719 URL: https://github.com/kamailio/kamailio/commit/3300632cb397d49725fcd702b56a562… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:30+02:00 htable: execute the kemi event route callbacks with context (cherry picked from commit 9eafd82c3e29ec4480bc5be3e6aa1e9d66243dc5) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/3300632cb397d49725fcd702b56a562… Patch: https://github.com/kamailio/kamailio/commit/3300632cb397d49725fcd702b56a562… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 264d04a593..8c4cdea09b 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -288,7 +288,7 @@ static int child_init(int rank) run_top_route(event_rt.rlist[rt], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &ht_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

5 years, 8 months

git:5.2:121282ac: topos: execute the kemi event route callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 121282ac4986d6389a6dd64c35b77337a4ca256b URL: https://github.com/kamailio/kamailio/commit/121282ac4986d6389a6dd64c35b7733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:19+02:00 topos: execute the kemi event route callbacks with context (cherry picked from commit d2cb91dffc262060337f553b178dbeb5dedb3dfb) --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/121282ac4986d6389a6dd64c35b7733… Patch: https://github.com/kamailio/kamailio/commit/121282ac4986d6389a6dd64c35b7733… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 06f1bd9c41..c1a597eb1e 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -554,7 +554,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(sr_kemi_route(keng, 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, 8 months

git:5.2:cb1b346f: core: kemi - backpup and restore old context inside sr_kemi_ctx_route()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: cb1b346f6b815ed0fdd9644e5c208f7c2a0d9f14 URL: https://github.com/kamailio/kamailio/commit/cb1b346f6b815ed0fdd9644e5c208f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:09+02:00 core: kemi - backpup and restore old context inside sr_kemi_ctx_route() (cherry picked from commit 0689ac5976121d5a8edf815c0cee51da1098530f) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/cb1b346f6b815ed0fdd9644e5c208f7… Patch: https://github.com/kamailio/kamailio/commit/cb1b346f6b815ed0fdd9644e5c208f7… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 456733b5e1..f638174947 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2429,6 +2429,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, 8 months

git:5.2:d82a6cd4: topos: set context when executing event route

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: d82a6cd45c1486f767b7fec2a02161f7314c9071 URL: https://github.com/kamailio/kamailio/commit/d82a6cd45c1486f767b7fec2a02161f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:49:39+02:00 topos: set context when executing event route - should fix detection of using KSR.drop() - reported by GH #1924 (cherry picked from commit a383027eae25e63a779ecf9377facefdd2e05ef6) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d82a6cd45c1486f767b7fec2a02161f… Patch: https://github.com/kamailio/kamailio/commit/d82a6cd45c1486f767b7fec2a02161f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index e13029db54..f6b6a3a2f5 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -521,7 +521,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, run_top_route(event_rt.rlist[evidx], (msg)?msg:fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, (msg)?msg:fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

5 years, 8 months

git:5.2:d63b21f1: core: kemi - wrapper function to run callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: d63b21f1b52861a31555f63b2d8d88c0c2a672ba URL: https://github.com/kamailio/kamailio/commit/d63b21f1b52861a31555f63b2d8d88c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:49:13+02:00 core: kemi - wrapper function to run callbacks with context (cherry picked from commit 395cae83da4d83920dd038d299c30ffa97b6c272) --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/d63b21f1b52861a31555f63b2d8d88c… Patch: https://github.com/kamailio/kamailio/commit/d63b21f1b52861a31555f63b2d8d88c… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 3c6bba057f..456733b5e1 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2422,3 +2422,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 473189ed0f..96ecf98cd2 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -146,5 +146,7 @@ int sr_kemi_core_set_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, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
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