CVSROOT : /home/coder-com/cvs
Module : ircu2.10
Branch tags: u2_10_11_01
Commit time: 2002-09-04 23:44:29 UTC
Modified files:
Tag: u2_10_11_01
ChangeLog INSTALL README README.FreeBSD doc/example.conf
doc/ircd.conf.sample doc/readme.features include/ircd_defs.h
include/ircd_features.h include/supported.h ircd/ircd.c
ircd/ircd_features.c ircd/ircd_relay.c
Log message:
Author: Arjen Wolfs <[EMAIL PROTECTED]> and Kev <[EMAIL PROTECTED]>
Log message:
Arjen:
Documentation typo fixups.
Kev:
Remove + as a channel prefix, since they're being deprecated. Create new
features NETWORK and URL_CLIENTS, so we can remove the define from
ircd_defs.h--these seem to have gotten overlooked before the .00 release.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.123.4.1 ircu2.10/ChangeLog:1.290.2.123.4.2
--- ircu2.10/ChangeLog:1.290.2.123.4.1 Tue Sep 3 20:44:48 2002
+++ ircu2.10/ChangeLog Wed Sep 4 18:44:18 2002
@@ -1,3 +1,38 @@
+2002-09-04 Kevin L Mitchell <[EMAIL PROTECTED]>
+
+ * doc/readme.features: add documentation for NETWORK and
+ URL_CLIENTS
+
+ * doc/example.conf: list new F-lines for NETWORK and
+ URL_CLIENTS--yeah, it's redundant, but we'll keep it for now
+
+ * doc/ircd.conf.sample: list new F-lines for NETWORK and
+ URL_CLIENTS
+
+ * ircd/ircd_relay.c: use feature for NETWORK
+
+ * ircd/ircd.c: use feature for URL_CLIENTS
+
+ * include/ircd_defs.h: remove now deprecated defined for NETWORK;
+ remove now deprecated define for URL_CLIENTS
+
+ * include/supported.h (FEATURESVALUES2): remove + as a channel
+ prefix, since we're deprecating them; use FEAT_NETWORK value
+ instead of static value set in ircd_defs.h
+
+ * ircd/ircd_features.c: create new FEAT_NETWORK, FEAT_URL_CLIENTS
+
+ * include/ircd_features.h: create new FEAT_NETWORK,
+ FEAT_URL_CLIENTS
+
+2002-09-04 Arjen Wolfs <[EMAIL PROTECTED]>
+
+ * README.FreeBSD: fix a few typos
+
+ * README: fix a few typos
+
+ * INSTALL: fix a few typos
+
2002-09-03 Kevin L Mitchell <[EMAIL PROTECTED]>
* include/patchlevel.h (PATCHLEVEL): bump patchlevel for
Index: ircu2.10/INSTALL
diff -u ircu2.10/INSTALL:1.3.2.2 ircu2.10/INSTALL:1.3.2.2.4.1
--- ircu2.10/INSTALL:1.3.2.2 Sat Aug 3 19:11:06 2002
+++ ircu2.10/INSTALL Wed Sep 4 18:44:18 2002
@@ -19,7 +19,7 @@
this and run configure again.
If configure runs without error(s), you are ready to compile. To compile ircu,
-run "make". Please use GNU make and gcc If the source code does not compile,
+run "make". Please use GNU make and gcc. If the source code does not compile,
make sure your environment is setup correctly. If you are convinced the source
of the failure is ircu, gather all relevant information about your system such
as the Architecture, OS version, the configure statement you used, etc. and
@@ -28,9 +28,12 @@
Once ircu is compiled, install it by running "make install".
Next, you will have to configure your IRC server by setting up your ircd.conf
-file. Use the included doc/example.conf as a starting point.
+file. Use the included doc/ircd.cond.sample as a starting point.
Setting up ircd.conf can be a bit tricky, so if this is your first time doing
it, begin with a bare-bones configuration and extend it as you go.
+
+If you are upgrading from ircu2.10.10, use the tools/transition script to
+convert your existing configuration file(s).
Good Luck!
Index: ircu2.10/README
diff -u ircu2.10/README:1.2.2.2 ircu2.10/README:1.2.2.2.4.1
--- ircu2.10/README:1.2.2.2 Mon Sep 2 10:29:35 2002
+++ ircu2.10/README Wed Sep 4 18:44:18 2002
@@ -14,8 +14,8 @@
many settings to be changed dynamically, rather than by with compile-
time configuration.
- The new "account" feature added to the P10 protocol, allows people to
- remain into service bots (i.e., gnuworld) during a netsplit. This means
- people will not have to login again once the network rejoins.
+ remain logged in to service bots (i.e., gnuworld) during a netsplit.
+ This means people will not have to login again once the network rejoins.
INSTALLATION
@@ -32,7 +32,7 @@
For platform-specific notes and hints, see the various README.<platform>
files included in this distribution. The notes below apply to servers that
-will serve large numbers (thousands) of clients simultaenously. If your
+will serve large numbers (thousands) of clients simultaneously. If your
server serves a small amount of users, you will not really have to do much
of anything about performance tuning.
Index: ircu2.10/README.FreeBSD
diff -u ircu2.10/README.FreeBSD:1.1.2.2 ircu2.10/README.FreeBSD:1.1.2.2.4.1
--- ircu2.10/README.FreeBSD:1.1.2.2 Mon Sep 2 10:29:35 2002
+++ ircu2.10/README.FreeBSD Wed Sep 4 18:44:18 2002
@@ -2,12 +2,11 @@
When running on FreeBSD, ircu can make use of the kqueue() event engine, which
results in much improved performance over the old poll()-based method. kqueue
-is included in the more recent 4.x release of FreeBSD.
+is included in the more recent 4.x releases of FreeBSD.
In order for ircu to be able to serve many clients simultaneously, you need
to increase the maximum allowable number of open files in the system. To do
-this, add lines execute commands such as the following during your system's
-boot sequence:
+this, add commands such as the following during your system's boot sequence:
sysctl -w kern.maxfiles=16384
sysctl -w kern.maxfilesperproc=16384
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.15.2.6 ircu2.10/doc/example.conf:1.15.2.6.4.1
--- ircu2.10/doc/example.conf:1.15.2.6 Wed Jul 17 17:55:39 2002
+++ ircu2.10/doc/example.conf Wed Sep 4 18:44:19 2002
@@ -579,6 +579,8 @@
# F:HIS_SERVERNAME:"*.undernet.org"
# F:HIS_SERVERINFO:"The Undernet Underworld"
# F:HIS_URLSERVERS:"http://www.undernet.org/servers.php";
+# F:NETWORK:"UnderNet"
+# F:URL_CLIENTS:"ftp://ftp.undernet.org/pub/irc/clients";
# Well, you have now reached the end of this sample configuration
Index: ircu2.10/doc/ircd.conf.sample
diff -u ircu2.10/doc/ircd.conf.sample:1.1.2.1 ircu2.10/doc/ircd.conf.sample:1.1.2.1.4.1
--- ircu2.10/doc/ircd.conf.sample:1.1.2.1 Mon Sep 2 10:34:35 2002
+++ ircu2.10/doc/ircd.conf.sample Wed Sep 4 18:44:19 2002
@@ -562,6 +562,8 @@
F:HIS_SERVERNAME:"*.undernet.org"
F:HIS_SERVERINFO:"The Undernet Underworld"
F:HIS_URLSERVERS:"http://www.undernet.org/servers.php";
+F:NETWORK:"UnderNet"
+F:URL_CLIENTS:"ftp://ftp.undernet.org/pub/irc/clients";
# That's it, you've (almost) reached the end!
Index: ircu2.10/doc/readme.features
diff -u ircu2.10/doc/readme.features:1.2.2.7 ircu2.10/doc/readme.features:1.2.2.7.4.1
--- ircu2.10/doc/readme.features:1.2.2.7 Mon Aug 19 10:51:54 2002
+++ ircu2.10/doc/readme.features Wed Sep 4 18:44:19 2002
@@ -1026,3 +1026,16 @@
As per UnderNet CFV-165, this is the URL shown to users when they do a /MAP or
/LINKS.
+
+NETWORK
+ * Type: string
+ * Default: "UnderNet"
+
+This defines the network name as reported in the 005 "supported features"
+numeric, and as used by the "Failed to deliver" message.
+
+URL_CLIENTS
+ * Type: string
+ * Default: "ftp://ftp.undernet.org/pub/irc/clients";
+
+This defines a URL that users may visit to find compatible IRC clients.
Index: ircu2.10/include/ircd_defs.h
diff -u ircu2.10/include/ircd_defs.h:1.3.2.2 ircu2.10/include/ircd_defs.h:1.3.2.2.4.1
--- ircu2.10/include/ircd_defs.h:1.3.2.2 Sat Jan 12 20:58:43 2002
+++ ircu2.10/include/ircd_defs.h Wed Sep 4 18:44:19 2002
@@ -19,7 +19,7 @@
*
* Commentary by Bleep (Thomas Helvey)
*
- * $Id: ircd_defs.h,v 1.3.2.2 2002/01/13 02:58:43 kev Exp $
+ * $Id: ircd_defs.h,v 1.3.2.2.4.1 2002/09/04 23:44:19 kev Exp $
*/
#ifndef INCLUDED_ircd_defs_h
#define INCLUDED_ircd_defs_h
@@ -28,16 +28,6 @@
* NOTE: Changing any of these definitions is equivalent to a protocol
* revision. Every server on a given network must also use the same sizes.
*/
-
-/*
- * NETWORK is the name the server claims the network is
- */
-#define NETWORK "UnderNet"
-
-/*
- * URL_CLIENTS is a URL to where to find compatible clients
- */
-#define URL_CLIENTS "ftp://ftp.undernet.org/pub/irc/clients";
/*
* NICKLEN is the maximum length allowed for a nickname
Index: ircu2.10/include/ircd_features.h
diff -u ircu2.10/include/ircd_features.h:1.11.2.7
ircu2.10/include/ircd_features.h:1.11.2.7.4.1
--- ircu2.10/include/ircd_features.h:1.11.2.7 Wed Jul 17 17:55:40 2002
+++ ircu2.10/include/ircd_features.h Wed Sep 4 18:44:19 2002
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd_features.h,v 1.11.2.7 2002/07/17 22:55:40 kev Exp $
+ * $Id: ircd_features.h,v 1.11.2.7.4.1 2002/09/04 23:44:19 kev Exp $
*/
struct Client;
@@ -165,6 +165,10 @@
FEAT_HIS_SERVERNAME,
FEAT_HIS_SERVERINFO,
FEAT_HIS_URLSERVERS,
+
+ /* Misc. random stuff */
+ FEAT_NETWORK,
+ FEAT_URL_CLIENTS,
FEAT_LAST_F
};
Index: ircu2.10/include/supported.h
diff -u ircu2.10/include/supported.h:1.9.2.4 ircu2.10/include/supported.h:1.9.2.4.4.1
--- ircu2.10/include/supported.h:1.9.2.4 Mon Apr 8 05:45:39 2002
+++ ircu2.10/include/supported.h Wed Sep 4 18:44:19 2002
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: supported.h,v 1.9.2.4 2002/04/08 10:45:39 vampire Exp $
+ * $Id: supported.h,v 1.9.2.4.4.1 2002/09/04 23:44:19 kev Exp $
*
* Description: This file has the featureset that ircu announces on connecting
* a client. It's in this .h because it's likely to be appended
@@ -57,7 +57,8 @@
feature_int(FEAT_MAXBANS), NICKLEN, TOPICLEN, \
AWAYLEN, TOPICLEN
-#define FEATURESVALUES2 "+#&", "(ov)@+", "b,k,l,imnpstr", "rfc1459", NETWORK
+#define FEATURESVALUES2 "#&", "(ov)@+", "b,k,l,imnpstr", "rfc1459", \
+ feature_str(FEAT_NETWORK)
#endif /* INCLUDED_supported_h */
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.51.2.8 ircu2.10/ircd/ircd.c:1.51.2.8.4.1
--- ircu2.10/ircd/ircd.c:1.51.2.8 Sat Jul 13 20:22:05 2002
+++ ircu2.10/ircd/ircd.c Wed Sep 4 18:44:19 2002
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd.c,v 1.51.2.8 2002/07/14 01:22:05 kev Exp $
+ * $Id: ircd.c,v 1.51.2.8.4.1 2002/09/04 23:44:19 kev Exp $
*/
#include "config.h"
@@ -393,8 +393,8 @@
send_reply(cptr, SND_EXPLICIT | ERR_BADPING,
":Your client may not be compatible with this server.");
send_reply(cptr, SND_EXPLICIT | ERR_BADPING,
- ":Compatible clients are available at "
- URL_CLIENTS);
+ ":Compatible clients are available at %s",
+ feature_str(FEAT_URL_CLIENTS));
}
exit_client_msg(cptr,cptr,&me, "Ping Timeout");
continue;
Index: ircu2.10/ircd/ircd_features.c
diff -u ircu2.10/ircd/ircd_features.c:1.15.2.8
ircu2.10/ircd/ircd_features.c:1.15.2.8.4.1
--- ircu2.10/ircd/ircd_features.c:1.15.2.8 Mon Aug 19 10:51:54 2002
+++ ircu2.10/ircd/ircd_features.c Wed Sep 4 18:44:19 2002
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd_features.c,v 1.15.2.8 2002/08/19 15:51:54 kev Exp $
+ * $Id: ircd_features.c,v 1.15.2.8.4.1 2002/09/04 23:44:19 kev Exp $
*/
#include "config.h"
@@ -372,6 +372,10 @@
F_S(HIS_SERVERNAME, 0, "*.undernet.org", 0),
F_S(HIS_SERVERINFO, 0, "The Undernet Underworld", 0),
F_S(HIS_URLSERVERS, 0, "http://www.undernet.org/servers.php";, 0),
+
+ /* Misc. random stuff */
+ F_S(NETWORK, 0, "UnderNet", 0),
+ F_S(URL_CLIENTS, 0, "ftp://ftp.undernet.org/pub/irc/clients";, 0),
#undef F_S
#undef F_B
Index: ircu2.10/ircd/ircd_relay.c
diff -u ircu2.10/ircd/ircd_relay.c:1.8 ircu2.10/ircd/ircd_relay.c:1.8.6.1
--- ircu2.10/ircd/ircd_relay.c:1.8 Mon Sep 17 04:00:59 2001
+++ ircu2.10/ircd/ircd_relay.c Wed Sep 4 18:44:19 2002
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd_relay.c,v 1.8 2001/09/17 09:00:59 isomer Exp $
+ * $Id: ircd_relay.c,v 1.8.6.1 2002/09/04 23:44:19 kev Exp $
*/
#include "config.h"
@@ -30,6 +30,7 @@
#include "hash.h"
#include "ircd.h"
#include "ircd_chattr.h"
+#include "ircd_features.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "match.h"
@@ -306,8 +307,8 @@
* nickname addressed?
*/
if (0 == (acptr = findNUser(name)) || !IsUser(acptr)) {
- send_reply(sptr, SND_EXPLICIT | ERR_NOSUCHNICK, "* :Target left " NETWORK ". "
- "Failed to deliver: [%.20s]", text);
+ send_reply(sptr, SND_EXPLICIT | ERR_NOSUCHNICK, "* :Target left %s. "
+ "Failed to deliver: [%.20s]", feature_str(FEAT_NETWORK), text);
return;
}
if (is_silenced(sptr, acptr))
----------------------- End of diff -----------------------
