Convert CtdlMessages to respect cm_lengths[]

[citadel.git] / citadel / modules / clamav / serv_virus.c

diff --git a/citadel/modules/clamav/serv_virus.c b/citadel/modules/clamav/serv_virus.c
index e57435cb793beea6951b847d303f49f2948518cc..81f53e13a41f68b8ee506ee1de8df8ab72c4dbdd 100644 (file)
--- a/citadel/modules/clamav/serv_virus.c
+++ b/citadel/modules/clamav/serv_virus.c
@@ -4,21 +4,21 @@
  * http://clamav.net (the ClamAV project is not in any way
  * affiliated with the Citadel project).
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  
+ *  
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  
+ *  
+ *  
  */
 
 #define CLAMD_PORT       "3310"
@@ -70,7 +70,7 @@
 /*
  * Connect to the clamd server and scan a message.
  */
-int clamd(struct CtdlMessage *msg) {
+int clamd(struct CtdlMessage *msg, recptypes *recp) {
        int sock = (-1);
        int streamsock = (-1);
        char clamhosts[SIZ];
@@ -94,7 +94,7 @@ int clamd(struct CtdlMessage *msg) {
        /* Try them one by one until we get a working one */
         for (clamhost=0; clamhost<num_clamhosts; ++clamhost) {
                 extract_token(buf, clamhosts, clamhost, '|', sizeof buf);
-                CtdlLogPrintf(CTDL_INFO, "Connecting to clamd at <%s>\n", buf);
+                syslog(LOG_INFO, "Connecting to clamd at <%s>\n", buf);
 
                 /* Assuming a host:port entry */ 
                 extract_token(hostbuf, buf, 0, ':', sizeof hostbuf);
@@ -105,7 +105,7 @@ int clamd(struct CtdlMessage *msg) {
                   /* Port specified lets try connecting to it! */
                   sock = sock_connect(hostbuf, portbuf);
 
-                if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
+                if (sock >= 0) syslog(LOG_DEBUG, "Connected!\n");
         }
 
        if (sock < 0) {
@@ -120,16 +120,16 @@ int clamd(struct CtdlMessage *msg) {
        CCC->SBuf.ReadWritePointer = NULL;
 
        /* Command */
-       CtdlLogPrintf(CTDL_DEBUG, "Transmitting STREAM command\n");
+       syslog(LOG_DEBUG, "Transmitting STREAM command\n");
        sprintf(buf, "STREAM\r\n");
        sock_write(&sock, buf, strlen(buf));
 
-       CtdlLogPrintf(CTDL_DEBUG, "Waiting for PORT number\n");
+       syslog(LOG_DEBUG, "Waiting for PORT number\n");
         if (sock_getln(&sock, buf, sizeof buf) < 0) {
                 goto bail;
         }
 
-        CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+        syslog(LOG_DEBUG, "<%s\n", buf);
        if (strncasecmp(buf, "PORT", 4)!=0) {
                goto bail;
        }
@@ -149,7 +149,7 @@ int clamd(struct CtdlMessage *msg) {
                return(0);
         }
        else {
-               CtdlLogPrintf(CTDL_DEBUG, "STREAM socket connected!\n");
+               syslog(LOG_DEBUG, "STREAM socket connected!\n");
        }
 
 
@@ -170,20 +170,17 @@ int clamd(struct CtdlMessage *msg) {
                close(streamsock);
        
        /* Response */
-       CtdlLogPrintf(CTDL_DEBUG, "Awaiting response\n");
+       syslog(LOG_DEBUG, "Awaiting response\n");
         if (sock_getln(&sock, buf, sizeof buf) < 0) {
                 goto bail;
         }
-        CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+        syslog(LOG_DEBUG, "<%s\n", buf);
        if (strncasecmp(buf, "stream: OK", 10)!=0) {
                is_virus = 1;
        }
 
        if (is_virus) {
-               if (msg->cm_fields['0'] != NULL) {
-                       free(msg->cm_fields['0']);
-               }
-               msg->cm_fields['0'] = strdup("message rejected by virus filter");
+               CM_SetField(msg, eErrorMsg, HKEY("message rejected by virus filter"));
        }
 
 bail:  close(sock);
@@ -201,6 +198,6 @@ CTDL_MODULE_INIT(virus)
                CtdlRegisterMessageHook(clamd, EVT_SMTPSCAN);
        }
        
-       /* return our Subversion id for the Log */
+       /* return our module name for the log */
         return "virus";
 }