[Asterisk-code-review] res_prometheus.c: missing module dependency (asterisk[master])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/17993 )

Change subject: res_prometheus.c: missing module dependency
......................................................................

res_prometheus.c: missing module dependency

added res_pjsip_outbound_registration to .requires in AST_MODULE_INFO
which fixes issue with module crashes on load "FRACK!, Failed assertion"

ASTERISK-29871

Change-Id: Ia0f49d048427a40e1b763296b834a52a03610096
---
M configs/samples/prometheus.conf.sample
M res/res_prometheus.c
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  N A: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/configs/samples/prometheus.conf.sample b/configs/samples/prometheus.conf.sample
index 3ee9290..ee4a196 100644
--- a/configs/samples/prometheus.conf.sample
+++ b/configs/samples/prometheus.conf.sample
@@ -10,6 +10,10 @@
 ; Because Prometheus scrapes statistics from HTTP servers, this module requires
 ; Asterisk's built-in HTTP server to be enabled and configured properly.
 ;
+; Module Dependencies:
+; only if Asterisk is build with pjproject bundled (default)
+; * res_pjsip.so
+; * res_pjsip_outbound_registration.so
 
 ; Settings that affect all statistic generation
 [general]
diff --git a/res/res_prometheus.c b/res/res_prometheus.c
index 11b8f02..4aacf6e 100644
--- a/res/res_prometheus.c
+++ b/res/res_prometheus.c
@@ -27,6 +27,7 @@
 /*** MODULEINFO
 	<use>pjproject</use>
 	<use type="module">res_pjsip</use>
+	<use type="module">res_pjsip_outbound_registration</use>
 	<support_level>extended</support_level>
  ***/
 
@@ -1002,6 +1003,7 @@
 	.reload = reload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
 #ifdef HAVE_PJPROJECT
-	.requires = "res_pjsip",
+	/* This module explicitly calls into res_pjsip if Asterisk is built with PJSIP support, so they are required. */
+	.requires = "res_pjsip,res_pjsip_outbound_registration",
 #endif
 );

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/17993
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ia0f49d048427a40e1b763296b834a52a03610096
Gerrit-Change-Number: 17993
Gerrit-PatchSet: 1
Gerrit-Owner: Mark Petersen <asterisk.org at zombie.dk>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: N A <mail at interlinked.x10host.com>
Gerrit-CC: Mark Petersen <bugs.digium.com at zombie.dk>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220211/b5a2a9ad/attachment.html>