diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-04-20 08:08:14 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-04-20 08:08:14 +0000 |
| commit | f92697290715e7df252b182ca54086d49195b832 (patch) | |
| tree | a88fecbd5e575fdcbb273ba54ade4e7ad6c69b11 /src/zabbix_agent | |
| parent | a6ec7d25390e40ce9a2ad2b07e1d406ebca1441a (diff) | |
| download | zabbix-f92697290715e7df252b182ca54086d49195b832.tar.gz zabbix-f92697290715e7df252b182ca54086d49195b832.tar.xz zabbix-f92697290715e7df252b182ca54086d49195b832.zip | |
- dropped support of experimental parameter NoTimeWait (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2748 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_agent')
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 5123c260..f5201667 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -72,7 +72,7 @@ char *CONFIG_FILE = NULL; char *CONFIG_PID_FILE = NULL; char *CONFIG_LOG_FILE = NULL; int CONFIG_AGENTD_FORKS = AGENTD_FORKS; -int CONFIG_NOTIMEWAIT = 0; +/*int CONFIG_NOTIMEWAIT = 0;*/ int CONFIG_DISABLE_ACTIVE = 0; int CONFIG_ENABLE_REMOTE_COMMANDS = 0; int CONFIG_TIMEOUT = AGENT_TIMEOUT; @@ -244,7 +244,7 @@ void init_config(void) {"DisableActive",&CONFIG_DISABLE_ACTIVE,0,TYPE_INT,PARM_OPT,0,1}, {"EnableRemoteCommands",&CONFIG_ENABLE_REMOTE_COMMANDS,0,TYPE_INT,PARM_OPT,0,1}, {"Timeout",&CONFIG_TIMEOUT,0,TYPE_INT,PARM_OPT,1,30}, - {"NoTimeWait",&CONFIG_NOTIMEWAIT,0,TYPE_INT,PARM_OPT,0,1}, +/* {"NoTimeWait",&CONFIG_NOTIMEWAIT,0,TYPE_INT,PARM_OPT,0,1},*/ {"ListenPort",&CONFIG_LISTEN_PORT,0,TYPE_INT,PARM_OPT,1024,32767}, {"ServerPort",&CONFIG_SERVER_PORT,0,TYPE_INT,PARM_OPT,1024,32767}, {"ListenIP",&CONFIG_LISTEN_IP,0,TYPE_STRING,PARM_OPT,0,0}, @@ -374,7 +374,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) int sockfd; struct sockaddr_in serv_addr; - struct linger ling; +/* struct linger ling;*/ if ( (sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { @@ -382,6 +382,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) exit(1); } + /* if(CONFIG_NOTIMEWAIT == 1) { ling.l_onoff=1; @@ -390,7 +391,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) { zabbix_log(LOG_LEVEL_WARNING, "Cannot setsockopt SO_LINGER [%s]", strerror(errno)); } - } + }*/ bzero((char *) &serv_addr, sizeof(serv_addr)); |