[svn-commits] rizzo: trunk r45518 - in /trunk: configs/manager.conf.sample main/manager.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Wed Oct 18 06:59:08 2006
New Revision: 45518

URL: http://svn.digium.com/view/asterisk?rev=45518&view=rev
Log:
remove unused fields and unimplemented options.


Modified:
    trunk/configs/manager.conf.sample
    trunk/main/manager.c

Modified: trunk/configs/manager.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/manager.conf.sample?rev=45518&r1=45517&r2=45518&view=diff
==============================================================================
--- trunk/configs/manager.conf.sample (original)
+++ trunk/configs/manager.conf.sample Wed Oct 18 06:59:08 2006
@@ -21,7 +21,6 @@
 ; default is 60 seconds.
 ;
 [general]
-displaysystemname = yes
 enabled = no
 ;webenabled = yes
 port = 5038

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?rev=45518&r1=45517&r2=45518&view=diff
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Oct 18 06:59:08 2006
@@ -156,8 +156,6 @@
 	int fd;
 	/*! Whether or not we're busy doing an action XXX currently useless */
 	int busy;
-	/*! Whether or not we're "dead" XXX currently unused */
-	int dead;
 	/*! Whether an HTTP manager is in use */
 	int inuse;
 	/*! Whether an HTTP session should be destroyed */
@@ -184,7 +182,6 @@
 	char inbuf[AST_MAX_MANHEADER_LEN];
 	int inlen;
 	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 */
 	struct eventqent *eventq;
 	/* Timeout for ast_carefulwrite() */
@@ -889,14 +886,6 @@
 		for (v = ast_variable_browse(cfg, cat); v; v = v->next) {
 			if (!strcasecmp(v->name, "secret")) {
 				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") ||
 				   !strcasecmp(v->name, "deny")) {
 				ha = ast_append_ha(v->name, v->value, ha);
@@ -2021,8 +2010,6 @@
 		ast_mutex_unlock(&s->__lock);
 		if (res < 0) {
 			if (errno == EINTR) {
-				if (s->dead)
-					return -1;
 				return 0;
 			}
 			ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno));