From 7508496df78ca5da6d0f8cfb8811cc66620c60bb Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 29 Jan 2024 15:26:37 -0500 Subject: [PATCH] Indent with tabs, as God intended. --- citadel/server/modules/blog/serv_blog.c | 19 +-- citadel/server/modules/clamav/serv_virus.c | 143 ++++++++++----------- 2 files changed, 69 insertions(+), 93 deletions(-) diff --git a/citadel/server/modules/blog/serv_blog.c b/citadel/server/modules/blog/serv_blog.c index fa1290936..c85c63752 100644 --- a/citadel/server/modules/blog/serv_blog.c +++ b/citadel/server/modules/blog/serv_blog.c @@ -1,20 +1,9 @@ // Support for blog rooms // -// Copyright (c) 1999-2023 by the citadel.org team +// Copyright (c) 1999-2024 by the citadel.org team // -// This program is open source 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 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 +// This program is open source software. Use, duplication, or disclosure +// is subject to the terms of the GNU General Public License, version 3. #include "../../sysdep.h" #include @@ -77,4 +66,4 @@ char *ctdl_module_init_blog(void) { // return our module id for the log return "blog"; -} +} \ No newline at end of file diff --git a/citadel/server/modules/clamav/serv_virus.c b/citadel/server/modules/clamav/serv_virus.c index 9971331f9..86156e346 100644 --- a/citadel/server/modules/clamav/serv_virus.c +++ b/citadel/server/modules/clamav/serv_virus.c @@ -1,21 +1,14 @@ -/* - * This module allows Citadel to use clamd to filter incoming messages - * arriving via SMTP. For more information on clamd, visit - * http://clamav.net (the ClamAV project is not in any way - * affiliated with the Citadel project). - * - * Copyright (c) 1987-2023 by the citadel.org team - * - * 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. - */ - -#define CLAMD_PORT "3310" +// This module allows Citadel to use clamd to filter incoming messages +// arriving via SMTP. For more information on clamd, visit +// http://clamav.net (the ClamAV project is not in any way +// affiliated with the Citadel project). +// +// Copyright (c) 1987-2024 by the citadel.org team +// +// This program is open source software. Use, duplication, or disclosure +// are subject to the terms of the GNU General Public License version 3. + +#define CLAMD_PORT "3310" #include "../../sysdep.h" #include @@ -47,91 +40,87 @@ #include "../../ctdl_module.h" -/* - * Connect to the clamd server and scan a message. - */ +// Connect to the clamd server and scan a message. int clamd(struct CtdlMessage *msg, struct recptypes *recp) { int sock = (-1); int streamsock = (-1); char clamhosts[SIZ]; int num_clamhosts; char buf[SIZ]; - char hostbuf[SIZ]; - char portbuf[SIZ]; + char hostbuf[SIZ]; + char portbuf[SIZ]; int is_virus = 0; int clamhost; StrBuf *msgtext; - CitContext *CCC; - /* See if we have any clamd hosts configured */ + // See if we have any clamd hosts configured num_clamhosts = get_hosts(clamhosts, "clamav"); if (num_clamhosts < 1) { return(0); } - /* Try them one by one until we get a working one */ - for (clamhost=0; clamhost\n", buf); - - /* Assuming a host:port entry */ - extract_token(hostbuf, buf, 0, ':', sizeof hostbuf); - if (extract_token(portbuf, buf, 1, ':', sizeof portbuf)==-1) - /* Didn't specify a port so we'll try the psuedo-standard 3310 */ - sock = sock_connect(hostbuf, CLAMD_PORT); - else - /* Port specified lets try connecting to it! */ - sock = sock_connect(hostbuf, portbuf); - - if (sock >= 0) syslog(LOG_DEBUG, "Connected!\n"); - } + // Try them one by one until we get a working one + for (clamhost=0; clamhost\n", buf); + + // Assuming a host:port entry + extract_token(hostbuf, buf, 0, ':', sizeof hostbuf); + if (extract_token(portbuf, buf, 1, ':', sizeof portbuf)==-1) { + // Didn't specify a port so we'll try the psuedo-standard 3310 + sock = sock_connect(hostbuf, CLAMD_PORT); + } + else { + // Port specified lets try connecting to it! + sock = sock_connect(hostbuf, portbuf); + } + + if (sock >= 0) { + syslog(LOG_DEBUG, "Connected!\n"); + } + } + // If the service isn't running, just pass the mail through. Potentially throwing away mails isn't good. if (sock < 0) { - /* If the service isn't running, just pass the mail - * through. Potentially throwing away mails isn't good. - */ return(0); } - CCC=CC; - CCC->SBuf.Buf = NewStrBuf(); - CCC->sMigrateBuf = NewStrBuf(); - CCC->SBuf.ReadWritePointer = NULL; - /* Command */ + CC->SBuf.Buf = NewStrBuf(); + CC->sMigrateBuf = NewStrBuf(); + CC->SBuf.ReadWritePointer = NULL; + + // Command syslog(LOG_DEBUG, "Transmitting STREAM command\n"); sprintf(buf, "STREAM\r\n"); sock_write(&sock, buf, strlen(buf)); syslog(LOG_DEBUG, "Waiting for PORT number\n"); - if (sock_getln(&sock, buf, sizeof buf) < 0) { - goto bail; - } + if (sock_getln(&sock, buf, sizeof buf) < 0) { + goto bail; + } - syslog(LOG_DEBUG, "<%s\n", buf); + syslog(LOG_DEBUG, "<%s\n", buf); if (strncasecmp(buf, "PORT", 4)!=0) { - goto bail; + goto bail; } - /* Should have received a port number to connect to */ + // Should have received a port number to connect to extract_token(portbuf, buf, 1, ' ', sizeof portbuf); - /* Attempt to establish connection to STREAM socket */ - streamsock = sock_connect(hostbuf, portbuf); + // Attempt to establish connection to STREAM socket + streamsock = sock_connect(hostbuf, portbuf); + // If the service isn't running, just pass the mail through. Potentially throwing away mails isn't good. if (streamsock < 0) { - /* If the service isn't running, just pass the mail - * through. Potentially throwing away mails isn't good. - */ - FreeStrBuf(&CCC->SBuf.Buf); - FreeStrBuf(&CCC->sMigrateBuf); + FreeStrBuf(&CC->SBuf.Buf); + FreeStrBuf(&CC->sMigrateBuf); return(0); - } + } else { - syslog(LOG_DEBUG, "STREAM socket connected!\n"); + syslog(LOG_DEBUG, "STREAM socket connected!\n"); } - - /* Message */ + // Message CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0); msgtext = CC->redirect_buffer; @@ -140,19 +129,17 @@ int clamd(struct CtdlMessage *msg, struct recptypes *recp) { sock_write(&streamsock, SKEY(msgtext)); FreeStrBuf(&msgtext); - /* Close the streamsocket connection; this tells clamd - * that we're done. - */ + // Close the streamsocket connection; this tells clamd that we're done. if (streamsock != -1) { close(streamsock); } - /* Response */ + // Response syslog(LOG_DEBUG, "Awaiting response\n"); - if (sock_getln(&sock, buf, sizeof buf) < 0) { - goto bail; - } - syslog(LOG_DEBUG, "<%s\n", buf); + if (sock_getln(&sock, buf, sizeof buf) < 0) { + goto bail; + } + syslog(LOG_DEBUG, "<%s\n", buf); if (strncasecmp(buf, "stream: OK", 10)!=0) { is_virus = 1; } @@ -162,8 +149,8 @@ int clamd(struct CtdlMessage *msg, struct recptypes *recp) { } bail: close(sock); - FreeStrBuf(&CCC->SBuf.Buf); - FreeStrBuf(&CCC->sMigrateBuf); + FreeStrBuf(&CC->SBuf.Buf); + FreeStrBuf(&CC->sMigrateBuf); return(is_virus); } @@ -174,6 +161,6 @@ char *ctdl_module_init_virus(void) { CtdlRegisterMessageHook(clamd, EVT_SMTPSCAN); } - /* return our module name for the log */ - return "virus"; + // return our module name for the log + return "virus"; } -- 2.30.2