sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

git:master:385fdc71: exec: docs for exec_cmd() function
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 385fdc71abd0b4f8349f725273bccd483d859088 URL: https://github.com/kamailio/kamailio/commit/385fdc71abd0b4f8349f725273bccd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T08:20:32+01:00 exec: docs for exec_cmd() function --- Modified: src/modules/exec/doc/exec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/385fdc71abd0b4f8349f725273bccd4… Patch: https://github.com/kamailio/kamailio/commit/385fdc71abd0b4f8349f725273bccd4… --- diff --git a/src/modules/exec/doc/exec_admin.xml b/src/modules/exec/doc/exec_admin.xml index 51667fb60d..12249d5104 100644 --- a/src/modules/exec/doc/exec_admin.xml +++ b/src/modules/exec/doc/exec_admin.xml @@ -267,6 +267,41 @@ exec_msg("echo TEST > /tmp/$rU.txt"); exec_avp("echo TEST"); exec_avp("echo TEST", "$avp(s:test)"); ... +</programlisting> + </example> + </section> + <section id="exec.f.exec_cmd"> + <title> + <function moreinfo="none">exec_cmd(command)</function> + </title> + <para> + Executes an external command. It is a lightweight version, which + does not pass the SIP message as parameter, does not set the + environment variables and it does not use the output of the command. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>command</emphasis> - Command to be executed. It + can include pseudo-variables. + </para> + </listitem> + </itemizedlist> + <para> + WARNING: if the var you are passing out has a bash special + character in it, the var needs to be placed inside quotes, for example: + exec_msg("print-contact.sh '$ct'"); + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function moreinfo="none">exec_cmd</function> usage</title> + <programlisting format="linespecific"> +... +exec_cmd("echo TEST > /tmp/test.txt"); +exec_cmd("echo TEST > /tmp/$rU.txt"); +... </programlisting> </example> </section> @@ -274,8 +309,8 @@ exec_avp("echo TEST", "$avp(s:test)"); <section id="exec.known_issues"> <title>Known Issues</title> <para> - There is currently no guarantee that scripts ever return and stop - blocking the &sip; server. (There is kill.c but it is not used along with + There is currently no guarantee that scripts ever return and stop + blocking the &sip; server. (There is kill.c but it is not used along with the current mechanisms based on popen. Besides that kill.c is ugly). </para> </section>

1 0

git:master:1e1e22c1: exec: added own exec cmd wrapper not to pass the sip message buffer
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 1e1e22c10cdc686fc2b82305990d577aaab7eb58 URL: https://github.com/kamailio/kamailio/commit/1e1e22c10cdc686fc2b82305990d577… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-27T21:45:59+01:00 exec: added own exec cmd wrapper not to pass the sip message buffer --- Modified: src/modules/exec/exec.c Modified: src/modules/exec/exec.h Modified: src/modules/exec/exec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e1e22c10cdc686fc2b82305990d577… Patch: https://github.com/kamailio/kamailio/commit/1e1e22c10cdc686fc2b82305990d577… --- diff --git a/src/modules/exec/exec.c b/src/modules/exec/exec.c index 14c693f95a..6bcf01f74f 100644 --- a/src/modules/exec/exec.c +++ b/src/modules/exec/exec.c @@ -305,3 +305,31 @@ int exec_avp(struct sip_msg *msg, char *cmd, pvname_list_p avpl) } return ret; } + +int exec_cmd(sip_msg_t *msg, char *cmd) +{ + FILE *pipe; + int exit_status; + int ret; + + pipe = popen(cmd, "r"); + if(pipe == NULL) { + LM_ERR("cannot open pipe: %s\n", cmd); + ser_error = E_EXEC; + return -1; + } + + ret = 1; + exit_status = pclose(pipe); + if(WIFEXITED(exit_status)) { /* exited properly .... */ + /* return false if script exited with non-zero status */ + if(WEXITSTATUS(exit_status) != 0) + ret = -1; + } else { /* exited erroneously */ + LM_ERR("cmd %s failed. exit_status=%d, errno=%d: %s\n", cmd, + exit_status, errno, strerror(errno)); + ret = -1; + } + + return ret; +} diff --git a/src/modules/exec/exec.h b/src/modules/exec/exec.h index 3bc84a7103..45d44f8719 100644 --- a/src/modules/exec/exec.h +++ b/src/modules/exec/exec.h @@ -32,5 +32,6 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len); int exec_msg(struct sip_msg *msg, char *cmd); int exec_avp(struct sip_msg *msg, char *cmd, pvname_list_p avpl); +int exec_cmd(sip_msg_t *msg, char *cmd); #endif diff --git a/src/modules/exec/exec_mod.c b/src/modules/exec/exec_mod.c index f0e1b986a9..b45e199711 100644 --- a/src/modules/exec/exec_mod.c +++ b/src/modules/exec/exec_mod.c @@ -277,7 +277,7 @@ static int ki_exec_cmd(sip_msg_t *msg, str *cmd) LM_DBG("executing [%s]\n", cmd->s); - ret = exec_msg(msg, cmd->s); + ret = exec_cmd(msg, cmd->s); LM_DBG("execution return code: %d\n", ret);

1 0

git:master:85a4047f: exec: added exec_cmd("...") function
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 85a4047f80c8b79db7d93dd704224eb3c608c97d URL: https://github.com/kamailio/kamailio/commit/85a4047f80c8b79db7d93dd704224eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-27T10:50:20+01:00 exec: added exec_cmd("...") function - execute the command without setting any env variables - lightweight version for exec_msg() --- Modified: src/modules/exec/exec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/85a4047f80c8b79db7d93dd704224eb… Patch: https://github.com/kamailio/kamailio/commit/85a4047f80c8b79db7d93dd704224eb… --- diff --git a/src/modules/exec/exec_mod.c b/src/modules/exec/exec_mod.c index a9410ee844..f0e1b986a9 100644 --- a/src/modules/exec/exec_mod.c +++ b/src/modules/exec/exec_mod.c @@ -53,6 +53,7 @@ static int mod_init(void); static int w_exec_dset(struct sip_msg *msg, char *cmd, char *foo); static int w_exec_msg(struct sip_msg *msg, char *cmd, char *foo); static int w_exec_avp(struct sip_msg *msg, char *cmd, char *avpl); +static int w_exec_cmd(struct sip_msg *msg, char *cmd, char *foo); static int exec_avp_fixup(void **param, int param_no); @@ -69,8 +70,10 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"exec_avp", (cmd_function)w_exec_avp, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, 0, + {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_cmd", (cmd_function)w_exec_cmd, 1, fixup_spve_null, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -265,6 +268,34 @@ static int exec_avp_fixup(void **param, int param_no) return 0; } +static int ki_exec_cmd(sip_msg_t *msg, str *cmd) +{ + int ret; + + if(cmd == 0 || cmd->s == 0) + return -1; + + LM_DBG("executing [%s]\n", cmd->s); + + ret = exec_msg(msg, cmd->s); + + LM_DBG("execution return code: %d\n", ret); + + return (ret == 0) ? 1 : ret; +} + +static int w_exec_cmd(struct sip_msg *msg, char *cmd, char *foo) +{ + str command; + + if(fixup_get_svalue(msg, (gparam_p)cmd, &command) != 0) { + LM_ERR("invalid command parameter"); + return -1; + } + return ki_exec_cmd(msg, &command); +} + + /** * */ @@ -285,6 +316,11 @@ static sr_kemi_t sr_kemi_exec_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("exec"), str_init("exec_cmd"), + SR_KEMIP_INT, ki_exec_cmd, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:fe50c42d: pkg/docker: Updated submodule
by Sergey Safarov 27 Jan '19

27 Jan '19

Module: kamailio Branch: master Commit: fe50c42d50d1383cbfa6a90a5c3c3b5dcd4afb67 URL: https://github.com/kamailio/kamailio/commit/fe50c42d50d1383cbfa6a90a5c3c3b5… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-27T12:26:50+03:00 pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/fe50c42d50d1383cbfa6a90a5c3c3b5… Patch: https://github.com/kamailio/kamailio/commit/fe50c42d50d1383cbfa6a90a5c3c3b5… --- diff --git a/pkg/docker b/pkg/docker index 97353c5459..b1c54322f0 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 97353c545936e6b51e2e2e8ccb13fc9688197206 +Subproject commit b1c54322f0f490786772db41c4390d7687ed16a6

1 0

Errored: sergey-safarov/kamailio#122 (master - fe723a9)
by Travis CI 27 Jan '19

27 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #122 Status: Errored Duration: 55 secs Commit: fe723a9 (master) Author: Sergey Safarov Message: aaa View the changeset: https://github.com/sergey-safarov/kamailio/compare/083388426f66...fe723a9a1… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484951696?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#121 (master - 0833884)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #121 Status: Errored Duration: 46 secs Commit: 0833884 (master) Author: Sergey Safarov Message: aaa View the changeset: https://github.com/sergey-safarov/kamailio/compare/13a7b04b88a0...083388426… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484863218?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#120 (master - 13a7b04)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #120 Status: Errored Duration: 46 secs Commit: 13a7b04 (master) Author: Sergey Safarov Message: aaaa View the changeset: https://github.com/sergey-safarov/kamailio/compare/d4a105d6dfa0...13a7b04b8… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484858178?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#119 (master - d4a105d)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #119 Status: Errored Duration: 45 secs Commit: d4a105d (master) Author: Sergey Safarov Message: aa View the changeset: https://github.com/sergey-safarov/kamailio/compare/fe9a380e31a9...d4a105d6d… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484855465?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#118 (master - fe9a380)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #118 Status: Errored Duration: 50 secs Commit: fe9a380 (master) Author: Sergey Safarov Message: Updated submodule View the changeset: https://github.com/sergey-safarov/kamailio/compare/b79423f9ef7b...fe9a380e3… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484848848?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:b79423f9: db_postgres: use generic PKG_MEM_ERROR helper defines, fix missing error log
by Henning Westerholt 26 Jan '19

26 Jan '19

Module: kamailio Branch: master Commit: b79423f9ef7bdf40207d5a3615d296fa0714eb71 URL: https://github.com/kamailio/kamailio/commit/b79423f9ef7bdf40207d5a3615d296f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-26T18:46:40+01:00 db_postgres: use generic PKG_MEM_ERROR helper defines, fix missing error log --- Modified: src/modules/db_postgres/km_dbase.c Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/km_res.c Modified: src/modules/db_postgres/km_val.c Modified: src/modules/db_postgres/pg_cmd.c Modified: src/modules/db_postgres/pg_con.c Modified: src/modules/db_postgres/pg_fld.c Modified: src/modules/db_postgres/pg_res.c Modified: src/modules/db_postgres/pg_sql.c Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b79423f9ef7bdf40207d5a3615d296f… Patch: https://github.com/kamailio/kamailio/commit/b79423f9ef7bdf40207d5a3615d296f…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019