samba-vscan/openantivirus vscan-oav.c,1.37.2.4,1.37.2.5 vscan-oav_core.c,1.18.2.3,1.18.2.4
Rainer Link <[email protected]> Sat, 25 Sep 2004 12:27:10 +0000
| Newsgroups | gmane.comp.security.virus.openantivirus.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/openantivirus/samba-vscan/openantivirus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6692/openantivirus
Modified Files:
Tag: VSCAN_0_3
vscan-oav.c vscan-oav_core.c
Log Message:
make the code a little bit more read-able (esp. the check for return values)
Index: vscan-oav.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/openantivirus/vscan-oav.c,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -d -r1.37.2.4 -r1.37.2.5
--- vscan-oav.c 6 May 2004 14:44:26 -0000 1.37.2.4
+++ vscan-oav.c 25 Sep 2004 12:27:07 -0000 1.37.2.5
@@ -4,7 +4,7 @@
* virusscanning VFS module for samba. Log infected files via syslog
* facility and block access using OpenAntiVirus ScannerDaemon.
*
- * Copyright (C) Rainer Link, 2001-2003
+ * Copyright (C) Rainer Link, 2001-2004
* OpenAntiVirus.org <rainer-pBPPa8WU5k41Tgt60Rntydi2O/[email protected]>
* Copyright (C) Stefan (metze) Metzmacher, 2003
* <[email protected]>
@@ -292,7 +292,7 @@
#else
return default_vfs_ops.open(conn, fname, flags, mode);
#endif
- else if ( filetype_skipscan(filepath) == 1 ) {
+ else if ( filetype_skipscan(filepath) == VSCAN_FT_SKIP_SCAN ) {
if ( verbose_file_logging )
vscan_syslog("File '%s' not scanned as file type is on exclude list", filepath);
#if (SMB_VFS_INTERFACE_VERSION >= 6)
@@ -317,7 +317,7 @@
/* must file actually be scanned? */
must_be_checked = lrufiles_must_be_checked(filepath, stat_buf.st_mtime);
- if ( must_be_checked == -1 ) {
+ if ( must_be_checked == VSCAN_LRU_DENY_ACCESS ) {
/* file has already been checked and marked as infected */
/* deny access */
if ( verbose_file_logging )
@@ -329,7 +329,7 @@
/* deny access */
errno = EACCES;
return -1;
- } else if ( must_be_checked == 0 ) {
+ } else if ( must_be_checked == VSCAN_LRU_GRANT_ACCESS ) {
/* file has already been checked, not marked as infected and not modified */
if ( verbose_file_logging )
vscan_syslog("File '%s' has already been scanned, not marked as infected and not modified. Not scanned anymore. Access granted", filepath);
@@ -348,7 +348,7 @@
/* scan file */
retval = vscan_oav_scanfile(sockfd, filepath, client_ip);
- if ( retval == -2 && vscan_config.common.deny_access_on_minor_error ) {
+ if ( retval == VSCAN_SCAN_MINOR_ERORR && vscan_config.common.deny_access_on_minor_error ) {
/* a minor error occured - deny access */
vscan_syslog("ERROR: daemon failed with a minor error - access to file %s denied", fname);
vscan_oav_end(sockfd);
@@ -359,7 +359,7 @@
/* deny access */
errno = EACCES;
return -1;
- } else if ( retval == -1 && vscan_config.common.deny_access_on_error ) {
+ } else if ( retval == VSCAN_SCAN_ERROR && vscan_config.common.deny_access_on_error ) {
/* an error occured - can not communicate to daemon - deny access */
vscan_syslog("ERROR: can not communicate to daemon - access to file %s denied", fname);
vscan_oav_end(sockfd);
@@ -371,7 +371,7 @@
errno = EACCES;
return -1;
- } else if ( retval == 1 ) {
+ } else if ( retval == VSCAN_SCAN_VIRUS_FOUND ) {
/* close socket */
vscan_oav_end(sockfd);
/* do action ... */
@@ -388,7 +388,7 @@
/* virus found, deny acces */
errno = EACCES;
return -1;
- } else if ( retval == 0 ) {
+ } else if ( retval == VSCAN_SCAN_OK ) {
/* file is clean, add to lrufiles */
lrufiles_add(filepath, stat_buf.st_mtime, False);
}
@@ -447,7 +447,7 @@
}
/* don't scan files which are in the list of exclude file types */
- if ( filetype_skipscan(filepath) == 1 ) {
+ if ( filetype_skipscan(filepath) == VSCAN_FT_SKIP_SCAN ) {
if ( verbose_file_logging )
vscan_syslog("File '%s' not scanned as file type is on exclude list", filepath);
return retval;
@@ -461,7 +461,7 @@
safe_strcpy(client_ip, fsp->conn->client_address, CLIENT_IP_SIZE -1);
rv = vscan_oav_scanfile(sockfd, filepath, client_ip);
vscan_oav_end(sockfd);
- if ( rv == 1 ) {
+ if ( rv == VSCAN_SCAN_VIRUS_FOUND ) {
/* virus was found */
#if (SMB_VFS_INTERFACE_VERSION >= 6)
rc = vscan_do_infected_file_action(handle, fsp->conn, filepath, vscan_config.common.quarantine_dir, vscan_config.common.quarantine_prefix, vscan_config.common.infected_file_action);
Index: vscan-oav_core.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/openantivirus/Attic/vscan-oav_core.c,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- vscan-oav_core.c 2 May 2004 19:45:32 -0000 1.18.2.3
+++ vscan-oav_core.c 25 Sep 2004 12:27:07 -0000 1.18.2.4
@@ -3,7 +3,7 @@
*
* Core Interface for OpenAntiVirus ScannerDaemon
*
- * Copyright (C) Rainer Link, 2001-2002
+ * Copyright (C) Rainer Link, 2001-2004
* OpenAntiVirus.org <rainer-pBPPa8WU5k41Tgt60Rntydi2O/[email protected]>
*
* Credits to W. Richard Stevens - RIP
@@ -75,7 +75,7 @@
fpin = fdopen(sockfd, "r");
if ( fpin == NULL ) {
vscan_syslog("ERROR: can not open stream for reading - %s", strerror(errno));
- return -1;
+ return VSCAN_SCAN_ERROR;
}
fpout = fdopen(sockfd, "w");
@@ -83,7 +83,7 @@
/* close fpin */
fclose(fpin);
vscan_syslog("ERROR: can not open stream for writing - %s", strerror(errno));
- return -1;
+ return VSCAN_SCAN_ERROR;
}
if ( verbose_file_logging )
@@ -103,7 +103,7 @@
/* closing streams */
fclose(fpin);
fclose(fpout);
- return -1;
+ return VSCAN_SCAN_ERROR;
}
/* hum, instead of flush()ing, use setvbuf to set line-based buffering? */
@@ -118,7 +118,7 @@
fclose(fpin);
fclose(fpout);
vscan_syslog("ERROR: can not get result from ScannerDaemon!");
- return -1;
+ return VSCAN_SCAN_ERROR;
}
/* close streams */
@@ -133,12 +133,12 @@
if ( strncmp("FOUND", recvline, 5) == 0 ) {
/* virus found */
vscan_oav_log_virus(scan_file, recvline, client_ip);
- return 1;
+ return VSCAN_SCAN_VIRUS_FOUND;
} else if ( strncmp("ERROR", recvline, 5) == 0 ) {
/* ERROR */
if ( verbose_file_logging )
vscan_syslog("ERROR: file %s not found, not readable or an error occured", scan_file);
- return -2;
+ return VSCAN_SCAN_MINOR_ERROR;
} else if ( strncmp("OK", recvline, 2) == 0 ) {
/* OK */
if ( verbose_file_logging )
@@ -147,10 +147,10 @@
/* unknown response */
vscan_syslog("ERROR: unknown response from ScannerDaemon while scanning %s!", scan_file);
/* FIXME: should we really mark this as a minor error? */
- return -2;
+ return VSCAN_SCAN_MINOR_ERROR;
}
- return 0;
+ return VSCAN_SCAN_OK;
}
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php