masqmail
diff src/masqmail.h @ 354:08932c629849
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 diff
1.1 --- a/src/masqmail.h Sun Sep 04 10:23:00 2011 +0200 1.2 +++ b/src/masqmail.h Sun Sep 04 11:25:38 2011 +0200 1.3 @@ -81,7 +81,7 @@ 1.4 gchar *name; 1.5 gchar *filename; 1.6 1.7 - gboolean is_local_net; 1.8 + gboolean is_perma; 1.9 gboolean last_route; 1.10 1.11 GList *allowed_senders; 1.12 @@ -138,7 +138,6 @@ 1.13 GList *local_hosts; 1.14 GList *local_addresses; 1.15 GList *not_local_addresses; 1.16 - GList *local_nets; 1.17 GList *listen_addresses; 1.18 1.19 /* ANSI C defines unsigned long to be at least 32bit 1.20 @@ -170,8 +169,8 @@ 1.21 gchar *alias_file; 1.22 int (*localpartcmp) (const char *, const char *); 1.23 1.24 - GList *local_net_routes; 1.25 - GList *connect_routes; /* list of pairs which point to lists */ 1.26 + GList *perma_routes; 1.27 + GList *query_routes; /* list of pairs which point to lists */ 1.28 1.29 gchar *online_query; 1.30 1.31 @@ -261,7 +260,7 @@ 1.32 GList *rcpt_list; 1.33 1.34 GList *hdr_list; 1.35 - GList *xtra_hdr_list; 1.36 + GList *xtra_hdr_list; /* rewritten headers */ 1.37 } msg_out; 1.38 1.39 typedef struct _msgout_perhost { 1.40 @@ -344,11 +343,10 @@ 1.41 /* conf.c */ 1.42 void init_conf(); 1.43 gboolean read_conf(gchar * filename); 1.44 -connect_route *read_route(gchar * filename, gboolean is_local_net); 1.45 -GList *read_route_list(GList * rf_list, gboolean is_local_net); 1.46 +connect_route *read_route(gchar * filename, gboolean is_perma); 1.47 +GList *read_route_list(GList * rf_list, gboolean is_perma); 1.48 void destroy_route(connect_route * r); 1.49 void destroy_route_list(GList * list); 1.50 -connect_route *create_local_route(); 1.51 1.52 /* expand.c */ 1.53 GList *var_table_rcpt(GList * var_table, address * rcpt);