sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
327 discussions

git:master:0aae6381: core: added xflags field to sip_msg_t
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 0aae63818588952280e901ea2c529cb936ce5cf6 URL: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:00:23+01:00 core: added xflags field to sip_msg_t - holds extended flags - 64 new flags in addition to the old 32 flags --- Modified: src/core/flags.c Modified: src/core/flags.h Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… Patch: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… --- diff --git a/src/core/flags.c b/src/core/flags.c index 5dbdd4ffbc..043824895f 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -317,5 +317,42 @@ static int fixup_t_flag(void** param, int param_no) return E_CFG; } +/** + * + */ +int setxflag(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + msg->xflags[fi] |= 1 << fb; + return 1; +} + +/** + * + */ +int resetxflag(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + msg->xflags[fi] &= ~ (1 << fb); + return 1; +} + +/** + * + */ +int isxflagset(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; +} #endif diff --git a/src/core/flags.h b/src/core/flags.h index 3876082472..e1186dbf79 100644 --- a/src/core/flags.h +++ b/src/core/flags.h @@ -34,6 +34,10 @@ enum { FL_WHITE=1, FL_YELLOW, FL_GREEN, FL_RED, FL_BLUE, FL_MAGENTA, typedef unsigned int flag_t; +#define KSR_XFLAGS_SIZE 2 +#define KSR_MAX_XFLAG \ + ((unsigned int)(KSR_XFLAGS_SIZE * sizeof(flag_t) * CHAR_BIT - 1 )) + #define MAX_FLAG ((unsigned int)( sizeof(flag_t) * CHAR_BIT - 1 )) struct sip_msg; @@ -43,6 +47,10 @@ int resetflag( struct sip_msg* msg, flag_t flag ); int isflagset( struct sip_msg* msg, flag_t flag ); +int setxflag(struct sip_msg* msg, flag_t flag); +int resetxflag(struct sip_msg* msg, flag_t flag); +int isxflagset(struct sip_msg* msg, flag_t flag); + /* Script flag functions. Script flags are global flags that keep their * value regardless of the SIP message being processed. */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 41e6deeb33..9270e0bba9 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -359,6 +359,7 @@ typedef struct sip_msg { to avoid unnecessary calculations */ unsigned int msg_flags; /*!< internal flags used by core */ flag_t flags; /*!< config flags */ + flag_t xflags[KSR_XFLAGS_SIZE]; /*!< config extended flags */ str set_global_address; str set_global_port; struct socket_info* force_send_socket; /*!< force sending on this socket */

1 0

git:5.1:5df0d505: auth_ephemeral: do pkg-config for libcrypto if exists
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 5df0d505d220addf43f459b29cc80f9aecef19dc URL: https://github.com/kamailio/kamailio/commit/5df0d505d220addf43f459b29cc80f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:26:17+01:00 auth_ephemeral: do pkg-config for libcrypto if exists - discover all the libs to link against - related to GH #1473 (cherry picked from commit 021e7e53585f78b56356c98f25bd731c51f96f9a) --- Modified: src/modules/auth_ephemeral/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5df0d505d220addf43f459b29cc80f9… Patch: https://github.com/kamailio/kamailio/commit/5df0d505d220addf43f459b29cc80f9… --- diff --git a/src/modules/auth_ephemeral/Makefile b/src/modules/auth_ephemeral/Makefile index 6701ee9e23..5c066502af 100644 --- a/src/modules/auth_ephemeral/Makefile +++ b/src/modules/auth_ephemeral/Makefile @@ -11,6 +11,14 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) + +ifneq ($(SSL_BUILDER),) +SSL_BUILDER+=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'libcrypto'; \ + fi) +endif + endif ifneq ($(SSL_BUILDER),)

1 0

git:5.1:3994fcd9: misc/examples/kemi: enable lua script reload in example config
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 3994fcd94e1d3291f4d14083f12b85a3b11ca148 URL: https://github.com/kamailio/kamailio/commit/3994fcd94e1d3291f4d14083f12b85a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:26:07+01:00 misc/examples/kemi: enable lua script reload in example config (cherry picked from commit e129965129b2377970a28fabd26b3be9b483c81b) --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3994fcd94e1d3291f4d14083f12b85a… Patch: https://github.com/kamailio/kamailio/commit/3994fcd94e1d3291f4d14083f12b85a… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index 8fe3616da2..507b7afa12 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -360,6 +360,7 @@ cfgengine "python" #!else #!ifdef WITH_CFGLUA +modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-lua.lua") cfgengine "lua" #!else

1 0

git:5.1:2f66b1df: nathelper: docs - mention UDP for SIP nat pinging contact addresses
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 2f66b1dfe12455534f94060a0f68bc3f8ac0f81d URL: https://github.com/kamailio/kamailio/commit/2f66b1dfe12455534f94060a0f68bc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:25:37+01:00 nathelper: docs - mention UDP for SIP nat pinging contact addresses (cherry picked from commit 82efea41d7a01c041ea6ff85cc864cfdf2fd1ba5) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2f66b1dfe12455534f94060a0f68bc3… Patch: https://github.com/kamailio/kamailio/commit/2f66b1dfe12455534f94060a0f68bc3… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 513c48400e..3fc540c23d 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -70,7 +70,7 @@ <listitem> <para> <emphasis>SIP request</emphasis> - a stateless SIP request is - sent to the contact address. + sent to the UDP contact address. </para> <itemizedlist> <listitem>

1 0

git:5.1:26c623ee: core: small improvements to help text
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 26c623ee6ffe35098c5edc109a16711cc487204a URL: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:25:27+01:00 core: small improvements to help text (cherry picked from commit 31e21ff23a0d8bff1f7a88a56aa4ab01d93e2cf3) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711… Patch: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711… --- diff --git a/src/main.c b/src/main.c index 9366884ac7..144b8ffb92 100644 --- a/src/main.c +++ b/src/main.c @@ -197,11 +197,11 @@ Options:\n\ -M nr Size of private memory allocated, in Megabytes\n\ -w dir Change the working directory to \"dir\" (default: \"/\")\n\ -t dir Chroot to \"dir\"\n\ - -u uid Change uid \n\ - -g gid Change gid \n\ + -u uid Change uid (user id)\n\ + -g gid Change gid (group id)\n\ -P file Create a pid file\n\ -G file Create a pgid file\n\ - -Y dir Runtime dir\n\ + -Y dir Runtime dir path\n\ -O nr Script optimization level (debugging option)\n\ -a mode Auto aliases mode: enable with yes or on,\n\ disable with no or off\n\ @@ -211,7 +211,7 @@ Options:\n\ -X name Specify internal manager for private memory (pkg)\n\ - if omitted, the one for shm is used\n" #ifdef STATS -" -s file File to which statistics is dumped (disabled otherwise)\n" +" -s file File where to write internal statistics on SIGUSR1\n" #endif ;

1 0

git:5.1:5f5f2638: db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 5f5f2638b50e079717952b5b279529e7647ce684 URL: https://github.com/kamailio/kamailio/commit/5f5f2638b50e079717952b5b279529e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:24:35+01:00 db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection - reported by GH #1479 (cherry picked from commit cdbee5a536920c4fab3ec619c8467c152d6f110a) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/5f5f2638b50e079717952b5b279529e… Patch: https://github.com/kamailio/kamailio/commit/5f5f2638b50e079717952b5b279529e… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aee5a1ba0a..72d6647689 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -316,7 +316,9 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) int col; db_mongodb_result_t *mgres; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_t *cdoc; const char *colname; @@ -360,6 +362,7 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) } if(cdocproj == 1) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -373,6 +376,12 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } else { if (!bson_iter_init (&citer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); @@ -506,7 +515,9 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -527,6 +538,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } } else { cdoc = (bson_t*)mgres->colsdoc; +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -540,6 +552,12 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } if(mgres->colsdoc) { @@ -864,7 +882,9 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op km_mongodb_con_t *mgcon; mongoc_client_t *client; bson_t *seldoc = NULL; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_t bcols; +#endif char *cname; char b1; char *jstr; @@ -944,23 +964,31 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op LM_ERR("cannot initialize columns bson document\n"); goto error; } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_begin (mgcon->colsdoc, "projection", 10, &bcols)) { LM_ERR("failed to start projection of fields\n"); goto error; } +#endif for(i = 0; i < _nc; i++) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_int32(&bcols, _c[i]->s, _c[i]->len, 1)) +#else + if(!bson_append_int32(mgcon->colsdoc, _c[i]->s, _c[i]->len, 1)) +#endif { LM_ERR("failed to append int to columns bson %.*s = %d [%d]\n", _c[i]->len, _c[i]->s, 1, i); goto error; } } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_end (mgcon->colsdoc, &bcols)) { LM_ERR("failed to end projection of fields\n"); goto error; } +#endif if(is_printable(L_DBG)) { jstr = bson_as_json (mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr);

1 0

git:5.1:63c93af1: db_mongodb: add error logger for failed query
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 63c93af189e7e5db92a392e0d176e71bda64290e URL: https://github.com/kamailio/kamailio/commit/63c93af189e7e5db92a392e0d176e71… Author: kelchy <kelchy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:24:06+01:00 db_mongodb: add error logger for failed query (cherry picked from commit 2a5d66fda013197aa5fbe4828cc7f6e61a74a9d6) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/63c93af189e7e5db92a392e0d176e71… Patch: https://github.com/kamailio/kamailio/commit/63c93af189e7e5db92a392e0d176e71… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index b1c9ac2bb7..aee5a1ba0a 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -753,6 +753,7 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) km_mongodb_con_t *mgcon; db_mongodb_result_t *mgres; const bson_t *itdoc; + bson_error_t error; mgcon = MONGODB_CON(_h); if(!_r) { @@ -777,7 +778,11 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) if(!mongoc_cursor_more (mgres->cursor) || !mongoc_cursor_next (mgres->cursor, &itdoc) || !itdoc) { - LM_DBG("no result from mongodb\n"); + if (mongoc_cursor_error (mgres->cursor, &error)) { + LM_DBG("An error occurred: %s\n", error.message); + } else { + LM_DBG("no result from mongodb\n"); + } return 0; } /* first document linked internally in result to get columns */

1 0

git:5.1:01338702: app_jsdt Minor update to documentation
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 01338702bac81a9b53d72c4415f37aa4483ce865 URL: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:23:38+01:00 app_jsdt Minor update to documentation (cherry picked from commit 7b0ad6b1a11687d035d4be92202ae1379f07fb20) --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa… Patch: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index 47f50bda92..d4fd89d377 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -17,15 +17,16 @@ <section> <title>Overview</title> <para> - This module allows executing JavaScript scripts from config file. + This module allows executing JavaScript scripts from the Kamailio + configuration file. It exports all KEMI functions to JavaScript in order to access the - current processed SIP message. These functions are within JavaScript - object 'KSR'. + currently processed SIP message. These functions are named within + the JavaScript object 'KSR'. </para> <para> - It includes the Duktape JavaScript engine (http://www.duktape.org), - which is a fast and easy to embed JavaScript interpreter. Exported API - from SIP router to JavaScript is documented in the dokuwiki. + The module is based on the Duktape JavaScript engine (http://www.duktape.org), + which is a fast and easy to embed JavaScript interpreter. The exported API + from Kamailio to JavaScript is documented in the wiki. </para> <para> The module has two JavaScript contexts: @@ -116,7 +117,7 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") <function moreinfo="none">jsdt_dofile(path)</function> </title> <para> - Execute the JS script stored in 'path'. The parameter can be + Execute the JavaScript script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. </para> <example> @@ -134,7 +135,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); <function moreinfo="none">jsdt_dostring(script)</function> </title> <para> - Execute the Lua script stored in parameter. The parameter can be + Execute the JavaScript script stored in parameter. The parameter can be a string with pseudo-variables. </para> <example> @@ -248,7 +249,7 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) <section> <title>Example of usage</title> <para> - Create your JS script and stored on file system, + Create your JS script and store it on the file system, say: '/usr/local/etc/kamailio/js/myscript.js'. </para> <programlisting format="linespecific">

1 0

git:5.1:6275646d: core: invoke KEMI ksr_onsend_route()
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 6275646db39c9c6b48eb4afffd1e71b89ea3e504 URL: https://github.com/kamailio/kamailio/commit/6275646db39c9c6b48eb4afffd1e71b… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:23:18+01:00 core: invoke KEMI ksr_onsend_route() This will invoke ksr_onsend_route() unconditionally in the cfgengine. (cherry picked from commit 4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7) --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/6275646db39c9c6b48eb4afffd1e71b… Patch: https://github.com/kamailio/kamailio/commit/6275646db39c9c6b48eb4afffd1e71b… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index a2e8f569fd..16ea5ce17c 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -70,7 +70,9 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, return 1; } ret=1; - if (onsend_rt.rlist[DEFAULT_RT]){ + // do if onsend_route{} or cfgengine exists + keng = sr_kemi_eng_get(); + if (onsend_rt.rlist[DEFAULT_RT] || keng){ onsnd_info.to=&dst->to; onsnd_info.send_sock=dst->send_sock; onsnd_info.buf=buf; @@ -86,8 +88,7 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, orig_msg->fwd_send_flags=dst->send_flags; /* intial value */ init_run_actions_ctx(&ra_ctx); - keng = sr_kemi_eng_get(); - if(unlikely(keng!=NULL)) { + if(keng) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ra_ctx); ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL, NULL);

1 0

git:5.1:6e2ab808: kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 6e2ab8089fd4d4b3ca0a23e240765474e6648b3c URL: https://github.com/kamailio/kamailio/commit/6e2ab8089fd4d4b3ca0a23e24076547… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:23:01+01:00 kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid - this being now the path used by default kamailio options (cherry picked from commit 6abd8472b764f88c5c054becb440fda8fff47349) --- Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/6e2ab8089fd4d4b3ca0a23e24076547… Patch: https://github.com/kamailio/kamailio/commit/6e2ab8089fd4d4b3ca0a23e24076547… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index eb8ab554b7..641449422c 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -101,7 +101,7 @@ fi ##### ------------------------------------------------ ##### ### configuration for starting/stopping kamailio if [ -z "$PID_FILE" ] ; then - PID_FILE=/var/run/kamailio.pid + PID_FILE=/var/run/kamailio/kamailio.pid fi if [ -z "$SYSLOG" ] ; then SYSLOG=1 # 0=output to console, 1=output to syslog diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 836290a5b8..d6e927fe84 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -154,7 +154,7 @@ # STORE_PLAINTEXT_PW=0 ## Kamailio START Options -## PID file path - default is: /var/run/kamailio.pid +## PID file path - default is: /var/run/kamailio/kamailio.pid # PID_FILE=/var/run/kamailio/kamailio.pid ## Extra start options - default is: not set

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018