Fixed setsockopt() in zabbix_agentd (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@3097 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 6 insertions, 7 deletions

diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index 4d73ac23..ec4b0ca9 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -206,11 +206,11 @@ static int parse_commandline(int argc, char **argv)
 	return task;
 }
 
-static ZBX_SOCKET connect_to_server(void)
+static ZBX_SOCKET tcp_listen(void)
 {
 	ZBX_SOCKET sock;
 	ZBX_SOCKADDR serv_addr;
-	char	on;
+	int	on;
 
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
 	{
@@ -222,7 +222,7 @@ static ZBX_SOCKET connect_to_server(void)
 	/* This is to immediately use the address even if it is in TIME_WAIT state */
 	/* http://www-128.ibm.com/developerworks/linux/library/l-sockpit/index.html */
 	on = 1;
-	if( -1 == setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on) ))
+	if( -1 == setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on) ))
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "Cannot setsockopt SO_REUSEADDR [%s]", strerror(errno));
 	}
@@ -275,7 +275,7 @@ int MAIN_ZABBIX_ENTRY(void)
 
 	zabbix_log(LOG_LEVEL_INFORMATION, "zabbix_agentd started. ZABBIX %s.", ZABBIX_VERSION);
 
-	sock = connect_to_server();
+	sock = tcp_listen();
 
 	init_collector_data();
 
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 66613ce3..eef7d8c1 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -432,15 +432,14 @@ int MAIN_ZABBIX_ENTRY(void)
 	
 	int		server_num = 0;
 
-/* Moved to daemon_init() */
-/*	if(CONFIG_LOG_FILE == NULL)
+	if(CONFIG_LOG_FILE == NULL)
 	{
 		zabbix_open_log(LOG_TYPE_SYSLOG,CONFIG_LOG_LEVEL,NULL);
 	}
 	else
 	{
 		zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE);
-	}*/
+	}
 
 	zabbix_log( LOG_LEVEL_WARNING, "Starting zabbix_server. ZABBIX %s.", ZABBIX_VERSION);