[svn-commits] oej: branch oej/tilghman-chanvar-backport r285157 - in /team/oej/tilghman-cha...

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Sep  6 07:04:00 2010
New Revision: 285157

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285157
Log:
Reset resolve

Modified:
    team/oej/tilghman-chanvar-backport/   (props changed)
    team/oej/tilghman-chanvar-backport/apps/app_chanspy.c
    team/oej/tilghman-chanvar-backport/main/manager.c

Propchange: team/oej/tilghman-chanvar-backport/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/tilghman-chanvar-backport/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep  6 07:04:00 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-284761
+/branches/1.4:1-285087

Modified: team/oej/tilghman-chanvar-backport/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/tilghman-chanvar-backport/apps/app_chanspy.c?view=diff&rev=285157&r1=285156&r2=285157
==============================================================================
--- team/oej/tilghman-chanvar-backport/apps/app_chanspy.c (original)
+++ team/oej/tilghman-chanvar-backport/apps/app_chanspy.c Mon Sep  6 07:04:00 2010
@@ -633,7 +633,7 @@
 			ast_channel_unlock(peer);
 
 			if (!ast_test_flag(flags, OPTION_QUIET)) {
-				if (ast_fileexists(peer_name, NULL, NULL) != -1) {
+				if (ast_fileexists(peer_name, NULL, NULL) > 0) {
 					res = ast_streamfile(chan, peer_name, chan->language);
 					if (!res)
 						res = ast_waitstream(chan, "");

Modified: team/oej/tilghman-chanvar-backport/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/tilghman-chanvar-backport/main/manager.c?view=diff&rev=285157&r1=285156&r2=285157
==============================================================================
--- team/oej/tilghman-chanvar-backport/main/manager.c (original)
+++ team/oej/tilghman-chanvar-backport/main/manager.c Mon Sep  6 07:04:00 2010
@@ -108,13 +108,22 @@
 
 static AST_RWLIST_HEAD_STATIC(channelvars, manager_channel_variable);
 
+static const int DEFAULT_ENABLED			= 0;	/*!< Default setting for manager to be enabled */
+static const int DEFAULT_WEBENABLED			= 0;	/*!< Default setting for the web interface to be enabled */
+static const int DEFAULT_BLOCKSOCKETS		= 0;	/*!< Default setting for block-sockets */
+static const int DEFAULT_DISPLAYCONNECTS	= 1;	/*!< Default setting for displaying manager connections */
+static const int DEFAULT_TIMESTAMPEVENTS	= 0;	/*!< Default setting for timestampevents */	
+static const int DEFAULT_HTTPTIMEOUT 		= 60;	/*!< Default manager http timeout */
+static const int DEFAULT_BROKENEVENTSACTION	= 0;	/*!< Default setting for brokeneventsaction */
+
+
 static int enabled;
 static int portno = DEFAULT_MANAGER_PORT;
 static int asock = -1;
-static int displayconnects = 1;
+static int displayconnects;
 static int timestampevents;
-static int httptimeout = 60;
-static int broken_events_action = 0;
+static int httptimeout;
+static int broken_events_action;
 
 static pthread_t t;
 static int block_sockets;
@@ -3111,8 +3120,8 @@
 	static struct sockaddr_in ba;
 	int x = 1;
 	int flags;
-	int webenabled = 0;
-	int newhttptimeout = 60;
+	int webenabled = DEFAULT_WEBENABLED;
+	int newhttptimeout = DEFAULT_HTTPTIMEOUT;
 	struct ast_manager_user *user = NULL;
 
 	if (!registered) {
@@ -3143,10 +3152,15 @@
 		/* Append placeholder event so master_eventq never runs dry */
 		append_event("Event: Placeholder\r\n\r\n", 0);
 	}
+
 	portno = DEFAULT_MANAGER_PORT;
-	displayconnects = 1;
+	displayconnects = DEFAULT_DISPLAYCONNECTS;
+	broken_events_action = DEFAULT_BROKENEVENTSACTION;
+	block_sockets = DEFAULT_BLOCKSOCKETS;
+	timestampevents = DEFAULT_TIMESTAMPEVENTS;
+	httptimeout = DEFAULT_HTTPTIMEOUT;
 	free_channelvars();
-	broken_events_action = 0;
+
 	cfg = ast_config_load("manager.conf");
 	if (!cfg) {
 		ast_log(LOG_NOTICE, "Unable to open management configuration manager.conf.  Call management disabled.\n");