diff options
| author | Aleksandrs Saveljevs <git-no-reply@zabbix.com> | 2010-12-23 21:25:01 +0300 |
|---|---|---|
| committer | Aleksandrs Saveljevs <git-no-reply@zabbix.com> | 2010-12-23 21:25:01 +0300 |
| commit | 9abcf3372e9e9e112057c0b91e7b489e5078fdb1 (patch) | |
| tree | dc01dc867d765a6cd5050dca6c5949a867dc3fd8 /include/zbxicmpping.h | |
| parent | e661e03dc185faf4955a344c0ac67fd50b2e3c12 (diff) | |
- [ZBX-3256] added automatic detection of fping command line option to use for specifying source IP address
- [ZBX-3333] fixed icmppingloss[] returning bad values when NIC bonding is used
- [ZBX-1985,ZBX-2394] fixed icmppingloss[] returning bad values when fping is capable of pinging both address families
[merge from branches/1.8 -c16416]
Diffstat (limited to 'include/zbxicmpping.h')
| -rw-r--r-- | include/zbxicmpping.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/zbxicmpping.h b/include/zbxicmpping.h index 5b52c45529f..fa558f1da96 100644 --- a/include/zbxicmpping.h +++ b/include/zbxicmpping.h @@ -20,29 +20,29 @@ #include "common.h" #include "db.h" -#define ZBX_FPING_HOST struct zbx_fping_host -ZBX_FPING_HOST +typedef struct { char *addr; double min, avg, max; - int rcv; -}; - -int do_ping(ZBX_FPING_HOST *hosts, int hosts_count, int count, int interval, int size, int timeout, char *error, int max_error_len); + int rcv, cnt; +} +ZBX_FPING_HOST; typedef enum { ICMPPING = 0, ICMPPINGSEC, ICMPPINGLOSS -} icmpping_t; +} +icmpping_t; typedef enum { ICMPPINGSEC_MIN = 0, ICMPPINGSEC_AVG, ICMPPINGSEC_MAX -} icmppingsec_type_t; +} +icmppingsec_type_t; typedef struct { @@ -54,5 +54,7 @@ typedef struct char *addr; icmpping_t icmpping; icmppingsec_type_t type; -} icmpitem_t; +} +icmpitem_t; +int do_ping(ZBX_FPING_HOST *hosts, int hosts_count, int count, int interval, int size, int timeout, char *error, int max_error_len); |