presence_reginfo: Add option for aggregating presentities

call-center-together · Sep 27, 2022 · 91cf0ce · 91cf0ce
1 parent 1fbdc35
commit 91cf0ce
Show file tree

Hide file tree

Showing 6 changed files with 420 additions and 2 deletions.
diff --git a/src/modules/presence_reginfo/Makefile b/src/modules/presence_reginfo/Makefile
@@ -8,6 +8,25 @@ include ../../Makefile.defs
 auto_gen=
 NAME=presence_reginfo.so
 
+ifeq ($(CROSS_COMPILE),)
+XML2CFG=$(shell which xml2-config)
+ifeq ($(XML2CFG),)
+XML2CFG=$(shell \
+	if pkg-config --exists libxml-2.0; then \
+		echo 'pkg-config libxml-2.0'; \
+	fi)
+endif
+endif
+
+ifneq ($(XML2CFG),)
+	DEFS += $(shell $(XML2CFG) --cflags )
+	LIBS += $(shell $(XML2CFG) --libs)
+else
+	DEFS+=-I$(LOCALBASE)/include/libxml2 \
+		-I$(LOCALBASE)/include
+	LIBS+=-L$(LOCALBASE)/lib -lxml2
+endif
+
 include ../../Makefile.modules
 
 

diff --git a/src/modules/presence_reginfo/add_events.c b/src/modules/presence_reginfo/add_events.c
@@ -27,6 +27,9 @@
 #include "../../core/parser/parse_content.h"
 #include "../presence/event_list.h"
 #include "presence_reginfo.h"
+#include "notify_body.h"
+
+extern int pres_reginfo_aggregate_presentities;
 
 int reginfo_add_events(void)
 {
@@ -39,12 +42,22 @@ int reginfo_add_events(void)
 
 	event.content_type.s = "application/reginfo+xml";
 	event.content_type.len = 23;
-	event.default_expires= pres_reginfo_default_expires;
+	event.default_expires = pres_reginfo_default_expires;
 	event.type = PUBL_TYPE;
 	event.req_auth = 0;
 	event.evs_publ_handl = 0;
 
-	if (pres_add_event(&event) < 0) {
+
+	if(pres_reginfo_aggregate_presentities) {
+		/* aggregate XML body and free() fuction */
+		event.agg_nbody = reginfo_agg_nbody;
+		event.free_body = free_xml_body;
+		/* modify XML body for each watcher to set the correct "version" */
+		event.aux_body_processing = reginfo_body_setversion;
+		event.aux_free_body = free_xml_body;
+	}
+
+	if(pres_add_event(&event) < 0) {
 		LM_ERR("failed to add event \"reginfo\"\n");
 		return -1;
 	}

diff --git a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml
@@ -86,6 +86,27 @@
             </example>
         </section>
 
+				<section id="presence_reginfo.p.aggregate_presentities">
+							<title><varname>aggregate_presentities</varname> (int)</title>
+							<para>
+							Whether to aggregate in a single notify body all registration 
+							presentities. Useful to have all registrations on first NOTIFY
+							following initial SUBSCRIBE.
+							</para>
+							<para>
+							<emphasis>Default value is <quote>0</quote> (disabled).
+							</emphasis>
+							</para>
+							<example>
+							<title>Set <varname>aggregate_presentities</varname> parameter</title>
+							<programlisting format="linespecific">
+					...
+					modparam("presence_reginfo", "aggregate_presentities", 1)
+					...
+					</programlisting>
+							</example>
+					</section>
+
 	</section>