bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug in upload QWK replies

Browse Source
This commit is contained in:
Michiel Broek 2003-08-08 20:31:05 +00:00
parent 0c9eec7371
commit 2ddbe9dffc
2 changed files with 120 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -23,6 +23,7 @@ v0.37.5 12-Jul-2003
During virusscan of file uploads, the mbtask timeout timer is During virusscan of file uploads, the mbtask timeout timer is
set to one hour to support very long scans. set to one hour to support very long scans.
Changed logging during user login. Changed logging during user login.
Fixed bugs in QWK mail upload processing.
mbsetup: mbsetup:
Added menu entry 1.5.21 for setting maximum allowed logins. Added menu entry 1.5.21 for setting maximum allowed logins.

231
mbsebbs/offline.c
View File

@ -2288,6 +2288,7 @@ void QWK_Fetch()
sprintf(Dirpath, "%s/%s", CFG.bbs_usersdir, exitinfo.Name); sprintf(Dirpath, "%s/%s", CFG.bbs_usersdir, exitinfo.Name);
sprintf(Filename, "%s.MSG", CFG.bbsid); sprintf(Filename, "%s.MSG", CFG.bbsid);
if (getfilecase(Dirpath, Filename)) { if (getfilecase(Dirpath, Filename)) {
sprintf(temp, "%s/%s", Dirpath, Filename);
up = fopen(temp, "r"); up = fopen(temp, "r");
} }
@ -2369,134 +2370,139 @@ void QWK_Fetch()
sprintf(otemp, "%s/etc/mareas.data", getenv("MBSE_ROOT")); sprintf(otemp, "%s/etc/mareas.data", getenv("MBSE_ROOT"));
if ((mf = fopen(otemp, "r+")) != NULL) { if ((mf = fopen(otemp, "r+")) != NULL) {
fread(&msgshdr, sizeof(msgshdr), 1, mf); fread(&msgshdr, sizeof(msgshdr), 1, mf);
fseek(mf, ((Area -1) * (msgshdr.recsize + msgshdr.syssize)) + msgshdr.hdrsize, SEEK_SET); if ((fseek(mf, ((Area -1) * (msgshdr.recsize + msgshdr.syssize)) + msgshdr.hdrsize, SEEK_SET) == 0) &&
fread(&msgs, msgshdr.recsize, 1, mf); (fread(&msgs, msgshdr.recsize, 1, mf) == 1)) {
Syslog('m', "pos %d, should be %d", ftell(mf), ((Area) * (msgshdr.recsize + msgshdr.syssize)) + msgshdr.hdrsize - msgshdr.syssize);
/* /*
* Check access to this area * Check access to this area
*/ */
if (msgs.Active && strlen(msgs.QWKname) && Access(exitinfo.Security, msgs.WRSec) && Syslog('m', "%s %s", msgs.QWKname, msgs.Base);
if (msgs.Active && strlen(msgs.QWKname) && Access(exitinfo.Security, msgs.WRSec) &&
(msgs.MsgKinds != RONLY)) { (msgs.MsgKinds != RONLY)) {
if (Open_Msgbase(msgs.Base, 'w')) { if (Open_Msgbase(msgs.Base, 'w')) {
Msg_New(); Msg_New();
pLine = szLine; pLine = szLine;
nCol = 0; nCol = 0;
Syslog('m', "Msgbase open and locked"); Syslog('m', "Msgbase open and locked");
strcpy(Msg.From, tlcap(StripSpaces(Qwk.MsgFrom, sizeof(Qwk.MsgFrom)))); strcpy(Msg.From, tlcap(StripSpaces(Qwk.MsgFrom, sizeof(Qwk.MsgFrom))));
strcpy(Msg.To, tlcap(StripSpaces(Qwk.MsgTo, sizeof(Qwk.MsgTo)))); strcpy(Msg.To, tlcap(StripSpaces(Qwk.MsgTo, sizeof(Qwk.MsgTo))));
strcpy(Msg.Subject, StripSpaces(Qwk.MsgSubj, sizeof(Qwk.MsgSubj))); strcpy(Msg.Subject, StripSpaces(Qwk.MsgSubj, sizeof(Qwk.MsgSubj)));
if ((Qwk.Msgstat == '*') || (Qwk.Msgstat == '+')) if ((Qwk.Msgstat == '*') || (Qwk.Msgstat == '+'))
Msg.Private = TRUE; Msg.Private = TRUE;
strcpy(Temp, StripSpaces(Qwk.Msgdate, sizeof(Qwk.Msgdate))); strcpy(Temp, StripSpaces(Qwk.Msgdate, sizeof(Qwk.Msgdate)));
ltm = malloc(sizeof(struct tm)); ltm = malloc(sizeof(struct tm));
memset(ltm, 0, sizeof(struct tm)); memset(ltm, 0, sizeof(struct tm));
ltm->tm_mday = atoi(&Temp[3]); ltm->tm_mday = atoi(&Temp[3]);
ltm->tm_mon = atoi(&Temp[0]) -1; ltm->tm_mon = atoi(&Temp[0]) -1;
ltm->tm_year = atoi(&Temp[6]); ltm->tm_year = atoi(&Temp[6]);
if (ltm->tm_year < 96) if (ltm->tm_year < 96)
ltm->tm_year += 100; ltm->tm_year += 100;
strcpy(Temp, StripSpaces(Qwk.Msgtime, sizeof(Qwk.Msgtime))); strcpy(Temp, StripSpaces(Qwk.Msgtime, sizeof(Qwk.Msgtime)));
ltm->tm_hour = atoi(&Temp[0]); ltm->tm_hour = atoi(&Temp[0]);
ltm->tm_min = atoi(&Temp[3]); ltm->tm_min = atoi(&Temp[3]);
ltm->tm_sec = 0; ltm->tm_sec = 0;
Msg.Written = mktime(ltm); Msg.Written = mktime(ltm);
free(ltm); free(ltm);
Msg.Arrived = time(NULL) - (gmt_offset((time_t)0) * 60); Msg.Arrived = time(NULL) - (gmt_offset((time_t)0) * 60);
Msg.Local = TRUE; Msg.Local = TRUE;
memset(&dest, 0, sizeof(dest)); memset(&dest, 0, sizeof(dest));
// dest.zone = Upr.destzone; // dest.zone = Upr.destzone;
// dest.net = Upr.destnet; // dest.net = Upr.destnet;
// dest.node = Upr.destnode; // dest.node = Upr.destnode;
// dest.point = Upr.destpoint; // dest.point = Upr.destpoint;
Add_Headkludges(fido2faddr(dest), FALSE); Add_Headkludges(fido2faddr(dest), FALSE);
for (r = 1; r < nRec; r++) { for (r = 1; r < nRec; r++) {
nReaded = fread(Temp, 1, 128, up); nReaded = fread(Temp, 1, 128, up);
Syslog('m', "nReaded=%d", nReaded); Syslog('m', "nReaded=%d", nReaded);
if (r == (nRec - 1)) { if (r == (nRec - 1)) {
x = 127; x = 127;
while (x > 0 && Temp[x] == ' ') { while (x > 0 && Temp[x] == ' ') {
nReaded--; nReaded--;
x--; x--;
}
Syslog('m', "Final=%d", nReaded);
} }
Syslog('m', "Final=%d", nReaded);
}
for (i = 0, pBuff = Temp; i < nReaded; i++, pBuff++) { for (i = 0, pBuff = Temp; i < nReaded; i++, pBuff++) {
if (*pBuff == '\r' || *pBuff == (char)0xE3) { if (*pBuff == '\r' || *pBuff == (char)0xE3) {
*pLine = '\0';
Syslog('m', "1 Len=%d \"%s\"", strlen(szLine), printable(szLine, 0));
MsgText_Add2(szLine);
if (strncmp(szLine, (char *)"--- ", 4) == 0)
HasTear = TRUE;
pLine = szLine;
nCol = 0;
} else if (*pBuff != '\n') {
*pLine++ = *pBuff;
nCol++;
if (nCol >= nWidth) {
*pLine = '\0'; *pLine = '\0';
while (nCol > 1 && *pLine != ' ') { Syslog('m', "1 Len=%d \"%s\"", strlen(szLine), printable(szLine, 0));
nCol--;
pLine--;
}
if (nCol > 0) {
while (*pLine == ' ')
pLine++;
strcpy (szWrp, pLine);
}
*pLine = '\0';
Syslog('m', "2 Len=%d \"%s\"", strlen(szLine), printable(szLine, 0));
MsgText_Add2(szLine); MsgText_Add2(szLine);
if (strncmp(szLine, (char *)"--- ", 4) == 0) if (strncmp(szLine, (char *)"--- ", 4) == 0)
HasTear = TRUE; HasTear = TRUE;
strcpy(szLine, szWrp); pLine = szLine;
pLine = strchr(szLine, '\0'); nCol = 0;
nCol = (short)strlen (szLine); } else if (*pBuff != '\n') {
*pLine++ = *pBuff;
nCol++;
if (nCol >= nWidth) {
*pLine = '\0';
while (nCol > 1 && *pLine != ' ') {
nCol--;
pLine--;
}
if (nCol > 0) {
while (*pLine == ' ')
pLine++;
strcpy (szWrp, pLine);
}
*pLine = '\0';
Syslog('m', "2 Len=%d \"%s\"", strlen(szLine), printable(szLine, 0));
MsgText_Add2(szLine);
if (strncmp(szLine, (char *)"--- ", 4) == 0)
HasTear = TRUE;
strcpy(szLine, szWrp);
pLine = strchr(szLine, '\0');
nCol = (short)strlen (szLine);
}
} }
} }
} }
} if (nCol > 0) {
if (nCol > 0) { *pLine = '\0';
*pLine = '\0'; Syslog('m', "3 Len=%d \"%s\"", strlen(szLine), printable(szLine, 0));
Syslog('m', "3 Len=%d \"%s\"", strlen(szLine), printable(szLine, 0)); MsgText_Add2(szLine);
MsgText_Add2(szLine); if (strncmp(szLine, (char *)"--- ", 4) == 0)
if (strncmp(szLine, (char *)"--- ", 4) == 0) HasTear = TRUE;
HasTear = TRUE;
}
Add_Footkludges(FALSE, NULL, HasTear);
Msg_AddMsg();
Msg_UnLock();
Syslog('+', "Msg (%ld) to \"%s\", \"%s\", in %s", Msg.Id, Msg.To, Msg.Subject, msgs.QWKname);
nPosted++;
Syslog('m', "Msgbase closed again");
fseek(mf, ((Area -1) * (msgshdr.recsize + msgshdr.syssize)) + msgshdr.hdrsize, SEEK_SET);
msgs.Posted.total++;
msgs.Posted.tweek++;
msgs.Posted.tdow[Diw]++;
msgs.Posted.month[Miy]++;
msgs.LastPosted = time(NULL);
fwrite(&msgs, msgshdr.recsize, 1, mf);
/*
* Add quick mailscan info
*/
if (msgs.Type != LOCALMAIL) {
sprintf(temp, "%s/tmp/%smail.jam", getenv("MBSE_ROOT"),
((msgs.Type == ECHOMAIL) || (msgs.Type == LIST))? "echo" : "net");
if ((fp = fopen(temp, "a")) != NULL) {
fprintf(fp, "%s %lu\n", msgs.Base, Msg.Id);
fclose(fp);
} }
Add_Footkludges(FALSE, NULL, HasTear);
Msg_AddMsg();
Msg_UnLock();
Syslog('+', "Msg (%ld) to \"%s\", \"%s\", in %s", Msg.Id, Msg.To, Msg.Subject, msgs.QWKname);
nPosted++;
Syslog('m', "Msgbase closed again");
fseek(mf, ((Area -1) * (msgshdr.recsize + msgshdr.syssize)) + msgshdr.hdrsize, SEEK_SET);
msgs.Posted.total++;
msgs.Posted.tweek++;
msgs.Posted.tdow[Diw]++;
msgs.Posted.month[Miy]++;
msgs.LastPosted = time(NULL);
fwrite(&msgs, msgshdr.recsize, 1, mf);
/*
* Add quick mailscan info
*/
if (msgs.Type != LOCALMAIL) {
sprintf(temp, "%s/tmp/%smail.jam", getenv("MBSE_ROOT"),
((msgs.Type == ECHOMAIL) || (msgs.Type == LIST))? "echo" : "net");
if ((fp = fopen(temp, "a")) != NULL) {
fprintf(fp, "%s %lu\n", msgs.Base, Msg.Id);
fclose(fp);
}
}
Msg_Close();
} }
Msg_Close(); } else {
Syslog('+', "Can't post messages in area %u", Area);
} }
fclose(mf);
} else { } else {
Syslog('+', "Can't post messages in area %u", Area); WriteError("$Can't read message area %u", Area);
} }
fclose(mf);
} }
} }
} else { } else {
@ -2518,7 +2524,8 @@ void QWK_Fetch()
do_mailout = TRUE; do_mailout = TRUE;
} }
fflush(stdout); fflush(stdout);
unlink(temp); sprintf(temp, "%s/%s", Dirpath, Filename);
Syslog('m', "Unlink %s rc=%d", temp, unlink(temp));
free(temp); free(temp);
free(otemp); free(otemp);
Pause(); Pause();