* Replaced citmail.c with a new one that simply SMTP-forwards to Citadel

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 043909343b9f130c7b994b987597b7ddff9ea538..1eda2ae400d92fa8a0641474e4e95093bf366d1d 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -29,6 +29,8 @@
 #include "tools.h"
 #include "internet_addressing.h"
 #include "user_ops.h"
+#include "parsedate.h"
+
 
 
 /*
@@ -230,7 +232,6 @@ void try_name(struct usersupp *us) {
 }
 
 
-
 /*
  * Convert an Internet email address to a Citadel user/host combination
  */
@@ -281,29 +282,75 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
 /*
  * convert_field() is a helper function for convert_internet_message().
  * Given start/end positions for an rfc822 field, it converts it to a Citadel
- * field if it wants to, and unfolds it if necessary
+ * field if it wants to, and unfolds it if necessary.
+ *
+ * Returns 1 if the field was converted and inserted into the Citadel message
+ * structure, implying that the source field should be removed from the
+ * message text.
  */
-void convert_field(struct CtdlMessage *msg, int beg, int end) {
+int convert_field(struct CtdlMessage *msg, int beg, int end) {
        char *rfc822;
-       char *fieldbuf;
-       char field[256];
+       char *key, *value;
        int i;
+       int colonpos = (-1);
+       int processed = 0;
+       char buf[256];
+       char *user, *node, *name;
 
        rfc822 = msg->cm_fields['M'];   /* M field contains rfc822 text */
-       strcpy(field, "");
-       for (i = beg; i <= end; ++i) {
-               if ((rfc822[i] == ':') && ((i-beg)<sizeof(field))) {
-                       if (strlen(field)==0) {
-                          safestrncpy(field, &rfc822[beg], i-beg+1);
-                       }
-               }
+       for (i = end; i >= beg; --i) {
+               if (rfc822[i] == ':') colonpos = i;
+       }
+
+       if (colonpos < 0) return(0);    /* no colon? not a valid header line */
+
+       key = mallok((end - beg) + 2);
+       safestrncpy(key, &rfc822[beg], (end-beg)+1);
+       key[colonpos - beg] = 0;
+       value = &key[(colonpos - beg) + 1];
+       unfold_rfc822_field(value);
+
+       lprintf(9, "Key=<%s> Value=<%s>\n", key, value);
+
+       /* Here's the big rfc822-to-citadel loop. */
+
+       if (!strcasecmp(key, "Date")) {
+               sprintf(buf, "%ld", parsedate(value) );
+               if (msg->cm_fields['T'] == NULL)
+                       msg->cm_fields['T'] = strdoop(buf);
+               processed = 1;
+       }
+
+       else if (!strcasecmp(key, "From")) {
+               user = mallok(strlen(value));
+               node = mallok(strlen(value));
+               name = mallok(strlen(value));
+               process_rfc822_addr(value, user, node, name);
+               lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
+               if (msg->cm_fields['A'] == NULL)
+                       msg->cm_fields['A'] = user;
+               else
+                       phree(user);
+               if (msg->cm_fields['N'] == NULL)
+                       msg->cm_fields['N'] = node;
+               else
+                       phree(node);
+               if (msg->cm_fields['H'] == NULL)
+                       msg->cm_fields['H'] = name;
+               else
+                       phree(name);
+               processed = 1;
+       }
+
+       else if (!strcasecmp(key, "Subject")) {
+               if (msg->cm_fields['U'] == NULL)
+                       msg->cm_fields['U'] = strdoop(value);
+               processed = 1;
        }
 
-       fieldbuf = mallok(end - beg + 2);
-       safestrncpy(fieldbuf, &rfc822[beg], end-beg+1);
-       unfold_rfc822_field(fieldbuf);
-       lprintf(9, "Field: key=<%s> value=<%s>\n", field, fieldbuf);
-       phree(fieldbuf);
+       /* Clean up and move on. */
+       phree(key);     /* Don't free 'value', it's actually the same buffer */
+       return(processed);
 }
 
 
@@ -314,9 +361,9 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 
        struct CtdlMessage *msg;
        int pos, beg, end;
-       int msglen;
        int done;
        char buf[256];
+       int converted;
 
        msg = mallok(sizeof(struct CtdlMessage));
        if (msg == NULL) return msg;
@@ -324,11 +371,10 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
        memset(msg, 0, sizeof(struct CtdlMessage));
        msg->cm_magic = CTDLMESSAGE_MAGIC;      /* self check */
        msg->cm_anon_type = 0;                  /* never anonymous */
-       msg->cm_format_type = 4;                /* always MIME */
+       msg->cm_format_type = FMT_RFC822;       /* internet message */
        msg->cm_fields['M'] = rfc822;
 
-       /* FIX   there's plenty to do here. */
-       msglen = strlen(rfc822);
+       lprintf(9, "Unconverted RFC822 message length = %d\n", strlen(rfc822));
        pos = 0;
        done = 0;
 
@@ -354,13 +400,19 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
                }
 
                /* At this point we have a field.  Are we interested in it? */
-               convert_field(msg, beg, end);
+               converted = convert_field(msg, beg, end);
+
+               /******
+               if (converted) {
+                       strcpy(&rfc822[beg], &rfc822[pos]);
+                       pos = beg;
+               }
+               ********/
 
                /* If we've hit the end of the message, bail out */
                if (pos > strlen(rfc822)) done = 1;
        }
 
-
        /* Follow-up sanity checks... */
 
        /* If there's no timestamp on this message, set it to now. */
@@ -369,5 +421,8 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
                msg->cm_fields['T'] = strdoop(buf);
        }
 
+       lprintf(9, "RFC822 length remaining after conversion = %d\n",
+               strlen(rfc822));
        return msg;
 }
+