Updated TODO

ChangeLog

@@ -19,6 +19,8 @@ v0.37.5		12-Jul-2003
 	mbsebbs:
 		Added check for maximum simultaneous logins.
 		Removed debug logging for userrecord i/o
+		During virusscan of file uploads, the mbtask timeout timer is
+		set to one hour to support very long scans.
 
 	mbsetup:
 		Added menu entry 1.5.21 for setting maximum allowed logins.

TODO

@@ -99,9 +99,6 @@ mbfido:
 	N: Add statistic mail messages.
 
 mbcico:
-	N: Doesn't poll internet nodes with non-standard ports when the
-	   FQDN:port is in the override field. -- Check this !
-
 	N: See if it is possible with binkp protocol to resume aborted
 	   transfers. -- ND option ??
 
@@ -116,9 +113,6 @@ mbfile:
 
 	L: Possibility to skip file areas from checking and reindexing.
 
-	N: Override timeout during virus scan when files are imported.
-	   -- Check, already done?
-
 	N: Add area sorting
 
 mbmsg:

mbsebbs/filesub.c

@@ -536,6 +536,7 @@ int ScanDirect(char *fn)
 		printf("%s %s %s %s ", (char *) Language(132), fn, (char *) Language(133), virscan.comment);
 		fflush(stdout);
 
+		Altime(3600);
 		if ((err = execute(virscan.scanner, virscan.options, temp, (char *)"/dev/null",
 					(char *)"/dev/null" , (char *)"/dev/null")) != virscan.error) {
 		    WriteError("VIRUS ALERT: Result %d (%s)", err, virscan.comment);
@@ -543,9 +544,11 @@ int ScanDirect(char *fn)
 		    /* Possible VIRUS found! */
 		    printf("%s\n", (char *) Language(199));
 		    Found = TRUE;
-			} else
+		} else {
 		    /* Ok */
 		    printf("%s\n", (char *) Language(200));
+		}
+		Altime(0);
 		fflush(stdout);
 	    }
 	}
@@ -644,6 +647,7 @@ int ScanArchive(char *fn, char *ftype)
 		printf("%s %s %s %s ", (char *) Language(132), fn, (char *) Language(133), virscan.comment);
 		fflush(stdout);
 
+		Altime(3600);
 		err = execute(virscan.scanner, virscan.options, (char *)"*", (char *)"/dev/null", 
 			(char *)"/dev/null", (char *)"/dev/null");
 		if (err != virscan.error) {
@@ -657,6 +661,7 @@ int ScanArchive(char *fn, char *ftype)
 		    printf("%s\n", (char *) Language(200));
 		}
 		fflush(stdout);
+		Altime(0);
 		Nopper();
 	    }
 	}
@@ -763,8 +768,6 @@ char *GetFileType(char *fn)
 int ImportFile(char *fn, int Area, int fileid, time_t iTime, off_t Size)
 {
     char    *temp, *temp1;
-//	int	i, x;
-//	char	*token;
 
     temp  = calloc(PATH_MAX, sizeof(char));
     temp1 = calloc(PATH_MAX, sizeof(char));
@@ -787,19 +790,7 @@ int ImportFile(char *fn, int Area, int fileid, time_t iTime, off_t Size)
 		exitinfo.Uploads++;
 		exitinfo.UploadK += (Size / 1024);
 		exitinfo.UploadKToday += (Size / 1024);
-				Syslog('b', "Uploads %d, Kb %d, Kb today %d", exitinfo.Uploads, 
+		Syslog('b', "Uploads %d, Kb %d, Kb today %d", exitinfo.Uploads, exitinfo.UploadK, exitinfo.UploadKToday);
-						exitinfo.UploadK, exitinfo.UploadKToday);
-	
-				/*
-				 * Give back the user his bytes from the upload
-				 * Work out byte ratio, then give time back to user
-				 */
-//				strcpy(temp, CFG.sByteRatio);
-//				token = strtok(temp, ":");
-//			 	i = atoi(token);
-//			 	token = strtok(NULL, "\0");
-//				x = atoi(token);
-//				Size *= i / x;
 		/* You have */  /* extra download KBytes. */
 		printf("%s %ld %s\n", (char *) Language(249), (long)(Size / 1024), (char *) Language(250));
 	
@@ -807,25 +798,14 @@ int ImportFile(char *fn, int Area, int fileid, time_t iTime, off_t Size)
 		Syslog('b', "DownloadKToday %d", exitinfo.DownloadKToday);
 	    }
 
-			/*
-			 * Give back the user his time that he used to upload
-			 * Work out time ratio, then give time back to user
-			 * Ratio 3:1, Upload time: times by 3 / 1
-			 */
-//			strcpy(temp, CFG.sTimeRatio);
-//			token = strtok(temp, ":");
-//		 	i = atoi(token);
-//		  	token = strtok(NULL, "\0");
-//			x = atoi(token);
-
-//			iTime *= i / x;
 	    iTime /= 60; /* Divide Seconds by 60 to give minutes */
 	    /* You have */ /* extra minutes. */
 	    printf("%s %ld %s\n", (char *) Language(249), iTime, (char *) Language(259));
-	
 	    exitinfo.iTimeLeft += iTime;
 
 	    WriteExitinfo();
+	    free(temp);
+	    free(temp1);
 	    return TRUE;
 	}
     }
@@ -1095,6 +1075,9 @@ void SetFileArea(unsigned long AreaNum)
 
 
 
+/*
+ * Return size in bytes of all files in the users wrk directory.
+ */
 unsigned long Quota()
 {
     DIR		    *dirp;