kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused fields and unimplemented options.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-10-18 11:59:08 +00:00
parent 998732456f
commit d171c3d864
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/manager.conf.sample
View File

@@ -21,7 +21,6 @@
; default is 60 seconds. ; default is 60 seconds.
; ;
[general] [general]
displaysystemname = yes
enabled = no enabled = no
;webenabled = yes ;webenabled = yes
port = 5038 port = 5038

13
main/manager.c
View File

@@ -156,8 +156,6 @@ struct mansession {
int fd; int fd;
/*! Whether or not we're busy doing an action XXX currently useless */ /*! Whether or not we're busy doing an action XXX currently useless */
int busy; int busy;
/*! Whether or not we're "dead" XXX currently unused */
int dead;
/*! Whether an HTTP manager is in use */ /*! Whether an HTTP manager is in use */
int inuse; int inuse;
/*! Whether an HTTP session should be destroyed */ /*! Whether an HTTP session should be destroyed */
@@ -184,7 +182,6 @@ struct mansession {
char inbuf[AST_MAX_MANHEADER_LEN]; char inbuf[AST_MAX_MANHEADER_LEN];
int inlen; int inlen;
int send_events; int send_events;
int displaysystemname; /*!< Add system name to manager responses and 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() */ /* Timeout for ast_carefulwrite() */
@@ -889,14 +886,6 @@ static int authenticate(struct mansession *s, struct message *m)
for (v = ast_variable_browse(cfg, cat); v; v = v->next) { for (v = ast_variable_browse(cfg, cat); v; v = v->next) {
if (!strcasecmp(v->name, "secret")) { if (!strcasecmp(v->name, "secret")) {
password = v->value; password = v->value;
} else if (!strcasecmp(v->name, "displaysystemname")) {
if (ast_true(v->value)) {
if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
s->displaysystemname = 1;
} else {
ast_log(LOG_ERROR, "Can't enable displaysystemname in manager.conf - no system name configured in asterisk.conf\n");
}
}
} 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);
@@ -2021,8 +2010,6 @@ static int get_input(struct mansession *s, char *output)
ast_mutex_unlock(&s->__lock); ast_mutex_unlock(&s->__lock);
if (res < 0) { if (res < 0) {
if (errno == EINTR) { if (errno == EINTR) {
if (s->dead)
return -1;
return 0; return 0;
} }
ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno));