From 12e52a43f733469ed29552272142a3c7e821256a Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 30 Jan 2021 21:48:27 -0500 Subject: [PATCH] All of the old network modules are now completely gone. Unfortunately this includes the parts that handled mailing lists, so that has to be put back in. --- citadel/modules/network/.gitignore | 1 - citadel/modules/network/netmail.h | 0 citadel/modules/network/netspool.h | 29 -------- citadel/modules/network/serv_netmail.c | 70 ------------------- citadel/modules/network/serv_netspool.c | 92 ------------------------- citadel/modules/network/serv_network.c | 83 ---------------------- citadel/modules/network/serv_network.h | 21 ------ 7 files changed, 296 deletions(-) delete mode 100644 citadel/modules/network/.gitignore delete mode 100644 citadel/modules/network/netmail.h delete mode 100644 citadel/modules/network/netspool.h delete mode 100644 citadel/modules/network/serv_netmail.c delete mode 100644 citadel/modules/network/serv_netspool.c delete mode 100644 citadel/modules/network/serv_network.c delete mode 100644 citadel/modules/network/serv_network.h diff --git a/citadel/modules/network/.gitignore b/citadel/modules/network/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/modules/network/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/modules/network/netmail.h b/citadel/modules/network/netmail.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/citadel/modules/network/netspool.h b/citadel/modules/network/netspool.h deleted file mode 100644 index ef00b88bc..000000000 --- a/citadel/modules/network/netspool.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This module handles shared rooms, inter-Citadel mail, and outbound - * mailing list processing. - * - * Copyright (c) 2000-2018 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 - * - * ** NOTE ** A word on the S_NETCONFIGS semaphore: - * This is a fairly high-level type of critical section. It ensures that no - * two threads work on the netconfigs files at the same time. Since we do - * so many things inside these, here are the rules: - * 1. begin_critical_section(S_NETCONFIGS) *before* begin_ any others. - * 2. Do *not* perform any I/O with the client during these sections. - * - */ - diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c deleted file mode 100644 index 9eb21f9a4..000000000 --- a/citadel/modules/network/serv_netmail.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * This module handles network mail and mailing list processing. - * - * Copyright (c) 2000-2021 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. - * - * ** NOTE ** A word on the S_NETCONFIGS semaphore: - * This is a fairly high-level type of critical section. It ensures that no - * two threads work on the netconfigs files at the same time. Since we do - * so many things inside these, here are the rules: - * 1. begin_critical_section(S_NETCONFIGS) *before* begin_ any others. - * 2. Do *not* perform any I/O with the client during these sections. - * - */ - -/* - * Duration of time (in seconds) after which pending list subscribe/unsubscribe - * requests that have not been confirmed will be deleted. - */ -#define EXP 259200 /* three days */ - -#include "sysdep.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_SYSCALL_H -# include -#else -# if HAVE_SYS_SYSCALL_H -# include -# endif -#endif - -#include -#include -#include -#include -#include "citadel.h" -#include "server.h" -#include "citserver.h" -#include "support.h" -#include "config.h" -#include "user_ops.h" -#include "database.h" -#include "msgbase.h" -#include "internet_addressing.h" -#include "serv_network.h" -#include "clientsocket.h" -#include "citadel_dirs.h" -#include "threads.h" -#include "context.h" -#include "ctdl_module.h" -#include "netspool.h" -#include "netmail.h" diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c deleted file mode 100644 index 1921bbaff..000000000 --- a/citadel/modules/network/serv_netspool.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This module handles shared rooms, inter-Citadel mail, and outbound - * mailing list processing. - * - * Copyright (c) 2000-2021 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. - * - * ** NOTE ** A word on the S_NETCONFIGS semaphore: - * This is a fairly high-level type of critical section. It ensures that no - * two threads work on the netconfigs files at the same time. Since we do - * so many things inside these, here are the rules: - * 1. begin_critical_section(S_NETCONFIGS) *before* begin_ any others. - * 2. Do *not* perform any I/O with the client during these sections. - * - */ - -/* - * Duration of time (in seconds) after which pending list subscribe/unsubscribe - * requests that have not been confirmed will be deleted. - */ -#define EXP 259200 /* three days */ - -#include "sysdep.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_SYSCALL_H -# include -#else -# if HAVE_SYS_SYSCALL_H -# include -# endif -#endif - -#include -#include -#include -#include -#include -#include "citadel.h" -#include "server.h" -#include "citserver.h" -#include "support.h" -#include "config.h" -#include "user_ops.h" -#include "database.h" -#include "msgbase.h" -#include "internet_addressing.h" -#include "serv_network.h" -#include "clientsocket.h" -#include "citadel_dirs.h" -#include "threads.h" -#include "context.h" -#include "ctdl_module.h" -#include "netspool.h" -#include "netmail.h" - - -/* - * Module entry point - */ -CTDL_MODULE_INIT(network_spool) -{ - if (!threading) - { - //CtdlREGISTERRoomCfgType(subpending, ParseSubPendingLine, 0, 5, SerializeGeneric, DeleteGenericCfgLine); - //CtdlREGISTERRoomCfgType(unsubpending, ParseUnSubPendingLine, 0, 4, SerializeGeneric, DeleteGenericCfgLine); - //CtdlREGISTERRoomCfgType(lastsent, ParseLastSent, 1, 1, SerializeLastSent, DeleteLastSent); - //CtdlREGISTERRoomCfgType(listrecp, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); - //CtdlREGISTERRoomCfgType(digestrecp, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); - //CtdlREGISTERRoomCfgType(participate, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); - //CtdlREGISTERRoomCfgType(roommailalias, ParseRoomAlias, 0, 1, SerializeGeneric, DeleteGenericCfgLine); - } - return "network_spool"; -} diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c deleted file mode 100644 index 6ed123eb0..000000000 --- a/citadel/modules/network/serv_network.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This module handles network mail and mailing list processing. - * - * Copyright (c) 2000-2021 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. - * - * ** NOTE ** A word on the S_NETCONFIGS semaphore: - * This is a fairly high-level type of critical section. It ensures that no - * two threads work on the netconfigs files at the same time. Since we do - * so many things inside these, here are the rules: - * 1. begin_critical_section(S_NETCONFIGS) *before* begin_ any others. - * 2. Do *not* perform any I/O with the client during these sections. - */ - -/* - * Duration of time (in seconds) after which pending list subscribe/unsubscribe - * requests that have not been confirmed will be deleted. - */ -#define EXP 259200 /* three days */ - -#include "sysdep.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_SYSCALL_H -# include -#else -# if HAVE_SYS_SYSCALL_H -# include -# endif -#endif - -#include -#include -#include -#include -#include "citadel.h" -#include "server.h" -#include "citserver.h" -#include "support.h" -#include "config.h" -#include "user_ops.h" -#include "database.h" -#include "msgbase.h" -#include "internet_addressing.h" -#include "serv_network.h" -#include "clientsocket.h" -#include "citadel_dirs.h" -#include "threads.h" -#include "context.h" -#include "ctdl_module.h" -#include "netspool.h" -#include "netmail.h" - - - -/* - * Module entry point - */ -CTDL_MODULE_INIT(network) -{ - if (!threading) - { - } - return "network"; -} diff --git a/citadel/modules/network/serv_network.h b/citadel/modules/network/serv_network.h deleted file mode 100644 index d5f455ab8..000000000 --- a/citadel/modules/network/serv_network.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2000-2017 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 - */ - -void free_netfilter_list(void); -void load_network_filter_list(void); -void network_queue_room(struct ctdlroom *, void *); -- 2.30.2