Mercurial > masqmail

comparison 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
comparison
equal deleted inserted replaced
353:48ff59cf0b34 354:08932c629849
79 79
80 typedef struct _connect_route { 80 typedef struct _connect_route {
81 gchar *name; 81 gchar *name;
82 gchar *filename; 82 gchar *filename;
83 83
84 gboolean is_local_net; 84 gboolean is_perma;
85 gboolean last_route; 85 gboolean last_route;
86 86
87 GList *allowed_senders; 87 GList *allowed_senders;
88 GList *denied_senders; 88 GList *denied_senders;
89 GList *allowed_recipients; 89 GList *allowed_recipients;
136 136
137 gchar *host_name; 137 gchar *host_name;
138 GList *local_hosts; 138 GList *local_hosts;
139 GList *local_addresses; 139 GList *local_addresses;
140 GList *not_local_addresses; 140 GList *not_local_addresses;
141 GList *local_nets;
142 GList *listen_addresses; 141 GList *listen_addresses;
143 142
144 /* ANSI C defines unsigned long to be at least 32bit 143 /* ANSI C defines unsigned long to be at least 32bit
145 i.e. ca. 4GB max; that should be enough. */ 144 i.e. ca. 4GB max; that should be enough. */
146 gulong max_msg_size; 145 gulong max_msg_size;
168 gboolean pipe_fromhack; 167 gboolean pipe_fromhack;
169 168
170 gchar *alias_file; 169 gchar *alias_file;
171 int (*localpartcmp) (const char *, const char *); 170 int (*localpartcmp) (const char *, const char *);
172 171
173 GList *local_net_routes; 172 GList *perma_routes;
174 GList *connect_routes; /* list of pairs which point to lists */ 173 GList *query_routes; /* list of pairs which point to lists */
175 174
176 gchar *online_query; 175 gchar *online_query;
177 176
178 gchar *errmsg_file; 177 gchar *errmsg_file;
179 gchar *warnmsg_file; 178 gchar *warnmsg_file;
259 258
260 address *return_path; 259 address *return_path;
261 GList *rcpt_list; 260 GList *rcpt_list;
262 261
263 GList *hdr_list; 262 GList *hdr_list;
264 GList *xtra_hdr_list; 263 GList *xtra_hdr_list; /* rewritten headers */
265 } msg_out; 264 } msg_out;
266 265
267 typedef struct _msgout_perhost { 266 typedef struct _msgout_perhost {
268 gchar *host; 267 gchar *host;
269 GList *msgout_list; 268 GList *msgout_list;
342 int child(const char *command); 341 int child(const char *command);
343 342
344 /* conf.c */ 343 /* conf.c */
345 void init_conf(); 344 void init_conf();
346 gboolean read_conf(gchar * filename); 345 gboolean read_conf(gchar * filename);
347 connect_route *read_route(gchar * filename, gboolean is_local_net); 346 connect_route *read_route(gchar * filename, gboolean is_perma);
348 GList *read_route_list(GList * rf_list, gboolean is_local_net); 347 GList *read_route_list(GList * rf_list, gboolean is_perma);
349 void destroy_route(connect_route * r); 348 void destroy_route(connect_route * r);
350 void destroy_route_list(GList * list); 349 void destroy_route_list(GList * list);
351 connect_route *create_local_route();
352 350
353 /* expand.c */ 351 /* expand.c */
354 GList *var_table_rcpt(GList * var_table, address * rcpt); 352 GList *var_table_rcpt(GList * var_table, address * rcpt);
355 GList *var_table_msg(GList * var_table, message * msg); 353 GList *var_table_msg(GList * var_table, message * msg);
356 GList *var_table_conf(GList * var_table); 354 GList *var_table_conf(GList * var_table);