[Asterisk-code-review] voicemail: Move app voicemail / res mwi external conflict to... (asterisk[master])

[George Joseph]

Hello Richard Mudgett, Anonymous Coward #1000019, Joshua Colp,

I'd like you to reexamine a change.  Please visit

    https://gerrit.asterisk.org/1885

to look at the new patch set (#3).

Change subject: voicemail: Move app_voicemail / res_mwi_external conflict to runtime
......................................................................

voicemail: Move app_voicemail / res_mwi_external conflict to runtime

The menuselect conflict between app_voicemail and res_mwi_external
makes it hard to package 1 version of Asterisk.  There no actual
build dependencies between the 2 so moving this check to runtime
seems like a better solution.

The ast_vm_register and ast_vm_greeter_register functions in app.c
were modified to return AST_MODULE_LOAD_SKIP if there was already
a voicemail module registered instead of -1. The modules' load_module
functions were then modified to check for SKIP and return SKIP
instead of the -1 in response to the load.  Since the modules were
originally returning the -1 on load, it was being interpreted as
AST_MODULE_LOAD_FAILURE which was causing Asterisk to stop so this
needed to be cleaned up anyway.

Now you can build both and use modules.conf to decide which voicemail
implementation to load.

The default menuselect options still build app_voicemail and not
res_mwi_external but if both ARE built, res_mwi_external will load
first and become the voicemail provider unless module.conf rules
prevent it.  This is noted in CHANGES.

Change-Id: I7d98d4e8a3b87b8df9e51c2608f0da6ddfb89247
---
M CHANGES
M apps/app_voicemail.c
M include/asterisk/app.h
M main/app.c
M res/res_mwi_external.c
5 files changed, 68 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/1885/3
-- 
To view, visit https://gerrit.asterisk.org/1885
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7d98d4e8a3b87b8df9e51c2608f0da6ddfb89247
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>