From 5713fadcc7efab3a4170a465040f6003a8c0f6cc Mon Sep 17 00:00:00 2001 From: Perry Lorier Date: Sat, 15 Jul 2000 01:31:24 +0000 Subject: [PATCH] Author: Isomer Log message: More doco changes, IPcheck 'fixes'. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@268 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- BUGS | 7 +++-- ChangeLog | 9 ++++-- doc/ircd.8 | 76 ++++++++++++++++++++------------------------------ ircd/IPcheck.c | 2 +- ircd/s_bsd.c | 8 ++++-- ircd/s_user.c | 1 - 6 files changed, 49 insertions(+), 54 deletions(-) diff --git a/BUGS b/BUGS index 473ae52..31bb985 100644 --- a/BUGS +++ b/BUGS @@ -1,8 +1,9 @@ # # BUGS file for ircu2.10 # -# $Id: BUGS,v 1.6 2000-04-15 04:20:14 bleep Exp $ +# $Id: BUGS,v 1.7 2000-07-15 01:31:23 isomer Exp $ # * crule parser coredumps on invalid input -* /mode #foo +o Thisnickdoesntexist -> Core dump. Kev? - - FIXED +* throttle + * gets corrupted data when adding a new server. + * looses count and assert()'s frequently? diff --git a/ChangeLog b/ChangeLog index 01ffa79..ad17e0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ +2000-07-09 Perry Lorier + * doc/ircd.8: Applied grammitical changes by Liandrin, applied + changes suggested by various other people. + * ircd/IPcheck.c: More bug fixes. Current problem appears to be + that it gets a corrupt entry somehow. 2000-07-09 Greg Sikorski * ircd/m_oper.c: Clean up compiler warning. 2000-07-08 Perry Lorier * doc/ircd.8: Updated the documentation, it was slightly out of date - being updated around the 05 March 1988. + being updated around 1989. * ircd/m_whois.c: Rewrote for clarity, and probably a bit more speed. fixed a few minor glitches. * doc/rfc1459.unet: Updated. @@ -1272,7 +1277,7 @@ # # ChangeLog for ircu2.10.11 # -# $Id: ChangeLog,v 1.155 2000-07-09 14:19:43 gte Exp $ +# $Id: ChangeLog,v 1.156 2000-07-15 01:31:23 isomer Exp $ # # Insert new changes at beginning of the change list. # diff --git a/doc/ircd.8 b/doc/ircd.8 index 92a1369..681fbc3 100644 --- a/doc/ircd.8 +++ b/doc/ircd.8 @@ -1,5 +1,5 @@ .\" @(#)ircd.8 2.0 (beta version) 29 Mar 1989 -.TH IRCD 8 "8 July 2000" +.TH IRCD 8 "10 July 2000" .SH NAME ircd \- The Undernet Internet Relay Chat Daemon .SH SYNOPSIS @@ -8,17 +8,16 @@ ircd \- The Undernet Internet Relay Chat Daemon [-t] [-d directory] [-f configfile] [-x debuglevel] [-h hostname] .SH DESCRIPTION .LP -\fIircd\fP is the server (daemon) program for the Internet Relay Chat -Program. The \fIircd\fP is a server in that its function is to "serve" +\fIircd\fP is the Undernet Internet Relay Chat daemon. +\fIircd\fP is a server in that its function is to "serve" the client program \fIirc(1)\fP with messages and commands. All commands -and user messages are passed directly to the \fIircd\fP for processing -and relaying to other ircd sites. The \fIirc(1)\fP program depends upon -there being an \fIircd\fP server running somewhere (either on your local -UNIX site or a remote ircd site) so that it will have somewhere to connect -to and thus allow the user to begin talking to other users. +and user messages are passed directly to \fIircd\fP for processing +and relaying to other servers. \fIirc(1)\fP depends upon +there being an \fIircd\fP server running somewhere for it to connect to +and thus allow the user to begin talking to other users. .LP -There are many common clients including ircii, epic, BitchX and other ones -for Non unix platforms as well, such as mIRC, Pirch, Ircle etc. +There are many common clients including ircII, EPIC, and BitchX for UNIX, +mIRC and pIRCh for Windows, and IRCle and Homer for the Macintosh. .SH OPTIONS .TP .B \-d directory @@ -26,57 +25,46 @@ This option tells the server to change to that directory and use that as a reference point when opening \fIircd.conf\fP and other startup files. .TP -.B \-o -This option is obsolete. -.TP -.B \-a -This option is obsolete. -.TP .B \-t Instructs the server run in the foreground and to direct debugging output to standard output. .TP .B \-x# -Defines the debuglevel for ircd. The higher the debuglevel, the more stuff -gets directed to debugging file (or standard output if -t option was used -as well). -.TP -.B \-i -This option is obsolete. +Defines the debug level for \fIircd\fP. The higher the debug level, the more +messages get directed to debugging file (or standard output if the -t option is +used). .TP .B \-w interface -This command is depreciated. Outgoing connections are bound to the -interface specified in the M:, and Incoming connections are accepted only on -interfaces specified in the P:'s. +This option is deprecated. Outgoing connections are bound to the +interface specified in the M: line, and incoming connections are accepted only on +interfaces specified in the P: lines. .TP .B \-f filename -Specifies the ircd.conf file to be used for this ircdaemon. The option -is used to override the default ircd.conf given at compile time. +Specifies the \fIircd.conf\fP file to be used for this server. The option +is used to override the default \fIircd.conf\fP given at compile time. .TP .B \-c -This flag must be given if you are running ircd from \fI/dev/console\fP or -any other situation where fd 0 isnt a tty and you want the server to fork +This flag must be given if you are running \fIircd\fP from \fI/dev/console\fP or +any other situation where fd 0 isn't a TTY and you want the server to fork off and run in the background. This needs to be given if you are starting \fIircd\fP from an \fIrc\fP (such as \fI/etc/rc.local\fP) file. .TP -.B \-q -This option is obsolete. -.TP .B \-h hostname Allows the user to manually set the server name at startup. The default name is hostname.domainname. +.TP .B \-p portname -This is depreciated in favour of specifying server ports in P:'s +This is deprecated in favor of specifying server ports in P: lines. .SH CONFIGURATION -If you plan to connect your \fIircd\fP server to an existing Irc-Network, -you will need to alter your local IRC CONFIGURATION FILE (typically named -"ircd.conf") so that it will accept and make connections to other \fIircd\fP -servers. This file contains the hostnames, Network Addresses, and sometimes -passwords for connections to other ircds around the world. Because -description of the actual file format of the "ircd.conf" file is beyond the -scope of this document, please refer to the file INSTALL in the IRC source -files documentation directory. +If you plan to connect your \fIircd\fP server to an existing IRC network, +you will need to alter your local \fIircd\fP configuration file (typically named +\fIircd.conf\fP) so that it will accept and make connections to other IRC +servers. This file contains the hostnames, network addresses, and +passwords for connections to other IRC servers around the world. Because +the description of the \fIircd.conf\fP file is beyond the scope of this +document, please refer to the INSTALL file in the \fIircd\fP +documentation directory. .LP BOOTING THE SERVER: The \fIircd\fP server can be started as part of the UNIX boot procedure or just by placing the server into Unix Background. @@ -113,13 +101,11 @@ For full COPYRIGHT see LICENSE file with IRC package. .RE .SH FILES /etc/utmp - "irc.conf" + "ircd.conf" .SH "SEE ALSO" irc(1) .SH BUGS See the file 'BUGS' included in the distribution. .SH AUTHOR The current authors of the undernet IRC daemon are coder-com@undernet.org, -the original author was Jarkko Oikarinen, currently jto@tolsun.oulu.fi, -manual page written by Jeff Trim, jtrim@orion.cair.du.edu, later modified by -jto@tolsun.oulu.fi and then isomer@coders.net. +the original author was Jarkko Oikarinen. \ No newline at end of file diff --git a/ircd/IPcheck.c b/ircd/IPcheck.c index 47bb61b..f867f74 100644 --- a/ircd/IPcheck.c +++ b/ircd/IPcheck.c @@ -35,7 +35,7 @@ #include #include -#if 1 +#if 0 #warning Nick collisions are horribly broken in #warning this version, and its known to core on #warning a whim. If your even concidering diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c index 5e39f22..f5c8aeb 100644 --- a/ircd/s_bsd.c +++ b/ircd/s_bsd.c @@ -611,7 +611,7 @@ void add_connection(struct Listener* listener, int fd) { ++listener->ref_count; Count_newunknown(UserStats); - + ip_registry_connect_succeeded(new_client); /* if we've made it this far we can put the client on the auth query pile */ start_auth(new_client); } @@ -1418,7 +1418,11 @@ int connect_server(struct ConfItem* aconf, struct Client* by, Count_newunknown(UserStats); ip_registry_add_local(aconf->ipnum.s_addr); - + /* Actually we lie, the connect hasn't succeeded yet, but we have a valid + * cptr, so we register it now. + * Maybe these two calls should be merged. + */ + ip_registry_connect_succeeded(cptr); add_client_to_list(cptr); hAddClient(cptr); nextping = CurrentTime; diff --git a/ircd/s_user.c b/ircd/s_user.c index 1c93ad4..cf85fb8 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -625,7 +625,6 @@ int register_user(struct Client *cptr, struct Client *sptr, nextping = CurrentTime; if (sptr->snomask & SNO_NOISY) set_snomask(sptr, sptr->snomask & SNO_NOISY, SNO_ADD); - ip_registry_connect_succeeded(sptr); } else /* if (IsServer(cptr)) */ -- 2.20.1