From dec376f24d293ec5b3b979981238115ad4e7fd9c Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 28 Jun 1999 20:26:02 +0000 Subject: [PATCH] * Changed any remaining references to UUCP, to "Internet" instead. --- citadel/ChangeLog | 3 ++ citadel/citadel.h | 2 +- citadel/citmail.c | 20 ++++++----- citadel/install.txt | 7 ++-- citadel/ipcdef.h | 2 +- citadel/network.txt | 73 +++++++++++++++++----------------------- citadel/techdoc/hack.txt | 4 +-- 7 files changed, 52 insertions(+), 59 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index e05e30e59..5765d2349 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,3 +1,6 @@ +Mon Jun 28 16:24:10 EDT 1999 Art Cancro + * Changed any remaining references to UUCP, to "Internet" instead. + Thu Jun 24 11:13:23 EDT 1999 Art Cancro * added server command line option "-f" to defrag databases on startup * control.c: better performance and reliability in [get|put]_control() diff --git a/citadel/citadel.h b/citadel/citadel.h index 573929ef7..5005385fe 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -48,7 +48,7 @@ struct ExpirePolicy { * System configuration */ struct config { - char c_nodename[16]; /* UUCP and Citadel nodename */ + char c_nodename[16]; /* Unqualified "short" nodename */ char c_fqdn[64]; /* Fully Qualified Domain Name */ char c_humannode[21]; /* Long name of system */ char c_phonenum[16]; /* Dialup number of system */ diff --git a/citadel/citmail.c b/citadel/citmail.c index be68dff2f..49a8524e6 100644 --- a/citadel/citmail.c +++ b/citadel/citmail.c @@ -31,10 +31,14 @@ #include "config.h" #include "internetmail.h" -#define LOCAL 0 -#define REMOTE 1 -#define UUCP 2 -#define CCITADEL 3 +/* message delivery classes */ +enum { + DELIVER_LOCAL, + DELIVER_REMOTE, + DELIVER_INTERNET, + DELIVER_CCITADEL +}; + #undef tolower #define tolower(x) isupper(x) ? (x+'a'-'A') : x @@ -366,7 +370,7 @@ void do_citmail(char recp[], int dtype) char *extra_headers = NULL; - if (dtype == REMOTE) { + if (dtype == DELIVER_REMOTE) { /* get the Citadel node name out of the path */ strncpy(destsys, recp, sizeof(destsys)); @@ -458,7 +462,7 @@ void do_citmail(char recp[], int dtype) fprintf(temp, "N%s%c", nodebuf, 0); fprintf(temp, "H%s%c", frombuf, 0); - if (dtype == REMOTE) { + if (dtype == DELIVER_REMOTE) { fprintf(temp, "D%s%c", destsys, 0); } if (strlen(recp) > 0) { @@ -536,7 +540,7 @@ void deliver(char recp[], int is_test, int deliver_to_ignet) if (deliver_to_ignet) { syslog(LOG_NOTICE, "to Citadel network user %s", recp); if (is_test == 0) - do_citmail(recp, REMOTE); + do_citmail(recp, DELIVER_REMOTE); } else if (!strcmp(recp, "uudecode")) { syslog(LOG_NOTICE, "uudecoding to bit bucket directory"); if (is_test == 0) @@ -555,7 +559,7 @@ void deliver(char recp[], int is_test, int deliver_to_ignet) */ syslog(LOG_NOTICE, "to Citadel recipient %s", recp); if (is_test == 0) - do_citmail(recp, LOCAL); + do_citmail(recp, DELIVER_LOCAL); } } diff --git a/citadel/install.txt b/citadel/install.txt index 9c5e32e83..4a9aecbb4 100644 --- a/citadel/install.txt +++ b/citadel/install.txt @@ -14,11 +14,8 @@ Unix and Unix-like platforms. The author's current development environment - The Citadel/UX server (this is the back end that does all processing) - A text-based client program designed with the traditional Citadel "look and feel" (room prompts, dot commands, and the like) - - A networker that utilizes any file transfer mechanism (such as UUCP for - standalone systems, or ftp for Internet) and can share messages with other - Citadel/UX systems, as well as UseNet sites. Gateway software to talk - with C86NET (Citadel-86 and its deriviatives), HengeNet (StoneHenge), - and NYTI FordBoard is also available. + - A networker that can share rooms and email between multiple systems. + Replication can be performed via TCP/IP or any external transport. - Setup programs - A rich set of utilities for system administration and maintenance - Documentation diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h index 48d418d02..e139b49fd 100644 --- a/citadel/ipcdef.h +++ b/citadel/ipcdef.h @@ -67,7 +67,7 @@ struct CtdlServInfo { #define US_DISAPPEAR 512 /* Use "disappearing msg prompts" */ #define US_REGIS 1024 /* Registered user */ #define US_PAGINATOR 2048 /* Pause after each screen of text */ -#define US_INTERNET 4096 /* UUCP/Internet mail privileges */ +#define US_INTERNET 4096 /* Internet mail privileges */ #define US_FLOORS 8192 /* User wants to see floors */ #define US_COLOR 16384 /* User wants ANSI color support */ #define US_USER_SET (US_LASTOLD | US_EXPERT | US_UNLISTED | \ diff --git a/citadel/network.txt b/citadel/network.txt index 68c540506..d8cca7bdf 100644 --- a/citadel/network.txt +++ b/citadel/network.txt @@ -15,8 +15,8 @@ first, let's look at the various network files and directories. into Citadel/UX binary format. netmailer.c Called by the main program when a user sends a network mail message. - citmail.c A patch to allow Citadel/UX users to receive - mail through the normal UUCP mail facility. + citmail.c A local MDA which can allow Citadel users to + receive Internet mail. cux2ascii.c A filter which translates Citadel/UX binary format to UseNet news format. network Directory in which all network files reside. @@ -29,36 +29,49 @@ first, let's look at the various network files and directories. SETUP - - There are three options in setup which must be properly set. The -first is NODENAME, which must be the same as your uucp system name. The second -is HUMANNODE, which is the "long" full name of your system (for documentation). -The third is FQDN, which is your system's fully qualified domain name. If -you don't have a domain, just set this value to your NODENAME followed by the -string ".UUCP" (a traditional convention, even if you're not on a UUCP net). + + There are a few options in the Global System Configuration which pertain +to the network. They are: + + -> node name: this is the unqualified "short" node name which uniquely +identifies your system on a Citadel network. + -> fully-qualified domain name (FQDN): this identifies how your computer is +named on the Internet. + -> Human-readable node name: this is a longer, more verbose name for your +system. It is also used as your "node title" on older Cit86Net-based +networks. SETTING UP SYSTEMS FILES + + Please note that it is *much* easier to use the "netsetup" (command-line) +or "dnetsetup" (curses-based) utilities to create systems files. You should +only work with these files manually if you need to do something special. For each of your neighboring Citadel/UX systems you must create a systems file. The file is called network/systems/sysname, where sysname is the other system's node name. The first line contains a command that transfers a spool file to the network/spoolin directory on the remote system. The string "%s" will be replaced by the name of the spool file by netproc. You may only use -%s ONCE in the command line. Usually, some sort of UUCP transfer will be used +%s ONCE in the command line. Usually, some sort of remote copy will be used to do the transfer, but you may use any facility you want, *** as long as the -file ends up in the network/spoolin directory on the remote system ***. In -a typical system, you will probably use uux to pipe the file through the -command "rcit -c" on the remote system. When the remote system receives this -command, it will copy standard input to the network/spoolin directory, and -then begin processing the file as soon as it is there. +file ends up in the network/spoolin directory on the remote system ***. + + If you're on the Internet, or any TCP/IP network, your systems file should +contain the following copy command: + +cat %s >>./network/spoolout/remote_system_name + + This simply stores the outbound spool data in a file in the "spoolout" +directory, where it will be picked up by server-to-server transfer programs. + After the command line you should enter the names of all the rooms you intend to share with this system. Each room name should be followed by a line containing a zero - this extra field is the "last message sent" (which will be updated by netproc when it is run). Here is a sample systems file for a node called uncnsrd: -cat %s |uux - uncnsrd!rcit -c +cat %s >>./network/spoolout/uncnsrd Network Test 0 Gateway @@ -87,30 +100,6 @@ messages travel across the network as quickly as possible. handle incoming messages only. - NETWORKING WITH A USENET NEWS SITE - - Two filters are provided that will allow a room to be equivalent to a -UseNet newsgroup. rcit, when called without the -c argument, will assume -that standard input is in the news format, and convert it before processing. -Likewise, the filter cux2ascii.c converts Citadel format to news format, -allowing you to use command lines such as - - cat %s |cux2ascii |uux - uunet!rnews - - ...the remote system need not be a Citadel/UX. By default, room names are -the same as the newsgroup names. However, if you wish the room name to be -different, you may specify so in the network/rnews.xref file. Here is a -sample of this file: - -comp.unix.wizards,UNIX wizards -alt.drugs,Drugs and Narcotics -alt.music,Music - - It is rather simple, each line taking the form of newsgroupname,sysname. -There may not be any spaces in the newsgroup name, but there may be spaces -in the corresponding room name. - - USING CITADEL/UX AS YOUR LOCAL E-MAIL SYSTEM To use Citadel/UX as your local mail system, simply define the "citmail" @@ -131,7 +120,7 @@ Pink Amoebas" at the target system. PLEASE NOTE that for your BBS users to be able to send mail, you should check the mailer command at the top of "netmailer.c" to be sure that it is the correct mailer command for your system. You might need a command like -"sendmail %s" for SMTP or "rmail %s" for UUCP. +"sendmail %s" or "smail %s" depending on what MTA you're using. MAIL ALIASES @@ -224,7 +213,7 @@ uum othersys!gateway!mailsys!%s information.) The "bin" entries specify neighbors, the "use" entries specify routing, and -the "uum" entries specify regular UUCP mail. The method of delivery is totally +the "uum" entries specify Internet mail. The method of delivery is totally transparent to the user, who only needs to enter the recipient as user@sysname. Note that netproc will probably stuff lots of other info into each entry. diff --git a/citadel/techdoc/hack.txt b/citadel/techdoc/hack.txt index fa757ed2a..321a2ea15 100644 --- a/citadel/techdoc/hack.txt +++ b/citadel/techdoc/hack.txt @@ -96,8 +96,8 @@ M Message Text Normal ASCII, newlines seperated by CR's or LF's, N Nodename Contains node name of system message originated on. O Room Room of origin. P Path Complete path of message, as in the UseNet news - standard. A user should be able to send UUCP mail to - this path. (Note that your system name will not be + standard. A user should be able to send Internet mail + to this path. (Note that your system name will not be tacked onto this until you're sending the message to someone else) R Recipient Only present in Mail messages. -- 2.30.2