samba-vscan/clamav vscan-clamav_core.c,1.5.2.4,1.5.2.5

Update of /cvsroot/openantivirus/samba-vscan/clamav
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21244/clamav

Modified Files:
      Tag: VSCAN_0_3
	vscan-clamav_core.c 
Log Message:
started some more code-reorganisation; not finished; could have
broken stuff


Index: vscan-clamav_core.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/clamav/vscan-clamav_core.c,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -d -r1.5.2.4 -r1.5.2.5
--- vscan-clamav_core.c	1 Mar 2004 10:03:49 -0000	1.5.2.4
+++ vscan-clamav_core.c	2 May 2004 19:45:31 -0000	1.5.2.5
@@ -59,27 +59,7 @@
 int vscan_clamav_init(void)
 {
 
-        int sockfd;
-        struct sockaddr_un servaddr;
-
-        /* create socket */
-        if (( sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 ) {
-               vscan_syslog("ERROR: can not create socket!");
-               return -1; 
-        }
-
-        bzero(&servaddr, sizeof(servaddr));
-        servaddr.sun_family = AF_UNIX;
-        safe_strcpy(servaddr.sun_path, clamd_socket_name, sizeof(servaddr.sun_path)-1);
-
-        /* connect to socket */
-        if ( connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) < 0 ) {
-                vscan_syslog("ERROR: can not connect to clamd (socket: '%s')!", clamd_socket_name);
-                return -1;
-        }
-
-    return sockfd;
-
+        return vscan_unix_socket_init("clamd", clamd_socket_name);
 }
 
 
@@ -142,7 +122,7 @@
     char *vir = NULL, *p1 = NULL;
     FILE *fpin;
 
-	/* open stream sockets */
+    /* open stream sockets */
     fpin = fdopen(sockfd, "r");
     if (fpin == NULL) {
         vscan_syslog("ERROR: Can not open stream for reading - %s", strerror(errno));
@@ -230,10 +210,7 @@
 void vscan_clamav_end(int sockfd)
 {
 
-        /* sockfd == -1 indicates an error while connecting to socket */
-        if ( sockfd >= 0 ) {
-                close(sockfd);
-        }
+	vscan_socket_end(sockfd);
 
 }
  



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click