* Prepared infrastructure for the networker rewrite

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 13fc032b38d2cd426ece88c915a97a03f3c7fb10..231ebbe5f3615b819d7272d9b3a222bcc53ae101 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 572.18  2000/07/22 03:44:17  ajc
+ * Prepared infrastructure for the networker rewrite
+
  Revision 572.17  2000/07/17 02:38:08  ajc
  * Completed serv_vandelay.c (importer/exporter module)
  * sendcommand.c: fix behavior of SEND_LISTING mode
@@ -1954,3 +1957,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
+

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index f57d8b1e5f6cc433a3eb6c66e60bee75ff1580b4..91afc10279e7d0eaff782aa964e1670e48b7be69 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -30,6 +30,7 @@ SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
        modules/serv_smtp$(SO) \
        modules/serv_pop3$(SO) \
        modules/serv_imap$(SO) \
+       modules/serv_network$(SO) \
        modules/serv_inetcfg$(SO) \
        modules/serv_rwho$(SO) \
        modules/serv_moderate$(SO) \
@@ -86,7 +87,8 @@ SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
        auth.c chkpwd.c html.c vcard.c serv_upgrade.c serv_vandelay.c \
        serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
        domain.c clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c \
-       serv_moderate.c client_passwords.c serv_imap.c imap_tools.c
+       serv_moderate.c client_passwords.c serv_imap.c imap_tools.c \
+       serv_network.c
 
 DEP_FILES=$(SOURCES:.c=.d)
 
@@ -198,6 +200,12 @@ modules/serv_vandelay.so: serv_vandelay.mo
 modules/serv_vandelay.mo: serv_vandelay.mo
        ln -f serv_vandelay.mo modules
 
+modules/serv_network.so: serv_network.mo
+       $(LINK_SHARED) -o modules/serv_network.so serv_network.mo
+
+modules/serv_network.mo: serv_network.mo
+       ln -f serv_network.mo modules
+
 modules/serv_upgrade.so: serv_upgrade.mo
        $(LINK_SHARED) -o modules/serv_upgrade.so serv_upgrade.mo
 

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index c9c6b513689a4afebdaa584dfa261aba06300ae2..8efb5b2d3d8b56b6a72c79ff00c7ae398711b935 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1118,6 +1118,10 @@ void delete_room(struct quickroom *qrbuf)
        assoc_file_name(filename, qrbuf, "images");
        unlink(filename);
 
+       /* Delete the room's network config file */
+       assoc_file_name(filename, qrbuf, "netconfigs");
+       unlink(filename);
+
        /* Delete the messages in the room
         * (Careful: this opens an S_QUICKROOM critical section!)
         */

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
new file mode 100644 (file)
index 0000000..f266d80
--- /dev/null
+++ b/citadel/serv_network.c
@@ -0,0 +1,54 @@
+/*
+ * $Id$ 
+ *
+ * This module will eventually replace netproc and some of its utilities.
+ * Copyright (C) 2000 by Art Cancro and others.
+ * This code is released under the terms of the GNU General Public License.
+ *
+ */
+
+#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <pwd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <string.h>
+#include <limits.h>
+#include "citadel.h"
+#include "server.h"
+#include <time.h>
+#include "sysdep_decls.h"
+#include "citserver.h"
+#include "support.h"
+#include "config.h"
+#include "dynloader.h"
+#include "room_ops.h"
+#include "user_ops.h"
+#include "policy.h"
+#include "database.h"
+#include "msgbase.h"
+#include "tools.h"
+#include "internet_addressing.h"
+#include "serv_network.h"
+
+
+void cmd_gnet(char *argbuf) {
+}
+
+
+void cmd_snet(char *argbuf) {
+}
+
+
+char *Dynamic_Module_Init(void)
+{
+       CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
+       CtdlRegisterProtoHook(cmd_snet, "SNET", "Get network config");
+       return "$Id$";
+}

diff --git a/citadel/serv_network.h b/citadel/serv_network.h
new file mode 100644 (file)
index 0000000..b28b04f
--- /dev/null
+++ b/citadel/serv_network.h
@@ -0,0 +1,3 @@
+
+
+

diff --git a/citadel/setup.c b/citadel/setup.c
index 19d6837e4efdbb0a433d16dee783ea898cbed757..16e2751566f07447f3978bd1628b86e4ecc0f479 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -903,14 +903,14 @@ NEW_INST:
 
        write_config_to_disk();
 
-       system("mkdir info 2>/dev/null");       /* Create these */
-       system("mkdir bio 2>/dev/null");
-       system("mkdir userpics 2>/dev/null");
-       system("mkdir messages 2>/dev/null");
-       system("mkdir help 2>/dev/null");
-       system("mkdir images 2>/dev/null");
-       sprintf(aaa, "mkdir %s 2>/dev/null", config.c_bucket_dir);
-       system(aaa);
+       mkdir("info", 0700);
+       mkdir("bio", 0700);
+       mkdir("userpics", 0700);
+       mkdir("messages", 0700);
+       mkdir("help", 0700);
+       mkdir("images", 0700);
+       mkdir("netconfigs", 0700);
+       mkdir(config.c_bucket_dir, 0700);
 
        /* Delete a bunch of old files from Citadel v4; don't need anymore */
        system("rm -fr ./chatpipes ./expressmsgs sessions 2>/dev/null");