X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=ucimap.h;h=921ab4ecf954ce62e0c33a43e2343825b12eec73;hp=adb7004e5337ff7ef00c27d964fc77f26d089df6;hb=ceaa2fbb3ce565b8d952179f2ac4cfe9190580ef;hpb=75888e2645fc300311972b7c4430b0b817f822b9

diff --git a/ucimap.h b/ucimap.h
index adb7004..921ab4e 100644
--- a/ucimap.h
+++ b/ucimap.h
@@ -33,15 +33,21 @@
 	(_name[(_bit) / 8] & (1 << ((_bit) % 8)))
 
 #define UCIMAP_OPTION(_type, _field) \
+	.type = UCIMAP_CUSTOM, \
 	.name = #_field, \
 	.offset = offsetof(_type, _field)
 
-struct uci_sectmap;
+
+#define UCIMAP_SECTION(_name, _field) \
+	.alloc_len = sizeof(_name), \
+	.smap_offset = offsetof(_name, _field)
+
+struct uci_sectionmap;
 struct uci_optmap;
 struct ucimap_list;
 
 struct uci_map {
-	struct uci_sectmap **sections;
+	struct uci_sectionmap **sections;
 	unsigned int n_sections;
 	struct list_head sdata;
 	struct list_head fixup;
@@ -60,37 +66,61 @@ enum ucimap_type {
 	UCIMAP_BOOL     = 0x1,
 	UCIMAP_INT      = 0x2,
 	UCIMAP_SECTION  = 0x3,
+	UCIMAP_CUSTOM	= 0x4,
 	UCIMAP_SUBTYPE  = 0xf, /* subtype mask */
 };
 
 union ucimap_data {
 	int i;
 	bool b;
-	const char *s;
+	char *s;
 	void *section;
 	struct ucimap_list *list;
 };
 
+struct ucimap_section_data {
+	struct list_head list;
+	struct uci_map *map;
+	struct uci_sectionmap *sm;
+	const char *section_name;
+
+	/* list of allocations done by ucimap */
+	struct uci_alloc *allocmap;
+	unsigned long allocmap_len;
+
+	/* map for changed fields */
+	unsigned char *cmap;
+	bool done;
+};
+
+
 struct uci_listmap {
 	struct list_head list;
 	union ucimap_data data;
 };
 
-struct uci_sectmap {
+struct uci_sectionmap {
 	/* type string for the uci section */
 	const char *type;
 
 	/* length of the struct to map into */
 	unsigned int alloc_len;
 
+	/* sectionmap offset */
+	unsigned int smap_offset;
+
+	/* allocate a new data structure and return a pointer to the section map data */
+	struct ucimap_section_data *(*alloc)(struct uci_map *map,
+		struct uci_sectionmap *sm, struct uci_section *s);
+
 	/* give the caller time to initialize the preallocated struct */
-	int (*init_section)(struct uci_map *map, void *section, struct uci_section *s);
+	int (*init)(struct uci_map *map, void *section, struct uci_section *s);
 
 	/* pass the fully processed struct to the callback after the section end */
-	int (*add_section)(struct uci_map *map, void *section);
+	int (*add)(struct uci_map *map, void *section);
 
 	/* let the callback clean up its own stuff in the section */
-	int (*free_section)(struct uci_map *map, void *section);
+	int (*free)(struct uci_map *map, void *section);
 
 	/* list of option mappings for this section */
 	struct uci_optmap *options;
@@ -102,6 +132,7 @@ struct uci_optmap {
 	unsigned int offset;
 	const char *name;
 	enum ucimap_type type;
+	int (*parse)(void *section, struct uci_optmap *om, union ucimap_data *data, const char *string);
 	union {
 		struct {
 			int base;
@@ -111,7 +142,7 @@ struct uci_optmap {
 		struct {
 			int maxlen;
 		} s;
-		struct uci_sectmap *sm;
+		struct uci_sectionmap *sm;
 	} data;
 };
 
@@ -122,7 +153,7 @@ struct ucimap_list {
 
 extern int ucimap_init(struct uci_map *map);
 extern void ucimap_cleanup(struct uci_map *map);
-extern void ucimap_set_changed(void *section, void *field);
+extern void ucimap_set_changed(struct ucimap_section_data *sd, void *field);
 extern int ucimap_store_section(struct uci_map *map, struct uci_package *p, void *section);
 extern void ucimap_parse(struct uci_map *map, struct uci_package *pkg);