Rototill universe struct definition.

diff --git a/includes/tree.h b/includes/tree.h
index 5b3d14f2e0be8e4e60237d36f4688f44c0b5828a..c7bb5ae75994363fcc0607cf9b1c477a4f75a8e9 100644 (file)
--- a/includes/tree.h
+++ b/includes/tree.h
@@ -284,34 +284,37 @@ struct lease; /* forward */
 
 struct universe {
        const char *name;
-       struct option_cache *(*lookup_func) PROTO ((struct universe *,
-                                                   struct option_state *,
-                                                   unsigned));
-       void (*save_func) PROTO ((struct universe *, struct option_state *,
-                                 struct option_cache *));
-       int (*get_func) PROTO ((struct data_string *, struct universe *,
-                               struct packet *, struct lease *,
-                               struct option_state *, struct option_state *,
-                               struct option_state *, struct binding_scope **,
-                               unsigned));
-       void (*set_func) PROTO ((struct universe *, struct option_state *,
-                                struct option_cache *, enum statement_op));
-               
-       void (*delete_func) PROTO ((struct universe *universe,
-                                   struct option_state *, int));
-       int (*option_state_dereference) PROTO ((struct universe *,
-                                               struct option_state *,
-                                               const char *, int));
-       int (*encapsulate) PROTO ((struct data_string *, struct packet *,
+       struct option_cache *(*lookup_func) (struct universe *,
+                                            struct option_state *,
+                                            unsigned);
+       void (*save_func) (struct universe *, struct option_state *,
+                          struct option_cache *);
+       void (*foreach) (struct packet *, struct lease *,
+                        struct option_state *, struct option_state *,
+                        struct binding_scope **, struct universe *, void *,
+                        void (*) (struct option_cache *, struct packet *,
                                   struct lease *, struct option_state *,
                                   struct option_state *,
                                   struct binding_scope **,
-                                  struct universe *));
+                                  struct universe *, void *));
+       void (*delete_func) (struct universe *universe,
+                            struct option_state *, int);
+       int (*option_state_dereference) (struct universe *,
+                                        struct option_state *,
+                                        const char *, int);
+       int (*decode) (struct option_state *,
+                      unsigned char *, unsigned, struct universe *);
+       int (*encapsulate) (struct data_string *, struct packet *,
+                           struct lease *, struct option_state *,
+                           struct option_state *,
+                           struct binding_scope **,
+                           struct universe *);
        void (*store_tag) PROTO ((unsigned char *, u_int32_t));
        void (*store_length) PROTO ((unsigned char *, u_int32_t));
        int tag_size, length_size;
        struct hash_table *hash;
        struct option *options [256];
+       struct option *enc_opt;
        int index;
 };