comparison src/masqmail.h @ 317:55b7bde95d37

reworked allowed and denied addrs for routes The following refactorings had been made: - allowed_mail_locals + allowed_return_paths -> allowed_senders - not_allowed_mail_locals + not_allowed_return_paths -> denied_senders - allowed_rcpt_domains -> allowed_recipients - not_allowed_rcpt_domains -> denied_recipients The new options allow more consistent and more flexible matching.
author meillo@marmaro.de
date Thu, 28 Apr 2011 09:55:06 +0200
parents e230bcd0f1c6
children 4c705c34182f
comparison
equal deleted inserted replaced
316:d596ac8b5afb 317:55b7bde95d37
82 gchar *filename; 82 gchar *filename;
83 83
84 gboolean is_local_net; 84 gboolean is_local_net;
85 gboolean last_route; 85 gboolean last_route;
86 86
87 GList *allowed_return_paths; 87 GList *allowed_senders;
88 GList *not_allowed_return_paths; 88 GList *denied_senders;
89 GList *allowed_mail_locals; 89 GList *allowed_recipients;
90 GList *not_allowed_mail_locals; 90 GList *denied_recipients;
91 GList *allowed_rcpt_domains;
92 GList *not_allowed_rcpt_domains;
93 91
94 interface *mail_host; 92 interface *mail_host;
95 gchar *wrapper; 93 gchar *wrapper;
96 gboolean connect_error_fail; 94 gboolean connect_error_fail;
97 95
388 gboolean addr_isequal_parent(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*)); 386 gboolean addr_isequal_parent(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*));
389 address *addr_find_ancestor(address * addr); 387 address *addr_find_ancestor(address * addr);
390 gboolean addr_is_delivered_children(address * addr); 388 gboolean addr_is_delivered_children(address * addr);
391 gboolean addr_is_finished_children(address * addr); 389 gboolean addr_is_finished_children(address * addr);
392 gchar *addr_string(address * addr); 390 gchar *addr_string(address * addr);
393 gint addr_match(address * addr1, address * addr2);
394 391
395 /* accept.c */ 392 /* accept.c */
396 accept_error accept_message(FILE * in, message * msg, guint flags); 393 accept_error accept_message(FILE * in, message * msg, guint flags);
397 accept_error accept_message_prepare(message * msg, guint flags); 394 accept_error accept_message_prepare(message * msg, guint flags);
398 395
491 void rewrite_headers(msg_out * msgout, connect_route * route); 488 void rewrite_headers(msg_out * msgout, connect_route * route);
492 void split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others); 489 void split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others);
493 gboolean route_strip_msgout(connect_route * route, msg_out * msgout); 490 gboolean route_strip_msgout(connect_route * route, msg_out * msgout);
494 msg_out *route_prepare_msgout(connect_route * route, msg_out * msgout); 491 msg_out *route_prepare_msgout(connect_route * route, msg_out * msgout);
495 GList *route_msgout_list(connect_route * route, GList * msgout_list); 492 GList *route_msgout_list(connect_route * route, GList * msgout_list);
496 gboolean route_is_allowed_return_path(connect_route * route, address * ret_path); 493 gboolean route_sender_is_allowed(connect_route * route, address * ret_path);
497 gboolean route_is_allowed_mail_local(connect_route * route, address * ret_path); 494 void route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list);
498 void msg_rcptlist_route(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list);
499 495
500 /* tables.c */ 496 /* tables.c */
501 table_pair *create_pair(gchar * key, gpointer value); 497 table_pair *create_pair(gchar * key, gpointer value);
502 table_pair *create_pair_string(gchar * key, gpointer value); 498 table_pair *create_pair_string(gchar * key, gpointer value);
503 table_pair *parse_table_pair(gchar * line, char delim); 499 table_pair *parse_table_pair(gchar * line, char delim);