Mercurial > masqmail

diff src/masqmail.h @ 354:08932c629849

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reworked the route concept; removed the idea of the localnet Renamed to reflect the actual meaning more clearly: s/online_routes/query_routes/g s/local_net_route/permanent_routes/g Removed local_nets, which are now represented by allowed_recipients in a permanent route. (See. examples/localnet.route) There is no more abiguity between `local' and `local net'. Run admin/config-transition on your config to learn how to update it.
author markus schnalke <meillo@marmaro.de>
date Sun, 04 Sep 2011 11:25:38 +0200
parents 332999b1303f
children f4ba4ed28848
line wrap: on
line diff
--- a/src/masqmail.h	Sun Sep 04 10:23:00 2011 +0200
+++ b/src/masqmail.h	Sun Sep 04 11:25:38 2011 +0200
@@ -81,7 +81,7 @@
 	gchar *name;
 	gchar *filename;
 
-	gboolean is_local_net;
+	gboolean is_perma;
 	gboolean last_route;
 
 	GList *allowed_senders;
@@ -138,7 +138,6 @@
 	GList *local_hosts;
 	GList *local_addresses;
 	GList *not_local_addresses;
-	GList *local_nets;
 	GList *listen_addresses;
 
 	/* ANSI C defines unsigned long to be at least 32bit
@@ -170,8 +169,8 @@
 	gchar *alias_file;
 	int (*localpartcmp) (const char *, const char *);
 
-	GList *local_net_routes;
-	GList *connect_routes;  /* list of pairs which point to lists */
+	GList *perma_routes;
+	GList *query_routes;  /* list of pairs which point to lists */
 
 	gchar *online_query;
 
@@ -261,7 +260,7 @@
 	GList *rcpt_list;
 
 	GList *hdr_list;
-	GList *xtra_hdr_list;
+	GList *xtra_hdr_list;  /* rewritten headers */
 } msg_out;
 
 typedef struct _msgout_perhost {
@@ -344,11 +343,10 @@
 /* conf.c */
 void init_conf();
 gboolean read_conf(gchar * filename);
-connect_route *read_route(gchar * filename, gboolean is_local_net);
-GList *read_route_list(GList * rf_list, gboolean is_local_net);
+connect_route *read_route(gchar * filename, gboolean is_perma);
+GList *read_route_list(GList * rf_list, gboolean is_perma);
 void destroy_route(connect_route * r);
 void destroy_route_list(GList * list);
-connect_route *create_local_route();
 
 /* expand.c */
 GList *var_table_rcpt(GList * var_table, address * rcpt);