git-svn-id: svn://cherokee-project.com/cherokee/trunk@384 5dc97367-97…

…f1-0310-9951-d761b3857238
cherokee · Sep 1, 2006 · ee8023f · ee8023f
1 parent 1c17f18
commit ee8023f
Show file tree

Hide file tree

Showing 64 changed files with 267 additions and 673 deletions.
diff --git a/cherokee/Makefile.am b/cherokee/Makefile.am
@@ -714,8 +714,6 @@ regex.h \
 regex.c \
 resolv_cache.h \
 resolv_cache.c \
-typed_table.h \
-typed_table.c \
 post.h \
 post.c 
 

diff --git a/cherokee/access.c b/cherokee/access.c
@@ -64,10 +64,10 @@ typedef union {
 } ip_t;
 
 typedef struct {
-	list_t    node;
+	cherokee_list_t node;
 
-	ip_type_t type;
-	ip_t      ip;
+	ip_type_t       type;
+	ip_t            ip;
 } ip_item_t;
 
 typedef struct {
@@ -87,7 +87,7 @@ new_ip (void)
 	ip_item_t *n = (ip_item_t *) malloc (sizeof(ip_item_t));
 	if (n == NULL) return NULL;
 
-	INIT_LIST_HEAD((list_t*)n);
+	INIT_LIST_HEAD (LIST(n));
 	memset (&n->ip, 0, sizeof(ip_t));
 
 	return n;
@@ -109,7 +109,7 @@ new_subnet (void)
 	memset (&n->base.ip, 0, sizeof(ip_t));
 	memset (&n->mask, 0, sizeof(ip_t));
 
-	INIT_LIST_HEAD((list_t*)n);
+	INIT_LIST_HEAD (LIST(n));
 	return n;
 }
 
@@ -154,18 +154,18 @@ print_ip (ip_type_t type, ip_t *ip)
 ret_t 
 cherokee_access_free (cherokee_access_t *entry)
 {
-	list_t *i, *tmp;
+	cherokee_list_t *i, *tmp;
 
 	/* Free the IP list items
 	 */
-	list_for_each_safe (i, tmp, (list_t*)&entry->list_ips) {
+	list_for_each_safe (i, tmp, LIST(&entry->list_ips)) {
 		list_del (i);
 		free (i);
 	}
 
 	/* Free the Subnet list items
 	 */
-	list_for_each_safe (i, tmp, (list_t*)&entry->list_subnets) {
+	list_for_each_safe (i, tmp, LIST(&entry->list_subnets)) {
 		list_del (i);
 		free (i);
 	}
@@ -317,7 +317,7 @@ cherokee_access_add_ip (cherokee_access_t *entry, char *ip)
 		return ret;
 	}
 
-	list_add ((list_t *)n, &entry->list_ips);
+	list_add (LIST(n), &entry->list_ips);
 
 	return ret;
 }
@@ -362,7 +362,7 @@ cherokee_access_add_subnet (cherokee_access_t *entry, char *subnet)
 	n = new_subnet();
 	if (n == NULL) return ret_error;
 
-	list_add ((list_t *)n, &entry->list_subnets);
+	list_add (LIST(n), &entry->list_subnets);
 
 	/* Parse the IP
 	 */
@@ -447,17 +447,17 @@ cherokee_access_add (cherokee_access_t *entry, char *ip_or_subnet)
 ret_t 
 cherokee_access_print_debug (cherokee_access_t *entry)
 {
-	list_t *i;
+	cherokee_list_t *i;
 
 	printf ("IPs: ");
-	list_for_each (i, (list_t*)&entry->list_ips) {
+	list_for_each (i, LIST(&entry->list_ips)) {
 		print_ip (IP_NODE(i)->type, &IP_NODE(i)->ip);
 		printf(" ");
 	}
 	printf("\n");
 
 	printf ("Subnets: ");
-	list_for_each (i, (list_t*)&entry->list_subnets) {
+	list_for_each (i, LIST(&entry->list_subnets)) {
 		print_ip (IP_NODE(i)->type, &IP_NODE(i)->ip);
 		printf("/");
 		print_ip (IP_NODE(i)->type, &SUBNET_NODE(i)->mask);
@@ -472,12 +472,12 @@ cherokee_access_print_debug (cherokee_access_t *entry)
 ret_t 
 cherokee_access_ip_match (cherokee_access_t *entry, cherokee_socket_t *sock)
 {
-	int     re;
-	list_t *i;
+	int              re;
+	cherokee_list_t *i;
 
 	/* Check in the IP list
 	 */
-	list_for_each (i, (list_t*)&entry->list_ips) {
+	list_for_each (i, LIST(&entry->list_ips)) {
 
 #ifdef HAVE_IPV6
 		/* This is a special case:
@@ -529,7 +529,7 @@ cherokee_access_ip_match (cherokee_access_t *entry, cherokee_socket_t *sock)
 
 	/* Check in the Subnets list
 	 */
-	list_for_each (i, (list_t*)&entry->list_subnets) {
+	list_for_each (i, LIST(&entry->list_subnets)) {
 		int j;
 		ip_t masqued_remote, masqued_list;
 

diff --git a/cherokee/access.h b/cherokee/access.h
@@ -30,8 +30,8 @@
 #include "socket.h"
 
 typedef struct {
-	list_t list_ips;
-	list_t list_subnets;
+	cherokee_list_t list_ips;
+	cherokee_list_t list_subnets;
 } cherokee_access_t;
 
 ret_t cherokee_access_new  (cherokee_access_t **entry);

diff --git a/cherokee/admin_client.c b/cherokee/admin_client.c
@@ -376,7 +376,7 @@ ask_get_connections (cherokee_admin_client_t *admin, void *arg)
 }
 
 static ret_t
-parse_reply_get_connections (char *reply, list_t *conns_list)
+parse_reply_get_connections (char *reply, cherokee_list_t *conns_list)
 {
 	char              *begin;
 	char              *end;
@@ -438,15 +438,15 @@ parse_reply_get_connections (char *reply, list_t *conns_list)
 				SHOULDNT_HAPPEN;
 		}
 
-		list_add ((list_t *)conn_info, conns_list);
+		list_add (LIST(conn_info), conns_list);
 		cherokee_buffer_clean (&info_str);
 	}
 
 	return ret_ok;
 }
 
 ret_t 
-cherokee_admin_client_ask_connections (cherokee_admin_client_t *admin, list_t *conns_list)
+cherokee_admin_client_ask_connections (cherokee_admin_client_t *admin, cherokee_list_t *conns_list)
 {
 	ret_t ret;
 

diff --git a/cherokee/admin_client.h b/cherokee/admin_client.h
@@ -101,7 +101,7 @@ ret_t cherokee_admin_client_ask_port_tls    (cherokee_admin_client_t *admin, cui
 ret_t cherokee_admin_client_ask_rx          (cherokee_admin_client_t *admin, cherokee_buffer_t *rx);
 ret_t cherokee_admin_client_ask_tx          (cherokee_admin_client_t *admin, cherokee_buffer_t *tx);
 
-ret_t cherokee_admin_client_ask_connections (cherokee_admin_client_t *admin, list_t *conns);
+ret_t cherokee_admin_client_ask_connections (cherokee_admin_client_t *admin, cherokee_list_t *conns);
 ret_t cherokee_admin_client_del_connection  (cherokee_admin_client_t *admin, char *id);
 ret_t cherokee_admin_client_ask_thread_num  (cherokee_admin_client_t *admin, cherokee_buffer_t *num);
 ret_t cherokee_admin_client_set_backup_mode (cherokee_admin_client_t *admin, cherokee_boolean_t active);

diff --git a/cherokee/admin_server.c b/cherokee/admin_server.c
@@ -147,8 +147,8 @@ ret_t
 cherokee_admin_server_reply_get_connections (cherokee_handler_admin_t *ahdl, cherokee_buffer_t *question, cherokee_buffer_t *reply)
 {
 	ret_t               ret;
-	list_t             *i, *tmp;
-	list_t              connections = LIST_HEAD_INIT(connections);
+	cherokee_list_t    *i, *tmp;
+	cherokee_list_t     connections = LIST_HEAD_INIT(connections);
 	cherokee_server_t  *server      = HANDLER_SRV(ahdl);
 
 	/* Get the connection info list

diff --git a/cherokee/cherokee.h b/cherokee/cherokee.h
@@ -42,7 +42,6 @@
 #include <cherokee/url.h>
 #include <cherokee/header.h>
 #include <cherokee/resolv_cache.h>
-#include <cherokee/typed_table.h>
 
 /* Server library
  */

diff --git a/cherokee/cherokee_show.c b/cherokee/cherokee_show.c
@@ -41,16 +41,16 @@
 int 
 main (int argc, char *argv[]) 
 {
-	ret_t              ret;
-	cuint_t            fds_num;
+	ret_t                    ret;
+	cuint_t                  fds_num;
 	cherokee_fdpoll_t       *fdpoll;
 	cherokee_admin_client_t *client;
 	cherokee_buffer_t        url;
-	list_t                  *i, *tmp;
+	cherokee_list_t         *i, *tmp;
 
-	cuint_t                     port;
-	cherokee_buffer_t           buf;
-	list_t                      conns = LIST_HEAD_INIT(conns);
+	cuint_t                  port;
+	cherokee_buffer_t        buf;
+	cherokee_list_t          conns = LIST_HEAD_INIT(conns);
 
 	if (argc <= 1) {
 		PRINT_ERROR ("%s url request\n", argv[0]);

diff --git a/cherokee/config_entry.h b/cherokee/config_entry.h
@@ -30,7 +30,6 @@
 #include "table.h"
 #include "handler.h"
 #include "http.h"
-#include "typed_table.h"
 #include "validator.h"
 
 #define CHEROKEE_CONFIG_PRIORITY_NONE    0
@@ -73,10 +72,7 @@ ret_t cherokee_config_entry_free     (cherokee_config_entry_t  *entry);
 ret_t cherokee_config_entry_init     (cherokee_config_entry_t  *entry);
 ret_t cherokee_config_entry_mrproper (cherokee_config_entry_t  *entry);
 
-ret_t cherokee_config_entry_set_handler_prop   (cherokee_config_entry_t *entry, char *prop_name, cherokee_typed_table_types_t type, void *value, cherokee_table_free_item_t free_func);
-ret_t cherokee_config_entry_set_validator_prop (cherokee_config_entry_t *entry, char *prop_name, cherokee_typed_table_types_t type, void *value, cherokee_table_free_item_t free_func);
-ret_t cherokee_config_entry_set_handler        (cherokee_config_entry_t *entry, cherokee_module_info_t *modinfo); 
-
+ret_t cherokee_config_entry_set_handler (cherokee_config_entry_t *entry, cherokee_module_info_t *modinfo); 
 ret_t cherokee_config_entry_complete    (cherokee_config_entry_t *entry, cherokee_config_entry_t *parent, cherokee_boolean_t same_type);
 ret_t cherokee_config_entry_inherit     (cherokee_config_entry_t *entry);
 

diff --git a/cherokee/config_node.c b/cherokee/config_node.c
@@ -30,7 +30,6 @@
 
 #include "config_node.h"
 #include "util.h"
-#include "list_ext.h"
 
 #define ENTRIES "config"
 
@@ -62,7 +61,7 @@ cherokee_config_node_new (cherokee_config_node_t **conf)
 ret_t 
 cherokee_config_node_mrproper (cherokee_config_node_t *conf)
 {
-	list_t *i, *j;
+	cherokee_list_t *i, *j;
 
 	cherokee_buffer_mrproper (&conf->key);
 	cherokee_buffer_mrproper (&conf->val);
@@ -87,7 +86,7 @@ cherokee_config_node_free (cherokee_config_node_t *conf)
 static cherokee_config_node_t *
 search_child (cherokee_config_node_t *current, cherokee_buffer_t *child)
 {
-	list_t                        *i;
+	cherokee_list_t        *i;
 	cherokee_config_node_t *entry;
 
 	list_for_each (i, &current->child) {
@@ -112,7 +111,7 @@ add_new_child (cherokee_config_node_t *entry, cherokee_buffer_t *key)
 
 	cherokee_buffer_add_buffer (&n->key, key);	   
 
-	list_add_tail ((list_t *)n, &entry->child);
+	list_add_tail (LIST(n), &entry->child);
 	return n;
 }
 
@@ -292,8 +291,8 @@ cherokee_config_node_get_buf (cherokee_config_node_t *conf, cherokee_buffer_t *k
 ret_t 
 cherokee_config_node_while (cherokee_config_node_t *conf, cherokee_config_node_while_func_t func, void *data)
 {
-	ret_t   ret;
-	list_t *i;
+	ret_t            ret;
+	cherokee_list_t *i;
 
 	cherokee_config_node_foreach (i, conf) {
 		ret = func (CONFIG_NODE(i), data);
@@ -499,12 +498,12 @@ cherokee_config_node_read_list (cherokee_config_node_t           *conf,
 static ret_t
 convert_to_list_step (char *entry, void *data)
 {
-	return cherokee_list_add_tail_content ((list_t *)data, strdup(entry));
+	return cherokee_list_add_tail_content (LIST(data), strdup(entry));
 }
 
 
 ret_t
-cherokee_config_node_convert_list (cherokee_config_node_t *conf, const char *key, list_t *list)
+cherokee_config_node_convert_list (cherokee_config_node_t *conf, const char *key, cherokee_list_t *list)
 {
 	return cherokee_config_node_read_list (conf, key, convert_to_list_step, list);
 }
diff --git a/cherokee/config_node.h b/cherokee/config_node.h
@@ -36,8 +36,8 @@
 CHEROKEE_BEGIN_DECLS
 
 typedef struct {
-	   list_t             entry;
-	   list_t             child;
+	   cherokee_list_t    entry;
+	   cherokee_list_t    child;
 
 	   cherokee_buffer_t  key;
 	   cherokee_buffer_t  val;
@@ -76,7 +76,7 @@ ret_t cherokee_config_node_read_int   (cherokee_config_node_t *conf, const char
 ret_t cherokee_config_node_read_list  (cherokee_config_node_t *conf, const char *key, 
 				       cherokee_config_node_list_func_t func, void *param);
 
-ret_t cherokee_config_node_convert_list (cherokee_config_node_t *conf, const char *key, list_t *list);
+ret_t cherokee_config_node_convert_list (cherokee_config_node_t *conf, const char *key, cherokee_list_t *list);
 
 CHEROKEE_END_DECLS
 

diff --git a/cherokee/connection-protected.h b/cherokee/connection-protected.h
@@ -82,7 +82,7 @@ typedef enum {
 
 
 struct cherokee_connection {
-	list_t                        list_entry;
+	cherokee_list_t               list_entry;
 
 	/* References
 	 */

diff --git a/cherokee/connection_info.c b/cherokee/connection_info.c
@@ -221,9 +221,9 @@ cherokee_connection_info_fill_up (cherokee_connection_info_t *info, cherokee_con
 
 
 ret_t 
-cherokee_connection_info_list_thread (list_t *list, void *_thread, cherokee_handler_t *self_handler)
+cherokee_connection_info_list_thread (cherokee_list_t *list, void *_thread, cherokee_handler_t *self_handler)
 {
-	list_t             *i;
+	cherokee_list_t    *i;
 	cherokee_boolean_t  locked = false;
 	cherokee_thread_t  *thread = THREAD(_thread);
 
@@ -251,7 +251,7 @@ cherokee_connection_info_list_thread (list_t *list, void *_thread, cherokee_hand
 		CHEROKEE_NEW(n,connection_info);
 
 		cherokee_connection_info_fill_up (n, CONN(i));
-		list_add ((list_t *)n, list);
+		list_add (LIST(n), list);
 	}
 
 	if (list_empty(list))
@@ -267,9 +267,9 @@ cherokee_connection_info_list_thread (list_t *list, void *_thread, cherokee_hand
 
 
 ret_t 
-cherokee_connection_info_list_server (list_t *list, cherokee_server_t *server, cherokee_handler_t *self)
+cherokee_connection_info_list_server (cherokee_list_t *list, cherokee_server_t *server, cherokee_handler_t *self)
 {
-	list_t *i;
+	cherokee_list_t *i;
 
 	cherokee_connection_info_list_thread (list, server->main_thread, self);
 

diff --git a/cherokee/connection_info.h b/cherokee/connection_info.h
@@ -40,7 +40,7 @@
 CHEROKEE_BEGIN_DECLS
 
 typedef struct {
-	list_t               list_entry;
+	cherokee_list_t      list_entry;
 	cherokee_buffer_t    id;              /* ID */
 	cherokee_buffer_t    phase;           /* Current task */
 	cherokee_buffer_t    request;         /* Request string */
@@ -61,8 +61,8 @@ ret_t cherokee_connection_info_free     (cherokee_connection_info_t  *info);
 
 ret_t cherokee_connection_info_fill_up     (cherokee_connection_info_t *info, cherokee_connection_t *conn);
 
-ret_t cherokee_connection_info_list_thread (list_t *infos_list, void *thread, cherokee_handler_t *self);
-ret_t cherokee_connection_info_list_server (list_t *infos_list, cherokee_server_t *server, cherokee_handler_t *self);
+ret_t cherokee_connection_info_list_thread (cherokee_list_t *infos_list, void *thread, cherokee_handler_t *self);
+ret_t cherokee_connection_info_list_server (cherokee_list_t *infos_list, cherokee_server_t *server, cherokee_handler_t *self);
 
 CHEROKEE_END_DECLS