[sr-dev] git:master:f0e0a849: presence_xml: do not include ../presence/presence.h
Module: kamailio
Branch: master
Commit: f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200
URL:
https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200.diff
Patch:
https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200.patch
---
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, _url},
+ { "db_url", PARAM_STR, _db_url},
{ "xcap_table", PARAM_STR, _table},
{ "force_active", INT_PARAM, _active },
{ "integrated_xcap_server", INT_PARAM, _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()!=0) {
@@ -196,7 +197,7 @@ static int mod_init(void)
if(force_active== 0)
{
/* binding to mysql module */
- if (db_bind_mod(_url, _dbf))
+ if (db_bind_mod(_db_url, _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(_url);
+ pxml_db = pxml_dbf.init(_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(_url);
+ pxml_db = pxml_dbf.init(_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"
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:eb1bf9a6: presence: do not include presence.h in other header files
Module: kamailio Branch: master Commit: eb1bf9a69abad3d237c136750fe8cacea4cd0a31 URL: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cacea4cd0a31 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/eb1bf9a69abad3d237c136750fe8cacea4cd0a31.diff Patch: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cacea4cd0a31.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dispatcher: add destination to in-memory dispatcher list (#1782)
With the current design, this should be a good approach. I am merging it, 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/1782#issuecomment-453824243___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:4269fc7c: Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory
Module: kamailio Branch: master Commit: 4269fc7cb134387e4d0c6bf4ad8d96988f7987fc URL: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d96988f7987fc Author: Daniel-Constantin Mierla Committer: GitHub 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/4269fc7cb134387e4d0c6bf4ad8d96988f7987fc.diff Patch: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d96988f7987fc.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:786b2645: janssonrpcc: add new parameter "keep_alive"
Module: kamailio Branch: master Commit: 786b2645d38386a9a1771f7fbd6a151af22b5c64 URL: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151af22b5c64 Author: Emmanuel Schmidbauer Committer: Emmanuel Schmidbauer 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/786b2645d38386a9a1771f7fbd6a151af22b5c64.diff Patch: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151af22b5c64.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dispatcher: add destination to in-memory dispatcher list (#1782)
Merged #1782 into master. -- 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#event-2070500646___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] janssonrpcc: add new parameter "keep_alive" (#1808)
Merged #1808 into master. -- 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#event-2070500780___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d6628516: Merge pull request #1808 from kamailio/janssonrpcc-keepalive
Module: kamailio Branch: master Commit: d66285162af2baa2335e6b2ff811b64cf9c84891 URL: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64cf9c84891 Author: Emmanuel Schmidbauer Committer: GitHub 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/d66285162af2baa2335e6b2ff811b64cf9c84891.diff Patch: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64cf9c84891.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation fault in TM module while processing SIP status 408 (#1806)
This might be something that was fixed by 39b89a18a8c357151a173ab02dc95dff1f02715d -- the trace looks a bit similar to the other reports. If you have a chance to try it, a report of result would be appreciated. Iirc, patch not ported to branch 5.0 yet, but should be done when releasing the last version in 5.0.x series, and that should be in the near future. -- 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/1806#issuecomment-453819062___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] janssonrpcc: add new parameter "keep_alive" (#1808)
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/1808#issuecomment-453824100___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] presence: do not include presence.h in other header files (eb1bf9a)
There is a compile ERROR:
```
presence_dmq.c:97:5: error: use of undeclared identifier 'pres_sruid'
if(pres_sruid.pid == 0) {
^
```
--
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/commit/eb1bf9a69abad3d237c136750fe8cacea4cd0a31#commitcomment-31922662___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:869f57aa: presence_xml: Makefile - link agaist libicu on macos/darwin
Module: kamailio Branch: master Commit: 869f57aac4496e10480094c36373f485aef11a80 URL: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f485aef11a80 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/869f57aac4496e10480094c36373f485aef11a80.diff Patch: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f485aef11a80.patch --- 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 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d3208e18: presence: Makefile - link agaist libicu on macos/darwin
Module: kamailio Branch: master Commit: d3208e1859051eb09013f855126f7f5f5ec47ab8 URL: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5f5ec47ab8 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/d3208e1859051eb09013f855126f7f5f5ec47ab8.diff Patch: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5f5ec47ab8.patch --- 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 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation fault in TM module while processing SIP status 408 (#1806)
It should be already in 5.2 branch. -- 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/1806#issuecomment-453823953___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] presence_xml db_url param can not set (#1809)
It was a "silent" conflict in declaration of db_url variable between the presence and presence_xml modules -- the presence_xml is built on top of presence module, and it was including the `../presence/presence.h` header file, which already declared db_url as extern. I pushed couple of patches to master branch, can you try it? If all ok, I will backport to branch 5.2 (5.2.1 being planned to be released in a few days). 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/issues/1809#issuecomment-453818898___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Segmentation fault in TM module while processing SIP status 408 (#1806)
OK, I will plan production upgrade with this patch and get back to you if problem happens again. BTW, we are already testing Kamailio v5.2 on QA setup. Is this patch already ported to v5.2 or should i apply it to QA setup as well. Thank you. -- 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/1806#issuecomment-453819771___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:7412f771: modules: readme files regenerated - dispatcher ... [skip ci]
Module: kamailio Branch: master Commit: 7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6 URL: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6 Author: Kamailio Dev Committer: Kamailio Dev Date: 2019-01-13T13:16:38+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/janssonrpcc/README --- Diff: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6.diff Patch: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:fb23d67b: acc_json: replaced angle brackets with xml tokens
Module: kamailio
Branch: master
Commit: fb23d67b396bafb51f9c971e2546df0faff54262
URL:
https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0faff54262
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2019-01-13T16:45:23+01:00
acc_json: replaced angle brackets with xml tokens
---
Modified: src/modules/acc_json/doc/acc_json_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0faff54262.diff
Patch:
https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0faff54262.patch
---
diff --git a/src/modules/acc_json/doc/acc_json_admin.xml
b/src/modules/acc_json/doc/acc_json_admin.xml
index ea1fbc446c..2dcfbcd0f2 100644
--- a/src/modules/acc_json/doc/acc_json_admin.xml
+++ b/src/modules/acc_json/doc/acc_json_admin.xml
@@ -216,16 +216,16 @@ route[RUN_ACC_PUBLISH] {
$var(count) = $var(count) + 1;
xinfo("[RUN_ACC_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n");
$var(res) = http_connect_raw("nsqd", "", "application/json",
$mqv(acc_events), "$var(nsq_res)");
- if ($var(res) < 0) {
+ if ($var(res) 0) {
xerr("[RUN_ACC_PUBLISH][$var(res)] http_connect_raw: timeout or error
!\n");
mq_add("acc_events", "acc_key", "$mqv(acc_events)");
- } else if ($var(res) < 200 || $var(res) > 299) {
+ } else if ($var(res) 200 || $var(res) 299) {
xerr("[RUN_ACC_PUBLISH][$var(res)] http unexpected response code
!\n");
mq_add("acc_dead_letter_queue", "acc_key", "$mqv(acc_events)");
return;
}
}
- if ($var(count) > 0 ) {
+ if ($var(count) 0 ) {
xinfo("[RUN_CDR_PUBLISH]done count[$var(count)]\n");
}
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] Regenerate module docs on github
Hello, that is a cron.d job on kamailio.org, it needs to run in a trusted system, because it has access to credentials for a github account with write permissions. As for acc_json readme, the use of < and > is not permitted in xml unless they are surrounding tags, you have to use and instead. That caused an error while generating the README, so it was not updated. I pushed a patch to fix it. Cheers, Daniel On 13.01.19 16:16, Julien Chavanton wrote: > Hi, not sure how to regenerate modules doc on the repo. Localy I can > use make but it seems people are using a more standard procedure ? > > Acc_json is not updated with some improvement in the examples. > > ___ > Kamailio (SER) - Development Mailing List > sr-dev@lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev -- 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 Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Regenerate module docs on github
Hi, not sure how to regenerate modules doc on the repo. Localy I can use make but it seems people are using a more standard procedure ? Acc_json is not updated with some improvement in the examples. ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:ee799504: modules: readme files regenerated - acc_json ... [skip ci]
Module: kamailio Branch: master Commit: ee799504ad5f7e272a9e61f1952099ca1183d461 URL: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099ca1183d461 Author: Kamailio Dev Committer: Kamailio Dev Date: 2019-01-13T16:46:28+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099ca1183d461.diff Patch: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099ca1183d461.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:97a198b4: dispatcher: add destination to in-memory dispatcher list
Module: kamailio Branch: master Commit: 97a198b4569d7237798c9e507c60ecfebb728ab3 URL: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecfebb728ab3 Author: Timmo Verlaan Committer: Timmo Verlaan 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/97a198b4569d7237798c9e507c60ecfebb728ab3.diff Patch: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecfebb728ab3.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0a5cba42: kamctl: added 'psa' command
Module: kamailio
Branch: master
Commit: 0a5cba422967f2e861ce209942a42e09719f4fcb
URL:
https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e09719f4fcb
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2019-01-14T08:47:41+01:00
kamctl: added 'psa' command
- print more attributes for running processes (extended 'ps')
---
Modified: utils/kamctl/kamctl
Modified: utils/kamctl/kamctl.ctlbase
---
Diff:
https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e09719f4fcb.diff
Patch:
https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e09719f4fcb.patch
---
diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl
index 4dd9bc7fed..b115f5a998 100755
--- a/utils/kamctl/kamctl
+++ b/utils/kamctl/kamctl
@@ -3010,6 +3010,11 @@ case $1 in
ctl_cmd_run core.psx
;;
+ psa)
+ require_ctlengine
+ ctl_cmd_run core.psa
+ ;;
+
uptime)
require_ctlengine
ctl_cmd_run core.uptime
diff --git a/utils/kamctl/kamctl.ctlbase b/utils/kamctl/kamctl.ctlbase
index a668e22d18..1fc64091af 100644
--- a/utils/kamctl/kamctl.ctlbase
+++ b/utils/kamctl/kamctl.ctlbase
@@ -81,6 +81,12 @@ usage_ctlcommon() {
echo
cat
