kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow write timeout to be set on a per-user basis in AMI (issue #5352)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-10-04 22:25:15 +00:00
parent e67a6e0344
commit f7d567fe85
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configs/manager.conf.sample
View File

@@ -30,6 +30,12 @@ bindaddr = 0.0.0.0
;deny=0.0.0.0/0.0.0.0 ;deny=0.0.0.0/0.0.0.0
;permit=209.16.236.73/255.255.255.0 ;permit=209.16.236.73/255.255.255.0
; ;
; If the device connected via this user accepts input slowly,
; the timeout for writes to it can be increased to keep it
; from being disconnected (value is in milliseconds)
;
; writetimeout = 100
;
; Authorization for various classes ; Authorization for various classes
;read = system,call,log,verbose,command,agent,user ;read = system,call,log,verbose,command,agent,user
;write = system,call,log,verbose,command,agent,user ;write = system,call,log,verbose,command,agent,user

2
include/asterisk/manager.h
View File

@@ -100,6 +100,8 @@ struct mansession {
int send_events; int send_events;
/* Queued events that we've not had the ability to send yet */ /* Queued events that we've not had the ability to send yet */
struct eventqent *eventq; struct eventqent *eventq;
/* Timeout for ast_carefulwrite() */
int writetimeout;
struct mansession *next; struct mansession *next;
}; };

14
manager.c
View File

@@ -495,7 +495,14 @@ static int authenticate(struct mansession *s, struct message *m)
} else if (!strcasecmp(v->name, "permit") || } else if (!strcasecmp(v->name, "permit") ||
!strcasecmp(v->name, "deny")) { !strcasecmp(v->name, "deny")) {
ha = ast_append_ha(v->name, v->value, ha); ha = ast_append_ha(v->name, v->value, ha);
} } else if (!strcasecmp(v->name, "writetimeout")) {
int val = atoi(v->value);
if (val < 100)
ast_log(LOG_WARNING, "Invalid writetimeout value '%s' at line %d\n", v->value, v->lineno);
else
s->writetimeout = val;
}
v = v->next; v = v->next;
} }
@@ -1286,7 +1293,7 @@ static int process_message(struct mansession *s, struct message *m)
ast_mutex_lock(&s->__lock); ast_mutex_lock(&s->__lock);
s->busy = 0; s->busy = 0;
while(s->eventq) { while(s->eventq) {
if (ast_carefulwrite(s->fd, s->eventq->eventdata, strlen(s->eventq->eventdata), 100)) { if (ast_carefulwrite(s->fd, s->eventq->eventdata, strlen(s->eventq->eventdata), s->writetimeout)) {
ret = -1; ret = -1;
break; break;
} }
@@ -1427,6 +1434,7 @@ static void *accept_thread(void *ignore)
} }
memset(s, 0, sizeof(struct mansession)); memset(s, 0, sizeof(struct mansession));
memcpy(&s->sin, &sin, sizeof(sin)); memcpy(&s->sin, &sin, sizeof(sin));
s->writetimeout = 100;
if(! block_sockets) { if(! block_sockets) {
/* For safety, make sure socket is non-blocking */ /* For safety, make sure socket is non-blocking */
@@ -1499,7 +1507,7 @@ int manager_event(int category, char *event, char *fmt, ...)
ast_mutex_lock(&s->__lock); ast_mutex_lock(&s->__lock);
if (s->busy) { if (s->busy) {
append_event(s, tmp); append_event(s, tmp);
} else if (ast_carefulwrite(s->fd, tmp, tmp_next - tmp, 100) < 0) { } else if (ast_carefulwrite(s->fd, tmp, tmp_next - tmp, s->writetimeout) < 0) {
ast_log(LOG_WARNING, "Disconnecting slow (or gone) manager session!\n"); ast_log(LOG_WARNING, "Disconnecting slow (or gone) manager session!\n");
s->dead = 1; s->dead = 1;
pthread_kill(s->t, SIGURG); pthread_kill(s->t, SIGURG);