sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
268 discussions

[kamailio/kamailio] slack: new module, send message to slack channel (#2838)
by Arsen Semenov 01 Sep '21

01 Sep '21

#### 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 this is a tiny module which provides integration with slack over webhooks. currently it exports only one function which accepts formatted string as an argument, evaluates pseudo-variables if any and sends the msg to slack channel (channel name, username and emoji are set as a module parameters). Kemi function is exported as well. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2838 -- Commit Summary -- * slack: new module, send message to slack channel -- File Changes -- A src/modules/slack/Makefile (31) A src/modules/slack/README (154) A src/modules/slack/doc/Makefile (4) A src/modules/slack/doc/slack.html (468) A src/modules/slack/doc/slack.xml (28) A src/modules/slack/doc/slack_admin.xml (175) A src/modules/slack/slack.c (298) A src/modules/slack/slack.h (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2838.patch https://github.com/kamailio/kamailio/pull/2838.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/2838

4 9

Info: Tomorrow Live - Kamailio World 2021 - Online
by Daniel-Constantin Mierla 31 Aug '21

31 Aug '21

Hello, couple of details for those that want to watch live or even participate to Kamailio World Online Conference, Sep 1-2, 2021 - the schedule is available at: * https://www.kamailioworld.com/k09-online/ There is no registration required, participation is completely free. You can watch live the presentations starting with 13:00UTC (14:00 London, 15:00 Berlin/Paris/Rome/Madrid, 09:00 New York) via KamailioWorld youtube channel: * https://www.youtube.com/c/KamailioWorld If you want to participate to the live video conferencing room, the link is: * https://meet.kamailioworld.com/live It is recommended to do it only if you want to address questions and interact with the speakers, otherwise the capacity of the video conferencing system may be filled and we will have to restrict the access in order to ensure good quality for presentations. You can also address questions via youtube chat that will be available next to the live stream or Matrix room: * #kamailio:matrix.kamailio.dev * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev To interact with other community member, join the Matrix chat room. No registration is required for Matrix to join the room, however the web client at the link above does not support the guests feature, you will have to use another client application that supports it or make an account with any federated Matrix server, like the one from element.io: * https://app.element.io/#/welcome Looking forward to chatting with many of you during the next two days! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:a2b4f695: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: a2b4f695326d762376d99faaa33170953dc2595f URL: https://github.com/kamailio/kamailio/commit/a2b4f695326d762376d99faaa331709… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-30T11:16:15+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/a2b4f695326d762376d99faaa331709… Patch: https://github.com/kamailio/kamailio/commit/a2b4f695326d762376d99faaa331709… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 945143421c..9100ef65ad 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -45,7 +45,10 @@ Daniel-Constantin Mierla 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) - 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, + origID, x5u, keyData) + + 4.8. secsipid_sign(sheaders, spaypload, keyPath) 5. Installation @@ -63,8 +66,9 @@ Daniel-Constantin Mierla 1.10. secsipid_get_url usage 1.11. secsipid_add_identity usage 1.12. secsipid_build_identity usage - 1.13. secsipid_sign usage - 1.14. Libsecsipid Usage + 1.13. secsipid_build_identity_prvkey usage + 1.14. secsipid_sign usage + 1.15. Libsecsipid Usage Chapter 1. Admin Guide @@ -97,7 +101,10 @@ Chapter 1. Admin Guide 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) - 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, + origID, x5u, keyData) + + 4.8. secsipid_sign(sheaders, spaypload, keyPath) 5. Installation @@ -232,7 +239,10 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) - 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, origID, + x5u, keyData) + + 4.8. secsipid_sign(sheaders, spaypload, keyPath) 4.1. secsipid_check_identity(keyPath) @@ -383,7 +393,29 @@ request_route { } ... -4.7. secsipid_sign(sheaders, spaypload, keyPath) +4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, origID, x5u, +keyData) + + Similar to secsipid_build_identity(), but the private key data is + provided as parameter instead to the file path. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. secsipid_build_identity_prvkey usage +... +request_route { + ... + if(secsipid_build_identity_prvkey("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "$var(prvkey)")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + +4.8. secsipid_sign(sheaders, spaypload, keyPath) Build Identity value using the key specified by "keyPath" to sign the JWT body. The sheaders and spayload have to be string representation of @@ -395,7 +427,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.13. secsipid_sign usage + Example 1.14. secsipid_sign usage ... request_route { ... @@ -421,7 +453,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.14. Libsecsipid Usage + Example 1.15. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 0

git:master:c8d8e50f: secsipid: docs for secsipid_build_identity_prvkey()
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: c8d8e50fe23d3310796c8615ccce346b4522fc7c URL: https://github.com/kamailio/kamailio/commit/c8d8e50fe23d3310796c8615ccce346… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T11:05:52+02:00 secsipid: docs for secsipid_build_identity_prvkey() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c8d8e50fe23d3310796c8615ccce346… Patch: https://github.com/kamailio/kamailio/commit/c8d8e50fe23d3310796c8615ccce346… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 88c4e761db..be388c17d6 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -397,6 +397,36 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_build_identity_prvkey"> + <title> + <function moreinfo="none">secsipid_build_identity_prvkey(origTN, destTN, attest, origID, x5u, keyData)</function> + </title> + <para> + Similar to secsipid_build_identity(), but the private key data is + provided as parameter instead to the file path. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_build_identity_prvkey</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_build_identity_prvkey("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "$var(prvkey)")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:f37e1837: secsipid: added function to build Identity by providing private key data
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: f37e1837ac227329849bd3ffc6729ad69f7618ab URL: https://github.com/kamailio/kamailio/commit/f37e1837ac227329849bd3ffc6729ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T10:58:03+02:00 secsipid: added function to build Identity by providing private key data --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f37e1837ac227329849bd3ffc6729ad… Patch: https://github.com/kamailio/kamailio/commit/f37e1837ac227329849bd3ffc6729ad…

1 0

git:master:06b99df0: secsipid: define values for mode parameter of internal function
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: 06b99df0a6e9faa82cd53f2f51ea481277f28fe3 URL: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T09:00:30+02:00 secsipid: define values for mode parameter of internal function --- Modified: src/modules/secsipid/secsipid_mod.c Modified: src/modules/secsipid/secsipid_papi.h --- Diff: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea481… Patch: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea481… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 27216e1cec..3ba76a8827 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -382,6 +382,10 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); } +#define SECSIPID_MODE_VALHDR (1<<0) +#define SECSIPID_MODE_VALVAR (1<<1) +#define SECSIPID_MODE_KEYPATH (1<<2) +#define SECSIPID_MODE_KEYDATA (1<<3) /** * @@ -404,7 +408,7 @@ static int ki_secsipid_add_identity_mode(sip_msg_t *msg, str *origtn, str *destt ibody.len = _secsipid_papi.SecSIPIDGetIdentity(origtn->s, desttn->s, attest->s, origid->s, x5u->s, keypath->s, &ibody.s); - if(mode==1) { + if(mode&SECSIPID_MODE_VALVAR) { _secsipid_data.ret = ibody.len; } @@ -415,7 +419,7 @@ static int ki_secsipid_add_identity_mode(sip_msg_t *msg, str *origtn, str *destt LM_DBG("identity value: %.*s\n", ibody.len, ibody.s); - if(mode==1) { + if(mode&SECSIPID_MODE_VALVAR) { if(_secsipid_data.value.s) { free(_secsipid_data.value.s); } @@ -470,7 +474,8 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, str *attest, str *origid, str *x5u, str *keypath) { return ki_secsipid_add_identity_mode(msg, origtn, desttn, - attest, origid, x5u, keypath, 0); + attest, origid, x5u, keypath, + SECSIPID_MODE_VALHDR|SECSIPID_MODE_KEYPATH); } /** @@ -512,7 +517,8 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, } return ki_secsipid_add_identity_mode(msg, &origtn, &desttn, - &attest, &origid, &x5u, &keypath, 0); + &attest, &origid, &x5u, &keypath, + SECSIPID_MODE_VALHDR|SECSIPID_MODE_KEYPATH); } /** @@ -527,7 +533,8 @@ static int ki_secsipid_build_identity(sip_msg_t *msg, str *origtn, str *desttn, memset(&_secsipid_data, 0, sizeof(secsipid_data_t)); return ki_secsipid_add_identity_mode(msg, origtn, desttn, - attest, origid, x5u, keypath, 1); + attest, origid, x5u, keypath, + SECSIPID_MODE_VALVAR|SECSIPID_MODE_KEYPATH); } /** @@ -574,7 +581,8 @@ static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdestt } return ki_secsipid_add_identity_mode(msg, &origtn, &desttn, - &attest, &origid, &x5u, &keypath, 1); + &attest, &origid, &x5u, &keypath, + SECSIPID_MODE_VALVAR|SECSIPID_MODE_KEYPATH); } /** diff --git a/src/modules/secsipid/secsipid_papi.h b/src/modules/secsipid/secsipid_papi.h index 657f5b9cc7..d96a515ba3 100644 --- a/src/modules/secsipid/secsipid_papi.h +++ b/src/modules/secsipid/secsipid_papi.h @@ -31,6 +31,9 @@ typedef struct secsipid_papi { int (*SecSIPIDGetIdentity)(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyPath, char** outPtr); + int (*SecSIPIDGetIdentityPrvKey)(char* origTN, char* destTN, char* attestVal, + char* origID, char* x5uVal, char* prvkeyData, char** outPtr); + int (*SecSIPIDCheck)(char* identityVal, int identityLen, int expireVal, char* pubkeyPath, int timeoutVal);

1 0

git:master:5a78a672: secsipid_proc: added SecSIPIDGetIdentityPrvKey to api
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: 5a78a67209bf1c170d97ce220cf204d5379b9f5f URL: https://github.com/kamailio/kamailio/commit/5a78a67209bf1c170d97ce220cf204d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T09:00:30+02:00 secsipid_proc: added SecSIPIDGetIdentityPrvKey to api --- Modified: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a78a67209bf1c170d97ce220cf204d… Patch: https://github.com/kamailio/kamailio/commit/5a78a67209bf1c170d97ce220cf204d… --- diff --git a/src/modules/secsipid_proc/secsipid_proc_mod.c b/src/modules/secsipid_proc/secsipid_proc_mod.c index 1054582b17..0e00483ced 100644 --- a/src/modules/secsipid_proc/secsipid_proc_mod.c +++ b/src/modules/secsipid_proc/secsipid_proc_mod.c @@ -39,6 +39,7 @@ int secsipid_proc_bind(secsipid_papi_t *papi) { papi->SecSIPIDSignJSONHP = SecSIPIDSignJSONHP; papi->SecSIPIDGetIdentity = SecSIPIDGetIdentity; + papi->SecSIPIDGetIdentityPrvKey = SecSIPIDGetIdentityPrvKey; papi->SecSIPIDCheck = SecSIPIDCheck; papi->SecSIPIDCheckFull = SecSIPIDCheckFull; papi->SecSIPIDCheckFullPubKey = SecSIPIDCheckFullPubKey;

1 0

git:master:733af502: modules: readme files regenerated - mqueue ... [skip ci]
by Kamailio Dev 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: 733af50276242bda54e579ace28141aedfee5014 URL: https://github.com/kamailio/kamailio/commit/733af50276242bda54e579ace28141a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-28T20:31:13+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README Modified: src/modules/rtimer/README --- Diff: https://github.com/kamailio/kamailio/commit/733af50276242bda54e579ace28141a… Patch: https://github.com/kamailio/kamailio/commit/733af50276242bda54e579ace28141a…

1 0

git:master:4368987b: rtimer: add one new module parameter
by Daniel-Constantin Mierla 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: 4368987be5b17faf443104e6193a559492625fe6 URL: https://github.com/kamailio/kamailio/commit/4368987be5b17faf443104e6193a559… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-28T20:17:30+02:00 rtimer: add one new module parameter Add default_interval to set the fire interval, if interval not present inside timer string. --- Modified: src/modules/rtimer/doc/rtimer_admin.xml Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4368987be5b17faf443104e6193a559… Patch: https://github.com/kamailio/kamailio/commit/4368987be5b17faf443104e6193a559… --- diff --git a/src/modules/rtimer/doc/rtimer_admin.xml b/src/modules/rtimer/doc/rtimer_admin.xml index 92422c5f3e..676bf2f5ad 100644 --- a/src/modules/rtimer/doc/rtimer_admin.xml +++ b/src/modules/rtimer/doc/rtimer_admin.xml @@ -56,6 +56,25 @@ </section> <section> <title>Parameters</title> + <section> + <title><varname>default_interval</varname> (int)</title> + <para> + The definition of the default interval of timers (if not present on the "timer" parameter) + </para> + <para> + The parameter can be set multiple times to get different intervals in same configuration file. + </para> + <example> + <title>Set <varname>default_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +# default time interval set to 300 seconds +modparam("rtimer", "default_interval", 300) +... + </programlisting> + </example> + </section> + <section> <title><varname>timer</varname> (str)</title> <para> diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index 4b398148ee..8111dfac5d 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -78,12 +78,15 @@ void stm_timer_exec(unsigned int ticks, int worker, void *param); void stm_main_timer_exec(unsigned int ticks, void *param); int stm_get_worker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int default_interval = 120; + static pv_export_t rtimer_pvs[] = { {{"rtimer_worker", (sizeof("rtimer_worker")-1)}, PVT_OTHER, stm_get_worker, 0, 0, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; static param_export_t params[]={ + {"default_interval", INT_PARAM, &default_interval}, {"timer", PARAM_STRING|USE_FUNC_PARAM, (void*)stm_t_param}, {"exec", PARAM_STRING|USE_FUNC_PARAM, (void*)stm_e_param}, {0,0,0} @@ -294,7 +297,7 @@ int stm_t_param(modparam_t type, void *val) return -1; } if(tmp.interval==0) - tmp.interval = 120; + tmp.interval = default_interval; nt = (stm_timer_t*)pkg_malloc(sizeof(stm_timer_t)); if(nt==0) @@ -307,6 +310,7 @@ int stm_t_param(modparam_t type, void *val) nt->next = _stm_list; _stm_list = nt; free_params(params_list); + LM_INFO("created rtimer name=%.*s interval=%d mode=%d\n", tmp.name.len, tmp.name.s, tmp.interval, tmp.mode); return 0; }

1 0

git:master:a8d42360: mqueue: add two new module parameters
by Daniel-Constantin Mierla 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: a8d4236070f69c6fd9c83dedd9c007facc34f70d URL: https://github.com/kamailio/kamailio/commit/a8d4236070f69c6fd9c83dedd9c007f… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-28T20:17:30+02:00 mqueue: add two new module parameters Add mqueue_name and mqueue_size to define queues. Updated doc. --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a8d4236070f69c6fd9c83dedd9c007f… Patch: https://github.com/kamailio/kamailio/commit/a8d4236070f69c6fd9c83dedd9c007f… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 7d785ac90b..9cdf57cfa4 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -150,6 +150,64 @@ modparam("mqueue", "mqueue", "name=qaz") </example> </section> + + <section id="mqueue.p.mqueue_name"> + <title><varname>mqueue_name</varname> (string)</title> + <para> + Definition of a memory queue, just by name. + </para> + <para> + <emphasis> + Default value is <quote>none</quote>. + </emphasis> + </para> + <para> + Value must be a string. + </para> + <para> + The parameter can be set many times, each holding the definition of one queue. + + The max size of each queue defined this way will be equal to mqueue_size(if mqueue_size configured), + or limitless (if mqueue_size not configured). + </para> + <example> + <title>Set <varname>mqueue_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mqueue", "mqueue_name", "my_own_queue") +... + </programlisting> + </example> + </section> + + <section id="mqueue.p.mqueue_size"> + <title><varname>mqueue_size</varname> (int)</title> + <para> + Definition of the size of all memory queues defined via "mqueue_name" parameter. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <para> + Value must be an int. + </para> + <para> + The parameter should be set before defining any "mqueue_name". + If not set, the queues defined via "mqueue_name" will be limitless. + </para> + <example> + <title>Set <varname>mqueue_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mqueue", "mqueue_size", 1024) +... + </programlisting> + </example> + </section> + + </section> <section> diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 325c84b472..154f5b5d81 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -50,11 +50,14 @@ static int w_mq_size(struct sip_msg *msg, char *mq, char *str2); static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val); static int w_mq_pv_free(struct sip_msg* msg, char* mq, char* str2); int mq_param(modparam_t type, void *val); +int mq_param_name(modparam_t type, void *val); static int fixup_mq_add(void** param, int param_no); static int bind_mq(mq_api_t* api); static int mqueue_rpc_init(void); +static int mqueue_size = 0; + static pv_export_t mod_pvs[] = { { {"mqk", sizeof("mqk")-1}, PVT_OTHER, pv_get_mqk, 0, @@ -84,6 +87,8 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"db_url", PARAM_STR, &mqueue_db_url}, {"mqueue", PARAM_STRING|USE_FUNC_PARAM, (void*)mq_param}, + {"mqueue_name", PARAM_STRING|USE_FUNC_PARAM, (void*)mq_param_name}, + {"mqueue_size", INT_PARAM, &mqueue_size }, {0, 0, 0} }; @@ -268,6 +273,39 @@ int mq_param(modparam_t type, void *val) return 0; } +int mq_param_name(modparam_t type, void *val) +{ + str qname = {0, 0}; + int msize = 0; + + if(val==NULL) + return -1; + + if(!shm_initialized()) + { + LM_ERR("shm not initialized - cannot define mqueue now\n"); + return 0; + } + + qname.s = (char*)val; + qname.len = strlen(qname.s); + + msize = mqueue_size; + + if(qname.len<=0) + { + LM_ERR("mqueue name not defined: %.*s\n", qname.len, qname.s); + return -1; + } + if(mq_head_add(&qname, msize)<0) + { + LM_ERR("cannot add mqueue: %.*s\n", qname.len, qname.s); + return -1; + } + LM_INFO("mqueue param: [%.*s|%d]\n", qname.len, qname.s, msize); + return 0; +} + static int fixup_mq_add(void** param, int param_no) { if(param_no==1 || param_no==2 || param_no==3) {

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021