sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

git:master:d6628516: Merge pull request #1808 from kamailio/janssonrpcc-keepalive

by GitHub

Module: kamailio Branch: master Commit: d66285162af2baa2335e6b2ff811b64cf9c84891 URL: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-13T07:08:04-05:00 Merge pull request #1808 from kamailio/janssonrpcc-keepalive janssonrpcc: add new parameter "keep_alive" --- Modified: src/modules/janssonrpcc/doc/janssonrpcc_admin.xml Modified: src/modules/janssonrpcc/janssonrpc_connect.c Modified: src/modules/janssonrpcc/janssonrpc_server.h Modified: src/modules/janssonrpcc/janssonrpc_srv.h Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64… Patch: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64…

5 years, 11 months

git:master:786b2645: janssonrpcc: add new parameter "keep_alive"

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: 786b2645d38386a9a1771f7fbd6a151af22b5c64 URL: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-01-11T12:47:07-05:00 janssonrpcc: add new parameter "keep_alive" - send periodic tcp keepalive packets to server in order to prevent connection from closing --- Modified: src/modules/janssonrpcc/doc/janssonrpcc_admin.xml Modified: src/modules/janssonrpcc/janssonrpc_connect.c Modified: src/modules/janssonrpcc/janssonrpc_server.h Modified: src/modules/janssonrpcc/janssonrpc_srv.h Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151… Patch: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151…

5 years, 11 months

[kamailio/kamailio] janssonrpcc: add new parameter "keep_alive" (#1808)

by Emmanuel Schmidbauer

- send periodic tcp keepalive packets to server in order to prevent connection from closing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1808 -- Commit Summary -- * janssonrpcc: add new parameter "keep_alive" -- File Changes -- M src/modules/janssonrpcc/doc/janssonrpcc_admin.xml (19) M src/modules/janssonrpcc/janssonrpc_connect.c (56) M src/modules/janssonrpcc/janssonrpc_server.h (1) M src/modules/janssonrpcc/janssonrpc_srv.h (1) M src/modules/janssonrpcc/janssonrpcc_mod.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1808.patch https://github.com/kamailio/kamailio/pull/1808.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/1808

5 years, 11 months

git:master:97a198b4: dispatcher: add destination to in-memory dispatcher list

by Timmo Verlaan

Module: kamailio Branch: master Commit: 97a198b4569d7237798c9e507c60ecfebb728ab3 URL: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2019-01-02T22:46:45+01:00 dispatcher: add destination to in-memory dispatcher list - add dispatcher.add rpc call to add destinations to in-memory dispatcher list - refactored ds_log_set to allow for re-use of loop over all destinations --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf… Patch: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf…

5 years, 11 months

git:master:4269fc7c: Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory

by GitHub

Module: kamailio Branch: master Commit: 4269fc7cb134387e4d0c6bf4ad8d96988f7987fc URL: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-13T13:07:41+01:00 Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory dispatcher: add destination to in-memory dispatcher list --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969… Patch: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969…

5 years, 11 months

[kamailio/kamailio] dispatcher: add destination to in-memory dispatcher list (#1782)

by Timmo Verlaan

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description To prevent code duplication I refactored ds_log_set a bit to allow for re-use of loop over all destinations and execute a callback. Perhaps there are more places this could be useful. Add dispatcher.add rpc call to add destinations to in-memory dispatcher list. This allows for more quick and flexible updates to dispatcher list in kamailio. _A few ideas that build on top of this change are:_ 1. modparam for reload to keep in-memory entries or not 2. modparam to not read list or db 3. `dispatcher.remove _group_ _destination_` 4. modifying in routing script with `ds_add_dst`/`ds_remove_dst` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1782 -- Commit Summary -- * dispatcher: add destination to in-memory dispatcher list -- File Changes -- M src/modules/dispatcher/dispatch.c (81) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (29) M src/modules/dispatcher/doc/dispatcher_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1782.patch https://github.com/kamailio/kamailio/pull/1782.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/1782

5 years, 11 months

git:master:f0e0a849: presence_xml: do not include ../presence/presence.h

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200 URL: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:34:25+01:00 presence_xml: do not include ../presence/presence.h - it is not needed, that header file is related to modparams of presence module - renamed db_url to presxml_db_url just to avoid possible conflict in the future like for GH #1809 --- Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… Patch: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index 36995c8b3c..228896c18a 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -81,7 +81,7 @@ pres_get_sphere_t pres_get_sphere; /* Module parameter variables */ str xcap_table= str_init("xcap"); -str db_url = str_init(DEFAULT_DB_URL); +static str presxml_db_url = str_init(DEFAULT_DB_URL); int force_active= 0; int force_dummy_presence = 0; int integrated_xcap_server= 0; @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - { "db_url", PARAM_STR, &db_url}, + { "db_url", PARAM_STR, &presxml_db_url}, { "xcap_table", PARAM_STR, &xcap_table}, { "force_active", INT_PARAM, &force_active }, { "integrated_xcap_server", INT_PARAM, &integrated_xcap_server}, @@ -156,7 +156,8 @@ static int mod_init(void) if(passive_mode==1) return 0; - LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s); + LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(presxml_db_url.s), + presxml_db_url.len, presxml_db_url.s); /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -196,7 +197,7 @@ static int mod_init(void) if(force_active== 0) { /* binding to mysql module */ - if (db_bind_mod(&db_url, &pxml_dbf)) + if (db_bind_mod(&presxml_db_url, &pxml_dbf)) { LM_ERR("Database module not found\n"); return -1; @@ -208,7 +209,7 @@ static int mod_init(void) return -1; } - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (!pxml_db) { LM_ERR("while connecting to database\n"); @@ -284,7 +285,7 @@ static int child_init(int rank) { if(pxml_db) return 0; - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (pxml_db== NULL) { LM_ERR("while connecting database\n"); diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index 7b523ef028..e165852684 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -35,7 +35,6 @@ #include "../../lib/srdb1/db.h" #include "../../modules/sl/sl.h" #include "../presence/event_list.h" -#include "../presence/presence.h" #include "../presence/presentity.h" #include "../xcap_client/xcap_functions.h"

5 years, 11 months

git:master:eb1bf9a6: presence: do not include presence.h in other header files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eb1bf9a69abad3d237c136750fe8cacea4cd0a31 URL: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:31:22+01:00 presence: do not include presence.h in other header files - it exports as extern the module parameter variables and other modules built on top of presence can end up including this header file, overwriting declaration of variables with same name - renamed db_url to pres_db_url, this being a common variable name, to avoid same situation with a mistaken include in the future - GH #1809 --- Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h Modified: src/modules/presence/presentity.h Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac… Patch: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac…

5 years, 11 months

git:master:869f57aa: presence_xml: Makefile - link agaist libicu on macos/darwin

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 869f57aac4496e10480094c36373f485aef11a80 URL: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:04:16+01:00 presence_xml: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/presence_xml/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… Patch: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… --- diff --git a/src/modules/presence_xml/Makefile b/src/modules/presence_xml/Makefile index 08711cdfa9..f6a1dd4d63 100644 --- a/src/modules/presence_xml/Makefile +++ b/src/modules/presence_xml/Makefile @@ -8,6 +8,12 @@ LIBS= ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -19,6 +25,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

5 years, 11 months

git:master:d3208e18: presence: Makefile - link agaist libicu on macos/darwin

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3208e1859051eb09013f855126f7f5f5ec47ab8 URL: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:03:28+01:00 presence: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/presence/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… Patch: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… --- diff --git a/src/modules/presence/Makefile b/src/modules/presence/Makefile index 6891a79d39..bd1bcebc75 100644 --- a/src/modules/presence/Makefile +++ b/src/modules/presence/Makefile @@ -7,6 +7,12 @@ NAME=presence.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -18,6 +24,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/srutils/srutils

5 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019