@@ -1,3 +1,11 @@

+Mon Mar  7 11:24:43 GMT 2005 (njh)

+----------------------------------

+  * libclamav:		Added fast track visa system which reduces memory

+				requirements for scanning some messages and

+				also offers some improvement in scan times.

+				Currently only implemented for uuencoded

+				emails

+

 Mon Mar  7 01:28:44 CET 2005 (tk)

 ---------------------------------

   * libclamav, clamd: add reference counter to cl_node and improve database

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.224 2005/03/06 21:13:16 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.225 2005/03/07 11:23:12 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -798,8 +798,41 @@ cli_parse_mbox(const char *dir, int desc, unsigned int options)

 				cli_dbgmsg("Finished processing message\n");

 			} else

 				lastLineWasEmpty = (bool)(buffer[0] == '\0');

-			if(messageAddStr(m, buffer) < 0)

-				break;

+

+			if((strncasecmp(buffer, "begin ", 6) == 0) &&

+			    isdigit(buffer[6]) &&

+			    isdigit(buffer[7]) &&

+			    isdigit(buffer[8]) &&

+			    buffer[9] == ' ') {

+			    	/*

+				 * Fast track visa to uudecode.

+				 * TODO: binhex, yenc

+				 */

+				fileblob *fb = fileblobCreate();

+				char *filename = cli_strtok(buffer, 2, " ");

+

+				fileblobSetFilename(fb, dir, filename);

+				cli_dbgmsg("Fast track uuencode %s\n", filename);

+				free(filename);

+

+				while(fgets(buffer, sizeof(buffer) - 1, fd) != NULL) {

+					unsigned char data[1024];

+					const unsigned char *uptr;

+

+					cli_chomp(buffer);

+					if(strcasecmp(buffer, "end") == 0)

+						break;

+

+					uptr = decodeLine(m, UUENCODE, buffer, data, sizeof(data));

+					if(uptr == NULL)

+						break;

+					fileblobAddData(fb, data, (size_t)(uptr - data));

+				}

+

+				fileblobDestroy(fb);

+			} else

+				if(messageAddStr(m, buffer) < 0)

+					break;

 		} while(fgets(buffer, sizeof(buffer) - 1, fd) != NULL);

 		fclose(fd);

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.146 2005/03/06 19:10:20 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.147 2005/03/07 11:23:12 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -68,7 +68,6 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.146 2005/03/06 19:10:20 nigelhor

 typedef enum { FALSE = 0, TRUE = 1 } bool;

 static	void	messageIsEncoding(message *m);

-static	unsigned char	*decodeLine(message *m, encoding_type enctype, const char *line, unsigned char *buf, size_t buflen);

 static unsigned char *decode(message *m, const char *in, unsigned char *out, unsigned char (*decoder)(char), bool isFast);

 static	void	sanitiseBase64(char *s);

 static	unsigned	char	hex(char c);

@@ -1858,7 +1857,7 @@ messageClearMarkers(message *m)

  *

  * len is sizeof(ptr)

  */

-static unsigned char *

+unsigned char *

 decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, size_t buflen)

 {

 	size_t len, reallen;

@@ -14,71 +14,6 @@

  *  You should have received a copy of the GNU General Public License

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

- *

- * $Log: message.h,v $

- * Revision 1.24  2004/11/28 22:06:40  nigelhorne

- * Tidy space only headers code

- *

- * Revision 1.23  2004/11/28 21:05:50  nigelhorne

- * Handle headers with only spaces

- *

- * Revision 1.22  2004/11/22 15:18:51  nigelhorne

- * Performance work

- *

- * Revision 1.21  2004/10/16 17:24:15  nigelhorne

- * Handle colons in quotes in headers

- *

- * Revision 1.20  2004/10/14 17:45:55  nigelhorne

- * Try to reclaim some memory if it becomes low when decoding

- *

- * Revision 1.19  2004/09/17 13:47:19  nigelhorne

- * Handle yEnc attachments

- *

- * Revision 1.18  2004/09/17 09:48:53  nigelhorne

- * Handle attempts to hide mime type

- *

- * Revision 1.17  2004/09/15 18:08:23  nigelhorne

- * Handle multiple encoding types

- *

- * Revision 1.16  2004/08/23 13:15:16  nigelhorne

- * messageClearMarkers

- *

- * Revision 1.15  2004/08/22 15:08:59  nigelhorne

- * messageExport

- *

- * Revision 1.14  2004/08/22 10:34:24  nigelhorne

- * Use fileblob

- *

- * Revision 1.13  2004/08/21 11:57:57  nigelhorne

- * Use line.[ch]

- *

- * Revision 1.12  2004/07/20 14:35:29  nigelhorne

- * Some MYDOOM.I were getting through

- *

- * Revision 1.11  2004/05/06 18:01:25  nigelhorne

- * Force attachments marked as RFC822 messages to be scanned

- *

- * Revision 1.10  2004/04/05 12:04:56  nigelhorne

- * Scan attachments with no filename

- *

- * Revision 1.9  2004/04/01 15:32:34  nigelhorne

- * Graceful exit if messageAddLine fails in strdup

- *

- * Revision 1.8  2004/03/29 09:22:03  nigelhorne

- * Tidy up code and reduce shuffling of data

- *

- * Revision 1.7  2004/03/21 17:19:49  nigelhorne

- * Handle bounce messages with no headers

- *

- * Revision 1.6  2004/03/21 09:41:27  nigelhorne

- * Faster scanning for non MIME messages

- *

- * Revision 1.5  2004/01/28 10:15:24  nigelhorne

- * Added support to scan some bounce messages

- *

- * Revision 1.4  2004/01/14 18:02:55  nigelhorne

- * added definition of binhexBegin

- *

  */

 #ifndef	_MESSAGE_H

@@ -136,5 +71,6 @@ const	text	*yEncBegin(const message *m);

 const	text	*bounceBegin(const message *m);

 const	text	*encodingLine(const message *m);

 void	messageClearMarkers(message *m);

+unsigned char	*decodeLine(message *m, encoding_type enctype, const char *line, unsigned char *buf, size_t buflen);

 #endif	/*_MESSAGE_H*/