aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2014-11-17 11:27:57 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2014-11-17 11:27:57 +0200
commit05fa31b7d7d1f23dde152341fc2f8149e66c40a5 (patch)
treec028a63659fe769dc74fa1891bc15112643f29f9 /src
parent7b7cb3c95e9fe5af0072d290e39cda9fa0f85b60 (diff)
downloadvarnish-mib-05fa31b7d7d1f23dde152341fc2f8149e66c40a5.tar.gz
varnish-mib-05fa31b7d7d1f23dde152341fc2f8149e66c40a5.tar.bz2
Minor changes
* src/Makefile.am (.mib2c.c): Fix MIBDIRS * src/varnish_mib.mib2c: Don't check for $i.settable - all OIDs are read-only.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/varnish_mib.mib2c10
2 files changed, 3 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b56c252..4efd22c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,25 +17,25 @@
dlmoddir=@DLMODDIR@
dlmod_LTLIBRARIES = varnish-mib.la
varnish_mib_la_SOURCES = \
varnish_mib.c
BUILT_SOURCES = \
varnish_mib.c
varnish_mib.c: varnish_mib.mib2c
.mib2c.c:
- MIBDIRS=${abs_srcdir}:${NET_SNMP_MIBDIRS} MIBS="+VARNISH-MIB" \
+ MIBDIRS=${top_srcdir}/src:${NET_SNMP_MIBDIRS} MIBS="+VARNISH-MIB" \
mib2c -c $< -f $@ varnish
#NET_SNMP_INCLUDES = `$(NET_SNMP_CONFIG) --cflags`
NET_SNMP_INCLUDES =
NET_SNMP_LIBS = `$(NET_SNMP_CONFIG) --libs`
NET_SNMP_EXLIBS = `$(NET_SNMP_CONFIG) --external-libs`
NET_SNMP_MIBDIRS = `net-snmp-config --mibdirs`
AM_LDFLAGS = \
-module \
-export-dynamic\
-avoid-version \
diff --git a/src/varnish_mib.mib2c b/src/varnish_mib.mib2c
index 798fc53..6df10ec 100644
--- a/src/varnish_mib.mib2c
+++ b/src/varnish_mib.mib2c
@@ -61,25 +61,25 @@ $vars{'varnish_translate'} = sub {
clientAcceptedConnections => 'sess_conn',
clientRequestsReceived => 'client_req',
clientCacheHits => 'cache_hit',
clientCacheHitsPass => 'cache_hitpass',
clientCacheMisses => 'cache_miss',
backendConnSuccess => 'backend_conn',
backendConnNotAttempted => 'backend_unhealthy',
backendConnToMany => 'backend_busy ',
backendConnFailures => 'backend_fail',
backendConnReuses => 'backend_reuse',
backendConnRecycled => 'backend_recycle',
backendConnUnused => 'backend_toolate',
- totalSessions => 's_sess ',
+ totalSessions => 's_sess',
totalRequests => 's_req ',
totalPipe => 's_pipe',
totalPass => 's_pass',
totalFetch => 's_fetch',
totalHeaderBytes => 's_req_hdrbytes',
totalBodyBytes => 's_req_bodybytes'
);
my $r = $trans{$name};
if (!defined($r)) {
print STDERR "no translation for $name!\n";
exit(1);
@@ -137,29 +137,23 @@ void
init_$modulename(void)
{
@foreach $i scalar@
const oid ${i}_oid[] = { $i.commaoid };
@end@
DEBUGMSGTL(("$name", "Initializing\n"));
@foreach $i scalar@
netsnmp_register_scalar(
netsnmp_create_handler_registration("$i", handle_$i,
${i}_oid, OID_LENGTH(${i}_oid),
- @if !$i.settable@
- HANDLER_CAN_RONLY
- @end@
- @if $i.settable@
- HANDLER_CAN_RWRITE
- @end@
- ));
+ HANDLER_CAN_RONLY));
@end@
varnish_snmp_init();
}
void
deinit_$modulename(void)
{
varnish_snmp_deinit();
}
@calldefine ROCOM@

Return to:

Send suggestions and report system problems to the System administrator.