<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8007">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Richard Mudgett: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add missing OPTIONAL_API and ARI dependences.<br><br>I've audited all modules that include any header which includes<br>asterisk/optional_api.h. All modules which use OPTIONAL_API now declare<br>those dependencies in AST_MODULE_INFO using requires or optional_modules<br>as appropriate.<br><br>In addition ARI dependency declarations have been reworked. Instead of<br>declaring additional required modules in res/ari/resource_*.c we now add<br>them to an optional array "requiresModules" in api-docs for each module.<br>This allows the AST_MODULE_INFO dependencies to include those missing<br>modules.<br><br>Change-Id: Ia0c70571f5566784f63605e78e1ceccb4f79c606<br>---<br>M apps/app_mixmonitor.c<br>M apps/app_statsd.c<br>M bridges/bridge_builtin_features.c<br>M res/ari/resource_bridges.c<br>M res/ari/resource_channels.c<br>M res/ari/resource_device_states.c<br>M res/ari/resource_events.c<br>M res/ari/resource_mailboxes.c<br>M res/ari/resource_playbacks.c<br>M res/ari/resource_recordings.c<br>M res/res_ari_bridges.c<br>M res/res_ari_channels.c<br>M res/res_ari_device_states.c<br>M res/res_ari_events.c<br>M res/res_ari_mailboxes.c<br>M res/res_ari_playbacks.c<br>M res/res_ari_recordings.c<br>M res/res_monitor.c<br>M res/res_pjsip.c<br>M res/res_pjsip/config_transport.c<br>M res/res_pjsip_outbound_registration.c<br>M res/res_statsd.c<br>M rest-api-templates/res_ari_resource.c.mustache<br>M rest-api-templates/swagger_model.py<br>M rest-api/api-docs/bridges.json<br>M rest-api/api-docs/channels.json<br>M rest-api/api-docs/deviceStates.json<br>M rest-api/api-docs/events.json<br>M rest-api/api-docs/mailboxes.json<br>M rest-api/api-docs/playbacks.json<br>M rest-api/api-docs/recordings.json<br>M tests/test_utils.c<br>M tests/test_websocket_client.c<br>33 files changed, 85 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c<br>index bb47cfc..af29492 100644<br>--- a/apps/app_mixmonitor.c<br>+++ b/apps/app_mixmonitor.c<br>@@ -1556,4 +1556,9 @@<br> return res;<br> }<br> <br>-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Mixed Audio Monitoring Application");<br>+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Mixed Audio Monitoring Application",<br>+ .support_level = AST_MODULE_SUPPORT_CORE,<br>+ .load = load_module,<br>+ .unload = unload_module,<br>+ .optional_modules = "func_periodic_hook",<br>+);<br>diff --git a/apps/app_statsd.c b/apps/app_statsd.c<br>index 54f9511..a4ca233 100644<br>--- a/apps/app_statsd.c<br>+++ b/apps/app_statsd.c<br>@@ -420,4 +420,9 @@<br> return ast_register_application_xml(app, statsd_exec);<br> }<br> <br>-AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "StatsD Dialplan Application");<br>+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "StatsD Dialplan Application",<br>+ .support_level = AST_MODULE_SUPPORT_EXTENDED,<br>+ .load = load_module,<br>+ .unload = unload_module,<br>+ .requires = "res_statsd",<br>+);<br>diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c<br>index e6cacbf..e9efb91 100644<br>--- a/bridges/bridge_builtin_features.c<br>+++ b/bridges/bridge_builtin_features.c<br>@@ -519,4 +519,9 @@<br> return AST_MODULE_LOAD_SUCCESS;<br> }<br> <br>-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Built in bridging features");<br>+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Built in bridging features",<br>+ .support_level = AST_MODULE_SUPPORT_CORE,<br>+ .load = load_module,<br>+ .unload = unload_module,<br>+ .optional_modules = "res_monitor",<br>+);<br>diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c<br>index a320c29..9808288 100644<br>--- a/res/ari/resource_bridges.c<br>+++ b/res/ari/resource_bridges.c<br>@@ -24,8 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_stasis_recording</depend><br>- <depend type="module">res_stasis_playback</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c<br>index 6b4f26c..cdf0f88 100644<br>--- a/res/ari/resource_channels.c<br>+++ b/res/ari/resource_channels.c<br>@@ -24,10 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_stasis_answer</depend><br>- <depend type="module">res_stasis_playback</depend><br>- <depend type="module">res_stasis_recording</depend><br>- <depend type="module">res_stasis_snoop</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/ari/resource_device_states.c b/res/ari/resource_device_states.c<br>index 020d930..c442fa5 100644<br>--- a/res/ari/resource_device_states.c<br>+++ b/res/ari/resource_device_states.c<br>@@ -24,7 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_stasis_device_state</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c<br>index d81067f..5a8e898 100644<br>--- a/res/ari/resource_events.c<br>+++ b/res/ari/resource_events.c<br>@@ -24,7 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_http_websocket</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/ari/resource_mailboxes.c b/res/ari/resource_mailboxes.c<br>index 3577e65..ae0f249 100644<br>--- a/res/ari/resource_mailboxes.c<br>+++ b/res/ari/resource_mailboxes.c<br>@@ -24,7 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_stasis_mailbox</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/ari/resource_playbacks.c b/res/ari/resource_playbacks.c<br>index 57f424c..fc05a8d 100644<br>--- a/res/ari/resource_playbacks.c<br>+++ b/res/ari/resource_playbacks.c<br>@@ -24,7 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_stasis_playback</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c<br>index 39ef65c..090f263 100644<br>--- a/res/ari/resource_recordings.c<br>+++ b/res/ari/resource_recordings.c<br>@@ -24,7 +24,6 @@<br> */<br> <br> /*** MODULEINFO<br>- <depend type="module">res_stasis_recording</depend><br> <support_level>core</support_level><br> ***/<br> <br>diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c<br>index 34b9d89..93cf7c4 100644<br>--- a/res/res_ari_bridges.c<br>+++ b/res/res_ari_bridges.c<br>@@ -35,6 +35,8 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_stasis_recording</depend><br>+ <depend type="module">res_stasis_playback</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -1579,5 +1581,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_stasis_recording,res_stasis_playback",<br> );<br>diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c<br>index 7862c10..7ca7e2e 100644<br>--- a/res/res_ari_channels.c<br>+++ b/res/res_ari_channels.c<br>@@ -35,6 +35,10 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_stasis_answer</depend><br>+ <depend type="module">res_stasis_playback</depend><br>+ <depend type="module">res_stasis_recording</depend><br>+ <depend type="module">res_stasis_snoop</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -2869,5 +2873,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_stasis_answer,res_stasis_playback,res_stasis_recording,res_stasis_snoop",<br> );<br>diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c<br>index ec8890b..04479e6 100644<br>--- a/res/res_ari_device_states.c<br>+++ b/res/res_ari_device_states.c<br>@@ -35,6 +35,7 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_stasis_device_state</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -349,5 +350,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_stasis_device_state",<br> );<br>diff --git a/res/res_ari_events.c b/res/res_ari_events.c<br>index f750a54..06eb77a 100644<br>--- a/res/res_ari_events.c<br>+++ b/res/res_ari_events.c<br>@@ -35,6 +35,7 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_http_websocket</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -473,5 +474,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_http_websocket",<br> );<br>diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c<br>index 6469f93..123664e 100644<br>--- a/res/res_ari_mailboxes.c<br>+++ b/res/res_ari_mailboxes.c<br>@@ -35,6 +35,7 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_stasis_mailbox</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -355,5 +356,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_stasis_mailbox",<br> );<br>diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c<br>index 0148a74..547b39e 100644<br>--- a/res/res_ari_playbacks.c<br>+++ b/res/res_ari_playbacks.c<br>@@ -35,6 +35,7 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_stasis_playback</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -307,5 +308,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_stasis_playback",<br> );<br>diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c<br>index 531ff65..45c789c 100644<br>--- a/res/res_ari_recordings.c<br>+++ b/res/res_ari_recordings.c<br>@@ -35,6 +35,7 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+ <depend type="module">res_stasis_recording</depend><br> <support_level>core</support_level><br> ***/<br> <br>@@ -891,5 +892,5 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis,res_stasis_recording",<br> );<br>diff --git a/res/res_monitor.c b/res/res_monitor.c<br>index 9dcbdbe..e2b5fb2 100644<br>--- a/res/res_monitor.c<br>+++ b/res/res_monitor.c<br>@@ -1013,4 +1013,5 @@<br> .load = load_module,<br> .unload = unload_module,<br> .load_pri = AST_MODPRI_CHANNEL_DEPEND,<br>+ .optional_modules = "func_periodic_hook",<br> );<br>diff --git a/res/res_pjsip.c b/res/res_pjsip.c<br>index ff262c9..6a6ba0f 100644<br>--- a/res/res_pjsip.c<br>+++ b/res/res_pjsip.c<br>@@ -5139,4 +5139,5 @@<br> .reload = reload_module,<br> .load_pri = AST_MODPRI_CHANNEL_DEPEND - 5,<br> .requires = "res_pjproject",<br>+ .optional_modules = "res_statsd",<br> );<br>diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c<br>index 63bf118..713ab02 100644<br>--- a/res/res_pjsip/config_transport.c<br>+++ b/res/res_pjsip/config_transport.c<br>@@ -30,6 +30,7 @@<br> #include "asterisk/acl.h"<br> #include "asterisk/utils.h"<br> #include "include/res_pjsip_private.h"<br>+/* We're only using a #define from http_websocket.h, no OPTIONAL_API symbols are used. */<br> #include "asterisk/http_websocket.h"<br> <br> #define MAX_POINTER_STRING 33<br>diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c<br>index 79bea48..80b885f 100644<br>--- a/res/res_pjsip_outbound_registration.c<br>+++ b/res/res_pjsip_outbound_registration.c<br>@@ -2290,4 +2290,5 @@<br> .unload = unload_module,<br> .load_pri = AST_MODPRI_APP_DEPEND,<br> .requires = "res_pjsip",<br>+ .optional_modules = "res_statsd",<br> );<br>diff --git a/res/res_statsd.c b/res/res_statsd.c<br>index 221b359..8565e41 100644<br>--- a/res/res_statsd.c<br>+++ b/res/res_statsd.c<br>@@ -381,13 +381,13 @@<br> }<br> }<br> <br>-/* The priority of this module is set to be as low as possible, since it could<br>- * be used by any other sort of module.<br>+/* The priority of this module is set just after realtime, since it loads<br>+ * configuration and could be used by any other sort of module.<br> */<br> AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Statsd client support",<br> .support_level = AST_MODULE_SUPPORT_EXTENDED,<br> .load = load_module,<br> .unload = unload_module,<br> .reload = reload_module,<br>- .load_pri = 0,<br>+ .load_pri = AST_MODPRI_REALTIME_DRIVER + 5,<br> );<br>diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache<br>index c1f680f..c697345 100644<br>--- a/rest-api-templates/res_ari_resource.c.mustache<br>+++ b/rest-api-templates/res_ari_resource.c.mustache<br>@@ -40,6 +40,9 @@<br> <depend type="module">res_ari</depend><br> <depend type="module">res_ari_model</depend><br> <depend type="module">res_stasis</depend><br>+{{#requires_modules}}<br>+ <depend type="module">{{.}}</depend><br>+{{/requires_modules}}<br> <support_level>core</support_level><br> ***/<br> <br>@@ -324,6 +327,6 @@<br> .support_level = AST_MODULE_SUPPORT_CORE,<br> .load = load_module,<br> .unload = unload_module,<br>- .requires = "res_ari,res_ari_model,res_stasis",<br>+ .requires = "res_ari,res_ari_model,res_stasis{{#requires_modules}},{{.}}{{/requires_modules}}",<br> );<br> {{/api_declaration}}<br>diff --git a/rest-api-templates/swagger_model.py b/rest-api-templates/swagger_model.py<br>index 0885241..3f729d8 100644<br>--- a/rest-api-templates/swagger_model.py<br>+++ b/rest-api-templates/swagger_model.py<br>@@ -647,6 +647,7 @@<br> self.api_version = api_decl_json.get('apiVersion')<br> self.base_path = api_decl_json.get('basePath')<br> self.resource_path = api_decl_json.get('resourcePath')<br>+ self.requires_modules = api_decl_json.get('requiresModules') or []<br> api_json = api_decl_json.get('apis') or []<br> self.apis = [<br> Api().load(j, processor, context) for j in api_json]<br>diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json<br>index cf8ee31..04416c1 100644<br>--- a/rest-api/api-docs/bridges.json<br>+++ b/rest-api/api-docs/bridges.json<br>@@ -6,6 +6,10 @@<br> "swaggerVersion": "1.1",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/bridges.{format}",<br>+ "requiresModules": [<br>+ "res_stasis_recording",<br>+ "res_stasis_playback"<br>+ ],<br> "apis": [<br> {<br> "path": "/bridges",<br>diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json<br>index 602606c..ec8bae2 100644<br>--- a/rest-api/api-docs/channels.json<br>+++ b/rest-api/api-docs/channels.json<br>@@ -6,6 +6,12 @@<br> "swaggerVersion": "1.1",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/channels.{format}",<br>+ "requiresModules": [<br>+ "res_stasis_answer",<br>+ "res_stasis_playback",<br>+ "res_stasis_recording",<br>+ "res_stasis_snoop"<br>+ ],<br> "apis": [<br> {<br> "path": "/channels",<br>diff --git a/rest-api/api-docs/deviceStates.json b/rest-api/api-docs/deviceStates.json<br>index 94d5b93..bd38935 100644<br>--- a/rest-api/api-docs/deviceStates.json<br>+++ b/rest-api/api-docs/deviceStates.json<br>@@ -6,6 +6,9 @@<br> "swaggerVersion": "1.1",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/deviceStates.{format}",<br>+ "requiresModules": [<br>+ "res_stasis_device_state"<br>+ ],<br> "apis": [<br> {<br> "path": "/deviceStates",<br>diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json<br>index e1b31bb..d85d8d9 100644<br>--- a/rest-api/api-docs/events.json<br>+++ b/rest-api/api-docs/events.json<br>@@ -6,6 +6,9 @@<br> "swaggerVersion": "1.2",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/events.{format}",<br>+ "requiresModules": [<br>+ "res_http_websocket"<br>+ ],<br> "apis": [<br> {<br> "path": "/events",<br>diff --git a/rest-api/api-docs/mailboxes.json b/rest-api/api-docs/mailboxes.json<br>index ed50019..8f5941b 100644<br>--- a/rest-api/api-docs/mailboxes.json<br>+++ b/rest-api/api-docs/mailboxes.json<br>@@ -6,6 +6,9 @@<br> "swaggerVersion": "1.1",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/mailboxes.{format}",<br>+ "requiresModules": [<br>+ "res_stasis_mailbox"<br>+ ],<br> "apis": [<br> {<br> "path": "/mailboxes",<br>diff --git a/rest-api/api-docs/playbacks.json b/rest-api/api-docs/playbacks.json<br>index 3dc4e1d..a78dcae 100644<br>--- a/rest-api/api-docs/playbacks.json<br>+++ b/rest-api/api-docs/playbacks.json<br>@@ -6,6 +6,9 @@<br> "swaggerVersion": "1.1",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/playbacks.{format}",<br>+ "requiresModules": [<br>+ "res_stasis_playback"<br>+ ],<br> "apis": [<br> {<br> "path": "/playbacks/{playbackId}",<br>diff --git a/rest-api/api-docs/recordings.json b/rest-api/api-docs/recordings.json<br>index d0b9630..6ffd6d8 100644<br>--- a/rest-api/api-docs/recordings.json<br>+++ b/rest-api/api-docs/recordings.json<br>@@ -6,6 +6,9 @@<br> "swaggerVersion": "1.1",<br> "basePath": "http://localhost:8088/ari",<br> "resourcePath": "/api-docs/recordings.{format}",<br>+ "requiresModules": [<br>+ "res_stasis_recording"<br>+ ],<br> "apis": [<br> {<br> "path": "/recordings/stored",<br>diff --git a/tests/test_utils.c b/tests/test_utils.c<br>index 68a2857..bcb2df3 100644<br>--- a/tests/test_utils.c<br>+++ b/tests/test_utils.c<br>@@ -646,4 +646,9 @@<br> return AST_MODULE_LOAD_SUCCESS;<br> }<br> <br>-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Utils test module");<br>+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Utils test module",<br>+ .support_level = AST_MODULE_SUPPORT_CORE,<br>+ .load = load_module,<br>+ .unload = unload_module,<br>+ .requires = "res_agi,res_crypto",<br>+);<br>diff --git a/tests/test_websocket_client.c b/tests/test_websocket_client.c<br>index 6743b53..e33f3f9 100644<br>--- a/tests/test_websocket_client.c<br>+++ b/tests/test_websocket_client.c<br>@@ -156,4 +156,9 @@<br> return 0;<br> }<br> <br>-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Websocket client test module");<br>+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Websocket client test module",<br>+ .support_level = AST_MODULE_SUPPORT_CORE,<br>+ .load = load_module,<br>+ .unload = unload_module,<br>+ .requires = "res_http_websocket",<br>+);<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8007">change 8007</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8007"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia0c70571f5566784f63605e78e1ceccb4f79c606 </div>
<div style="display:none"> Gerrit-Change-Number: 8007 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>