9 files changed, 828 insertions, 335 deletions

diff --git a/src/.gitignore b/src/.gitignore
index 61958b7..f40282a 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,2 +1,3 @@
 varnish_mib.c
 varnish_mib.h
+belex.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 48c786b..3a7f12a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,9 +20,12 @@ dlmod_LTLIBRARIES = varnish-mib.la
 varnish_mib_la_SOURCES = \
  auth.c\
  ban.c\
+ backend.h\
+ belex.l\
  betab.c\
  sha256.c\
  sha256.h\
+ statdict.c\
  varnish_mib.c\
  varnish_mib.h\
  vcli.c
diff --git a/src/backend.h b/src/backend.h
new file mode 100644
index 0000000..0c15e60
--- /dev/null
+++ b/src/backend.h
@@ -0,0 +1,16 @@
+typedef struct be_string {
+        char const *start;
+        size_t len;
+} be_string_t;
+
+typedef void (*regfun_t)(be_string_t *, be_string_t *, be_string_t *, void *);
+
+void read_defs(const char *str, size_t len, regfun_t regfun, void *d);
+void varnish_backend_table_timeout_parser(const char *token, char *line);
+struct VSC_point;
+void backend_register(char const *name, size_t len, char const *param,
+                      const struct VSC_point *vpt);
+void backend_clear(void);
+int backend_collect_addr(void);
+void backend_parser(const char *str, size_t len, regfun_t regfun, void *d);
+
diff --git a/src/ban.c b/src/ban.c
index 26dc5f4..0c354e9 100644
--- a/src/ban.c
+++ b/src/ban.c
@@ -38,7 +38,7 @@ send_ban_cmd(vcli_conn_t *conn, const char *expr)
 int
 varnish_ban(netsnmp_agent_request_info   *reqinfo,
             netsnmp_request_info         *requests,
-            struct VSM_data              *vd)
+            struct vsm                   *vsm)
 {
         int rc;
         struct vcli_conn conn;
@@ -52,7 +52,7 @@ varnish_ban(netsnmp_agent_request_info   *reqinfo,
         memcpy(expr, requests->requestvb->val.string, len);
         expr[len] = 0;
         DEBUGMSGTL(("varnish_ban", "setting ban %s\n", expr));
-        rc = vcli_connect(vd, &conn);
+        rc = vcli_connect(vsm, &conn);
         if (rc == SNMP_ERR_NOERROR) {
                 rc = send_ban_cmd(&conn, expr);
                 vcli_disconnect(&conn);
@@ -151,13 +151,14 @@ banTable_load(netsnmp_cache *cache, void *vmagic)
         int rc;
         struct vcli_conn conn;
         char *p;
-        struct VSM_data *vd;
+        
+        struct vsm *vsm = varnish_get_vsm_data();
+        if (!vsm)
+                return SNMP_ERR_GENERR;
         
         DEBUGMSGTL(("varnish_ban", "reloading ban table\n"));
-        vd = varnish_get_vsm_data();
-        if (!vd)
-                return SNMP_ERR_NOSUCHNAME;
-        rc = vcli_connect(vd, &conn);
+        rc = vcli_connect(vsm, &conn);
+
         if (rc != SNMP_ERR_NOERROR)
                 return rc;
         
diff --git a/src/belex.l b/src/belex.l
new file mode 100644
index 0000000..f35f114
--- /dev/null
+++ b/src/belex.l
@@ -0,0 +1,178 @@
+%option nounput
+%option noinput
+
+%{
+#include "backend.h"
+        
+enum {
+        T_BOGUS = 256,
+        T_IDENT,
+        T_NUMBER,
+        T_STRING,
+        T_BACKEND,
+        T_HOST,
+        T_PORT
+};
+
+static char const *input_string;
+static size_t input_len;
+static size_t input_pos;
+static char const *string_start;
+static size_t current_pos;
+
+#define YY_INPUT(buf,result,max_size) \
+        do {                                            \
+                size_t n = input_len - input_pos;       \
+                if (n > max_size)                       \
+                        n = max_size;                   \
+                memcpy(buf, input_string, n);           \
+                input_pos += n;                         \
+                result = n;                             \
+        } while (0)
+
+#define YY_USER_ACTION                          \
+        current_pos += yyleng;
+
+#define YY_DECL static int yylex(void)
+static int yywrap(void);
+
+static char const *
+input_point(void)
+{
+    return input_string + current_pos;
+}
+
+#define YYSTYPE be_string_t
+#define YYSTYPE_INITIALIZER { NULL, 0 }
+
+static YYSTYPE yylval;
+%}
+
+%x COMMENT STR
+
+%%
+         /* C-style comments */
+"/*"                    BEGIN(COMMENT);
+<COMMENT>[^*]*          /* eat anything that's not a '*' */
+<COMMENT>"*"+[^*/]*     /* eat up '*'s not followed by '/'s */
+<COMMENT>"*"+"/"        BEGIN(INITIAL);
+
+         /* Single-line comments */
+"//".*\n                ;
+#.*\n                   ;
+
+         /* Multi-line strings */
+"{\""                   { BEGIN(STR); string_start = input_point(); }
+<STR>[^\"]*             /* eat anything that's not a '"' */
+<STR>"\""+[^"}]*        /* eat up '"'s not followed by '}'s */
+<STR>"\""+"}"           { BEGIN(INITIAL);
+                          yylval.start = string_start;
+                          yylval.len = input_point() - yylval.start - 2;
+                          return T_STRING;
+                        }
+         /* Single-line strings */
+\".*\"                  {
+                            yylval.start = input_point() - yyleng + 1;
+                            yylval.len = yyleng - 2;
+                            return T_STRING;
+                        }
+backend                 return T_BACKEND;
+".host"                 return T_HOST;
+".port"                 return T_PORT;
+"{"|"}"|"="|";"         return yytext[0];
+
+[a-zA-Z_][a-zA-Z0-9_.]+ {
+                            yylval.start = input_point() - yyleng;
+                            yylval.len = yyleng;
+                            return T_IDENT;
+                        }
+[0-9]+                  return T_NUMBER;
+
+[ \t\n]+                ;
+
+.                       return T_BOGUS;
+
+%%
+int
+yywrap(void)
+{
+    return 1;
+}
+
+static void
+set_input(char const *str, size_t len)
+{
+    input_string = str;
+    input_len = len;
+    input_pos = 0;
+    current_pos = 0;
+}
+
+static int brace_nesting;
+
+static void
+read_backend(regfun_t regfun, void *d)
+{
+    int c;
+    int in_statement;
+    YYSTYPE label, host = YYSTYPE_INITIALIZER, port = YYSTYPE_INITIALIZER;
+
+    if ((c = yylex()) != T_IDENT && c != T_STRING)
+        return;
+    label = yylval;
+    if ((c = yylex()) != '{')
+        return;
+    brace_nesting++;
+    in_statement = 0;
+    while (brace_nesting == 1) {
+       c = yylex();
+       if (c == 0)
+           break;
+       else if (c == '{')
+           brace_nesting++;
+       else if (c == '}')
+           brace_nesting++;
+       else if (in_statement) {
+           if (c == ';')
+               in_statement = 0;
+       } else {
+           in_statement = 1;
+           if (c == T_HOST || c == T_PORT) {
+               YYSTYPE *stk = c == T_HOST ? &host : &port;
+               in_statement = 1;