Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

presence : add default_expires and use in the presence* modules #3003

Merged
merged 6 commits into from Jan 18, 2022
Merged

presence : add default_expires and use in the presence* modules #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7bc490b
presence_conference: use parameter default_expires instead of 3600 co…
Jan 14, 2022
8297df3
presence_dialoginfo: use parameter default_expires instead of 3600 co…
Jan 14, 2022
5954ff9
presence_mwi: use parameter default_expires instead of 3600 constant
Jan 14, 2022
fe1c2b0
presence_profile: use parameter default_expires instead of 3600 constant
Jan 14, 2022
46b2aa9
presence_reginfo: use parameter default_expires instead of 3600 constant
Jan 14, 2022
e771b1e
presence_xml: use parameter default_expires instead of 3600 constant
Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modules/presence_conference/add_events.c
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ int conference_add_events(void)
event.content_type.s = "application/conference-info+xml";
event.content_type.len = 31;

event.default_expires= 3600;
event.default_expires = pres_conf_default_expires;
event.type = PUBL_TYPE;
event.req_auth = 0;
event.evs_publ_handl = 0;
Expand Down
20 changes: 20 additions & 0 deletions src/modules/presence_conference/doc/presence_conference_admin.xml
View file
Open in desktop
Expand Up @@ -76,6 +76,26 @@ modparam("presence_conference", "use_partial_states", 0)
</example>
</section>

<section id="presence_conference.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_conference", "default_expires", 3600)
...
</programlisting>
</example>
</section>

</section>

<section>
Expand Down
2 changes: 2 additions & 0 deletions src/modules/presence_conference/presence_conference.c
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@ add_event_t pres_add_event;

/* module parameters */
int use_partial_states = 0;
unsigned int pres_conf_default_expires = 3600;

/* module exported commands */
static cmd_export_t cmds[] =
Expand All @@ -59,6 +60,7 @@ static cmd_export_t cmds[] =
/* module exported paramaters */
static param_export_t params[] = {
{ "use_partial_states", INT_PARAM, &use_partial_states },
{ "default_expires", INT_PARAM, &pres_conf_default_expires },
{0, 0, 0}
};

Expand Down
1 change: 1 addition & 0 deletions src/modules/presence_conference/presence_conference.h
View file
Open in desktop
Expand Up @@ -26,5 +26,6 @@
#define _PRES_CONFERENCE_H_

extern add_event_t pres_add_event;
extern unsigned int pres_conf_default_expires;

#endif
2 changes: 1 addition & 1 deletion src/modules/presence_dialoginfo/add_events.c
View file
Open in desktop
Expand Up @@ -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;
Expand Down
20 changes: 20 additions & 0 deletions src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/modules/presence_dialoginfo/presence_dialoginfo.c
View file
Open in desktop
Expand Up @@ -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[] =
Expand All @@ -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}
};

Expand Down
1 change: 1 addition & 0 deletions src/modules/presence_dialoginfo/presence_dialoginfo.h
View file
Open in desktop
Expand Up @@ -26,5 +26,6 @@
#define _PRES_DLGINFO_H_

extern add_event_t pres_add_event;
extern unsigned int pres_dlginfo_default_expires;

#endif
2 changes: 1 addition & 1 deletion src/modules/presence_mwi/add_events.c
View file
Open in desktop
Expand Up @@ -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;
Expand Down
23 changes: 20 additions & 3 deletions src/modules/presence_mwi/doc/presence_mwi_admin.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions src/modules/presence_mwi/presence_mwi.c
View file
Open in desktop
Expand Up @@ -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[] =
{
Expand All @@ -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}
};

Expand Down
1 change: 1 addition & 0 deletions src/modules/presence_mwi/presence_mwi.h
View file
Open in desktop
Expand Up @@ -34,5 +34,6 @@
#define _PRES_MWI_H_

extern add_event_t pres_add_event;
extern unsigned int pres_mwi_default_expires;

#endif
3 changes: 1 addition & 2 deletions src/modules/presence_profile/add_events.c
View file
Open in desktop
Expand Up @@ -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;
Expand Down
22 changes: 19 additions & 3 deletions src/modules/presence_profile/doc/presence_profile_admin.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
11 changes: 10 additions & 1 deletion src/modules/presence_profile/presence_profile.c
View file
Open in desktop
Expand Up @@ -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 */
Expand Down
1 change: 1 addition & 0 deletions src/modules/presence_profile/presence_profile.h
View file
Open in desktop
Expand Up @@ -31,5 +31,6 @@
#define _PRES_PROFILE_H_

extern add_event_t pres_add_event;
extern unsigned int pres_profile_default_expires;

#endif
2 changes: 1 addition & 1 deletion src/modules/presence_reginfo/add_events.c
View file
Open in desktop
Expand Up @@ -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;
Expand Down
25 changes: 25 additions & 0 deletions src/modules/presence_reginfo/doc/presence_reginfo_admin.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
13 changes: 11 additions & 2 deletions src/modules/presence_reginfo/presence_reginfo.c
View file
Open in desktop
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/modules/presence_reginfo/presence_reginfo.h
View file
Open in desktop
Expand Up @@ -25,5 +25,5 @@
#define _PRES_REGINFO_H_

extern add_event_t pres_add_event;

extern unsigned int pres_reginfo_default_expires;
#endif
9 changes: 5 additions & 4 deletions src/modules/presence_xml/add_events.c
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand All @@ -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");
Expand All @@ -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;
Expand All @@ -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;
Expand Down