X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.h;h=5f59ac951d27cc9ec30b74350bf8a32c460c8b94;hb=b03aed62997f838e8b75d12839398a999a8f9183;hp=6f283f16b136562f5cebb8f8cc57a3229833a9ae;hpb=87187cd6e3cde9404d051e14167edd0abbab5134;p=citadel.git

diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index 6f283f16b..5f59ac951 100644
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -1,7 +1,3 @@
-/* 
- * $Id$
- *
- */
 
 #include "server.h"
 
@@ -13,29 +9,24 @@ struct internet_address_list {
 };
 
 
-int fuzzy_match(struct usersupp *us, char *matchstring);
-void process_rfc822_addr(char *rfc822, char *user, char *node, char *name);
-char *rfc822_fetch_field(char *rfc822, char *fieldname);
-
-int IsDirectory(char *addr);
-void CtdlDirectoryInit(void);
-void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr);
-void CtdlDirectoryDelUser(char *internet_addr);
-int CtdlDirectoryLookup(char *target, char *internet_addr);
-
-int convert_internet_address(char *destuser, char *desthost, char *source);
-enum {
-	rfc822_address_locally_validated,
-	rfc822_no_such_user,
-	rfc822_address_on_citadel_network,
-	rfc822_address_nonlocal,
-	rfc822_room_delivery
-};
+int fuzzy_match(struct ctdluser *us, char *matchstring);
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name);
+char *rfc822_fetch_field(const char *rfc822, const char *fieldname);
+void sanitize_truncated_recipient(char *str);
+char *qp_encode_email_addrs(char *source);
+int alias (char *name);
 
 
+int IsDirectory(char *addr, int allow_masq_domains);
+void CtdlDirectoryInit(void);
+int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr);
+int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr);
+int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen);
 struct CtdlMessage *convert_internet_message(char *rfc822);
+struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822);
 
 int CtdlHostAlias(char *fqdn);
+char *harvest_collected_addresses(struct CtdlMessage *msg);
 
 /* 
  * Values that can be returned by CtdlHostAlias()
@@ -44,7 +35,17 @@ enum {
 	hostalias_nomatch,
 	hostalias_localhost,
 	hostalias_gatewaydomain,
-	hostalias_directory
+	hostalias_directory,
+	hostalias_masq
+};
+
+extern char *inetcfg;
+
+
+struct spamstrings_t {
+	struct spamstrings_t *next;
+	char *string;
 };
 
-extern DLEXP char *inetcfg;
+extern struct spamstrings_t *spamstrings;
+