sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
261 discussions

git:master:0a347638: websocket: Makefile - support for FreeBSD build

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a3476384b325514b1da784b74cc821360193409 URL: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… Patch: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… --- diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index f74003225b..764453b080 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -39,7 +39,8 @@ endif LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) - LIBS+= -lunistring + DEFS += -I$(LOCALBASE)/include + LIBS += -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif

2 years, 11 months

git:master:c4b280bd: phonenum: Makefile - support for FreeBSD build

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c4b280bd5b5b0cfb8d34ecef296972f2a043791e URL: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… Patch: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index 4f187fccf6..f465226a97 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -5,13 +5,11 @@ include ../../Makefile.defs auto_gen= NAME=phonenum.so -CXX=g++ -LD=g++ -LIB_DIR = /opt/local/lib +CXX?=g++ +LD?=g++ -LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding - -DEFS+= -I/opt/local/include +LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding +DEFS+=-I$(LOCALBASE)/include CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing

2 years, 11 months

git:master:23c39ecb: core: set exit flag for return 0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 23c39ecbdd29f2fff0af4a693b08032e8afff48b URL: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T09:57:45+01:00 core: set exit flag for return 0 --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… Patch: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… --- diff --git a/src/core/action.c b/src/core/action.c index b8525f6c6a..48b150dd70 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -366,6 +366,9 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) goto error; } h->run_flags|=(unsigned int)a->val[1].u.number; + if(unlikely((ret==0) && (h->run_flags&RETURN_R_F))) { + h->run_flags |= EXIT_R_F; + } break; case FORWARD_T: #ifdef USE_TCP

2 years, 11 months

git:master:af080336: modules: readme files regenerated - presence_conference ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: af080336e1d63cf51d0f29ed946ebfb73c2c77f0 URL: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-18T20:31:18+01:00 modules: readme files regenerated - presence_conference ... [skip ci] --- Modified: src/modules/presence_conference/README Modified: src/modules/presence_dialoginfo/README Modified: src/modules/presence_mwi/README Modified: src/modules/presence_profile/README Modified: src/modules/presence_reginfo/README Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb… Patch: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb…

2 years, 11 months

[kamailio/kamailio] presence : add default_expires and use in the presence* modules (PR #3003)

by adita76

#### 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 - [x] Related to issue #2996 #### Description closes #2996 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3003 -- Commit Summary -- * presence: added default_expires parameter * presence_conference: use parameter presence/default_expires instead of 3600 constant * presence_dialoginfo: use parameter presence/default_expires instead of 3600 constant * presence_mwi: use parameter presence/default_expires instead of 3600 constant * presence_profile: use parameter presence/default_expires instead of 3600 constant * presence_reginfo: use parameter presence/default_expires instead of 3600 constant * presence_xml: use parameter presence/default_expires instead of 3600 constant -- File Changes -- M src/modules/presence/doc/presence_admin.xml (22) M src/modules/presence/presence.c (6) M src/modules/presence/presence.h (1) M src/modules/presence_conference/add_events.c (14) M src/modules/presence_dialoginfo/add_events.c (12) M src/modules/presence_mwi/add_events.c (12) M src/modules/presence_profile/add_events.c (13) M src/modules/presence_reginfo/add_events.c (12) M src/modules/presence_xml/add_events.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3003.patch https://github.com/kamailio/kamailio/pull/3003.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3003 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3003(a)github.com>

2 years, 11 months

git:master:ad8e1c4d: presence_xml: use parameter default_expires instead of 3600 constant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad8e1c4d0cfb0a8c6af17b08900ef45064e54303 URL: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_xml: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/doc/presence_xml_admin.xml Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… Patch: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… --- diff --git a/src/modules/presence_xml/add_events.c b/src/modules/presence_xml/add_events.c index a7e82aa71f..54a3c52bf4 100644 --- a/src/modules/presence_xml/add_events.c +++ b/src/modules/presence_xml/add_events.c @@ -33,6 +33,7 @@ #include "../../core/parser/parse_content.h" #include "../../core/data_lump_rpl.h" #include "../../core/ut.h" +#include "../presence/presence.h" #include "xcap_auth.h" #include "notify_body.h" #include "add_events.h" @@ -65,7 +66,7 @@ int xml_add_events(void) event.agg_nbody = pres_agg_nbody; event.evs_publ_handl = xml_publ_handl; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; event.get_rules_doc = pres_get_rules_doc; event.get_pidf_doc = pres_get_pidf_doc; if(psapi.add_event(&event) < 0) { @@ -85,7 +86,7 @@ int xml_add_events(void) event.content_type.len = 27; event.type = WINFO_TYPE; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event presence.winfo\n"); @@ -106,7 +107,7 @@ int xml_add_events(void) event.content_type.len = 27; event.type = PUBL_TYPE; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event dialog;sla\n"); return -1; @@ -124,7 +125,7 @@ int xml_add_events(void) event.content_type.len = 25; event.type = PUBL_TYPE; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event xcap-diff\n"); return -1; diff --git a/src/modules/presence_xml/doc/presence_xml_admin.xml b/src/modules/presence_xml/doc/presence_xml_admin.xml index 4eaf7d82ac..387fd2f759 100644 --- a/src/modules/presence_xml/doc/presence_xml_admin.xml +++ b/src/modules/presence_xml/doc/presence_xml_admin.xml @@ -413,6 +413,27 @@ modparam("presence_xml", "presence_single_body_lookup_element", "status") </programlisting> </example> </section> + +<section id="presence_xml.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index cc9b814eed..85ebca3d49 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -98,6 +98,8 @@ int pxml_force_single_body = 0; str pxml_single_body_priorities = str_init("Available|Ringing|On the Phone"); str pxml_single_body_lookup_element = str_init("note"); +unsigned int pxml_default_expires = 3600; + /** SL API structure */ sl_api_t slb; @@ -138,6 +140,7 @@ static param_export_t params[]={ { "force_presence_single_body", INT_PARAM, &pxml_force_single_body }, { "presence_single_body_priorities", PARAM_STR, &pxml_single_body_priorities }, { "presence_single_body_lookup_element", PARAM_STR, &pxml_single_body_lookup_element }, + { "default_expires", INT_PARAM, &pxml_default_expires }, { 0, 0, 0} }; /* clang-format on */ diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index e77891e642..7c20b9c7eb 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -53,4 +53,6 @@ extern int pxml_integrated_xcap_server; extern xcap_serv_t *xs_list; extern xcapGetNewDoc_t xcap_GetNewDoc; +extern unsigned int pxml_default_expires; + #endif

2 years, 11 months

git:master:e8ece95f: presence_reginfo: use parameter default_expires instead of 3600 constant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e8ece95f0c56d81d644fe469e3cbbf56c11c0891 URL: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_reginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_reginfo/add_events.c Modified: src/modules/presence_reginfo/doc/presence_reginfo_admin.xml Modified: src/modules/presence_reginfo/presence_reginfo.c Modified: src/modules/presence_reginfo/presence_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… Patch: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… --- diff --git a/src/modules/presence_reginfo/add_events.c b/src/modules/presence_reginfo/add_events.c index 3cb9f7a145..468a14dd3a 100644 --- a/src/modules/presence_reginfo/add_events.c +++ b/src/modules/presence_reginfo/add_events.c @@ -39,7 +39,7 @@ int reginfo_add_events(void) event.content_type.s = "application/reginfo+xml"; event.content_type.len = 23; - event.default_expires= 3600; + event.default_expires= pres_reginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml index b99c35e088..9c7450a2e2 100644 --- a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml +++ b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml @@ -64,6 +64,31 @@ </section> </section> + <section> + <title>Parameters</title> + <section id="presence_reginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_reginfo", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + + </section> + + <section> <title>Functions</title> <para> diff --git a/src/modules/presence_reginfo/presence_reginfo.c b/src/modules/presence_reginfo/presence_reginfo.c index eadbfdad24..abb8755ca0 100644 --- a/src/modules/presence_reginfo/presence_reginfo.c +++ b/src/modules/presence_reginfo/presence_reginfo.c @@ -46,14 +46,23 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_reginfo_default_expires = 3600; + +/* module exported paramaters */ +static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_reginfo_default_expires }, + {0, 0, 0} +}; + /* module exports */ /* clang-format off */ struct module_exports exports= { "presence_reginfo", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ - 0, /* RPC method exports */ + params, /* exported parameters */ + 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ diff --git a/src/modules/presence_reginfo/presence_reginfo.h b/src/modules/presence_reginfo/presence_reginfo.h index 6d5371535b..6fa47c008f 100644 --- a/src/modules/presence_reginfo/presence_reginfo.h +++ b/src/modules/presence_reginfo/presence_reginfo.h @@ -25,5 +25,5 @@ #define _PRES_REGINFO_H_ extern add_event_t pres_add_event; - +extern unsigned int pres_reginfo_default_expires; #endif

2 years, 11 months

git:master:86cb58b0: presence_profile: use parameter default_expires instead of 3600 constant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86cb58b045854c6fe95afbd81c2c13c81e1052d5 URL: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_profile: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_profile/add_events.c Modified: src/modules/presence_profile/doc/presence_profile_admin.xml Modified: src/modules/presence_profile/presence_profile.c Modified: src/modules/presence_profile/presence_profile.h --- Diff: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… Patch: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… --- diff --git a/src/modules/presence_profile/add_events.c b/src/modules/presence_profile/add_events.c index 72a5f58567..ec03193d41 100644 --- a/src/modules/presence_profile/add_events.c +++ b/src/modules/presence_profile/add_events.c @@ -45,11 +45,10 @@ int profile_add_events(void) event.name.s = "ua-profile"; event.name.len = 10; - event.content_type.s = "text/xml"; event.content_type.len = 8; - event.default_expires= 3600; + event.default_expires= pres_profile_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_profile/doc/presence_profile_admin.xml b/src/modules/presence_profile/doc/presence_profile_admin.xml index c54be3446b..ddc811f88e 100644 --- a/src/modules/presence_profile/doc/presence_profile_admin.xml +++ b/src/modules/presence_profile/doc/presence_profile_admin.xml @@ -64,9 +64,25 @@ <section> <title>Exported Parameters</title> - <para> - None. - </para> + <section id="presence_profile.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_profile", "default_expires", 3600) + ... + </programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/presence_profile/presence_profile.c b/src/modules/presence_profile/presence_profile.c index 0a4ab47434..ba3a2746f1 100644 --- a/src/modules/presence_profile/presence_profile.c +++ b/src/modules/presence_profile/presence_profile.c @@ -56,13 +56,22 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_profile_default_expires = 3600; + +/* module exported paramaters */ +static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_profile_default_expires }, + {0, 0, 0} +}; + /* module exports */ /* clang-format off */ struct module_exports exports= { "presence_profile", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ + params, /* exported parameters */ 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */ diff --git a/src/modules/presence_profile/presence_profile.h b/src/modules/presence_profile/presence_profile.h index 7906f323b4..ff70a74941 100644 --- a/src/modules/presence_profile/presence_profile.h +++ b/src/modules/presence_profile/presence_profile.h @@ -31,5 +31,6 @@ #define _PRES_PROFILE_H_ extern add_event_t pres_add_event; +extern unsigned int pres_profile_default_expires; #endif

2 years, 11 months

git:master:1e3606eb: presence_mwi: use parameter default_expires instead of 3600 constant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e3606ebca0d927595f6a0aa98cc0972174b9a62 URL: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_mwi: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_mwi/add_events.c Modified: src/modules/presence_mwi/doc/presence_mwi_admin.xml Modified: src/modules/presence_mwi/presence_mwi.c Modified: src/modules/presence_mwi/presence_mwi.h --- Diff: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Patch: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… --- diff --git a/src/modules/presence_mwi/add_events.c b/src/modules/presence_mwi/add_events.c index 001034ade4..089940e081 100644 --- a/src/modules/presence_mwi/add_events.c +++ b/src/modules/presence_mwi/add_events.c @@ -124,7 +124,7 @@ int mwi_add_events(void) event.content_type.s = "application/simple-message-summary"; event.content_type.len = 34; - event.default_expires= 3600; + event.default_expires= pres_mwi_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = mwi_publ_handl; diff --git a/src/modules/presence_mwi/doc/presence_mwi_admin.xml b/src/modules/presence_mwi/doc/presence_mwi_admin.xml index e73c3f72a8..654dd080cd 100644 --- a/src/modules/presence_mwi/doc/presence_mwi_admin.xml +++ b/src/modules/presence_mwi/doc/presence_mwi_admin.xml @@ -68,9 +68,26 @@ <section> <title>Parameters</title> - <para> - None. - </para> + <section id="presence_mwi.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_mwi", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/presence_mwi/presence_mwi.c b/src/modules/presence_mwi/presence_mwi.c index afd605f7c7..9fdeeeb84c 100644 --- a/src/modules/presence_mwi/presence_mwi.c +++ b/src/modules/presence_mwi/presence_mwi.c @@ -59,6 +59,9 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_mwi_default_expires = 3600; + /* module exported commands */ static cmd_export_t cmds[] = { @@ -67,6 +70,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_mwi_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_mwi/presence_mwi.h b/src/modules/presence_mwi/presence_mwi.h index 9e7d5c4d52..5eed0d742c 100644 --- a/src/modules/presence_mwi/presence_mwi.h +++ b/src/modules/presence_mwi/presence_mwi.h @@ -34,5 +34,6 @@ #define _PRES_MWI_H_ extern add_event_t pres_add_event; +extern unsigned int pres_mwi_default_expires; #endif

2 years, 11 months

git:master:31598421: presence_dialoginfo: use parameter default_expires instead of 3600 constant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31598421de858786f9ed416db8f33c12c0efd383 URL: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_dialoginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_dialoginfo/add_events.c Modified: src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c Modified: src/modules/presence_dialoginfo/presence_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Patch: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… --- diff --git a/src/modules/presence_dialoginfo/add_events.c b/src/modules/presence_dialoginfo/add_events.c index 03cd981837..bed11b2d48 100644 --- a/src/modules/presence_dialoginfo/add_events.c +++ b/src/modules/presence_dialoginfo/add_events.c @@ -43,7 +43,7 @@ int dlginfo_add_events(void) event.content_type.s = "application/dialog-info+xml"; event.content_type.len = 27; - event.default_expires= 3600; + event.default_expires= pres_dlginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml index cdb1729584..caca121f18 100644 --- a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml +++ b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml @@ -248,6 +248,26 @@ modparam("presence_dialoginfo", "force_dummy_dialog", 1) </example> </section> +<section id="presence_dialoginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_dialoginfo", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.c b/src/modules/presence_dialoginfo/presence_dialoginfo.c index 9bf8199dda..edc96fb11e 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.c +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int force_single_dialog = 0; int force_dummy_dialog = 0; +unsigned int pres_dlginfo_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -60,6 +61,7 @@ static cmd_export_t cmds[] = static param_export_t params[] = { { "force_single_dialog", INT_PARAM, &force_single_dialog }, { "force_dummy_dialog", INT_PARAM, &force_dummy_dialog }, + { "default_expires", INT_PARAM, &pres_dlginfo_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.h b/src/modules/presence_dialoginfo/presence_dialoginfo.h index 750a8c3347..2e9c40553d 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.h +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.h @@ -26,5 +26,6 @@ #define _PRES_DLGINFO_H_ extern add_event_t pres_add_event; +extern unsigned int pres_dlginfo_default_expires; #endif

2 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022