- (mibII/*.c host/*.c): Don't provide "dummy" values (unless explicitly configured)
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@2967 06827809-a52a-0410-b366-d66718629ded
diff --git a/agent/mibgroup/host/hr_device.c b/agent/mibgroup/host/hr_device.c
index 52c8e96..9dfc11c 100644
--- a/agent/mibgroup/host/hr_device.c
+++ b/agent/mibgroup/host/hr_device.c
@@ -234,7 +234,11 @@
if ( device_descr[ type ] != NULL )
strcpy(string, ((*device_descr[type])(dev_idx)) );
else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
sprintf(string, "a black box of some sort");
+#endif
*var_len = strlen(string);
return (u_char *) string;
case HRDEV_ID:
@@ -249,13 +253,21 @@
if ( device_status[ type ] != NULL )
long_return = ((*device_status[type])(dev_idx));
else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
long_return = 2; /* Assume running */
+#endif
return (u_char *)&long_return;
case HRDEV_ERRORS:
if ( device_errors[ type ] != NULL )
long_return = (*device_errors[type])(dev_idx);
else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
long_return = 0; /* Assume OK */
+#endif
return (u_char *)&long_return;
default:
DEBUGMSGTL(("snmpd", "unknown sub-id %d in var_hrdevice\n", vp->magic));
diff --git a/agent/mibgroup/host/hr_print.c b/agent/mibgroup/host/hr_print.c
index a2abb48..381659a 100644
--- a/agent/mibgroup/host/hr_print.c
+++ b/agent/mibgroup/host/hr_print.c
@@ -150,9 +150,15 @@
switch (vp->magic){
case HRPRINT_STATUS:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 3; /* idle */
return (u_char *)&long_return;
case HRPRINT_ERROR:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0; /* Null string */
return (u_char *)&long_return;
default:
diff --git a/agent/mibgroup/host/hr_proc.c b/agent/mibgroup/host/hr_proc.c
index 222db0a..068d095 100644
--- a/agent/mibgroup/host/hr_proc.c
+++ b/agent/mibgroup/host/hr_proc.c
@@ -158,6 +158,9 @@
*var_len = nullOidLen;
return (u_char *) nullOid;
case HRPROC_LOAD:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = avenrun[0] * 100; /* 1 minute average */
if ( long_return > 100 )
long_return=100;
diff --git a/agent/mibgroup/host/hr_storage.c b/agent/mibgroup/host/hr_storage.c
index ccdc72a..cc5a7cf 100644
--- a/agent/mibgroup/host/hr_storage.c
+++ b/agent/mibgroup/host/hr_storage.c
@@ -405,6 +405,9 @@
#endif
break;
default:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 1024; /* As likely as any! */
break;
}
@@ -442,6 +445,9 @@
#endif
#endif
default:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 1024;
break;
}
@@ -471,6 +477,9 @@
#endif
#endif
default:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 1024;
break;
}
@@ -481,6 +490,9 @@
else switch ( store_idx ) {
case HRS_TYPE_MEM:
case HRS_TYPE_SWAP:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
break;
#if !defined(linux) && !defined(solaris2)
@@ -489,6 +501,9 @@
break;
#endif
default:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
break;
}
diff --git a/agent/mibgroup/host/hr_swinst.c b/agent/mibgroup/host/hr_swinst.c
index 0fa438c..bb25823 100644
--- a/agent/mibgroup/host/hr_swinst.c
+++ b/agent/mibgroup/host/hr_swinst.c
@@ -323,7 +323,11 @@
else
long_return = 0; /* predates this agent */
} else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
long_return = 363136200;
+#endif
ret = (u_char *) &long_return;
break;
@@ -375,6 +379,9 @@
stat( string, &stat_buf );
ret = date_n_time(&stat_buf.st_mtime, var_len);
} else {
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
sprintf(string, "back in the mists of time");
*var_len = strlen(string);
ret = (u_char *) string;
diff --git a/agent/mibgroup/host/hr_swrun.c b/agent/mibgroup/host/hr_swrun.c
index 2e678bf..37602f0 100644
--- a/agent/mibgroup/host/hr_swrun.c
+++ b/agent/mibgroup/host/hr_swrun.c
@@ -344,7 +344,11 @@
switch (vp->magic){
case HRSWRUN_OSINDEX:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
long_return = 1; /* Probably! */
+#endif
return (u_char *)&long_return;
case HRSWRUN_INDEX:
@@ -377,6 +381,9 @@
strcpy( string, cp );
fclose(fp);
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
sprintf(string, "process name");
#endif
*var_len = strlen(string);
@@ -411,6 +418,9 @@
strcpy( string, buf );
fclose(fp);
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
sprintf(string, "/bin/wombat");
#endif
*var_len = strlen(string);
@@ -471,6 +481,9 @@
strcpy( string, cp );
fclose(fp);
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
sprintf(string, "-h -q -v");
#endif
*var_len = strlen(string);
@@ -638,6 +651,9 @@
long_return = atoi( cp ); /* rss */
fclose(fp);
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 16*1024; /* XXX - 16M! */
#endif
return (u_char *)&long_return;
diff --git a/agent/mibgroup/host/hr_system.c b/agent/mibgroup/host/hr_system.c
index 5be8a34..d6da33f 100644
--- a/agent/mibgroup/host/hr_system.c
+++ b/agent/mibgroup/host/hr_system.c
@@ -160,6 +160,9 @@
fgets( string, sizeof(string), fp);
fclose(fp);
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
sprintf(string, "ask Dave"); /* XXX */
#endif
*var_len = strlen(string);
@@ -171,6 +174,9 @@
#if USING_HOST_HR_SWRUN_MODULE
long_return = count_processes();
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *)&long_return;
@@ -182,6 +188,9 @@
auto_nlist(NPROC_SYMBOL, (char *)&nproc, sizeof (int));
long_return = nproc;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
#endif
diff --git a/agent/mibgroup/mibII/at.c b/agent/mibgroup/mibII/at.c
index c93ed9b..dd68c1d 100644
--- a/agent/mibgroup/mibII/at.c
+++ b/agent/mibgroup/mibII/at.c
@@ -249,6 +249,9 @@
#ifdef ARP_SCAN_FOUR_ARGUMENTS
long_return = lowIfIndex;
#else /* ARP_SCAN_FOUR_ARGUMENTS */
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 1; /* XXX */
#endif /* ARP_SCAN_FOUR_ARGUMENTS */
return (u_char *)&long_return;
diff --git a/agent/mibgroup/mibII/interfaces.c b/agent/mibgroup/mibII/interfaces.c
index fcd12c6..aac4591 100644
--- a/agent/mibgroup/mibII/interfaces.c
+++ b/agent/mibgroup/mibII/interfaces.c
@@ -597,6 +597,9 @@
#ifdef if_odrops
long_return = (u_long) if_msg.ifm_data.ifi_odrops;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -824,6 +827,9 @@
if(ifnet.if_type == IFT_ISDNPRIMARY) long_return=64000*30;
}
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) 10000000;
#endif
return (u_char *) &long_return;
@@ -861,6 +867,9 @@
+ (now.tv_usec - ifnet.if_lastchange.tv_usec) / 10000);
}
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0; /* XXX */
#endif
return (u_char *) &long_return;
@@ -868,6 +877,9 @@
#ifdef STRUCT_IFNET_HAS_IF_IBYTES
long_return = (u_long) ifnet.if_ibytes;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) ifnet.if_ipackets * 308; /* XXX */
#endif
return (u_char *) &long_return;
@@ -883,6 +895,9 @@
#if STRUCT_IFNET_HAS_IF_IMCASTS
long_return = (u_long) ifnet.if_imcasts;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) 0; /* XXX */
#endif
return (u_char *) &long_return;
@@ -890,6 +905,9 @@
#if STRUCT_IFNET_HAS_IF_IQDROPS
long_return = (u_long) ifnet.if_iqdrops;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) 0; /* XXX */
#endif
return (u_char *) &long_return;
@@ -900,6 +918,9 @@
#if STRUCT_IFNET_HAS_IF_NOPROTO
long_return = (u_long) ifnet.if_noproto;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) 0; /* XXX */
#endif
return (u_char *) &long_return;
@@ -907,6 +928,9 @@
#ifdef STRUCT_IFNET_HAS_IF_OBYTES
long_return = (u_long) ifnet.if_obytes;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) ifnet.if_opackets * 308; /* XXX */
#endif
return (u_char *) &long_return;
@@ -922,6 +946,9 @@
#if STRUCT_IFNET_HAS_IF_OMCASTS
long_return = (u_long) ifnet.if_omcasts;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = (u_long) 0; /* XXX */
#endif
return (u_char *) &long_return;
diff --git a/agent/mibgroup/mibII/ip.c b/agent/mibgroup/mibII/ip.c
index 41f4d8c..b6afc64 100644
--- a/agent/mibgroup/mibII/ip.c
+++ b/agent/mibgroup/mibII/ip.c
@@ -290,6 +290,9 @@
long_return = 2; /* HOST */
}
#else /* sparc */
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif /* sparc */
@@ -300,7 +303,11 @@
*/
if (!auto_nlist(TCP_TTL_SYMBOL, (char *) &long_return,
sizeof(long_return)))
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
long_return = 60; /* XXX */
+#endif
return (u_char *) &long_return;
case IPINRECEIVES:
long_return = ipstat.ips_total;
@@ -322,6 +329,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[7];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -329,6 +339,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[8];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -344,6 +357,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[10];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -351,6 +367,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[11];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -369,6 +388,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[15];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = ipstat.ips_fragments; /* XXX */
/*
* NB: This is the count of fragments received, rather than
@@ -385,6 +407,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[17];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -392,6 +417,9 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[18];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
@@ -399,10 +427,16 @@
#ifdef MIB_IPCOUNTER_SYMBOL
long_return = MIB_ipcounter[19];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
return (u_char *) &long_return;
case IPROUTEDISCARDS:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *) &long_return;
default:
@@ -478,7 +512,11 @@
*/
if (!auto_nlist(TCP_TTL_SYMBOL,(char *) &long_return,
sizeof(long_return)))
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#else
long_return = 60; /* XXX */
+#endif
return (u_char *) &long_return;
case IPINRECEIVES:
long_return = ipstat.ips_total;
@@ -529,6 +567,9 @@
- (ipstat.ips_fragdropped + ipstat.ips_fragtimeout);
return (u_char *) &long_return;
case IPFRAGFAILS:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *) &long_return;
case IPFRAGCREATES:
@@ -733,6 +774,9 @@
#endif
return(u_char *) &long_return;
case IPADREASMMAX:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return(u_char *) &long_return;
default:
@@ -1100,6 +1144,9 @@
return (u_char *) &long_return;
case IPINDISCARDS:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *) &long_return;
@@ -1148,6 +1195,9 @@
return (u_char *) &long_return;
case IPROUTEDISCARDS:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *) &long_return;
@@ -1360,6 +1410,9 @@
return (u_char *)&long_return;
case IPADREASMMAX:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
diff --git a/agent/mibgroup/mibII/system_mib.c b/agent/mibgroup/mibII/system_mib.c
index bfaa61e..0ad1c98 100644
--- a/agent/mibgroup/mibII/system_mib.c
+++ b/agent/mibgroup/mibII/system_mib.c
@@ -269,6 +269,9 @@
*write_method = writeSystem;
return (u_char *)sysLocation;
case SYSSERVICES:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 72;
return (u_char *)&long_return;
diff --git a/agent/mibgroup/mibII/tcp.c b/agent/mibgroup/mibII/tcp.c
index 867beb1..c6f6738 100644
--- a/agent/mibgroup/mibII/tcp.c
+++ b/agent/mibgroup/mibII/tcp.c
@@ -296,6 +296,9 @@
#endif
case TCPMAXCONN:
#ifndef linux
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *) &long_return;
#else
@@ -311,6 +314,9 @@
#ifdef hpux
long_return = MIB_tcpcounter[7];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = tcpstat.tcps_conndrops; /* XXX */
#endif
return (u_char *) &long_return;
@@ -318,6 +324,9 @@
#ifdef hpux
long_return = MIB_tcpcounter[8];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = tcpstat.tcps_drops; /* XXX */
#endif
return (u_char *) &long_return;
@@ -446,6 +455,9 @@
#endif
case TCPMAXCONN:
#ifndef linux
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *) &long_return;
#else
@@ -461,6 +473,9 @@
#ifdef hpux
long_return = MIB_tcpcounter[7];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = tcpstat.tcps_conndrops; /* XXX */
#endif
return (u_char *) &long_return;
@@ -468,6 +483,9 @@
#ifdef hpux
long_return = MIB_tcpcounter[8];
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = tcpstat.tcps_drops; /* XXX */
#endif
return (u_char *) &long_return;
diff --git a/agent/mibgroup/mibII/udp.c b/agent/mibgroup/mibII/udp.c
index 2ea4041..84ac730 100644
--- a/agent/mibgroup/mibII/udp.c
+++ b/agent/mibgroup/mibII/udp.c
@@ -258,6 +258,9 @@
#if defined(linux)
long_return = udpstat.UdpInDatagrams;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
#endif
@@ -269,6 +272,9 @@
#if defined(linux)
long_return = udpstat.UdpNoPorts;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
#endif
@@ -280,6 +286,9 @@
#if defined(linux)
long_return = udpstat.UdpOutDatagrams;
#else
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#endif
#endif
diff --git a/agent/mibgroup/mibII/var_route.c b/agent/mibgroup/mibII/var_route.c
index f443228..496ad5f 100644
--- a/agent/mibgroup/mibII/var_route.c
+++ b/agent/mibgroup/mibII/var_route.c
@@ -338,15 +338,27 @@
long_return = (rtp->rtm_flags & RTF_UP) ? 1 : 0;
return (u_char *)&long_return;
case IPROUTEMETRIC2:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTEMETRIC3:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTEMETRIC4:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTEMETRIC5:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTENEXTHOP:
@@ -363,6 +375,9 @@
? 2 : (rtp->rtm_flags & RTF_DYNAMIC) ? 4 : 1;
return (u_char *)&long_return;
case IPROUTEAGE:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *)&long_return;
case IPROUTEMASK:
@@ -610,15 +625,27 @@
long_return = (rthead[RtIndex]->rt_flags & RTF_GATEWAY) ? 1 : 0;
return (u_char *)&long_return;
case IPROUTEMETRIC2:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTEMETRIC3:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTEMETRIC4:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTEMETRIC5:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = -1;
return (u_char *)&long_return;
case IPROUTENEXTHOP:
@@ -639,12 +666,18 @@
long_return = (rthead[RtIndex]->rt_flags & RTF_DYNAMIC) ? 4 : 2;
return (u_char *)&long_return;
case IPROUTEAGE:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *)&long_return;
case IPROUTEMASK:
#if NEED_KLGETSA
/* XXX - Almost certainly not right
but I don't have a suitable system to test this on */
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
#else /* NEED_KLGETSA */
#ifndef linux
@@ -1572,6 +1605,9 @@
return (u_char *)&long_return;
case IPROUTEAGE:
+#ifdef NO_DUMMY_VALUES
+ return NULL;
+#endif
long_return = 0;
return (u_char *)&long_return;
