2006-01-24 23:16:55 +01:00
|
|
|
$NetBSD: patch-al,v 1.4 2006/01/24 22:16:55 adam Exp $
|
2005-10-18 06:48:51 +02:00
|
|
|
|
2006-01-24 23:16:55 +01:00
|
|
|
--- agent/mibgroup/host/hr_network.c.orig 2005-10-28 20:49:36.000000000 +0200
|
2005-10-18 06:48:51 +02:00
|
|
|
+++ agent/mibgroup/host/hr_network.c
|
2006-01-24 23:16:55 +01:00
|
|
|
@@ -193,6 +193,10 @@ static netsnmp_interface_entry *HRN_ifne
|
2005-07-31 04:30:18 +02:00
|
|
|
static char HRN_name[MAX_PHYSADDR_LEN];
|
|
|
|
static nmapi_phystat HRN_ifnet;
|
|
|
|
#define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c)
|
|
|
|
+#elif defined darwin
|
|
|
|
+static char HRN_name[IFNAMSIZ];
|
|
|
|
+static struct if_msghdr HRN_ifnet;
|
|
|
|
+#define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c, d)
|
|
|
|
#else /* hpux11 */
|
|
|
|
static char HRN_name[16];
|
2006-01-24 23:16:55 +01:00
|
|
|
#ifndef WIN32
|
|
|
|
@@ -222,7 +226,7 @@ int
|
2005-07-31 04:30:18 +02:00
|
|
|
Get_Next_HR_Network(void)
|
|
|
|
{
|
2006-01-24 23:16:55 +01:00
|
|
|
short HRN_index;
|
|
|
|
-#if !defined( solaris2) && ! defined( WIN32 )
|
|
|
|
+#if !defined(solaris2) && !defined(darwin) && !defined(WIN32)
|
|
|
|
if (M_Interface_Scan_Next(&HRN_index, HRN_name, &HRN_ifnet, NULL) == 0)
|
|
|
|
HRN_index = -1;
|
|
|
|
#else
|
|
|
|
@@ -245,7 +249,11 @@ Save_HR_Network_Info(void)
|
2005-07-31 04:30:18 +02:00
|
|
|
HRN_savedFlags = HRN_ifnet.if_entry.ifOper;
|
|
|
|
HRN_savedErrors = HRN_ifnet.if_entry.ifInErrors +
|
|
|
|
HRN_ifnet.if_entry.ifOutErrors;
|
|
|
|
-#else /* hpux11 */
|
|
|
|
+#elif defined(__APPLE__)
|
|
|
|
+ HRN_savedFlags = HRN_ifnet.ifm_flags;
|
|
|
|
+ HRN_savedFlags = HRN_ifnet.ifm_data.ifi_ierrors +
|
|
|
|
+ HRN_ifnet.ifm_data.ifi_oerrors;
|
|
|
|
+#else
|
2006-01-24 23:16:55 +01:00
|
|
|
#ifndef WIN32
|
2005-07-31 04:30:18 +02:00
|
|
|
HRN_savedFlags = HRN_ifnet.if_flags;
|
|
|
|
HRN_savedErrors = HRN_ifnet.if_ierrors + HRN_ifnet.if_oerrors;
|