* rework imap tokenizer, we no longer copy the stuff around, we keep a reference...

[citadel.git] / citadel / internet_addressing.h

diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index 2bca6173faa64c31172b7f83c9b1a94b37591f92..ca4c2da6e1e7afb3b080604fa5e81e14fdda65b4 100644 (file)
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -13,28 +13,20 @@ 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 fuzzy_match(struct ctdluser *us, char *matchstring);
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name);
+char *rfc822_fetch_field(char *rfc822, const char *fieldname);
 
+int IsDirectory(char *addr, int allow_masq_domains);
 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
-};
-
-
+void 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()
@@ -43,7 +35,17 @@ enum {
        hostalias_nomatch,
        hostalias_localhost,
        hostalias_gatewaydomain,
-       hostalias_directory
+       hostalias_directory,
+       hostalias_masq
 };
 
-extern DLEXP char *inetcfg;
+extern char *inetcfg;
+
+
+struct spamstrings_t {
+       struct spamstrings_t *next;
+       char *string;
+};
+
+extern struct spamstrings_t *spamstrings;
+