* Added a generic (void *) parameter to the ForEachUser() and ForEachRoom()

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index c1942956034645bba9cf75f19b94b22753bc9e78..365a1ec9f57dd6252272072f7cc10bb7a04534b9 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -29,9 +29,15 @@
 #include "tools.h"
 #include "internet_addressing.h"
 #include "user_ops.h"
+#include "room_ops.h"
 #include "parsedate.h"
 
 
+struct trynamebuf {
+       char buffer1[256];
+       char buffer2[256];
+};
+
 
 /*
  * Return 0 if a given string fuzzy-matches a Citadel user account
@@ -217,18 +223,20 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
  * Back end for convert_internet_address()
  * (Compares an internet name [buffer1] and stores in [buffer2] if found)
  */
-void try_name(struct usersupp *us) {
+void try_name(struct usersupp *us, void *data) {
+       struct trynamebuf *tnb;
+       tnb = (struct trynamebuf *)data;
        
-       if (!strncasecmp(CC->buffer1, "cit", 3))
-               if (atol(&CC->buffer1[3]) == us->usernum)
-                       strcpy(CC->buffer2, us->fullname);
+       if (!strncasecmp(tnb->buffer1, "cit", 3))
+               if (atol(&tnb->buffer1[3]) == us->usernum)
+                       strcpy(tnb->buffer2, us->fullname);
 
-       if (!collapsed_strcmp(CC->buffer1, us->fullname)) 
-                       strcpy(CC->buffer2, us->fullname);
+       if (!collapsed_strcmp(tnb->buffer1, us->fullname)) 
+                       strcpy(tnb->buffer2, us->fullname);
 
        if (us->uid != BBSUID)
-               if (!strcasecmp(CC->buffer1, getpwuid(us->uid)->pw_name))
-                       strcpy(CC->buffer2, us->fullname);
+               if (!strcasecmp(tnb->buffer1, getpwuid(us->uid)->pw_name))
+                       strcpy(tnb->buffer2, us->fullname);
 }
 
 
@@ -240,6 +248,9 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
        char user[256];
        char node[256];
        char name[256];
+       struct quickroom qrbuf;
+       int i;
+       struct trynamebuf tnb;
 
        /* Split it up */
        process_rfc822_addr(source, user, node, name);
@@ -252,27 +263,35 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
                strcpy(node, config.c_nodename);
        }
 
-       /* Return an error condition if the node is not known.
-        * FIX ... make this work for non-local systems
-        */
-       if (strcasecmp(node, config.c_nodename)) {
-               return(rfc822_address_invalid);
-       }
-       
        /* Now try to resolve the name
         * FIX ... do the multiple-addresses thing
         */
        if (!strcasecmp(node, config.c_nodename)) {
+               /* Try all local rooms */
+               if (!strncasecmp(user, "room_", 5)) {
+                       strcpy(name, &user[5]);
+                       for (i=0; i<strlen(name); ++i) 
+                               if (name[i]=='_') name[i]=' ';
+                       if (getroom(&qrbuf, name) == 0) {
+                               strcpy(destuser, qrbuf.QRname);
+                               strcpy(desthost, config.c_nodename);
+                               return rfc822_room_delivery;
+                       }
+               }
+
+               /* Try all local users */
                strcpy(destuser, user);
                strcpy(desthost, config.c_nodename);
-               strcpy(CC->buffer1, user);
-               strcpy(CC->buffer2, "");
-               ForEachUser(try_name);
-               if (strlen(CC->buffer2) == 0) return(rfc822_no_such_user);
-               strcpy(destuser, CC->buffer2);
+               strcpy(tnb.buffer1, user);
+               strcpy(tnb.buffer2, "");
+               ForEachUser(try_name, &tnb);
+               if (strlen(tnb.buffer2) == 0) return(rfc822_no_such_user);
+               strcpy(destuser, tnb.buffer2);
                return(rfc822_address_locally_validated);
        }
 
+       strcpy(destuser, user);
+       strcpy(desthost, node);
        return(rfc822_address_invalid); /* unknown error */
 }
 
@@ -322,9 +341,9 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
        }
 
        else if (!strcasecmp(key, "From")) {
-               user = mallok(strlen(value));
-               node = mallok(strlen(value));
-               name = mallok(strlen(value));
+               user = mallok(1024);
+               node = mallok(1024);
+               name = mallok(1024);
                process_rfc822_addr(value, user, node, name);
                lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
                if (msg->cm_fields['A'] == NULL)
@@ -371,7 +390,7 @@ 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;
 
        lprintf(9, "Unconverted RFC822 message length = %d\n", strlen(rfc822));
@@ -401,10 +420,13 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 
                /* At this point we have a field.  Are we interested in it? */
                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;