diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-14 09:02:15 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-14 09:02:15 +0000 |
| commit | 0a80c5c1d8605f34a3512f618328127a46d899db (patch) | |
| tree | dd189ef62cd4b38f8818a3b7aada094b6d68eead /src/zabbix_sender | |
| parent | 9d8cf662472860e667de2265f64d0d9203b5ac93 (diff) | |
| download | zabbix-0a80c5c1d8605f34a3512f618328127a46d899db.tar.gz zabbix-0a80c5c1d8605f34a3512f618328127a46d899db.tar.xz zabbix-0a80c5c1d8605f34a3512f618328127a46d899db.zip | |
fixed commilation
git-svn-id: svn://svn.zabbix.com/trunk@4004 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_sender')
| -rw-r--r-- | src/zabbix_sender/Makefile.am | 3 | ||||
| -rw-r--r-- | src/zabbix_sender/zabbix_sender.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/zabbix_sender/Makefile.am b/src/zabbix_sender/Makefile.am index acfb90bf..89e1b407 100644 --- a/src/zabbix_sender/Makefile.am +++ b/src/zabbix_sender/Makefile.am @@ -10,5 +10,4 @@ zabbix_sender_LDADD = \ ../libs/zbxsys/libzbxsys.a \ ../libs/zbxcrypto/libzbxcrypto.a \ ../libs/zbxconf/libzbxconf.a \ - ../libs/zbxcomms/libzbxcomms.a \ - ../libs/zbxnet/libzbxnet.a + ../libs/zbxcomms/libzbxcomms.a diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index 43a29db0..2b4f95a7 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -107,7 +107,7 @@ static int CONFIG_LOG_LEVEL = LOG_LEVEL_CRIT; static char* INPUT_FILE = NULL; static char* ZABBIX_SERVER = NULL; -int ZABBIX_SERVER_PORT = 0; +unsigned short ZABBIX_SERVER_PORT = 0; static char* ZABBIX_HOSTNAME = NULL; static char* ZABBIX_KEY = NULL; static char* ZABBIX_KEY_VALUE = NULL; @@ -286,7 +286,7 @@ static zbx_task_t parse_commandline(int argc, char **argv) ZABBIX_SERVER = strdup(zbx_optarg); break; case 'p': - ZABBIX_SERVER_PORT = atoi(zbx_optarg); + ZABBIX_SERVER_PORT = (unsigned short)atoi(zbx_optarg); break; case 's': ZABBIX_HOSTNAME = strdup(zbx_optarg); @@ -405,9 +405,9 @@ int main(int argc, char **argv) if( ZABBIX_SERVER_PORT ) sentdval_args.port = ZABBIX_SERVER_PORT; else - sentdval_args.port = atoi(str_port); + sentdval_args.port = (unsigned short)atoi(str_port); - if( MIN_ZABBIX_PORT > sentdval_args.port || sentdval_args.port > MAX_ZABBIX_PORT ) + if( MIN_ZABBIX_PORT > sentdval_args.port /* || sentdval_args.port > MAX_ZABBIX_PORT (MAX_ZABBIX_PORT == max unsigned short) */) { zabbix_log( LOG_LEVEL_WARNING, "[line %i] Incorrect port number [%i]. Allowed [%i:%i]", total_count, sentdval_args.port, MIN_ZABBIX_PORT, MAX_ZABBIX_PORT); @@ -440,7 +440,7 @@ int main(int argc, char **argv) if( !ZABBIX_SERVER_PORT ) ZABBIX_SERVER_PORT = 10051; - if( MIN_ZABBIX_PORT > ZABBIX_SERVER_PORT || ZABBIX_SERVER_PORT > MAX_ZABBIX_PORT ) + if( MIN_ZABBIX_PORT > ZABBIX_SERVER_PORT /* || ZABBIX_SERVER_PORT > MAX_ZABBIX_PORT (MAX_ZABBIX_PORT == max unsigned short) */) { zabbix_log( LOG_LEVEL_WARNING, "Incorrect port number [%i]. Allowed [%i:%i]", ZABBIX_SERVER_PORT, MIN_ZABBIX_PORT, MAX_ZABBIX_PORT); |