extern struct config config;
+/*
+ * This function is self explanatory.
+ * (What can I say, I'm in a weird mood today...)
+ */
+void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
+ int i;
+
+ for (i=0; i<strlen(name); ++i) if (name[i]=='@') {
+ if (i>0) if (isspace(name[i-1])) {
+ strcpy(&name[i-1], &name[i]);
+ i = 0;
+ }
+ while (isspace(name[i+1])) {
+ strcpy(&name[i+1], &name[i+2]);
+ }
+ }
+ }
+
+
/*
* Aliasing for network mail.
* (Error messages have been commented out, because this is a server.)
char aaa[300],bbb[300];
lprintf(9, "alias() called for <%s>\n", name);
+
+ remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
fp=fopen("network/mail.aliases","r");
if (fp==NULL) fp=fopen("/dev/null","r");
char buf[1024];
long msg_len;
int msg_ok = 0;
- char boundary[256]; /* attachment boundary */
- char current_section = 0; /* section currently being parsed */
- int has_attachments = 0;
struct cdbdata *dmsgtext;
char *mptr;
char lnode[256];
char mid[256];
time_t xtime = 0L;
- /* */
+ /* */
- strcpy(boundary, "");
msg_num = atol(msgid);
/* now for the user-mode message reading loops */
cprintf("%d Message %ld:\n",LISTING_FOLLOWS,msg_num);
- if (mode == MT_CITADEL) cprintf("type=%d\n",format_type);
+ if (mode == MT_CITADEL) cprintf("type=%d\n", format_type);
if ( (anon_flag == MES_ANON) && (mode == MT_CITADEL) ) {
cprintf("nhdr=yes\n");
cprintf(" [%s]",buf);
cprintf("\n");
}
- else if (ch=='Z') {
- has_attachments = 1;
- sprintf(boundary, "--%s", buf);
- }
else if (ch=='P') cprintf("path=%s\n",buf);
else if (ch=='U') cprintf("subj=%s\n",buf);
else if (ch=='I') cprintf("msgn=%s\n",buf);
/* If the format type on disk is 1 (fixed-format), then we want
* everything to be output completely literally ... regardless of
- * what message transfer format is in use.
+ * what message transfer format is in use. Format type 4 is
+ * temporarily being output this way as well.
*/
- if (format_type == 1) {
+ if ( (format_type == 1) || (format_type == 4)) {
strcpy(buf, "");
while(ch = *mptr++, ch>0) {
if (ch == 13) ch = 10;
if ( (ch == 10) || (strlen(buf)>250) ) {
- if (has_attachments) if (!strncmp(buf, boundary, strlen(boundary))) {
- ++current_section;
- }
- if (current_section == desired_section) {
- if ( (has_attachments == 0) || (strncmp(buf, boundary, strlen(boundary)))) {
- cprintf("%s\n", buf);
- }
- }
+ cprintf("%s\n", buf);
strcpy(buf, "");
}
else {
headers_only = extract_int(cmdbuf, 1);
desired_section = extract_int(cmdbuf, 2);
- output_message(msgid,MT_CITADEL, headers_only, desired_section);
+ output_message(msgid, MT_CITADEL, headers_only, desired_section);
return;
}
int generate_id) { /* 1 to generate an I field */
long newmsgid;
+ char *actual_message;
+ size_t actual_length;
+ long retval;
+ char msgidbuf[32];
/* Get a new message number */
newmsgid = get_new_message_number();
- /* Write our little bundle of joy into the message base */
+ if (generate_id) {
+ sprintf(msgidbuf, "I%ld", newmsgid);
+ actual_length = message_length + strlen(msgidbuf) + 1;
+ actual_message = mallok(actual_length);
+ memcpy(actual_message, message_in_memory, 3);
+ memcpy(&actual_message[3], msgidbuf, (strlen(msgidbuf)+1) );
+ memcpy(&actual_message[strlen(msgidbuf)+4],
+ &message_in_memory[3], message_length - 3);
+ }
+
+ else {
+ actual_message = message_in_memory;
+ actual_length = message_length;
+ }
+ /* Write our little bundle of joy into the message base */
begin_critical_section(S_MSGMAIN);
if ( cdb_store(CDB_MSGMAIN, &newmsgid, sizeof(long),
- message_in_memory, message_length) < 0 ) {
+ actual_message, actual_length) < 0 ) {
lprintf(2, "Can't store message\n");
- end_critical_section(S_MSGMAIN);
- return 0L;
+ retval = 0L;
+ }
+ else {
+ retval = newmsgid;
}
end_critical_section(S_MSGMAIN);
+ if (generate_id) {
+ phree(actual_message);
+ }
+
/* Finally, return the pointers */
- return(newmsgid);
+ return(retval);
}
*/
void save_message(char *mtmp, /* file containing proper message */
char *rec, /* Recipient (if mail) */
- char mtsflag, /* 0 for normal, 1 to force Aide> room */
+ char *force_room, /* if non-zero length, force a room */
int mailtype, /* local or remote type, see citadel.h */
int generate_id) /* set to 1 to generate an 'I' field */
{
FILE *fp;
struct usersupp userbuf;
int a;
+ static int seqnum = 0;
- lprintf(9, "save_message(%s,%s,%d,%d,%d)\n",
- mtmp, rec, mtsflag, mailtype, generate_id);
+ lprintf(9, "save_message(%s,%s,%s,%d,%d)\n",
+ mtmp, rec, force_room, mailtype, generate_id);
/* Strip non-printable characters out of the recipient name */
strcpy(recipient, rec);
templen = statbuf.st_size;
/* Now read it into memory */
- message_in_memory = (char *) malloc(templen);
+ message_in_memory = (char *) mallok(templen);
if (message_in_memory == NULL) {
lprintf(2, "Can't allocate memory to save message!\n");
return;
fclose(fp);
newmsgid = send_message(message_in_memory, templen, generate_id);
- free(message_in_memory);
+ phree(message_in_memory);
if (newmsgid <= 0L) return;
strcpy(actual_rm, CC->quickroom.QRname);
/* ...or if this is a private message, go to the target mailbox. */
if (strlen(recipient) > 0) {
- mailtype = alias(recipient);
+ /* mailtype = alias(recipient); */
if (mailtype == M_LOCAL) {
if (getuser(&userbuf, recipient)!=0) {
- mtsflag = 1; /* User not found, goto Aide */
+ /* User not found, goto Aide */
+ strcpy(force_room, AIDEROOM);
}
else {
strcpy(hold_rm, actual_rm);
}
/* ...or if this message is destined for Aide> then go there. */
- if (mtsflag) {
+ if (strlen(force_room) > 0) {
strcpy(hold_rm, actual_rm);
- strcpy(actual_rm, AIDEROOM);
+ strcpy(actual_rm, force_room);
}
/* This call to usergoto() changes rooms if necessary. It also
}
/* Add the message pointer to the room */
- AddMessageToRoom(&CC->quickroom, newmsgid);
+ CC->quickroom.QRhighest = AddMessageToRoom(&CC->quickroom, newmsgid);
/* update quickroom */
- CC->quickroom.QRhighest = newmsgid;
lputroom(&CC->quickroom, actual_rm);
/* Network mail - send a copy to the network program. */
if ( (strlen(recipient)>0) && (mailtype != M_LOCAL) ) {
- sprintf(aaa,"./network/spoolin/nm.%d",getpid());
+ sprintf(aaa,"./network/spoolin/netmail.%04x.%04x.%04x",
+ getpid(), CC->cs_pid, ++seqnum);
copy_file(mtmp,aaa);
- system("exec nohup ./netproc >/dev/null 2>&1 &");
+ system("exec nohup ./netproc -i >/dev/null 2>&1 &");
}
/* Bump this user's messages posted counter. */
*/
void aide_message(char *text)
{
- time_t now;
FILE *fp;
- time(&now);
fp=fopen(CC->temp,"wb");
fprintf(fp,"%c%c%c",255,MES_NORMAL,0);
fprintf(fp,"Psysop%c",0);
- fprintf(fp,"T%ld%c",now,0);
+ fprintf(fp,"T%ld%c", time(NULL), 0);
fprintf(fp,"ACitadel%c",0);
fprintf(fp,"OAide%c",0);
fprintf(fp,"N%s%c",NODENAME,0);
fprintf(fp,"M%s\n%c",text,0);
fclose(fp);
- save_message(CC->temp,"",1,M_LOCAL,1);
+ save_message(CC->temp,"",AIDEROOM,M_LOCAL,1);
syslog(LOG_NOTICE,text);
}
int type, /* see MES_ types in header file */
int net_type, /* see MES_ types in header file */
int format_type, /* local or remote (see citadel.h) */
- char *fake_name, /* who we're masquerading as */
- char *boundary) { /* boundary (if exist attachments) */
+ char *fake_name) { /* who we're masquerading as */
FILE *fp;
int a;
if (recipient[0]!=0) fprintf(fp, "R%s%c", recipient, 0);
if (dest_node[0]!=0) fprintf(fp, "D%s%c", dest_node, 0);
- if (boundary[0]!=0) fprintf(fp, "Z%s%c", boundary, 0);
putc('M',fp);
int anon_flag = 0;
int format_type = 0;
char newusername[256]; /* <bc> */
- char boundary[256];
int a,b;
int e = 0;
extract(recipient,entargs,1);
anon_flag = extract_int(entargs,2);
format_type = extract_int(entargs,3);
- extract(boundary, entargs, 5);
/* first check to make sure the request is valid. */
cprintf("%d send message\n",SEND_LISTING);
if (CC->fake_postname[0])
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_postname, boundary);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_postname);
else
if (CC->fake_username[0])
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_username, boundary);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_username);
else
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, "", boundary);
- save_message(CC->temp,buf,mtsflag,e,1);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, "");
+ save_message(CC->temp,buf, (mtsflag ? AIDEROOM : ""), e,1);
CC->fake_postname[0]='\0';
return;
}
}
fclose(fp);
- save_message(CC->temp, recp, 0, e, 0);
+ save_message(CC->temp, recp, "", e, 0);
}
/* put the message into the target room */
lgetroom(&qtemp, targ);
- AddMessageToRoom(&qtemp, num);
+ qtemp.QRhighest = AddMessageToRoom(&qtemp, num);
lputroom(&qtemp, targ);
cprintf("%d Message moved.\n", OK);
projects / citadel.git / blobdiff