diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-05-12 11:53:38 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-05-12 11:53:38 +0000 |
| commit | 8ffad73609ee2547a179e11d11f0258a7bc0f0b1 (patch) | |
| tree | 537c486fd2860d3f81a6160342277a40b810898f /src/zabbix_agent | |
| parent | 86d48d9a4012ed8c8864515c273d9d569f769eab (diff) | |
| download | zabbix-8ffad73609ee2547a179e11d11f0258a7bc0f0b1.tar.gz zabbix-8ffad73609ee2547a179e11d11f0258a7bc0f0b1.tar.xz zabbix-8ffad73609ee2547a179e11d11f0258a7bc0f0b1.zip | |
- zabbix_suckerd housekeeping process to disconnect from
DB when unactive (Alexei)
- support for check_service[http] (Alexei)
- drop column config.password_required (Alexei)
- drop column users.groupid (Alexei)
- drop table groups (Alexei)
- added parameter DBConnectOnEach for zabbix_trapperd (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@359 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_agent')
| -rw-r--r-- | src/zabbix_agent/sysinfo.c | 10 | ||||
| -rw-r--r-- | src/zabbix_agent/sysinfo.h | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/zabbix_agent/sysinfo.c b/src/zabbix_agent/sysinfo.c index dcff2e99..7a7f02d5 100644 --- a/src/zabbix_agent/sysinfo.c +++ b/src/zabbix_agent/sysinfo.c @@ -150,6 +150,7 @@ COMMAND commands[AGENT_MAX_USER_COMMANDS]= {"check_service[ssh]" ,CHECK_SERVICE_SSH, 0, 0}, {"check_service[smtp]" ,CHECK_SERVICE_SMTP, 0, 0}, {"check_service[ftp]" ,CHECK_SERVICE_FTP, 0, 0}, + {"check_service[http]" ,CHECK_SERVICE_HTTP, 0, 0}, {"check_service[pop]" ,CHECK_SERVICE_POP, 0, 0}, {"check_service[nntp]" ,CHECK_SERVICE_NNTP, 0, 0}, {"check_service[imap]" ,CHECK_SERVICE_IMAP, 0, 0}, @@ -203,12 +204,12 @@ void process(char *command,char *value) int i; char *n,*l,*r; float (*function)(); - char *(*function_str)(); + char *(*function_str)() = NULL; char *parameter = NULL; char key[MAX_STRING_LEN+1]; char param[1024]; char cmd[1024]; - char *res2; + char *res2 = NULL; int ret_str=0; for( p=command+strlen(command)-1; p>command && ( *p=='\r' || *p =='\n' || *p == ' ' ); --p ); @@ -1400,6 +1401,11 @@ float CHECK_SERVICE_FTP(void) return tcp_expect("127.0.0.1",21,"220",""); } +float CHECK_SERVICE_HTTP(void) +{ + return tcp_expect("127.0.0.1",80,NULL,""); +} + float CHECK_SERVICE_POP(void) { return tcp_expect("127.0.0.1",110,"+OK",""); diff --git a/src/zabbix_agent/sysinfo.h b/src/zabbix_agent/sysinfo.h index bbdd3a7a..dadb9658 100644 --- a/src/zabbix_agent/sysinfo.h +++ b/src/zabbix_agent/sysinfo.h @@ -41,6 +41,7 @@ char *VERSION(void); float CHECK_SERVICE_SSH(void); float CHECK_SERVICE_SMTP(void); float CHECK_SERVICE_FTP(void); +float CHECK_SERVICE_HTTP(void); float CHECK_SERVICE_POP(void); float CHECK_SERVICE_NNTP(void); float CHECK_SERVICE_IMAP(void); |