bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove wwiv support

Browse Source
This commit is contained in:
Andrew Pamment 2017-03-20 21:06:52 +10:00
parent 84caf645bc
commit 071df70e4c
2 changed files with 15 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
mail_menu.c
View File

@ -112,7 +112,6 @@ void free_message_headers(struct msg_headers *msghs) {
int msg_is_to(struct user_record *user, char *addressed_to, char *address, int type, int rn, int msgconf) { int msg_is_to(struct user_record *user, char *addressed_to, char *address, int type, int rn, int msgconf) {
char *myname; char *myname;
char *wwiv_addressee;
struct fido_addr *dest; struct fido_addr *dest;
int j; int j;
if (rn) { if (rn) {
@ -121,27 +120,7 @@ int msg_is_to(struct user_record *user, char *addressed_to, char *address, int t
} else { } else {
myname = strdup(user->loginname); myname = strdup(user->loginname);
} }
if (type == NETWORK_WWIV) { if (type == NETWORK_FIDO) {
wwiv_addressee = strdup(addressed_to);
for (j=1;j<strlen(addressed_to);j++) {
if (wwiv_addressee[j] == '(' || wwiv_addressee[j] == '#') {
wwiv_addressee[j-1] = '\0';
break;
}
}
if (strcasecmp(myname, wwiv_addressee) == 0) {
// name match
if (conf.mail_conferences[msgconf]->wwivnode == atoi(address)) {
free(wwiv_addressee);
free(myname);
return 1;
}
}
free(wwiv_addressee);
free(myname);
return 0;
} else if (type == NETWORK_FIDO) {
if (strcasecmp(myname, addressed_to) == 0) { if (strcasecmp(myname, addressed_to) == 0) {
dest = parse_fido_addr(address); dest = parse_fido_addr(address);
if (conf.mail_conferences[msgconf]->fidoaddr->zone == dest->zone && if (conf.mail_conferences[msgconf]->fidoaddr->zone == dest->zone &&
@ -176,10 +155,7 @@ int msg_is_from(struct user_record *user, char *addressed_from, char *address, i
} else { } else {
myname = strdup(user->loginname); myname = strdup(user->loginname);
} }
if (type == NETWORK_WWIV) { if (type == NETWORK_FIDO) {
free(myname);
return 0;
} else if (type == NETWORK_FIDO) {
if (strcasecmp(myname, addressed_from) == 0) { if (strcasecmp(myname, addressed_from) == 0) {
orig = parse_fido_addr(address); orig = parse_fido_addr(address);
if (conf.mail_conferences[msgconf]->fidoaddr->zone == orig->zone && if (conf.mail_conferences[msgconf]->fidoaddr->zone == orig->zone &&
@ -1386,41 +1362,7 @@ void read_message(struct user_record *user, struct msg_headers *msghs, int mailn
JAM_ReadMsgText(jb, msghs->msgs[mailno]->msg_h->TxtOffset, msghs->msgs[mailno]->msg_h->TxtLen, (char *)body); JAM_ReadMsgText(jb, msghs->msgs[mailno]->msg_h->TxtOffset, msghs->msgs[mailno]->msg_h->TxtLen, (char *)body);
JAM_WriteLastRead(jb, user->id, &jlr); JAM_WriteLastRead(jb, user->id, &jlr);
if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) { z2 = msghs->msgs[mailno]->msg_h->TxtLen;
body2 = (char *)malloc(msghs->msgs[mailno]->msg_h->TxtLen);
z2 = 0;
if (body[0] == 4 && body[1] == '0') {
skip_line = 1;
} else {
skip_line = 0;
}
for (z=0;z<msghs->msgs[mailno]->msg_h->TxtLen;z++) {
if (body[z] == '\r') {
if (body[z+1] == '\n') {
z++;
}
if (body[z+1] == 4 && body[z+2] == '0') {
skip_line = 1;
} else {
body2[z2++] = '\r';
skip_line = 0;
}
} else {
if (!skip_line) {
if (body[z] == 3 || body[z] == 4 || body[z] == 0xff) {
z++;
} else {
body2[z2++] = body[z];
}
}
}
}
free(body);
body = body2;
} else {
z2 = msghs->msgs[mailno]->msg_h->TxtLen;
}
lines = 0; lines = 0;
chars = 0; chars = 0;
@ -1566,23 +1508,13 @@ void read_message(struct user_record *user, struct msg_headers *msghs, int mailn
strcpy(buffer, msghs->msgs[mailno]->from); strcpy(buffer, msghs->msgs[mailno]->from);
} }
if (conf.mail_conferences[user->cur_mail_conf]->realnames == 0) { if (conf.mail_conferences[user->cur_mail_conf]->realnames == 0) {
if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) { from = (char *)malloc(strlen(user->loginname) + 1);
from = (char *)malloc(strlen(user->loginname) + 20); strcpy(from, user->loginname);
sprintf(from, "%s #%d @%d", user->loginname, user->id, conf.mail_conferences[user->cur_mail_conf]->wwivnode);
} else {
from = (char *)malloc(strlen(user->loginname) + 1);
strcpy(from, user->loginname);
}
} else { } else {
if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) { from = (char *)malloc(strlen(user->firstname) + strlen(user->lastname) + 2);
from = (char *)malloc(strlen(user->loginname) + 23 + strlen(user->firstname)); sprintf(from, "%s %s", user->firstname, user->lastname);
sprintf(from, "%s #%d @%d (%s)", user->loginname, user->id, conf.mail_conferences[user->cur_mail_conf]->wwivnode, user->firstname);
} else {
from = (char *)malloc(strlen(user->firstname) + strlen(user->lastname) + 2);
sprintf(from, "%s %s", user->firstname, user->lastname);
}
} }
if ((conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV && conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_ECHOMAIL_AREA) || conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) { if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) {
to = (char *)malloc(4); to = (char *)malloc(4);
strcpy(to, "ALL"); strcpy(to, "ALL");
} else { } else {
@ -1748,13 +1680,6 @@ void read_message(struct user_record *user, struct msg_headers *msghs, int mailn
jsf.Buffer = (char *)buffer; jsf.Buffer = (char *)buffer;
JAM_PutSubfield(jsp, &jsf); JAM_PutSubfield(jsp, &jsf);
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer)); jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer));
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) {
sprintf(buffer, "%d", atoi(strchr(from, '@') + 1));
jsf.LoID = JAMSFLD_DADDRESS;
jsf.HiID = 0;
jsf.DatLen = strlen(buffer);
jsf.Buffer = (char *)buffer;
JAM_PutSubfield(jsp, &jsf);
} }
} }
@ -1870,7 +1795,6 @@ int mail_menu(struct user_record *user) {
char *msg; char *msg;
int closed; int closed;
struct fido_addr *from_addr = NULL; struct fido_addr *from_addr = NULL;
int wwiv_to;
struct stat s; struct stat s;
int do_internal_menu = 0; int do_internal_menu = 0;
char *lRet; char *lRet;
@ -1990,7 +1914,7 @@ int mail_menu(struct user_record *user) {
s_printf(get_string(113)); s_printf(get_string(113));
break; break;
} }
if ((conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV && conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_ECHOMAIL_AREA) || conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) { if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) {
sprintf(buffer, "ALL"); sprintf(buffer, "ALL");
} else { } else {
s_printf(get_string(54)); s_printf(get_string(54));
@ -2022,14 +1946,6 @@ int mail_menu(struct user_record *user) {
} }
s_printf(get_string(123), from_addr->zone, from_addr->net, from_addr->node, from_addr->point); s_printf(get_string(123), from_addr->zone, from_addr->net, from_addr->node, from_addr->point);
} }
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) {
wwiv_to = atoi(buffer2);
if (wwiv_to == 0) {
s_printf(get_string(122));
break;
} else {
s_printf(get_string(124), wwiv_to);
}
} }
} }
to = strdup(buffer); to = strdup(buffer);
@ -2070,17 +1986,9 @@ int mail_menu(struct user_record *user) {
jmh.DateWritten = (uint32_t)time(NULL); jmh.DateWritten = (uint32_t)time(NULL);
jmh.Attribute |= JAM_MSG_LOCAL; jmh.Attribute |= JAM_MSG_LOCAL;
if (conf.mail_conferences[user->cur_mail_conf]->realnames == 0) { if (conf.mail_conferences[user->cur_mail_conf]->realnames == 0) {
if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) { strcpy(buffer, user->loginname);
sprintf(buffer, "%s #%d @%d", user->loginname, user->id, conf.mail_conferences[user->cur_mail_conf]->wwivnode);
} else {
strcpy(buffer, user->loginname);
}
} else { } else {
if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) { sprintf(buffer, "%s %s", user->firstname, user->lastname);
sprintf(buffer, "%s #%d @%d (%s)", user->loginname, user->id, conf.mail_conferences[user->cur_mail_conf]->wwivnode, user->firstname);
} else {
sprintf(buffer, "%s %s", user->firstname, user->lastname);
}
} }
jsp = JAM_NewSubPacket(); jsp = JAM_NewSubPacket();
@ -2191,13 +2099,6 @@ int mail_menu(struct user_record *user) {
jsf.Buffer = (char *)buffer; jsf.Buffer = (char *)buffer;
JAM_PutSubfield(jsp, &jsf); JAM_PutSubfield(jsp, &jsf);
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer)); jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) {
sprintf(buffer, "%d", wwiv_to);
jsf.LoID = JAMSFLD_DADDRESS;
jsf.HiID = 0;
jsf.DatLen = strlen(buffer);
jsf.Buffer = (char *)buffer;
JAM_PutSubfield(jsp, &jsf);
} }
} }

4
main.c
View File

@ -321,13 +321,9 @@ static int mail_area_handler(void* user, const char* section, const char* name,
if (strcasecmp(name, "type") == 0) { if (strcasecmp(name, "type") == 0) {
if (strcasecmp(value, "fido") == 0) { if (strcasecmp(value, "fido") == 0) {
mc->nettype = NETWORK_FIDO; mc->nettype = NETWORK_FIDO;
} else if (strcasecmp(value, "wwiv") == 0) {
mc->nettype = NETWORK_WWIV;
} }
} else if (strcasecmp(name, "fido node") == 0) { } else if (strcasecmp(name, "fido node") == 0) {
mc->fidoaddr = parse_fido_addr(value); mc->fidoaddr = parse_fido_addr(value);
} else if (strcasecmp(name, "wwiv node") == 0) {
mc->wwivnode = atoi(value);
} }
} else { } else {
// check if it's partially filled in // check if it's partially filled in