kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix another incorrect case with meetme's PIN logic and add documentation

Browse Source 
This fixes an issue where a user of a dynamic conference was asked for a PIN
twice.  This also adds documentation to assist in future modifications to the
piece of code responsible for PIN checking.

(closes issue AST-670)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@344439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2011-11-10 21:14:11 +00:00
parent 47cff21b6d
commit b17a694234
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/app_meetme.c
View File

@@ -4342,14 +4342,27 @@ static int conf_exec(struct ast_channel *chan, const char *data)
res = -1;
}
} else {
/* Check to see if the conference requires pin
* validation and check for exemptions to that
* requirement. */
if ((!ast_strlen_zero(cnf->pin) ||
/* Conference requires a pin for specified access level */
int req_pin = !ast_strlen_zero(cnf->pin) ||
(!ast_strlen_zero(cnf->pinadmin) &&
ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
(ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT) ||
ast_strlen_zero(args.pin) || !cnf->isdynamic)) {
ast_test_flag64(&confflags, CONFFLAG_ADMIN));
/* The following logic was derived from a
* 4 variable truth table and defines which
* circumstances are not exempt from pin
* checking.
* If this needs to be modified, write the
* truth table back out from the boolean
* expression AB+A'D+C', change the erroneous
* result, and rederive the expression.
* Variables:
* A: pin provided?
* B: always prompt?
* C: dynamic?
* D: has users? */
int not_exempt = !cnf->isdynamic;
not_exempt = not_exempt || (!ast_strlen_zero(args.pin) && ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT));
not_exempt = not_exempt || (ast_strlen_zero(args.pin) && cnf->users);
if (req_pin && not_exempt) {
char pin[MAX_PIN] = "";
int j;