X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=ucimap.h;h=d56d8ef99113ca935866f52043e7cd8721f46851;hb=cd68df2c254e4341652f30aecee304b314fac8ff;hp=2aedc78c0f39b6637bb42d0a0a08d44de340708a;hpb=8ae8a7fc893e18676d6a35193f8a74c87ceb7b7f;p=project%2Fuci.git

diff --git a/ucimap.h b/ucimap.h
index 2aedc78..d56d8ef 100644
--- a/ucimap.h
+++ b/ucimap.h
@@ -11,6 +11,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#ifndef __UCIMAP_H
+#define __UCIMAP_H
+
 #include <stdbool.h>
 #include "uci_list.h"
 #include "uci.h"
@@ -37,12 +40,17 @@
 	.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;
@@ -63,28 +71,56 @@ enum ucimap_type {
 	UCIMAP_SECTION  = 0x3,
 	UCIMAP_CUSTOM	= 0x4,
 	UCIMAP_SUBTYPE  = 0xf, /* subtype mask */
+
+	/* automatically create lists from
+	 * options with space-separated items */
+	UCIMAP_LIST_AUTO = 0x0100,
+	UCIMAP_FLAGS     = 0xff00, /* flags mask */
 };
 
 union ucimap_data {
 	int i;
 	bool b;
 	char *s;
-	void *section;
+	void *ptr;
 	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 */
+	/* length of the struct to map into, filled in by macro */
 	unsigned int alloc_len;
 
+	/* sectionmap offset, filled in by macro */
+	unsigned int smap_offset;
+
+	/* return a pointer to the section map data (allocate if necessary) */
+	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)(struct uci_map *map, void *section, struct uci_section *s);
 
@@ -105,6 +141,7 @@ struct uci_optmap {
 	const char *name;
 	enum ucimap_type type;
 	int (*parse)(void *section, struct uci_optmap *om, union ucimap_data *data, const char *string);
+	int (*format)(void *section, struct uci_optmap *om, union ucimap_data *data, char **string);
 	union {
 		struct {
 			int base;
@@ -114,7 +151,7 @@ struct uci_optmap {
 		struct {
 			int maxlen;
 		} s;
-		struct uci_sectmap *sm;
+		struct uci_sectionmap *sm;
 	} data;
 };
 
@@ -125,7 +162,9 @@ 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 int ucimap_store_section(struct uci_map *map, struct uci_package *p, void *section);
+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, struct ucimap_section_data *sd);
 extern void ucimap_parse(struct uci_map *map, struct uci_package *pkg);
+extern int ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct ucimap_section_data *sd, struct uci_section *s);
 
+#endif