Added option for limiting a user from logging in
as multiple agents at same time. bug 6046 thanks ppyy git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
a44bc3a0d7
commit
1dc0312d01
|
@ -157,6 +157,7 @@ static ast_group_t group;
|
||||||
static int autologoff;
|
static int autologoff;
|
||||||
static int wrapuptime;
|
static int wrapuptime;
|
||||||
static int ackcall;
|
static int ackcall;
|
||||||
|
static int multiplelogin = 1;
|
||||||
|
|
||||||
static int maxlogintries = 3;
|
static int maxlogintries = 3;
|
||||||
static char agentgoodbye[AST_MAX_FILENAME_LEN] = "vm-goodbye";
|
static char agentgoodbye[AST_MAX_FILENAME_LEN] = "vm-goodbye";
|
||||||
|
@ -1044,6 +1045,8 @@ static int read_agent_config(void)
|
||||||
/* Read in [general] section for persistance */
|
/* Read in [general] section for persistance */
|
||||||
if ((general_val = ast_variable_retrieve(cfg, "general", "persistentagents")))
|
if ((general_val = ast_variable_retrieve(cfg, "general", "persistentagents")))
|
||||||
persistent_agents = ast_true(general_val);
|
persistent_agents = ast_true(general_val);
|
||||||
|
if (ast_false(ast_variable_retrieve(cfg, "general", "multiplelogin") ) )
|
||||||
|
multiplelogin=0;
|
||||||
|
|
||||||
/* Read in the [agents] section */
|
/* Read in the [agents] section */
|
||||||
v = ast_variable_browse(cfg, "agents");
|
v = ast_variable_browse(cfg, "agents");
|
||||||
|
@ -1254,6 +1257,29 @@ static int check_beep(struct agent_pvt *newlyavailable, int needlock)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* return 1 if multiple login is fine, 0 if it is not and we find a match, -1 if multiplelogin is not allowed and we dont find a match. */
|
||||||
|
static int allow_multiple_login(char *chan,char *context)
|
||||||
|
{
|
||||||
|
struct agent_pvt *p;
|
||||||
|
char loginchan[80];
|
||||||
|
if(multiplelogin)
|
||||||
|
return 1;
|
||||||
|
if(!chan)
|
||||||
|
return 0;
|
||||||
|
if(!context)
|
||||||
|
context="default";
|
||||||
|
|
||||||
|
snprintf(loginchan, sizeof(loginchan), "%s@%s", chan, !ast_strlen_zero(context) ? context : "default");
|
||||||
|
|
||||||
|
p = agents;
|
||||||
|
while(p) {
|
||||||
|
if(!strcasecmp(chan, p->loginchan))
|
||||||
|
return 0;
|
||||||
|
p = p->next;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/*--- agent_request: Part of the Asterisk PBX interface ---*/
|
/*--- agent_request: Part of the Asterisk PBX interface ---*/
|
||||||
static struct ast_channel *agent_request(const char *type, int format, void *data, int *cause)
|
static struct ast_channel *agent_request(const char *type, int format, void *data, int *cause)
|
||||||
{
|
{
|
||||||
|
@ -1822,9 +1848,15 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
|
||||||
res = 0;
|
res = 0;
|
||||||
} else
|
} else
|
||||||
res = ast_app_getdata(chan, "agent-newlocation", tmpchan+pos, sizeof(tmpchan) - 2, 0);
|
res = ast_app_getdata(chan, "agent-newlocation", tmpchan+pos, sizeof(tmpchan) - 2, 0);
|
||||||
if (ast_strlen_zero(tmpchan) || ast_exists_extension(chan, !ast_strlen_zero(context) ? context : "default", tmpchan,
|
if (ast_strlen_zero(tmpchan) )
|
||||||
1, NULL))
|
|
||||||
break;
|
break;
|
||||||
|
if(ast_exists_extension(chan, !ast_strlen_zero(context) ? context : "default", tmpchan,1, NULL) ) {
|
||||||
|
if(!allow_multiple_login(tmpchan,context) ) {
|
||||||
|
args.extension = NULL;
|
||||||
|
pos = 0;
|
||||||
|
} else
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (args.extension) {
|
if (args.extension) {
|
||||||
ast_log(LOG_WARNING, "Extension '%s' is not valid for automatic login of agent '%s'\n", args.extension, p->agent);
|
ast_log(LOG_WARNING, "Extension '%s' is not valid for automatic login of agent '%s'\n", args.extension, p->agent);
|
||||||
args.extension = NULL;
|
args.extension = NULL;
|
||||||
|
|
|
@ -2680,8 +2680,9 @@ static int sip_indicate(struct ast_channel *ast, int condition)
|
||||||
switch(condition) {
|
switch(condition) {
|
||||||
case AST_CONTROL_RINGING:
|
case AST_CONTROL_RINGING:
|
||||||
if (ast->_state == AST_STATE_RING) {
|
if (ast->_state == AST_STATE_RING) {
|
||||||
if (!ast_test_flag(p, SIP_PROGRESS_SENT) ||
|
if ((!ast_test_flag(p, SIP_PROGRESS_SENT) ||
|
||||||
(ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) {
|
(ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) &&
|
||||||
|
ast_test_flag(p, SIP_PROG_INBAND) != SIP_PROG_INBAND_YES) {
|
||||||
/* Send 180 ringing if out-of-band seems reasonable */
|
/* Send 180 ringing if out-of-band seems reasonable */
|
||||||
transmit_response(p, "180 Ringing", &p->initreq);
|
transmit_response(p, "180 Ringing", &p->initreq);
|
||||||
ast_set_flag(p, SIP_RINGING);
|
ast_set_flag(p, SIP_RINGING);
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
;
|
;
|
||||||
persistentagents=yes
|
persistentagents=yes
|
||||||
|
|
||||||
|
;enable or disable a single extension from longing in as multiple
|
||||||
|
;agents, defaults to enabled
|
||||||
|
;multiplelogin=yes
|
||||||
|
|
||||||
[agents]
|
[agents]
|
||||||
;
|
;
|
||||||
; Define autologoff times if appropriate. This is how long
|
; Define autologoff times if appropriate. This is how long
|
||||||
|
|
Loading…
Reference in New Issue