diff options
Diffstat (limited to 'src/betab.c')
-rw-r--r-- | src/betab.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/betab.c b/src/betab.c index 388083b..afec48a 100644 --- a/src/betab.c +++ b/src/betab.c | |||
@@ -136,7 +136,7 @@ backendTable_load(netsnmp_cache *cache, void *vmagic) | |||
136 | netsnmp_tdata *table_data = (netsnmp_tdata *) vmagic; | 136 | netsnmp_tdata *table_data = (netsnmp_tdata *) vmagic; |
137 | struct backend_dfn *dfn; | 137 | struct backend_dfn *dfn; |
138 | 138 | ||
139 | DEBUGMSGTL(("varnish_backend", "loading backend table\n")); | 139 | DEBUGMSGTL(("varnish_mib:backend", "loading backend table\n")); |
140 | 140 | ||
141 | VTAILQ_FOREACH(dfn, &backends, list) { | 141 | VTAILQ_FOREACH(dfn, &backends, list) { |
142 | int i; | 142 | int i; |
@@ -182,7 +182,7 @@ backendTable_free(netsnmp_cache *cache, void *vmagic) | |||
182 | netsnmp_tdata *table = (netsnmp_tdata *) vmagic; | 182 | netsnmp_tdata *table = (netsnmp_tdata *) vmagic; |
183 | netsnmp_tdata_row *row; | 183 | netsnmp_tdata_row *row; |
184 | 184 | ||
185 | DEBUGMSGTL(("varnish_backend", "freeing backend table\n")); | 185 | DEBUGMSGTL(("varnish_mib:backend", "freeing backend table\n")); |
186 | while ((row = netsnmp_tdata_row_first(table))) { | 186 | while ((row = netsnmp_tdata_row_first(table))) { |
187 | struct backendTable_entry *entry = row->data; | 187 | struct backendTable_entry *entry = row->data; |
188 | free(entry->vbeIdent); | 188 | free(entry->vbeIdent); |
@@ -190,14 +190,6 @@ backendTable_free(netsnmp_cache *cache, void *vmagic) | |||
190 | netsnmp_tdata_remove_and_delete_row(table, row); | 190 | netsnmp_tdata_remove_and_delete_row(table, row); |
191 | } | 191 | } |
192 | } | 192 | } |
193 | |||
194 | unsigned backendTable_timeout = 5; | ||
195 | |||
196 | void | ||
197 | varnish_backend_table_timeout_parser(const char *token, char *line) | ||
198 | { | ||
199 | varnish_mib_timeout_parser(token, line, &backendTable_timeout); | ||
200 | } | ||
201 | 193 | ||
202 | static struct backend_dfn * | 194 | static struct backend_dfn * |
203 | dfn_lookup(be_string_t *vclname, be_string_t *label) | 195 | dfn_lookup(be_string_t *vclname, be_string_t *label) |
@@ -334,19 +326,15 @@ backend_name_add(struct backend_name_list *namelist, | |||
334 | } | 326 | } |
335 | 327 | ||
336 | int | 328 | int |
337 | backend_collect_addr(void) | 329 | backend_collect_addr(struct vsm *vsm) |
338 | { | 330 | { |
339 | struct backend_dfn *dfn; | 331 | struct backend_dfn *dfn; |
340 | struct vcli_conn conn; | 332 | struct vcli_conn conn; |
341 | struct vsm *vsm; | ||
342 | int rc; | 333 | int rc; |
343 | struct backend_name_list namelist | 334 | struct backend_name_list namelist |
344 | = VTAILQ_HEAD_INITIALIZER(namelist); | 335 | = VTAILQ_HEAD_INITIALIZER(namelist); |
345 | 336 | ||
346 | vsm = varnish_get_vsm_data(); | 337 | DEBUGMSGTL(("varnish_mib:backend", "getting backend info\n")); |
347 | if (!vsm) | ||
348 | return SNMP_ERR_GENERR; | ||
349 | DEBUGMSGTL(("varnish_backend", "getting backend info\n")); | ||
350 | 338 | ||
351 | rc = vcli_connect(vsm, &conn); | 339 | rc = vcli_connect(vsm, &conn); |
352 | if (rc != SNMP_ERR_NOERROR) | 340 | if (rc != SNMP_ERR_NOERROR) |