diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-11-17 11:27:57 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-11-17 11:27:57 +0200 |
commit | 05fa31b7d7d1f23dde152341fc2f8149e66c40a5 (patch) | |
tree | c028a63659fe769dc74fa1891bc15112643f29f9 /src | |
parent | 7b7cb3c95e9fe5af0072d290e39cda9fa0f85b60 (diff) | |
download | varnish-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.am | 2 | ||||
-rw-r--r-- | src/varnish_mib.mib2c | 10 |
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 | |||
@@ -23,13 +23,13 @@ varnish_mib_la_SOURCES = \ | |||
23 | BUILT_SOURCES = \ | 23 | BUILT_SOURCES = \ |
24 | varnish_mib.c | 24 | varnish_mib.c |
25 | 25 | ||
26 | varnish_mib.c: varnish_mib.mib2c | 26 | varnish_mib.c: varnish_mib.mib2c |
27 | 27 | ||
28 | .mib2c.c: | 28 | .mib2c.c: |
29 | MIBDIRS=${abs_srcdir}:${NET_SNMP_MIBDIRS} MIBS="+VARNISH-MIB" \ | 29 | MIBDIRS=${top_srcdir}/src:${NET_SNMP_MIBDIRS} MIBS="+VARNISH-MIB" \ |
30 | mib2c -c $< -f $@ varnish | 30 | mib2c -c $< -f $@ varnish |
31 | 31 | ||
32 | #NET_SNMP_INCLUDES = `$(NET_SNMP_CONFIG) --cflags` | 32 | #NET_SNMP_INCLUDES = `$(NET_SNMP_CONFIG) --cflags` |
33 | NET_SNMP_INCLUDES = | 33 | NET_SNMP_INCLUDES = |
34 | NET_SNMP_LIBS = `$(NET_SNMP_CONFIG) --libs` | 34 | NET_SNMP_LIBS = `$(NET_SNMP_CONFIG) --libs` |
35 | NET_SNMP_EXLIBS = `$(NET_SNMP_CONFIG) --external-libs` | 35 | NET_SNMP_EXLIBS = `$(NET_SNMP_CONFIG) --external-libs` |
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 | |||
@@ -67,13 +67,13 @@ $vars{'varnish_translate'} = sub { | |||
67 | backendConnNotAttempted => 'backend_unhealthy', | 67 | backendConnNotAttempted => 'backend_unhealthy', |
68 | backendConnToMany => 'backend_busy ', | 68 | backendConnToMany => 'backend_busy ', |
69 | backendConnFailures => 'backend_fail', | 69 | backendConnFailures => 'backend_fail', |
70 | backendConnReuses => 'backend_reuse', | 70 | backendConnReuses => 'backend_reuse', |
71 | backendConnRecycled => 'backend_recycle', | 71 | backendConnRecycled => 'backend_recycle', |
72 | backendConnUnused => 'backend_toolate', | 72 | backendConnUnused => 'backend_toolate', |
73 | totalSessions => 's_sess ', | 73 | totalSessions => 's_sess', |
74 | totalRequests => 's_req ', | 74 | totalRequests => 's_req ', |
75 | totalPipe => 's_pipe', | 75 | totalPipe => 's_pipe', |
76 | totalPass => 's_pass', | 76 | totalPass => 's_pass', |
77 | totalFetch => 's_fetch', | 77 | totalFetch => 's_fetch', |
78 | totalHeaderBytes => 's_req_hdrbytes', | 78 | totalHeaderBytes => 's_req_hdrbytes', |
79 | totalBodyBytes => 's_req_bodybytes' | 79 | totalBodyBytes => 's_req_bodybytes' |
@@ -143,19 +143,13 @@ init_$modulename(void) | |||
143 | DEBUGMSGTL(("$name", "Initializing\n")); | 143 | DEBUGMSGTL(("$name", "Initializing\n")); |
144 | 144 | ||
145 | @foreach $i scalar@ | 145 | @foreach $i scalar@ |
146 | netsnmp_register_scalar( | 146 | netsnmp_register_scalar( |
147 | netsnmp_create_handler_registration("$i", handle_$i, | 147 | netsnmp_create_handler_registration("$i", handle_$i, |
148 | ${i}_oid, OID_LENGTH(${i}_oid), | 148 | ${i}_oid, OID_LENGTH(${i}_oid), |
149 | @if !$i.settable@ | 149 | HANDLER_CAN_RONLY)); |
150 | HANDLER_CAN_RONLY | ||
151 | @end@ | ||
152 | @if $i.settable@ | ||
153 | HANDLER_CAN_RWRITE | ||
154 | @end@ | ||
155 | )); | ||
156 | @end@ | 150 | @end@ |
157 | varnish_snmp_init(); | 151 | varnish_snmp_init(); |
158 | } | 152 | } |
159 | 153 | ||
160 | void | 154 | void |
161 | deinit_$modulename(void) | 155 | deinit_$modulename(void) |