From 9abcf3372e9e9e112057c0b91e7b489e5078fdb1 Mon Sep 17 00:00:00 2001 From: Aleksandrs Saveljevs Date: Thu, 23 Dec 2010 18:25:01 +0000 Subject: - [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] --- include/zbxicmpping.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'include/zbxicmpping.h') 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); -- cgit v1.2.3