ngIRCd 0.8.3

to do IDENT lookups and is logging to syslog. Bug discovered by CoKi,
<coki@nosystem.com.ar>, thanks a lot! [from HEAD.]
(http://www.nosystem.com.ar/advisories/advisory-11.txt)

AUTHORS

@@ -1,13 +1,35 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                        (c)2001-2005 Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
-                           -- AUTHORS / Autoren --
+                       -- AUTHORS and CONTRIBUTORS --
 
 
-Alexander Barton, alex@arthur.ath.cx
+Main Authors
+~~~~~~~~~~~~
+Alexander Barton, <alex@barton.de> (alex)
+
+
+Contributors
+~~~~~~~~~~~~
+Goetz Hoffart, <goetz@hoffart.de> (goetz)
+Ilja Osthoff, <i.osthoff@gmx.net> (ilja)
+Benjamin Pineau, <ben@zouh.org>
+Sean Reifschneider, <jafo-rpms@tummy.com>
+Florian Westphal, <westphal@foo.fh-furtwangen.de>
+
+
+Code snippets
+~~~~~~~~~~~~~
+J. Kercheval: pattern matching functions
+Patrick Powell, <papowell@astart.com>: snprintf()-function
+Andrew Tridgell & Martin Pool: strl{cpy|cat}()-functions
+
+
+-- 
+$Id: AUTHORS,v 1.8.2.2 2005/01/26 13:26:41 alex Exp $

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

ChangeLog

@@ -1,15 +1,482 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                       (c)2001-2005 Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
-                        -- ChangeLog / Aenderungen --
+                               -- ChangeLog --
 
 
+ngIRCd 0.8.3 (2005-02-03)
+
+  - Fixed a bug that could case a root exploit when the daemon is compiled
+    to do IDENT lookups and is logging to syslog. Bug discovered by CoKi,
+    <coki@nosystem.com.ar>, thanks a lot!
+    (http://www.nosystem.com.ar/advisories/advisory-11.txt)
+
+ngIRCd 0.8.2 (2005-01-26)
+
+  - Added doc/SSL.txt to distribution.
+  - Fixed a buffer overflow that could cause the daemon to crash. Bug found
+    by Florian Westphal, <westphal@foo.fh-furtwangen.de>.
+  - Fixed a possible buffer underrun when reading the MOTD file. Thanks
+    to Florian Westphal, <westphal@foo.fh-furtwangen.de>.
+  - Fixed detection of IRC lines which are too long to send. Detected by
+    Florian Westphal, <westphal@foo.fh-furtwangen.de>.
+  - Fixed return values of our own implementation of strlcpy(). The code has
+    been taken from rsync and they fixed it, but we didn't until today :-/
+    It has only been used when the system didn't implement strlcpy by itself,
+    not on "modern" systems. Florian Westphal, <westphal@foo.fh-furtwangen.de>.
+
+nIRCd 0.8.1 (2004-12-25)
+
+  - Autoconf: Updated config.guess and config.sub
+  - Added some more debug code ...
+  - Fixed wrong variable names in output of "ngircd --configtest".
+  - Debian: Fxied the name of the "default file" in the init script for
+    ngircd-full packages. And do the test if the binary is executable after
+    reading this file.
+  - Enhanced the "test suite": please have a look at src/testsuite/README!
+
+ngIRCd 0.8.0 (2004-06-26)
+
+  - Fixed wrong buffer size calculation for results of the resolver.
+
+  ngIRCd 0.8.0-pre2 (2004-05-16)
+  - Enhanced logging to console when running in "no-detached mode": added
+    PID and log messages of resolver sub-processes.
+  - Fixed host name lookups when using IDENT user lookups.
+  - "make clean" and "make maintainer-clean" remove more files mow.
+
+  ngIRCd 0.8.0-pre1 (2004-05-07)
+  - Two new configuration options: "ChrootDir" and "MotdPhrase", thanks to
+    Benjamin Pineau <ben@zouh.org>. Now you can force the daemon to change
+    its root and working directory to something "safe". MotdPhrase is used
+    to define an "MOTD string" instead of a whole file, useful if the
+    "real" MOTD file would be outside the "jail".
+  - INVITE- and BAN-lists become synchronized between IRC+ servers when
+    establishing new connections, if the peer supports this as well.
+  - Reorganized autogen.sh and configure scripts.
+  - Fixed a wrong assert() which could cause the daemon to exit spuriously
+    when closing down connections.
+  - Better logging of decompression errors returned by zlib.
+  - Servers other than the destination server didn't clean up the invite
+    list of an "invite-only" channel properly when an INVITE'd user joined.
+  - Changed the reply of the MODE command to match the syntax of the
+    original ircd exactly: the unnecessary but missing ":" before the last
+    parameter has been added.
+  - Fixed TRACE: don't output "Serv" lines for ourself; display more info.
+  - Results of the resolver (hostnames and IDENT names) are discarded after
+    the client is successfully registered with the server.
+  - Better logging while establishing and shutting down connections.
+  - The type of service (TOS) of all sockets is set to "interactive" now.
+  - Added short command line option "-t" as alternative to "--configtest".
+  - Added optional support for "IDENT" lookups on incoming connections. You
+    have to enable this function with the ./configure switch "--with-ident".
+    The default is not to do IDENT lookups.
+
+ngIRCd 0.7.7 (2004-02-05)
+
+  - The info text ("real name") of users is set to "-" if none has been
+    specified using the USER command (e. g. "USER user * * :"). Reason:
+    the original ircd doesn't like empty ones and would KILL such users.
+  - Fixed (optional) TCP Wrapper test which was broken and could result in
+    false results. Thanks to Fuminori Tanizaki <tany@mcnet.ad.jp>!
+  - Removed "USE_" prefixes of configuration #defines.
+
+ngIRCd 0.7.6 (2003-12-05)
+
+  - Fixed abort() ("server crash") when INVITE'ing users to nonexistent
+    channels. Bug found by <hiddenx@wp.pl>.
+  - Extended version numbering of CVS versions (added date).
+  - Enhanced/fixed doc/Protocol.txt;
+
+ngIRCd 0.7.5 (2003-11-07)
+
+  - Fixed ban behavior: users which are banned from a channel can't no
+    longer send PRIVMSG's to this channel (fixes Bug #47).
+  - Fixed and enhanced the "penalty handling" of the server: commands that
+    require more resources block the client for a short time.
+  - Changed the internal time resolution to one second.
+  - New configuration variable "MaxConnectionsIP" to limit the number of
+    simultaneous connections from a single IP that the server will accept.
+    This configuration options lowers the risk of denial of service attacks
+    (DoS), the default is 5 connections per client IP.
+  - Fixed build problems under Mac OS X 10.3.
+  - Use "-pipe" when compiling with gcc, speeds things up a little :-)
+  - Added new configuration variable "Listen" to bind all listening
+    sockets of the server to a single IP address.
+  - Suppress misleading error message of diff during make run.
+  - Enhanced test-suite and made it work on GNU/Hurd.
+  - Fixed minor typo in debug output :-)
+
+ngIRCd 0.7.1 (2003-07-18)
+
+  - Included files to build Debian packages (located in "debian/").
+  - Updated config.guess and config.sub to newer upstream versions.
+  - NJOIN propagates user channel modes correctly again ... Upsa.
+  - Made Makefile more compatible with "make -j<n>".
+  - Added support for GNU/Hurd.
+  - Fixed a compiler warning related to an unnecessary assert().
+  - Enhanced VERSION command when using debug versions.
+
+ngIRCd 0.7.0 (2003-05-01)
+
+  - "ServerName" is checked better now: a dot (".") is required.
+  - The KILL command verifies and logs more parameters.
+
+  ngIRCd 0.7.0-pre2 (2003-04-27)
+  - CVS build system fixes (made autogen.sh more portable).
+  - Fixed compilation and test-suite on Solaris (tested with 2.6).
+  - New documentation file "doc/Platforms.txt" describing the status of
+    ngIRCd on the various tested platforms.
+  - Test for broken GCC on Mac OS X and disable "-pedantic" in this case.
+  - Disable "-ansi" on Cygwin: system headers are incompatible.
+  - The server tried to connect to other servers only once when DNS or
+    socket failures occurred.
+  - Fixed --configtest: There is no variable "ServerPwd", it's "Password".
+
+  ngIRCd 0.7.0-pre1 (2003-04-22)
+  - New signal handler (more secure, actions are executed outside).
+  - GCC: the compiler is now called with more warning options enabled.
+  - Replaced a lot of str[n]cpy(), str[n]cat() and sprintf() calls with the
+    more secure functions strlcpy(), strlcat() and snprintf(). On systems
+    that don't support strlcpy() and strlcat(), these functions are included
+    in the libngportab now (with prototypes in portab.h).
+  - If the server can't close a socket, it panics now. This is an error that
+    can't occur during normal operation so there is something broken.
+  - The order of log messages during disconnects is more "natural" now ;-)
+  - Cleaned up handling of server configuration structures: modifying and
+    removing servers during runtime works more reliable now.
+  - Compression code from "conn.[ch]" is now found in new "conn-zip.[ch]"
+  - Moved some connection functions from "conn.[ch]" to "conn-func.[ch]".
+  - New command CONNECT to enable and add server links. The syntax is not
+    RFC-compatible: use "CONNECT <name> <port>" to enable and connect an
+    configured server and "CONNECT <name> <port> <host> <mypwd> <peerpwd>"
+    to add a new server (ngIRCd tries to connect new servers only once!).
+  - Added DISCONNECT command ("DISCONNECT <name>") to disable servers.
+  - Restructured the documentation: Now the main language is English. The
+    german documentation has been removed (until there is a maintainer).
+  - Enhanced killing of users caused by a nickname collision.
+  - Better error detection for status code ("numerics") forwarding.
+  - Moved tool functions to own library: "libngtool".
+  - New command TRACE (you can trace only servers at the moment).
+  - New command HELP that lists all understood commands.
+  - There should no longer remain "unknown connections" (see e.g. LUSERS)
+    if an outgoing server link can't be established.
+  - Added AC_PREREQ(2.50) to configure.in for better autoconf compatibility.
+  - Conn_Close() now handles recursive calls for the same link correctly.
+  - ngIRCd can register itself with Rendezvous: to enable support pass the
+    new switch "--with-rendezvous" to configure.
+  - Added support for TCP Wrappers library: pass "--with-tcp-wrappers" to
+    configure to enable it.
+  - Changed some configure options to use "--with"/"--without" as prefix
+    instead of "--enable"/"--disable": "--without-syslog", "--without-zlib",
+    "--with-tcp-wrappers", and "--with-rendezvous".
+  - Better error reporting to clients on connect.
+  - Enhanced manual pages ngircd(8) and ngircd.conf(5).
+  - Documentation is now installed in $(datadir)/doc/ngircd.
+  - Enhanced hanling of NJOIN in case of nick collisions.
+
+ngIRCd 0.6.1, 2003-01-21
+
+  - Fixed KILL: you can't crash the server by killing yourself any more,
+    ngIRCd no longer sends a QUIT to other servers after the KILL, and you
+    can kill only valid users now.
+  - The server no longer forwards commands to ordinary users, instead it
+    answers with the correct error message ("no such server") now.
+  - WHOIS commands weren't always forwarded as requested.
+  - The server sets a correct default AWAY message now when propagating
+    between servers (bug introduced in 0.6.0).
+  - Fixed up and enhanced CHANINFO command: channel keys and user limits
+    are synchronized between servers now, too.
+  - MODE returns the key and user limit for channel members correctly now.
+  - Non-members of a channel could crash the server when trying to change
+    its modes or modes of its members.
+  - The server didn't validate weather a target user is a valid channel
+    member when changing his channel user modes which could crash ngIRCd.
+
+
+Older changes (sorry, only available in german language):
+
+ngIRCd 0.6.0, 2002-12-24
+
+  ngIRCd 0.6.0-pre2, 2002-12-23
+  - neuer Numeric 005 ("Features") beim Connect.
+  - LUSERS erweitert: nun wird die maximale Anzahl der lokalen und globalen
+    Clients, die dem Server bzw. im Netzwerk seit dem letzten (Re-)Start
+    dem Server gleichzeitig bekannt waren, angezeigt.
+
+  ngIRCd 0.6.0-pre1, 2002-12-18
+  - beim Schliessen einer Verbindung zeigt der Server nun vor dem ERROR
+    noch eine Statistik ueber die empfangene und gesendete Datenmenge an.
+  - der Server wartet bei einer eingehenden Verbindung nun laenger auf den
+    Resolver (4 Sekunden), wenn das Ergebnis eintrifft setzt er aber den
+    Login sofort fort (bisher wurde immer mind. 1 Sekunde gewartet).
+  - Connection-Strukturen werden nun "pool-weise" verwaltet; der Pool wird
+    bei Bedarf bis zu einem konfigurierten Limit vergroessert.
+  - Mit der neuen Konfigurationsvariable "MaxConnections" (Sektion "Global")
+    kann die maximale Anzahl gleichzeitiger Verbindungen begrenzt werden.
+    Der Default ist -1, "unlimitiert".
+  - der Server erkennt nun, ob bereits eine eingehende Verbindung von einem
+    Peer-Server besteht und versucht dann nicht mehr, selber eine eigene
+    ausgehende Verbindung zu diesem auufzubauen. Dadurch kann nun auf beiden
+    Servern in der Konfiguration ein Port fuer den Connect konfiguriert
+    werden (beide Server versuchen sich dann gegenseitig zu connectieren).
+  - Test-Suite und Dokumentation an A/UX angepasst.
+  - unter HP-UX definiert das configure-Script nun _XOPEN_SOURCE_EXTENDED.
+  - Server identifizieren sich nun mit asyncronen Passwoertern, d.h. das
+    Passwort, welches A an B schickt, kann ein anderes sein als das, welches
+    B als Antwort an A sendet. In der Konfig.-Datei, Abschnitt "Server",
+    wurde "Password" dazu durch "MyPassword" und "PeerPassword" ersetzt.
+  - Der Server kann nun zur Laufzeit die Konfiguration neu einlesen: dies
+    macht er nach dem Befehl REHASH oder wenn ein HUP-Signal empfangen wird.
+  - Channel-Mode "P" ("persistent") kann nur noch von IRC-Operatoren gesetzt
+    werden. Grund: User koennen den Server sonst leicht "Channel-Flooden".
+  - MOTD kann nun an andere Server geforwarded werden.
+  - IRC-Befehl "TIME" implementiert.
+  - Server-Server-Links koennen nun komprimiert werden, dazu wird die zlib
+    (www.zlib.org) benoetigt. Unterstuetzt die Gegenseite die Komprimierung
+    nicht, wird automatisch unkomprimiert kommuniziert. Das Verfahren ist
+    kompatibel mit dem Original-ircd 2.10.3, d.h. beide Server koennen
+    miteinander ueber komprimiert Links kommunizieren.
+  - Handling der Schreibpuffer umgestellt: Server sollte schneller arbeiten.
+  - Prefix-Fehler werden besser protokolliert (mit verursachendem Befehl).
+  - SQUIT wird nicht mehr doppelt an andere Server weitergeleitet.
+  - Der Server versucht nun vor dem Schliessen einer Verbindung Daten, die
+    noch im Schreibpuffer stehen, zu senden.
+  - Source in weiteres Modul "irc-info" aufgespalten.
+  - Konfigurationsvariablen werden besser validiert: Laengen, Zahlen, ...
+  - neuen Befehl STATS begonnen: bisher unterstuetzt wird "l" und "m".
+  - bei ISON und USERHOST fehlte im Ergebnis-String der korrekte Absender.
+  - IRC Operatoren koennen nun mit KILL User toeten. Achtung: ein Grund muss
+    zwingend als zweiter Parameter angegeben werden!
+  - neue Konfigurations-Variable "MaxJoins": Hiermit kann die maximale Zahl
+    der Channels, in denen ein User Mitglied sein kann, begrent werden.
+  - neuer, deutlich flexiblerer Parser fuer den MODE Befehl.
+  - neue Channel-Modes l (User-Limit) und k (Channel-Key) implementiert.
+
+ngIRCd 0.5.4, 24.11.2002
+
+  - Fehler-Handling von connect() gefixed: der Server kann sich nun auch   
+    unter A/UX wieder zu anderen verbinden.
+  - in den Konfigurationsvariablen ServerUID und ServerGID kann nun nicht
+    nur die numerische ID, sondern auch der Name des Users bzw. der Gruppe
+    verwendet werden. Beim Start des Daemons wird nun beides angezeigt.
+  - Besseres Logging von Prefix-Fehlern.
+  - angenommene Sockets werden nun korrekt auf "non-blocking" konfiguriert,
+    beim Senden und Empfangen werden Blockierungen besser abgefangen.
+  - RPL_UMODEIS hat Code 221, nicht 211 ... *argl*
+  - select() in Try_Write() hat falschen (keinen!) Timeout verwendet;
+    die "Zeit-Aufloesung" des Servers sind zudem nun 2 Sekunden (TIME_RES).
+    Insgesamt sollte die Reaktionszeit des Server nun besser sein.
+
+ngIRCd 0.5.3, 08.11.2002
+
+  - NOTICE liefert nun wirklich nie mehr einen Fehler, auch dann nicht,
+    wenn der sendende Client noch gar nicht registriert ist.
+  - ein "schneller Server-Reconnect" wird nur noch dann versucht, wenn die
+    Verbindung zuvor ordentlich (="lange genug") in Ordnung war; somit also
+    nicht meht, wenn der Peer-Server gleich beim Connect ein ERROR liefert.
+    Das vermeidet "Connect-Orgien".
+  - einige Datentypen aufgeraumt: z.B. sind viele INT32s nun LONGs. Das ist
+    auf Platformen mit 8-Byte-Integern kompatibler.
+  - RPL_YOURHOST_MSG ist nun ircII- und RFC-kompatibel ;-)
+  - Segfault unter hoher Netzaktivitaet behoben: in Conn_Close() wird die
+    Connection-Struktur nun frueher als "ungueltig" markiert.
+
+ngIRCd 0.5.2, 04.10.2002
+
+  - Buffer Overflow in Read_Resolver_Result() behoben.
+  - Format-String-Bugs, die zum Abbruch des Servers fuehrten, behoben.
+  - Maximale Laenge eines IRC-Prefix wurde falsch berechnet.
+
+ngIRCd 0.5.1, 03.10.2002
+
+  - in RPL_YOURHOST_MSG wurde ein fehlerhafter Versionsstring geliefert.
+  - Test-Suite: start-server.sh, stop-server.sh und stress-server.sh koennen
+    nun "manuell" von der Kommandozeile gestartet werden, stress-server.sh
+    startet per Default nur noch 5 Sessions, eine andere Zahl kann auf der
+    Kommandozeile uebergeben werden (Syntax: "stress-server.sh <count>").
+  - In bestimmten Faellen hat der Server versucht auf einen bereits wieder
+    geschlossenen Socket Daten zu schreiben; das fuehrte zu einem Abbruch des
+    Servers durch ein assert(). Nun wird geprueft, ob der Socket noch ok ist.
+  - im "contrib"-Verzeichnis befindet sich nun eine RPM-Spec-Datei, aus den
+    .tar.gz's koennen nun mit "rpm -ta <archiv>" RPM's erzeugt werden. Danke
+    an Sean Reifschneider <jafo@tummy.com>!
+  - Syntax von RPL_MYINFO_MSG korrigiert: liefert nun vier Parameter.
+
+ngIRCd 0.5.0, 20.09.2002
+
+  - Dokumentation aktualisiert.
+  - Fehler bei Validierung von "AdminInfo2" behoben.
+  - Test der Flags fuer "ps" in der Testsuite verbessert, ist nun zu mehr
+    Plattformen kompatibler.
+
+  ngIRCd 0.5.0-pre2, 17.09.2002
+  - Fix in IRC_WriteStrServersPrefix() war "badly broken" -- behoben.
+
+  ngIRCd 0.5.0-pre1, 16.09.2002
+  - Manual-Pages ngircd.8 und ngircd.conf.5 begonnen.
+  - Wird der Netzwerk-Sniffer aktiviert (--sniffer), so schaltet der
+    ngIRCd nun automatisch in den Debug-Modus.
+  - auf Systemen, die inet_aton() nicht kennen (wie z.B. A/UX), kann der
+    ngIRCd nun dennoch auch aktiv Server-Links aufbauen.
+  - h_errno wird auf Systemen, die das nicht kennen (wie z.B. HP-UX 10.20)
+    nicht mehr verwendet. Somit compiliert der ngIRCd nun auch dort :-)
+  - um auf dem Ziel-System nicht vorhandene Funktionen nachzubilden wird nun
+    die "libngportab" erzeugt; genutzt wird dies bisher fuer vsnprintf().
+    Nun compiliert der ngIRCd auch unter Solaris 2.5.1.
+  - "persistente Channels" (Mode 'P') implementiert: diese koennen in der
+    Konfigurationsdatei definiert werden (Sektion "Channel", vgl. Beispiel-
+    Konfiguration "sample-ngircd.conf") und bleiben auch dann bestehen,
+    wenn kein User mehr im Channel ist. Zu Channel-Operatoren werden bisher
+    nur IRC-Operatoren, die den Channel betreten. Die persistenten Channels
+    werden durch das Flag "P" gelennzeichnet, welches normal durch Channel-
+    Op's gesetzt und geloescht werden kann.
+  - bei "--configtest" werden keine leere Abschnitte mehr ausgegeben.
+  - Source in weitere Module aufgespalten: lists, irc-op und resolve.
+  - #include's aufgeraeumt: Header includieren keine anderen mehr.
+  - KICK implementiert (bisher kann nur ein User aus einem Channel geckicked
+    werden, Listen, wir im RFC vorgesehen, werden bisher nicht unterstuetzt).
+  - INVITE, den Channel-Mode "i" sowie Invite-Lists ueber den MODE-Befehl
+    (setzen, erfragen und loeschen) implementiert.
+  - Source an ansi2knr fuer pre-ANSI-Compiler angepasst; ansi2knr in Source-
+    Tree aufgenommen und in Build-System integriert; der ngIRCd compiliert
+    nun z.B. unter A/UX mit dem nativen Compiler von Apple.
+  - TOPIC lieferte bei unbekanntem Channel einen falschen Fehlercode.
+  - LIST versteht nun Wildcards und kann an andere Server geforwarded werden.
+  - wurde ein KILL fuer nicht-lokale Clients empfangen, so wurden die
+    Verwaltungs-Strukturen nicht korrekt freigegeben.
+  - empfangene NJOIN's wurden "zerhackt" an andere Server weitergegeben.
+  - neue Konfigurationsoption "OperCanUseMode" (Sektion "Global"):
+    ist sie aktiv, koennen IRC-Operatoren immer Channel-Modes setzen.
+  - Dokumentation des neuen IRC+-Protokolls begonnen: doc/Protocol.txt
+  - Protokoll- und Server-ID bei PASS-Befehlen auf neues Format umgestellt;
+    bei empfangenen PASS-Befehlen werden diese zudem nun auch ausgewertet.
+    Die unterstuetzten Flags sind in doc/Protocol.txt beschrieben.
+  - mit dem neuen Befehl CHANINFO syncronisieren Server, die das IRC+-
+    Protokoll unterstuetzen, Channel-Modes und Topics.
+  - neue Option "--disable-ircplus" fuer das configure-Script, um das
+    IRC+-Protokoll abzuschalten (per Default ist es aktiviert).
+  - Ban-Lists (setzen, erfragen und loeschen) implementiert.
+  - wird der Server mit "-n"/"--nodaemon" gestartet, so werden keine Mel-
+    dungen mehr ueber Syslog ausgegeben, sondern nur noch auf der Konsole.
+  - "Test-Suite" begonnen (in "make check" integriert): Dabei wird ein
+    speziell konfigurierter Server auf Port 6789 gestartet, mit dem dann
+    einige Tests durchgefuehrt werden (u.a. "Stress-Test" mit 50 Clients).
+  - zu lange Operator-Namen in der Konfiguration wurden falsch gekuerzt.
+  - kleine Anpassung an AIX 3.2.5: nun laeuft der ngIRCd auch dort :-)
+  - ADMIN-Befehl implementiert. Die Daten hierzu werden in der Konfig-Datei
+    im [Global]-Abschnitt mit den Variablen "AdminInfo1", "AdminInfo2" und
+    "AdminEMail" konfiguriert.
+  
+ngIRCd 0.4.3, 11.06.2002
+
+  - Bei PRIVMSG und NOTICE hat der ngIRCd nicht ueberpruft, ob das Ziel
+    ueberhaupt ein User ist. War es keiner, so fuehrte dies zu einem
+    Abbruch des Servers [es wurde assert() aufgerufen].
+
+ngIRCd 0.4.2, 29.04.2002
+
+  - LUSERS verzaehlt sich bei eigenen Server-Links nicht mehr.
+  - QUIT wird nun auch von noch nicht registrierten Clients akzeptiert.
+  - IRC-Funktion LIST implementiert; bisher werden allerdings noch keine
+    Wildcards (bis auf "*") unterstuetzt.
+
+ngIRCd 0.4.1, 08.04.2002
+
+  - Bei Server-Links wird nicht mehr an Hand der Anzahl der Parameter
+    eines empfangenen SERVER-Befehls, sondern "intern" erkannt, ob es
+    sich um eine ein- oder ausgehende Verbindung handelt und somit das
+    eigene PASS-SERVER-Paar gesendet werden muss oder nicht. Da sich
+    verschiedene Versionen des Original-ircd's anders verhalten, schlug
+    die Anmeldung je nach Gehenseite evtl. fehl.
+  - Bei einem NICK-Befehl eines lokalen Client konnte der Server ab-
+    stuerzen, da ein Format-String einer Log-Meldung fehlerhaft war.
+
+ngIRCd 0.4.0, 01.04.2002
+
+  - IRC-Befehle nochmal auf weitere Source-Dateien aufgespalten.
+  - WHO implementiert (bisher ohne komplette Unterstuetzung von Masks).
+  - Der AWAY-Mode wurde nicht ueber mehrere Server-Links weitergegeben.
+  - stderr wird nun in eine Datei umgelenkt (/tmp/ngircd-<PID>.err).
+    Laeuft der Server nicht im Debug-Modus, so wird diese bei Programm-
+    ende geloescht. Sollte der Server abstuerzen, finden sich hier evtl.
+    zusaetzliche Informationen.
+  - In Nicknames wird das Zeichen "-" nun als zulaessig erkannt.
+  - die Beispiel-Konfigurationsdatei (doc/sample-ngircd.conf) wird als
+    ngircd.conf installiert, wenn noch keine "echte" Konfigurationsdatei
+    vorhanden ist.
+  - bei WHO, WHOIS und NAMES wird nun nur noch der Status "Operator" oder
+    "voiced" geliefert -- nicht mehr beides.
+  - Server-Gruppen implementiert: es wird immer nur zu einem Server in
+    einer Gruppe eine Verbindung aufgebaut, klappt es beim ersten Server
+    nicht, so wird der naechste probiert (Variable "Group" in der Kon-
+    figurationsdatei, Sektion [Server]).
+  - IRC_PING() ist, wenn nicht im "strict RFC"-Mode, toleranter und ak-
+    zeptiert beliebig viele Parameter (z.B. BitchX sendet soetwas).
+  - die "Portab-Header" werden nicht mehr benoetigt, die System-Erkennung
+    wird nun ausschliesslich vom configure-Script durchgefuehrt. System-
+    abhaengige Definitionen finden sich nun unter src/portrab/.
+  - Clients und Channels werden nicht mehr ueber ihren Namen, sondern
+    einen Hash-Wert gesucht: sollte deutlich schneller sein.
+  - neuer Kommandozeilen-Parameter "--configtest": die Konfiguration wird
+    gelesen und dann die verwendeten Werte angezeigt.
+  - Client-Mode "s" (Server Notices) implementiert.
+  - mit dem neuen Kommandozeilen-Parameter "--config"/"-f" kann eine
+    alternative Konfigurationsdatei angegeben werden.
+  - nach dem Start kann der ngIRCd, wenn er mit root-Rechten laeuft,
+    zu einer anderen User-ID und Group-ID wechseln.
+  - URL der Homepage wird u.a. bei "--version" mit angezeigt.
+
+ngIRCd 0.3.0, 02.03.2002
+
+  - bekommt der Server ein HUP-Signal, so startet er neu -- genau so, wie
+    er auf den IRC-Befehl RESTART reagiert.
+  - FAQ um Hinweise auf den Bugtracker erweitert.
+  - neuer Kommandozeilen-Schalter "--passive" (-p): wird er angegeben, so
+    verbindet sich der ngIRCd nicht mehr automatisch zu anderen Servern.
+    Zum Debuggen manchmal ganz praktisch :-)
+  - direkt nach dem Start schreibt der ngIRCd nun die aktiven Kommando-
+    zeilenschalter in's Logfile (Passive, Debug, Sniffer ...).
+  - das Signal-Flag SA_RESTART wird nur noch gesetzt, wenn es auf dem
+    jeweiligen System auch definiert ist.
+  - bei ausgehenden Verbindungen wird nun der Ziel-Port protokolliert.
+  - neue Befehle VERSION und KILL implementiert.
+  - make-Target "check" (und "distcheck") mit Sinn erfuellt :-)
+    (die Tests sind aber bisher nicht all zu tiefgehend ...)
+  - Durch einen Ueberlauf konnte die Idle-Time bei WHOIS negativ werden ...
+  - Anpassungen an A/UX: gehoert nun auch zu den unterstuetzten Platformen.
+  - WHOIS wird nicht mehr automatisch an den "Original-Server" weiterge-
+    leitet: war eh nicht RFC-konform und machte mit Clients Probleme.
+  - an User wird nun immer ein "komplettes" Prefix (mit Host-Mask) ver-
+    schickt, Server bekommen nach wie vor kurze: das "Original" hat bei
+    bestimmten Befehlen (PRIVMSG) ansonsten evtl. Probleme ...
+  - NAMES korrigiert und vollstaendig implementiert.
+  - SQUIT wird auf jeden Fall geforwarded, zudem besseres Logging.
+  - Ist ein Nick bei der User-Registrierung bereits belegt, nimmt der
+    Server nun korrekt weitere NICK-Befehle an und verwendet diese.
+  - PRIVMSG beachtet nun die Channel-Modes "n" und "m".
+  - AWAY implementiert. PRIVMSG, MODE, USERHOST und WHOIS angepasst.
+  - der ngIRCd unterstuetzt nun Channel-Topics (TOPIC-Befehl).
+  - ausgehende Server-Verbindungen werden nun asyncron connectiert und
+    blockieren nicht mehr den ganzen Server, wenn die Gegenseite nicht
+    erreicht werden kann (bis zum Timeout konnten Minuten vergehen!).
+  - Wert der Konfigurations-Variable "ConnectRetry" wird besser beachtet.
+  - Channel- und Nicknames werden nun ordentlich validiert.
+
+ngIRCd 0.2.1, 17.02.2002
+
+  - NICK korrigiert: es werden nun auch alle "betroffenen" User informiert.
+  - configure-Script erweitert, u.a. bessere Anpassung an BeOS: dort wird
+    nun die "libbe" zum ngIRCd gelinkt, somit funktioniert auch syslog.
+  - Fehlerhafte bzw. noch nicht verstandene Modes werden nun ausfuehrlicher
+    an den Client geliefert.
+
 ngIRCd 0.2.0, 15.02.2002
 
   - Nicknames und Channel-Namen werden etwas besser auf Gueltigkeit ueber-
@@ -48,7 +515,6 @@ ngIRCd 0.1.0, 29.01.2002
   - Clients werden nun korrekt sowohl nur ueber den Nickname als auch die
     komplette "Host Mask" erkannt.
 
-
 ngIRCd 0.0.3, 16.01.2002
 
   - Server-Links vollstaendig implementiert: der ngIRCd kann nun auch
@@ -95,4 +561,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.17 2002/02/15 14:35:55 alex Exp $
+$Id: ChangeLog,v 1.233.2.20 2005/02/03 10:16:25 alex Exp $

INSTALL

@@ -1,75 +1,180 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2004 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
-                         -- INSTALL / Installation --
+                                -- INSTALL --
+
+                         
+
+I. Upgrade Information
+~~~~~~~~~~~~~~~~~~~~~~
+
+Differences to version 0.6.x
+
+- Some options of the configure script have been renamed:
+    --disable-syslog  ->  --without-syslog
+    --disable-zlib    ->  --without-zlib
+  Please call "./configure --help" to review the full list of options!
+
+Differences to version 0.5.x
+
+- Starting with version 0.6.0, other servers are identified using asynchronous
+  passwords: therefore the variable "Password" in [Server]-sections has been
+  replaced by "MyPassword" and "PeerPassword".
+
+- New configuration variables, section [Global]: MaxConnections, MaxJoins
+  (see example configuration file "doc/sample-ngircd.conf"!).
 
 
-ngIRCd ist fuer UNIXoide-Systeme konzipiert. Dieser Text beschreibt den
-"Standardfall": ein UNIX bzw. UNIX-aehnliches System, das von GNU automake
-und GNU autoconf ("configure") unterstuetzt wird.
+II. Standard Installation
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ngIRCd is developed for UNIX-based systems, which means that the installation
+on modern UNIX-like systems that are supported by GNU autoconf and GNU
+automake ("configure") should be no problem.
+
+The normal installation procedure after getting (and expanding) the source
+files (using a distribution archive or CVS) is as following:
+
+  1) ./autogen.sh	[only necessary when using CVS]
+  2) ./configure
+  3) make
+  4) make install
+
+(Please see details below!)
+
+Now the newly compiled executable "ngircd" is installed in its standard
+location, /usr/local/sbin/.
+
+The next step is to configure and afterwards starting the daemon. Please
+have a look at the ngircd(8) and ngircd.conf(5) manual pages for details
+and all possible options.
+
+If no previous version of the configuration file exists (the standard name
+is /usr/local/etc/ngircd.conf), a sample configuration file containing all
+possible options will be installed there. You'll find its template in the
+doc/ directory: sample-ngircd.conf.
 
 
-I. Quick Start
-~~~~~~~~~~~~~~
+1): "autogen.sh"
 
-In der Regel sind folgende Schritte ausreichend:
+The first step, autogen.sh, is only necessary if the configure-script isn't
+already generated. This never happens in official ("stable") releases in
+tar.gz-archives, but when using CVS.
 
-   1) ./autogen.sh	[nur erforderlich, wenn ueber CVS bezogen]
-   2) ./configure
-   3) make
+This step is therefore only interesting for developers.
+
+autogen.sh produces the Makefile.in's, which are necessary for the configure
+script itself, and some more files for make. To run autogen.sh you'll need
+GNU autoconf and GNU automake (use recent versions! autoconf 2.53 and
+automake 1.6.1 are known to work).
+
+Again: "end users" do not need this step!
 
 
-zu 1) autogen.sh:
+2): "./configure"
 
-Der erste Schritt, autogen.sh, ist nur notwendig, wenn das configure-Script
-noch nicht vorhanden ist. Dies ist nie bei offiziellen ("stabilen") Versionen
-in tar.gz-Archiven der Fall, jedoch nie, wenn der Source-Code ueber CVS
-bezogen wurde.
+The configure-script is used to detect local system dependencies.
 
-Dieser Absatz ist also eigentlich ausschliesslich fuer Entwickler interessant.
+In the perfect case, configure should recognise all needed libraries, header
+files and so on. If this shouldn't work, "./configure --help" shows all
+possible options.
 
-autogen.sh erzeugt die fuer das configure-Script notwendigen Makefile.in's
-sowie das configure-Script selber und weitere fuer den make-Lauf erforderliche
-Dateien. Dazu wird sowohl GNU automake als auch GNU autoconf (in aktuellen
-Versionen!) benoetigt.
+In addition, you can pass some command line options to "configure" to enable
+and/or disable some features of ngIRCd. All these options are shown using
+"./configure --help", too.
 
-(nochmal: "Endanwender" mussen diesen Schritt i.d.R. nicht ausfuehren!)
+Compiling a static binary will avoid you the hassle of feeding a chroot dir
+(if you want use the chroot feature). Just do something like:
+  CFLAGS=-static ./configure [--your-options ...]
+Then you can use a void directory as ChrootDir (like OpenSSH's /var/empty).
 
 
-zu 2) ./configure:
+3): "make"
 
-Mit dem configure-Script wird ngIRCd, wie GNU Software meistens, an das
-lokale System angepasst und die erforderlichen Makefile's erzeugt.
-
-Im Optimalfall sollte configure alle benoetigten Libraries, Header etc. selber
-erkennen und entsprechend reagieren. Sollte dies einmal nicht der Fall sein,
-so zeigt "./configure --help" moegliche Optionen.
+The make command uses the Makefiles produced by configure and compiles the
+ngIRCd daemon.
 
 
-zu 3) make:
+4): "make install"
 
-Der make-Befehl bearbeitet die vom configure-Script erzeugten Makefile's und
-uebersetzt die comBase-Library und die Testprogramme.
+Use "make install" to install the server and a sample configuration file on
+the local system. Normally, root privileges are necessary to complete this
+step. If there is already an older configuration file present, it won't be
+overwritten.
+
+This files will be installed by default:
+
+- /usr/local/sbin/ngircd: executable server
+- /usr/local/etc/ngircd.conf: sample configuration (if not already present)
+- /usr/local/share/doc/ngircd/: documentation
 
 
-II. Nuetzliche make-Targets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+II. Useful make-targets
+~~~~~~~~~~~~~~~~~~~~~~~
 
-Die vom configure-Script erzeugten Makefile's enthalten immer die folgenden
-nuetzlichen Targets:
+The Makefile produced by the configure-script contains always these useful
+targets:
 
- - clean: alle Erzeugnisse des Compilers/Linkers loeschen.
-   Naechster Schritt: -> make
+ - clean: delete every product from the compiler/linker
+   next step: -> make
 
- - distclean: zusaetzliche alle Makefile's loeschen.
-   Naechster Schritt: -> ./configure
+ - distclean: the above plus erase all generated Makefiles
+   next step: -> ./configure
 
- - maintainer-clean: alle automat. erzeugten Dateien loeschen.
-   Naechster Schritt: -> ./autogen.sh
+ - maintainer-clean: erase all automatic generated files
+   next step: -> ./autogen.sh
 
+
+III. Sample configuration file ngircd.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the sample configuration file, there are comments beginning with "#" OR
+";" -- this is only for the better understanding of the file.
+
+The file is separated in four blocks: [Global], [Operator], [Server], and
+[Channel].
+
+In the [Global] section, there is the main configuration like the server
+name and the ports, on which the server should be listening. IRC operators
+of this server are defined in [Operator] blocks. [Server] is the section
+where server links are configured. And [Channel] blocks are used to
+configure pre-defined ("persistent") IRC channels.
+
+The meaning of the variables in the configuration file is explained in the 
+"doc/sample-ngircd.conf", which is used as sample configuration file in
+/usr/local/etc after running "make install" (if you don't already have one)
+and in the "ngircd.conf" manual page.
+
+
+IV. Command line options
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+These parameters could be passed to the ngIRCd:
+
+-f, --config <file>
+	The daemon uses the file <file> as configuration file rather than
+	the standard configuration /usr/local/etc/ngircd.conf.
+
+-n, --nodaemon
+	ngIRCd should be running as a foreground process.
+
+-p, --passive
+	Server-links won't be automatically established.
+
+-t, --configtest
+	Reads, validates and dumps the configuration file as interpreted
+	by the server. Then exits.
+
+Use "--help" to see a short help text describing all available parameters
+the server understands, with "--version" the ngIRCd shows its version
+number. In both cases the server exits after the output.
+
+
+-- 
+$Id: INSTALL,v 1.18.2.2 2004/09/03 20:02:02 alex Exp $

MacOSX/ngircd.pbproj/project.pbxproj

@@ -1,627 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 34;
-	objects = {
-		014CEA520018CE5811CA2923 = {
-			buildRules = (
-			);
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				OPTIMIZATION_CFLAGS = "-O0";
-			};
-			isa = PBXBuildStyle;
-			name = Development;
-		};
-		014CEA530018CE5811CA2923 = {
-			buildRules = (
-			);
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-			};
-			isa = PBXBuildStyle;
-			name = Deployment;
-		};
-//010
-//011
-//012
-//013
-//014
-//030
-//031
-//032
-//033
-//034
-		034768E8FF38A79811DB9C8B = {
-			isa = PBXExecutableFileReference;
-			path = ngircd;
-			refType = 3;
-		};
-//030
-//031
-//032
-//033
-//034
-//080
-//081
-//082
-//083
-//084
-		08FB7793FE84155DC02AAC07 = {
-			buildStyles = (
-				014CEA520018CE5811CA2923,
-				014CEA530018CE5811CA2923,
-			);
-			isa = PBXProject;
-			mainGroup = 08FB7794FE84155DC02AAC07;
-			projectDirPath = "";
-			targets = (
-				08FB779FFE84155DC02AAC07,
-			);
-		};
-		08FB7794FE84155DC02AAC07 = {
-			children = (
-				1AB674ADFE9D54B511CA2CBB,
-				F51F791401DFD0DE01D13771,
-				F56D8B9E01E0BFA00155ADA7,
-				F52162B301C7B904012300F4,
-				F52162C201C7B904012300F4,
-				F52162C301C7B904012300F4,
-				F52162C401C7B904012300F4,
-				F52162C501C7B904012300F4,
-				F52162C601C7B904012300F4,
-				F52162C701C7B904012300F4,
-				F52162C801C7B904012300F4,
-				F52162C901C7B904012300F4,
-				F52162CA01C7B904012300F4,
-				F52162CB01C7B904012300F4,
-			);
-			isa = PBXGroup;
-			name = ngircd;
-			refType = 4;
-		};
-		08FB779FFE84155DC02AAC07 = {
-			buildPhases = (
-				08FB77A0FE84155DC02AAC07,
-				08FB77A1FE84155DC02AAC07,
-				08FB77A3FE84155DC02AAC07,
-				08FB77A5FE84155DC02AAC07,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "";
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = ngircd;
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-			};
-			dependencies = (
-			);
-			isa = PBXToolTarget;
-			name = ngircd;
-			productInstallPath = "$(HOME)/bin";
-			productName = ngircd;
-			productReference = 034768E8FF38A79811DB9C8B;
-			shouldUseHeadermap = 1;
-		};
-		08FB77A0FE84155DC02AAC07 = {
-			buildActionMask = 2147483647;
-			files = (
-				F52162CC01C7B904012300F4,
-				F52162CD01C7B904012300F4,
-				F52162CE01C7B904012300F4,
-				F52162CF01C7B904012300F4,
-				F52162D001C7B904012300F4,
-				F52162D901C7BAAE012300F4,
-				F52162DC01C7BCDD012300F4,
-				F52162E401C7C79E012300F4,
-				F51D17FE01C8F5B701E11C2E,
-				F51D180401C8FDD001E11C2E,
-				F51D180501C8FDD001E11C2E,
-				F576ABFC01D5E77301A85B03,
-				F576ABFF01D61D7401A85B03,
-				F51F791301DFC95301D13771,
-			);
-			isa = PBXHeadersBuildPhase;
-			name = Headers;
-		};
-		08FB77A1FE84155DC02AAC07 = {
-			buildActionMask = 2147483647;
-			files = (
-				F52162D101C7B904012300F4,
-				F52162D201C7B904012300F4,
-				F52162D301C7B904012300F4,
-				F52162DD01C7BCDD012300F4,
-				F52162E501C7C79E012300F4,
-				F51D17FF01C8F5B701E11C2E,
-				F51D180701C8FDD001E11C2E,
-				F576ABFD01D5E77301A85B03,
-				F5263AEE01E263D201CE8F8F,
-			);
-			isa = PBXSourcesBuildPhase;
-			name = Sources;
-		};
-		08FB77A3FE84155DC02AAC07 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXFrameworksBuildPhase;
-			name = "Frameworks & Libraries";
-		};
-		08FB77A5FE84155DC02AAC07 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			name = "ResourceManager Resources";
-		};
-//080
-//081
-//082
-//083
-//084
-//1A0
-//1A1
-//1A2
-//1A3
-//1A4
-		1AB674ADFE9D54B511CA2CBB = {
-			children = (
-				034768E8FF38A79811DB9C8B,
-			);
-			isa = PBXGroup;
-			name = Products;
-			refType = 4;
-		};
-//1A0
-//1A1
-//1A2
-//1A3
-//1A4
-//F50
-//F51
-//F52
-//F53
-//F54
-		F51D17FC01C8F5B701E11C2E = {
-			isa = PBXFileReference;
-			name = client.c;
-			path = ../src/ngircd/client.c;
-			refType = 2;
-		};
-		F51D17FD01C8F5B701E11C2E = {
-			isa = PBXFileReference;
-			name = client.h;
-			path = ../src/ngircd/client.h;
-			refType = 2;
-		};
-		F51D17FE01C8F5B701E11C2E = {
-			fileRef = F51D17FD01C8F5B701E11C2E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F51D17FF01C8F5B701E11C2E = {
-			fileRef = F51D17FC01C8F5B701E11C2E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F51D180001C8FDD001E11C2E = {
-			isa = PBXFileReference;
-			name = channel.c;
-			path = ../src/ngircd/channel.c;
-			refType = 2;
-		};
-		F51D180101C8FDD001E11C2E = {
-			isa = PBXFileReference;
-			name = channel.h;
-			path = ../src/ngircd/channel.h;
-			refType = 2;
-		};
-		F51D180201C8FDD001E11C2E = {
-			isa = PBXFileReference;
-			name = irc.c;
-			path = ../src/ngircd/irc.c;
-			refType = 2;
-		};
-		F51D180301C8FDD001E11C2E = {
-			isa = PBXFileReference;
-			name = irc.h;
-			path = ../src/ngircd/irc.h;
-			refType = 2;
-		};
-		F51D180401C8FDD001E11C2E = {
-			fileRef = F51D180101C8FDD001E11C2E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F51D180501C8FDD001E11C2E = {
-			fileRef = F51D180301C8FDD001E11C2E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F51D180701C8FDD001E11C2E = {
-			fileRef = F51D180201C8FDD001E11C2E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F51F791201DFC95301D13771 = {
-			isa = PBXFileReference;
-			name = defines.h;
-			path = ../src/ngircd/defines.h;
-			refType = 2;
-		};
-		F51F791301DFC95301D13771 = {
-			fileRef = F51F791201DFC95301D13771;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F51F791401DFD0DE01D13771 = {
-			children = (
-				F5263AEF01E2A9B801CE8F8F,
-				F51F791501DFD0DE01D13771,
-				F51F791601DFD0DE01D13771,
-				F51F791701DFD0DE01D13771,
-			);
-			isa = PBXGroup;
-			name = doc;
-			path = /Users/alex/Develop/ngircd/doc;
-			refType = 0;
-		};
-		F51F791501DFD0DE01D13771 = {
-			isa = PBXFileReference;
-			path = CVS.txt;
-			refType = 4;
-		};
-		F51F791601DFD0DE01D13771 = {
-			isa = PBXFileReference;
-			path = RFC.txt;
-			refType = 4;
-		};
-		F51F791701DFD0DE01D13771 = {
-			isa = PBXFileReference;
-			path = "sample-ngircd.conf";
-			refType = 4;
-		};
-		F52162B301C7B904012300F4 = {
-			children = (
-				F52162B801C7B904012300F4,
-				F52162D801C7BAAE012300F4,
-				F52162B901C7B904012300F4,
-			);
-			isa = PBXGroup;
-			name = src;
-			path = ../src;
-			refType = 2;
-		};
-		F52162B801C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
-		};
-		F52162B901C7B904012300F4 = {
-			children = (
-				F52162BD01C7B904012300F4,
-				F52162BA01C7B904012300F4,
-				F52162BE01C7B904012300F4,
-				F52162BF01C7B904012300F4,
-				F51D180001C8FDD001E11C2E,
-				F51D180101C8FDD001E11C2E,
-				F51D17FC01C8F5B701E11C2E,
-				F51D17FD01C8F5B701E11C2E,
-				F52162E201C7C77B012300F4,
-				F52162E301C7C77B012300F4,
-				F52162DA01C7BCDC012300F4,
-				F52162DB01C7BCDC012300F4,
-				F51D180201C8FDD001E11C2E,
-				F51D180301C8FDD001E11C2E,
-				F52162BB01C7B904012300F4,
-				F52162BC01C7B904012300F4,
-				F576ABFA01D5E77301A85B03,
-				F576ABFB01D5E77301A85B03,
-				F52162C001C7B904012300F4,
-				F52162C101C7B904012300F4,
-				F51F791201DFC95301D13771,
-				F576ABFE01D61D7401A85B03,
-			);
-			isa = PBXGroup;
-			path = ngircd;
-			refType = 4;
-		};
-		F52162BA01C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = global.h;
-			refType = 4;
-		};
-		F52162BB01C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = log.c;
-			refType = 4;
-		};
-		F52162BC01C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = log.h;
-			refType = 4;
-		};
-		F52162BD01C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
-		};
-		F52162BE01C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = ngircd.c;
-			refType = 4;
-		};
-		F52162BF01C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = ngircd.h;
-			refType = 4;
-		};
-		F52162C001C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = tool.c;
-			refType = 4;
-		};
-		F52162C101C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = tool.h;
-			refType = 4;
-		};
-		F52162C201C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = acconfig.h;
-			path = ../acconfig.h;
-			refType = 2;
-		};
-		F52162C301C7B904012300F4 = {
-			isa = PBXExecutableFileReference;
-			name = autogen.sh;
-			path = ../autogen.sh;
-			refType = 2;
-		};
-		F52162C401C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = configure.in;
-			path = ../configure.in;
-			refType = 2;
-		};
-		F52162C501C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = Makefile.am;
-			path = ../Makefile.am;
-			refType = 2;
-		};
-		F52162C601C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = INSTALL;
-			path = ../INSTALL;
-			refType = 2;
-		};
-		F52162C701C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = AUTHORS;
-			path = ../AUTHORS;
-			refType = 2;
-		};
-		F52162C801C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = ChangeLog;
-			path = ../ChangeLog;
-			refType = 2;
-		};
-		F52162C901C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = COPYING;
-			path = ../COPYING;
-			refType = 2;
-		};
-		F52162CA01C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = NEWS;
-			path = ../NEWS;
-			refType = 2;
-		};
-		F52162CB01C7B904012300F4 = {
-			isa = PBXFileReference;
-			name = README;
-			path = ../README;
-			refType = 2;
-		};
-		F52162CC01C7B904012300F4 = {
-			fileRef = F52162C201C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162CD01C7B904012300F4 = {
-			fileRef = F52162BA01C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162CE01C7B904012300F4 = {
-			fileRef = F52162BC01C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162CF01C7B904012300F4 = {
-			fileRef = F52162BF01C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162D001C7B904012300F4 = {
-			fileRef = F52162C101C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162D101C7B904012300F4 = {
-			fileRef = F52162BB01C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162D201C7B904012300F4 = {
-			fileRef = F52162BE01C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162D301C7B904012300F4 = {
-			fileRef = F52162C001C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162D801C7BAAE012300F4 = {
-			isa = PBXFileReference;
-			name = config.h;
-			path = ../src/config.h;
-			refType = 2;
-		};
-		F52162D901C7BAAE012300F4 = {
-			fileRef = F52162D801C7BAAE012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162DA01C7BCDC012300F4 = {
-			isa = PBXFileReference;
-			name = conn.c;
-			path = ../src/ngircd/conn.c;
-			refType = 2;
-		};
-		F52162DB01C7BCDC012300F4 = {
-			isa = PBXFileReference;
-			name = conn.h;
-			path = ../src/ngircd/conn.h;
-			refType = 2;
-		};
-		F52162DC01C7BCDD012300F4 = {
-			fileRef = F52162DB01C7BCDC012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162DD01C7BCDD012300F4 = {
-			fileRef = F52162DA01C7BCDC012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162E201C7C77B012300F4 = {
-			isa = PBXFileReference;
-			name = conf.c;
-			path = ../src/ngircd/conf.c;
-			refType = 2;
-		};
-		F52162E301C7C77B012300F4 = {
-			isa = PBXFileReference;
-			name = conf.h;
-			path = ../src/ngircd/conf.h;
-			refType = 2;
-		};
-		F52162E401C7C79E012300F4 = {
-			fileRef = F52162E301C7C77B012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F52162E501C7C79E012300F4 = {
-			fileRef = F52162E201C7C77B012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5263AEE01E263D201CE8F8F = {
-			fileRef = F51D180001C8FDD001E11C2E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5263AEF01E2A9B801CE8F8F = {
-			isa = PBXFileReference;
-			name = Makefile.am;
-			path = ../doc/Makefile.am;
-			refType = 2;
-		};
-		F56D8B9E01E0BFA00155ADA7 = {
-			children = (
-				F56D8B9F01E0BFA00155ADA7,
-				F56D8BA001E0BFA00155ADA7,
-			);
-			isa = PBXGroup;
-			name = MacOSX;
-			path = "";
-			refType = 2;
-		};
-		F56D8B9F01E0BFA00155ADA7 = {
-			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
-		};
-		F56D8BA001E0BFA00155ADA7 = {
-			children = (
-				F56D8BA101E0BFA00155ADA7,
-			);
-			isa = PBXGroup;
-			path = ngircd.pbproj;
-			refType = 4;
-		};
-		F56D8BA101E0BFA00155ADA7 = {
-			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
-		};
-		F576ABFA01D5E77301A85B03 = {
-			isa = PBXFileReference;
-			path = parse.c;
-			refType = 4;
-		};
-		F576ABFB01D5E77301A85B03 = {
-			isa = PBXFileReference;
-			path = parse.h;
-			refType = 4;
-		};
-		F576ABFC01D5E77301A85B03 = {
-			fileRef = F576ABFB01D5E77301A85B03;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F576ABFD01D5E77301A85B03 = {
-			fileRef = F576ABFA01D5E77301A85B03;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F576ABFE01D61D7401A85B03 = {
-			isa = PBXFileReference;
-			name = messages.h;
-			path = ../src/ngircd/messages.h;
-			refType = 2;
-		};
-		F576ABFF01D61D7401A85B03 = {
-			fileRef = F576ABFE01D61D7401A85B03;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-	};
-	rootObject = 08FB7793FE84155DC02AAC07;
-}

Makefile.am

@@ -1,42 +1,37 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
 #
-# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
-# der GNU General Public License (GPL), wie von der Free Software Foundation
-# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
-# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
-# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
-# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.5 2002/01/02 02:52:09 alex Exp $
-#
-# $Log: Makefile.am,v $
-# Revision 1.5  2002/01/02 02:52:09  alex
-# - Copyright-Texte angepasst ;-)
-#
-# Revision 1.4  2001/12/31 02:20:20  alex
-# - Unterverzeichnis "doc" aufgenommen.
-#
-# Revision 1.3  2001/12/30 19:24:28  alex
-# - acconfig.h in die "noinst_HEADERS" aufgenommen.
-#
-# Revision 1.2  2001/12/12 17:21:58  alex
-# - Projektdatei fuer den Mac OS X Project Builder erstellt.
-#
-# Revision 1.1.1.1  2001/12/11 21:53:04  alex
-# Imported sources to CVS.
+# $Id: Makefile.am,v 1.14.2.1 2004/05/11 00:38:17 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = doc MacOSX src
+SUBDIRS = doc src man contrib
 
-noinst_HEADERS = acconfig.h
+clean-local:
+	rm -f build-stamp*
 
 maintainer-clean-local:
+	rm -rf autom4te.cache
 	rm -f Makefile.in Makefile aclocal.m4 configure
 	rm -f mkinstalldirs missing depcomp install-sh
-	rm -f config.log
+	rm -f config.log debian
+
+lint:
+	make -C src/ngircd lint
+
+rpm: distcheck
+	rpm -ta ngircd-*.tar.gz
+
+deb:
+	[ -f debian/rules ] || ln -s contrib/Debian debian
+	dpkg-buildpackage -rfakeroot
 
 # -eof-

NEWS

@@ -1,15 +1,152 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2004 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
-                           -- NEWS / Neuigkeiten --
+                                  -- NEWS --
 
 
+ngIRCd 0.8.0 (2004-06-26)
+
+  - Two new configuration options: "ChrootDir" and "MotdPhrase", thanks to
+    Benjamin Pineau <ben@zouh.org>. Now you can force the daemon to change
+    its root and working directory to something "safe". MotdPhrase is used
+    to define an "MOTD string" instead of a whole file, useful if the
+    "real" MOTD file would be outside the "jail".
+  - INVITE- and BAN-lists become synchronized between IRC+ servers when
+    establishing new connections, if the peer supports this as well.
+  - The type of service (TOS) of all sockets is set to "interactive" now.
+  - Added short command line option "-t" as alternative to "--configtest".
+  - Added optional support for "IDENT" lookups on incoming connections. You
+    have to enable this function with the ./configure switch "--with-ident".
+    The default is not to do IDENT lookups.
+
+ngIRCd 0.7.5 (2003-07-11)
+
+  - New configuration variable "MaxConnectionsIP" to limit the number of
+    simultaneous connections from a single IP that the server will accept.
+    This configuration options lowers the risk of denial of service attacks
+    (DoS), the default is 5 connections per client IP.
+  - Added new configuration variable "Listen" to bind all listening
+    sockets of the server to a single IP address.
+       
+ngIRCd 0.7.1 (2003-07-18)
+
+  - Added support for GNU/Hurd.
+
+ngIRCd 0.7.0 (2003-05-01)
+
+  - New command CONNECT to enable and add server links. The syntax is not
+    RFC-compatible: use "CONNECT <name> <port>" to enable and connect an
+    configured server and "CONNECT <name> <port> <host> <mypwd> <peerpwd>"
+    to add a new server (ngIRCd tries to connect new servers only once!).
+  - Added DISCONNECT command ("DISCONNECT <name>") to disable servers.
+  - New command TRACE (you can trace only servers at the moment).
+  - New command HELP that lists all understood commands.
+  - ngIRCd can register itself with Rendezvous: to enable support pass the
+    new switch "--with-rendezvous" to configure.
+  - Added support for TCP Wrappers library: pass "--with-tcp-wrappers" to
+    configure to enable it.
+  - Changed some configure options to use "--with"/"--without" as prefix
+    insetead of "--enable"/"--disable": "--without-syslog", "--without-zlib",
+    "--with-tcp-wrappers", and "--with-rendezvous".
+  - Enhanced manual pages ngircd(8) and ngircd.conf(5).
+  - Documentation is now installed in $(datadir)/doc/ngircd.
+
+
+Older news (sorry, only available in german language):
+
+ngIRCd 0.6.0, 2002-12-24
+
+  - beim Schliessen einer Verbindung zeigt der Server nun vor dem ERROR
+    noch eine Statistik ueber die empfangene und gesendete Datenmenge an.
+  - Connection-Strukturen werden nun "pool-weise" verwaltet; der Pool wird
+    bei Bedarf bis zu einem konfigurierten Limit vergroessert.
+  - Mit der neuen Konfigurationsvariable "MaxConnections" (Sekion "Global")
+    kann die maximale Anzahl gleichzeitiger Verbindungen begrenzt werden.
+    Der Default ist -1, "unlimitiert".
+  - der Server erkennt nun, ob bereits eine eingehende Verbindung von einem
+    Peer-Server besteht und versucht dann nicht mehr, selber eine eigene
+    ausgehende Verbindung zu diesem auufzubauen. Dadurch kann nun auf beiden
+    Servern in der Konfiguration ein Port fuer den Connect konfiguriert
+    werden (beide Server versuchen sich dann gegenseitig zu connectieren).
+  - Server identifizieren sich nun mit asyncronen Passwoertern, d.h. das
+    Passwort, welches A an B schickt, kann ein anderes sein als das, welches
+    B als Antwort an A sendet. In der Konfig.-Datei, Abschnitt "Server",
+    wurde "Password" dazu durch "MyPassword" und "PeerPassword" ersetzt.
+  - Der Server kann nun zur Laufzeit die Konfiguration neu einlesen: dies
+    macht er nach dem Befehl REHASH oder wenn ein HUP-Signal empfangen wird.
+  - Server-Server-Links koennen nun komprimiert werden, dazu wird die zlib
+    (www.zlib.org) benoetigt. Unterstuetzt die Gegenseite die Komprimierung
+    nicht, wird automatisch unkomprimiert kommuniziert. Das Verfahren ist
+    kompatibel mit dem Original-ircd 2.10.3, d.h. beide Server koennen
+    miteinander ueber komprimiert Links kommunizieren.
+  - neue Konfigurations-Variable "MaxJoins": Hiermit kann die maximale Zahl
+    der Channels, in denen ein User Mitglied sein kann, begrent werden.
+  - neue Channel-Modes l (User-Limit) und k (Channel-Key) implementiert.
+
+ngIRCd 0.5.0, 20.09.2002
+
+  - AIX (3.2.5), HP-UX (10.20), IRIX (6.5), NetBSD (1.5.3/m68k) und Solaris
+    (2.5.1, 2.6) gehoeren nun auch zu den unterstuetzten Platformen.
+  - Unter A/UX (und evtl. weiteren Systemen) kompiliert der ngIRCd nun mit
+    dem "nativen" (ggf. pre-ANSI) Compiler.
+  - "persistente Channels" (Mode 'P') implementiert: diese koennen in der
+    Konfigurationsdatei definiert werden (Sektion "Channel", vgl. Beispiel-
+    Konfiguration "sample-ngircd.conf") und bleiben auch dann bestehen,
+    wenn kein User mehr im Channel ist.
+  - neue IRC-Befehle: KICK, INVITE, ADMIN, CHANINFO; LIST wurde erweitert.
+    Mit dem neuen Befehl CHANINFO syncronisieren Server, die das IRC+-
+    Protokoll unterstuetzen, Channel-Modes und Topics. Fuer den ADMIN-Befehl
+    gibt es neue Konfigurationsoptionen (Sektion "Global"): "AdminInfo1",
+    "AdminInfo2" und "AdminEMail".
+  - Invite- und Ban-Lists implementiert.
+  - neue Konfigurationsoption "OperCanUseMode" (Sektion "Global"):
+    ist sie aktiv, koennen IRC-Operatoren immer Channel-Modes setzen.
+  - "Test-Suite" begonnen: mit "make check" wird sie durchlaufen.
+
+ngIRCd 0.4.2, 29.04.2002
+
+  - IRC-Funktion LIST implementiert; bisher werden allerdings noch keine
+    Regular Expressions (bis auf "*") unterstuetzt.
+
+ngIRCd 0.4.0, 01.04.2002
+
+  - WHO implementiert (bisher ohne komplette Unterstuetzung von Masks).
+  - stderr wird nun in eine Datei umgelenkt (/ngircd-<PID>.err).
+    Laeuft der Server nicht im Debug-Modus, so wird diese bei Programm-
+    ende geloescht. Sollte der Server abstuerzen, finden sich hier evtl.
+    zusaetzliche Informationen.
+  - Server-Gruppen implementiert: es wird immer nur zu einem Server in
+    einer Gruppe eine Verbindung aufgebaut, klappt es beim ersten Server
+    nicht, so wird der naechste probiert.
+  - Clients und Channels werden nicht mehr ueber ihren Namen, sondern
+    einen Hash-Wert gesucht: sollte deutlich schneller sein.
+  - neuer Kommandozeilen-Parameter "--configtest": die Konfiguration wird
+    gelesen und die dann verwendeten Werte angezeigt.
+  - Client-Mode "s" (Server Notices) implementiert.
+  - mit dem neuen Kommandozeilen-Parameter "--config"/"-f" kann eine
+    alternative Konfigurationsdatei angegeben werden.
+  - nach dem Start kann der ngIRCd, wenn er mit root-Rechten laeuft,
+    zu einer anderen User-ID und Group-ID wechseln.
+
+ngIRCd 0.3.0, 02.03.2002
+
+  - bekommt der Server ein HUP-Signal, so startet er neu -- genau so, wie
+    er auf den IRC-Befehl RESTART reagiert.
+  - neuer Kommandozeilen-Schalter "--passive" (-p): wird er angegeben, so
+    verbindet sich der ngIRCd nicht mehr automatisch zu anderen Servern.
+    Zum Debuggen manchmal ganz praktisch :-)
+  - neue Befehle VERSION und KILL implementiert. NAMES korrigiert.
+  - Anpassungen an A/UX: gehoert nun auch zu den unterstuetzten Platformen.
+  - AWAY (und der User-Mode 'a') ist nun implementiert.
+  - der ngIRCd unterstuetzt nun Channel-Topics (TOPIC-Befehl).
+  - Channel- und Nicknames werden nun ordentlich validiert.
+
 ngIRCd 0.2.0, 15.02.2002
 
   - Begonnen Channel-Modes und User-Channel-Modes zu implementieren: der
@@ -52,4 +189,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: NEWS,v 1.10 2002/02/15 14:35:55 alex Exp $
+$Id: NEWS,v 1.64.2.3 2004/06/26 09:12:38 alex Exp $

README

@@ -1,45 +1,87 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2004 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
-                           -- README / Liesmich --
+                                -- README --
+                           
+                      Ilja Osthoff, <ilja@glide.ath.cx>
 
 
-ngIRCd ist ein Server fuer den Internet Relay Chat (IRC). Er ist von Grund
-auf neu geschrieben, also nicht wie die meisten anderen IRCd's vom Urvater,
-dem Daemon des IRCNet abgeleitet.
+I. Introduction
+~~~~~~~~~~~~~~~
 
-Zur Zeit befindet sich ngIRCd noch in Entwicklung, vieles ist noch nicht
-implementiert bzw. nur "halbherzig": Channels gibt es noch nicht, genau so
-wenig wie Server-Links. Das private Chatten (PRIVMSG) mit den Client-Befehlen
-/msg und /query sollte hingegen funktionieren, ein wenig praktische Funk-
-tionalitaet ist also tatsaechlich schon vorhanden ;-)
-
-Bisher (mehr oder wenig vollstaendig) implementierte IRC-Befehle:
-
-DIE, ERROR, ISON, JOIN, LINKS, LUSERS, MODE, MOTD, NAMES, NICK, NOTICE, NJOIN,
-OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, RESTART, SERVER, SQUIT, USER,
-USERHOST, WHOIS.
-
-Ueber Rueckmeldungen, Bug-Reports und Patches freue ich mich! Also los, haut
-in die Tasten! :-))
-
-Via E-Mail erreichst du mich als <alex@arthur.ath.cx> bzw. <alex@barton.de>.
-Die Homepage des ngIRCd findest du unter <http://arthur.ath.cx/~alex/ngircd/>.
-
-[ ... more to come ... ]
+ngIRCd is an Open-Source server for the Internet Relay Chat (IRC), which
+is developed and published under the terms of the GNU General Public
+Licence (URL: http://www.gnu.org/licenses/gpl.html). ngIRCd means "next
+generation IRC daemon", it's written from scratch and not deduced from the
+"grandfather of IRC daemons", the daemon of the IRCNet.
 
 
-Hinweise zur Installation findest du in der Datei INSTALL.
-Alle Autoren von ngIRCd sind in AUTHORS aufgefuehrt.
-In der Datei COPYING steht die GNU General Public License.
-Das README liest du gerade ,-)
+II. Status
+~~~~~~~~~~~
+
+At present, the ngIRCd is under active development, some features are not
+implemented, some only partly.
+
+Till today (more or less complete) implemented IRC-commands:
+
+ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INVITE, ISON,
+JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN,
+NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, REHASH, RESTART, SERVER,
+SQUIT, STATS, TIME, TOPIC, TRACE, USER, USERHOST, VERSION, WHO, WHOIS.
+
+
+III. Features (or: why use ngIRCd?)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- no problems with servers which have dynamic IP addresses
+- simple, easy understandable configuration file,
+- freely published open-source C source code,
+- ngIRCd will be developed on in the future.
+- supported platforms (tested versions): AIX (3.2.5), A/UX (3.0.1), FreeBSD
+  (4.5), HP-UX (10.20), IRIX (6.5), Linux (2.x), Mac OS X (10.x), NetBSD
+  (1.5.2/i386, 1.5.3/m68k), Solaris (2.5.1, 2.6), Windows with Cygwin, and
+  OpenBSD (3.4/i386).
+
+
+IV. Documentation
+~~~~~~~~~~~~~~~~~
+
+More documentation can be found in the "doc/" directory and the homepage of
+the ngIRCd: <http://arthur.ath.cx/~alex/ngircd/>.
+
+
+V. Download
+~~~~~~~~~~~
+
+The homepage of the ngIRCd is: <http://arthur.ath.cx/~alex/ngircd>; you
+will find the newest information about the ngIRCd and the most recent
+("stable") releases there.
+
+If you are interested in the latest development versions (which are not
+always stable), then please read the section "CVS" on the homepage and
+the file "doc/CVS.txt" which describes the use of CVS, the "Concurrent
+Versioning System".
+
+
+VI. Bugs
+~~~~~~~~
+
+If you find bugs in the ngIRCd (which might be there :-), please report
+them at the following URL:
+
+<http://arthur.ath.cx/~alex/ngircd/#bugs>
+
+There you can read about known bugs and limitations, too.
+
+If you have critics, patches or something else, please feel free to post a
+mail to: <alex@barton.de> or <alex@arthur.ath.cx>
 
 
 -- 
-$Id: README,v 1.4 2002/01/29 00:17:39 alex Exp $
+$Id: README,v 1.18.2.1 2004/05/07 11:24:17 alex Exp $

acconfig.h

@@ -1,49 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- *
- * $Id: acconfig.h,v 1.7 2002/01/02 02:52:09 alex Exp $
- *
- * $Log: acconfig.h,v $
- * Revision 1.7  2002/01/02 02:52:09  alex
- * - Copyright-Texte angepasst ;-)
- *
- * Revision 1.6  2001/12/31 02:21:00  alex
- * - "doc"-Unterverzeichnis aufgenommen.
- *
- * Revision 1.5  2001/12/29 03:04:35  alex
- * - neue configure-Option "--enable-strict-rfc", #define STRICT_RFC.
- *
- * Revision 1.4  2001/12/27 01:44:49  alex
- * - die Verwendung von syslog kann nun abgeschaltet werden.
- *
- * Revision 1.3  2001/12/25 22:01:47  alex
- * - neue configure-Option "--enable-sniffer".
- *
- * Revision 1.2  2001/12/21 23:54:15  alex
- * - zusaetzliche Debug-Ausgaben koennen eingeschaltet werden.
- *
- * Revision 1.1  2001/12/12 01:58:52  alex
- * - Test auf socklen_t verbessert.
- */
-
-
-#undef HAVE_socklen_t
-
-#undef DEBUG
-
-#undef SNIFFER
-
-#undef USE_SYSLOG
-
-#undef STRICT_RFC
-
-
-/* -eof- */

autogen.sh

@@ -1,23 +1,183 @@
 #!/bin/sh
 #
-# $Id: autogen.sh,v 1.2 2001/12/12 01:58:17 alex Exp $
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
 #
-# $Log: autogen.sh,v $
-# Revision 1.2  2001/12/12 01:58:17  alex
-# - fuer fehlende Dateien werden nun "nur noch" symbolische Links erzeugt.
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
-# Revision 1.1.1.1  2001/12/11 21:53:04  alex
-# Imported sources to CVS.
+# $Id: autogen.sh,v 1.12 2004/04/05 12:02:21 alex Exp $
 #
 
-if [ -f configure ]; then
-	echo "autogen.sh: configure-Skript existiert bereits ..."
+#
+# Usage: [VAR=<value>] ./autogen.sh [<configure-args>]
+#
+# This script generates the ./configure script using GNU automake and
+# GNU autoconf. It tries to be smart in finding the correct/usable/available
+# installed versions of these tools on your system.
+#
+# The following strategy is used for each of aclocal, autoheader, automake,
+# and autoconf: first, "tool" (the regular name of the tool, e. g. "autoconf"
+# or "automake") is checked. If this fails, "tool<major><minor>" (for example
+# "automake16") and "tool-<major>.<minor>" (e. g. "autoconf-2.54") are tried
+# with <major> being 2 for tool of GNU autoconf and 1 for tools of automake;
+# <minor> is tried from 99 to 0. The first occurrence will be used.
+#
+# When you pass <configure-args> to autogen.sh it will call the generated
+# ./configure script on success and pass these parameters to it.
+#
+# You can tweak the behaviour using these environment variables:
+#
+# - ACLOCAL=<cmd>, AUTOHEADER=<cmd>, AUTOMAKE=<cmd>, AUTOCONF=<cmd>
+#   Name and optionally path to the particular tool.
+# - PREFIX=<path>
+#   Search the GNU autoconf and GNU automake tools in <path> first. If the
+#   generated ./configure script will be called, pass "--prefix=<path>" to it.
+# - EXIST=<tool>
+#   Use <tool> to test for aclocal, autoheader etc. pp. ...
+#   When not specified, either "type" or "which" is used.
+# - VERBOSE=1
+#   Output the detected names of the GNU automake and GNU autoconf tools.
+# - GO=1
+#   Call ./configure even if no arguments have been passed to autogen.sh.
+#
+# Examples:
+#
+# - ./autogen.sh
+#   Generates the ./configure script.
+# - GO=1 ./autogen.sh
+#   Generates the ./configure script and runs it as "./configure".
+# - VERBOSE=1 ./autogen.sh --with-ident
+#   Show tool names, generates the ./configure script, and runs it with
+#   these arguments: "./configure --with-ident".
+# - ACLOCAL=aclocal-1.6 GO=1 PREFIX=$HOME ./autogen.sh
+#   Uses "aclocal-1.6" as aclocal tool, generates the ./configure script,
+#   and runs it with these arguments: "./configure --prefix=$HOME".
+#
+
+Search()
+{
+	[ $# -eq 2 ] || exit 1
+
+	searchlist="$1"
+	major="$2"
+	minor=99
+
+	[ -n "$PREFIX" ] && searchlist="${PREFIX}/$1 ${PREFIX}/bin/$1 $searchlist"
+
+	for name in $searchlist; do
+		$EXIST "${name}" >/dev/null 2>&1
+		if [ $? -eq 0 ]; then
+			echo "${name}"
+			return 0
+		fi
+	done
+
+	while [ $minor -ge 0 ]; do
+		for name in $searchlist; do
+			$EXIST "${name}${major}${minor}" >/dev/null 2>&1
+			if [ $? -eq 0 ]; then
+				echo "${name}${major}${minor}"
+				return 0
+			fi
+			$EXIST "${name}-${major}.${minor}" >/dev/null 2>&1
+			if [ $? -eq 0 ]; then
+				echo "${name}-${major}.${minor}" >/dev/null 2>&1
+				return 0
+			fi
+		done
+		minor=`expr $minor - 1`
+	done
+	return 1
+}
+
+Notfound()
+{
+	echo "Error: $* not found!"
+	echo "Please install recent versions of GNU autoconf and GNU automake."
+	exit 1
+}
+
+# Reset locale settings to suppress warning messages of Perl
+unset LC_ALL
+unset LANG
+
+# Which command should be used to detect the automake/autoconf tools?
+[ -z "$EXIST" ] && existlist="type which" || existlist="$EXIST"
+EXIST=""
+for t in $existlist; do
+	$t /bin/ls >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		rm -f /tmp/test.$$
+		$t /tmp/test.$$ >/dev/null 2>&1
+		[ $? -ne 0 ] && EXIST="$t"
+	fi
+	[ -n "$EXIST" ] && break
+done
+if [ -z "$EXIST" ]; then
+	echo "Didn't detect a working command to test for the autoconf/automake tools!"
+	echo "Searchlist: $existlist"
+	exit 1
+fi
+[ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools."
+
+# We want to use GNU automake 1.7, if available (WANT_AUTOMAKE is used by
+# the wrapper scripts of Gentoo Linux):
+WANT_AUTOMAKE=1.7
+export WANT_AUTOMAKE
+
+# Try to detect the needed tools when no environment variable already
+# spezifies one:
+echo "Searching tools ..."
+[ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
+[ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
+[ -z "$AUTOHEADER" ] && AUTOHEADER=`Search autoheader 2`
+[ "$VERBOSE" = "1" ] && echo "AUTOHEADER=$AUTOHEADER"
+[ -z "$AUTOMAKE" ] && AUTOMAKE=`Search automake 1`
+[ "$VERBOSE" = "1" ] && echo "AUTOMAKE=$AUTOMAKE"
+[ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2`
+[ "$VERBOSE" = "1" ] && echo "AUTOCONF=$AUTOCONF"
+
+# Call ./configure when parameters have been passed to this script and
+# GO isn't already defined.
+[ -z "$GO" -a $# -gt 0 ] && GO=1
+
+# Verify that all tools have been found
+[ -z "$AUTOCONF" ] && Notfound autoconf
+[ -z "$AUTOHEADER" ] && Notfound autoheader
+[ -z "$AUTOMAKE" ] && Notfound automake
+[ -z "$AUTOCONF" ] && Notfound autoconf
+
+export AUTOCONF AUTOHEADER AUTOMAKE AUTOCONF
+
+# Generate files
+echo "Generating files ..."
+$ACLOCAL && \
+	$AUTOHEADER && \
+	$AUTOMAKE --add-missing && \
+	$AUTOCONF
+
+if [ $? -eq 0 -a -x ./configure ]; then
+	# Success: if we got some parameters we call ./configure and pass
+	# all of them to it.
+	if [ "$GO" = "1" ]; then
+		[ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p=""
+		[ -n "$*" ] && a=" $*" || a=""
+		c="./configure${p}${a}"
+		echo "Calling \"$c\" ..."
+		$c
+		exit $?
+	else
+		echo "Okay, autogen.sh done; now run the \"configure\" script."
+		exit 0
+	fi
+else
+	# Failure!?
+	echo "Error! Check your installation of GNU automake and autoconf!"
+	exit 1
 fi
 
-aclocal && \
- autoheader && \
- automake --add-missing && \
- autoconf && \
- echo "Okay, autogen.sh war erfolgreich."
-
 # -eof-

configure.in

@@ -1,105 +1,47 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
 #
-# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
-# der GNU General Public License (GPL), wie von der Free Software Foundation
-# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
-# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
-# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
-# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.24 2002/02/15 14:35:55 alex Exp $
-#
-# $Log: configure.in,v $
-# Revision 1.24  2002/02/15 14:35:55  alex
-# - Version 0.2.0
-#
-# Revision 1.23  2002/01/29 01:07:15  alex
-# - Version auf 0.1.1-pre im CVS angehoben.
-#
-# Revision 1.22  2002/01/29 00:24:17  alex
-# - Version 0.1.0
-#
-# Revision 1.21  2002/01/16 23:06:16  alex
-# - Version auf 0.0.4-pre im CVS angehoben.
-#
-# Revision 1.20  2002/01/16 22:55:45  alex
-# - Version 0.0.3
-#
-# Revision 1.19  2002/01/06 16:21:09  alex
-# - CVS-Version auf "0.0.3-pre" angehoben.
-#
-# Revision 1.18  2002/01/06 16:09:37  alex
-# - Version 0.0.2
-#
-# Revision 1.17  2002/01/05 15:53:20  alex
-# - Test auf Header "arpa/inet.h" und Funktion inet_aton() hinzugefuegt (BeOS).
-#
-# Revision 1.16  2002/01/02 13:41:36  alex
-# - CFLAGS wird nur noch gesetzt, wenn der GCC verwendet wird.
-#
-# Revision 1.15  2002/01/02 02:52:09  alex
-# - Copyright-Texte angepasst ;-)
-#
-# Revision 1.14  2001/12/31 16:11:13  alex
-# - CVS-Version auf "0.0.2-pre" angehoben.
-#
-# Revision 1.13  2001/12/31 16:02:30  alex
-# - Version 0.0.1
-#
-# Revision 1.12  2001/12/31 02:21:00  alex
-# - "doc"-Unterverzeichnis aufgenommen.
-#
-# Revision 1.11  2001/12/29 03:04:06  alex
-# - neue configure-Option "--enable-strict-rfc".
-#
-# Revision 1.10  2001/12/27 16:25:36  alex
-# - neue configure-Option "--with-portab=DIR".
-#
-# Revision 1.9  2001/12/27 02:08:38  alex
-# - da fehlte an zwei Stellen ein AC_MSG_ERROR ... ups!
-#
-# Revision 1.8  2001/12/27 01:44:49  alex
-# - die Verwendung von syslog kann nun abgeschaltet werden.
-#
-# Revision 1.7  2001/12/27 00:37:07  alex
-# - Erkennung der "portab header" geaendert, CFLAGS werden nun anders gesetzt.
-#
-# Revision 1.6  2001/12/25 22:01:47  alex
-# - neue configure-Option "--enable-sniffer".
-#
-# Revision 1.5  2001/12/21 23:54:26  alex
-# - zusaetzliche Debug-Ausgaben koennen eingeschaltet werden.
-#
-# Revision 1.4  2001/12/12 17:21:58  alex
-# - Projektdatei fuer den Mac OS X Project Builder erstellt.
-#
-# Revision 1.3  2001/12/12 01:58:53  alex
-# - Test auf socklen_t verbessert.
-#
-# Revision 1.2  2001/12/11 22:04:21  alex
-# - Test auf stdint.h (HAVE_STDINT_H) hinzugefuegt.
-#
-# Revision 1.1.1.1  2001/12/11 21:53:04  alex
-# Imported sources to CVS.
+# $Id: configure.in,v 1.102.2.7 2005/02/03 10:16:25 alex Exp $
 #
 
-# -- Initialisierung --
+# -- Initialisation --
 
-AC_INIT
+AC_PREREQ(2.50)
+AC_INIT(ngircd, 0.8.3)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
-AM_INIT_AUTOMAKE(ngircd,0.2.0)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE(1.6)
 AM_CONFIG_HEADER(src/config.h)
 
-# -- Variablen --
+# -- Templates for config.h --
+
+AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
+AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists])
+AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled])
+AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant])
+AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
+AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
+AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
+AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
+AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included])
+AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
+
+AH_TEMPLATE([TARGET_OS], [Target operating system name])
+AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
+AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 
 # -- C Compiler --
 
 AC_PROG_CC
-AC_LANG_C
 
-# -- Hilfsprogramme --
+# -- Helper programs --
 
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -107,45 +49,45 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-# -- Header --
+# -- Compiler Features --
+
+AM_C_PROTOTYPES
+AC_C_CONST
+
+# -- Hard coded system and compiler dependencies/features/options ... --
+
+if test "$GCC" = "yes"; then
+	# We are using the GNU C compiler. Good!
+	CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
+fi
+
+case "$target_os" in
+	hpux*)
+		# This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED
+		# (tested with HP/UX 11.11)
+		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+		;;
+esac
+
+# Add additional CFLAGS, eventually specified on the command line:
+test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
+
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+
+# -- Headers --
 
 AC_HEADER_STDC
-
 AC_HEADER_TIME
-
-AC_ARG_WITH(portab,
-	[  --with-portab=DIR       search the "portab headers" in DIR],
-	[	if test "x$withval" != "xno"; then
-			CFLAGS="$CFLAGS -I${withval}"
-			if test -f ${withval}/portab.h; then
-				AC_MSG_RESULT([searching "portab headers" in ${withval}...])
-			else
-				AC_MSG_ERROR([${withval}/portab.h not found!])
-			fi
-		else
-			AC_MSG_ERROR([Can't disable Alex \"portability headers\"!])
-		fi
-	],
-	[	AC_CHECK_HEADER(portab.h,[
-			AC_CHECK_HEADER(imp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-			AC_CHECK_HEADER(exp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-		],[
-			AC_CHECK_HEADER(/usr/local/include/portab.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-			AC_CHECK_HEADER(/usr/local/include/imp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-			AC_CHECK_HEADER(/usr/local/include/exp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-			CFLAGS="$CFLAGS -I/usr/local/include"
-		])
-	]
-)
+AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
-	errno.h fcntl.h netinet/in.h string.h \
-	sys/socket.h sys/time.h unistd.h \
+	ctype.h errno.h fcntl.h netdb.h netinet/in.h stdlib.h string.h \
+	strings.h sys/socket.h sys/time.h unistd.h \
 	],,AC_MSG_ERROR([required C header missing!]))
 
-AC_CHECK_HEADERS(arpa/inet.h)
+AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h])
 
-# -- Datentypen --
+# -- Datatypes --
 
 AC_MSG_CHECKING(whether socklen_t exists)
 AC_TRY_COMPILE([
@@ -160,47 +102,141 @@ AC_TRY_COMPILE([
 	AC_MSG_RESULT(no)
 ])
 
-# -- Funktionen --
-
-AC_FUNC_MALLOC
-
-AC_CHECK_FUNCS([ \
-	gethostname inet_ntoa memmove memset select \
-	socket strcasecmp strchr strerror strstr waitpid \
-	],,AC_MSG_ERROR([required function missing!]))
-
-AC_CHECK_FUNCS(inet_aton)
+AC_TYPE_SIGNAL
+AC_TYPE_SIZE_T
 
 # -- Libraries --
 
-# -- Konfigurationsoptionen --
+AC_CHECK_LIB(UTIL,memmove)
+AC_CHECK_LIB(socket,bind)
+AC_CHECK_LIB(nsl,gethostent)
 
-AC_ARG_ENABLE(syslog,
-	[  --disable-syslog        disable syslog (autodetected by default)],
-	[	if test "$enableval" = "yes"; then
-			AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG, 1),AC_MSG_ERROR([Can't enable syslog: syslog.h not found!]))
-		else
-			AC_MSG_RESULT([disabling syslog])
+# -- Functions --
+
+AC_FUNC_FORK
+AC_FUNC_STRFTIME
+
+AC_CHECK_FUNCS([ \
+	bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \
+	memset realloc setsid setsockopt socket strcasecmp strchr strerror \
+	strstr waitpid],,AC_MSG_ERROR([required function missing!]))
+
+AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strlcpy strlcat)
+
+AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
+	AC_MSG_ERROR([required function select() is missing!])
+)
+
+# -- Configuration options --
+
+x_syslog_on=no
+AC_ARG_WITH(syslog,
+	[  --without-syslog        disable syslog (autodetected by default)],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_LIB(be, syslog)
+			AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
+				AC_MSG_ERROR([Can't enable syslog!])
+			)
 		fi
 	],
-	[	AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG, 1))
+	[
+		AC_CHECK_LIB(be, syslog)
+		AC_CHECK_FUNCS(syslog, x_syslog_on=yes)
+	]
+)
+if test "$x_syslog_on" = "yes"; then
+	AC_DEFINE(SYSLOG, 1)
+	AC_CHECK_HEADERS(syslog.h)
+fi
+
+x_zlib_on=no
+AC_ARG_WITH(zlib,
+	[  --without-zlib          disable zlib compression (autodetected by default)],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_LIB(z, deflate)
+			AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
+				AC_MSG_ERROR([Can't enable zlib!])
+			)
+		fi
+	],
+	[	AC_CHECK_LIB(z, deflate)
+		AC_CHECK_FUNCS(deflate, x_zlib_on=yes)
+	]
+)
+if test "$x_zlib_on" = "yes"; then
+	AC_DEFINE(ZLIB, 1)
+	AC_CHECK_HEADERS(zlib.h)
+fi
+
+x_tcpwrap_on=no
+AC_ARG_WITH(tcp-wrappers,
+	[  --with-tcp-wrappers     enable TCP wrappers support],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_LIB(wrap, tcpd_warn)
+			AC_MSG_CHECKING(for hosts_access)
+			AC_TRY_LINK([
+				#include <tcpd.h>
+				],[
+				void *ptr;
+				ptr = hosts_access;
+				],[
+				AC_MSG_RESULT(yes)
+				AC_DEFINE(TCPWRAP, 1)
+				x_tcpwrap_on=yes
+				],[
+				AC_MSG_RESULT(no)
+				AC_MSG_ERROR([Can't enable TCP wrappers!])
+			])
+		fi
 	]
 )
 
-AC_ARG_ENABLE(strict-rfc,
-	[  --enable-strict-rfc     strict RFC conformance, may break clients],
-	if test "$enableval" = "yes"; then
-		AC_DEFINE(STRICT_RFC, 1)
-		AC_MSG_RESULT([enabling strict RFC conformance])
-	fi
+x_rendezvous_on=no
+AC_ARG_WITH(rendezvous,
+	[  --with-rendezvous       enable support for "Rendezvous"],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=yes,
+				AC_MSG_ERROR([Can't enable Rendezvous!])
+			)
+		fi
+	]
 )
+if test "$x_rendezvous_on" = "yes"; then
+	AC_DEFINE(RENDEZVOUS, 1)
+	AC_CHECK_HEADERS(DNSServiceDiscovery/DNSServiceDiscovery.h mach/port.h)
+fi
 
+x_identauth_on=no
+AC_ARG_WITH(ident,
+	[  --with-ident            enable "IDENT" ("AUTH") protocol support],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_LIB(ident, ident_id)
+			AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
+				AC_MSG_ERROR([Can't enable IDENT support!])
+			)
+		fi
+	]
+)
+if test "$x_identauth_on" = "yes"; then
+	AC_DEFINE(IDENTAUTH, 1)
+	AC_CHECK_HEADERS(ident.h)
+fi
+
+x_ircplus_on=yes
+AC_ARG_ENABLE(ircplus,
+	[  --disable-ircplus       disable IRC+ protocol],
+	if test "$enableval" = "no"; then x_ircplus_on=no; fi
+)
+if test "$x_ircplus_on" = "yes"; then
+	AC_DEFINE(IRCPLUS, 1)
+fi
+
+x_sniffer_on=no; x_debug_on=no
 AC_ARG_ENABLE(sniffer,
-	[  --enable-sniffer        enable network traffic monitor (enables debug mode!)],
+	[  --enable-sniffer        enable IRC traffic sniffer (enables debug mode)],
 	if test "$enableval" = "yes"; then
 		AC_DEFINE(SNIFFER, 1)
-		AC_MSG_RESULT([enabling network traffic monitor])
-		x_debug_on=yes
+		x_sniffer_on=yes; x_debug_on=yes
 	fi
 )
 
@@ -210,24 +246,120 @@ AC_ARG_ENABLE(debug,
 )
 if test "$x_debug_on" = "yes"; then
 	AC_DEFINE(DEBUG, 1)
-	AC_MSG_RESULT([enabling additional debug output])
+	test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
 fi
 
-# -- Variablen II --
+x_strict_rfc_on=no
+AC_ARG_ENABLE(strict-rfc,
+	[  --enable-strict-rfc     strict RFC conformance -- may break clients!],
+	if test "$enableval" = "yes"; then
+		AC_DEFINE(STRICT_RFC, 1)
+		x_strict_rfc_on=yes
+	fi
+)
 
-if test "$GCC" = "yes"; then
-	CFLAGS="-Wall $CFLAGS"
-fi
+# -- Definitions --
 
-# -- Ausgabe --
+AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu" )
+AC_DEFINE_UNQUOTED(TARGET_VENDOR, "$target_vendor" )
+AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" )
+
+# Add additional CFLAGS, eventually specified on the command line, but after
+# running this configure script. Useful for "-Werror" for example.
+test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
+
+# -- Generate files --
 
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
-	MacOSX/Makefile \
-	MacOSX/ngircd.pbproj/Makefile \
 	src/Makefile \
+	src/portab/Makefile \
+	src/tool/Makefile \
 	src/ngircd/Makefile \
+	src/testsuite/Makefile \
+	man/Makefile \
+	contrib/Makefile \
+	contrib/Debian/Makefile \
+	contrib/MacOSX/Makefile \
 ])
 
+type dpkg >/dev/null 2>&1
+if test $? -eq 0; then
+	# Generate debian/ link if the dpkg command exists
+	# (read: if we are running on a debian compatible system)
+	echo "creating Debian-specific links ..."
+	test -f debian/rules || ln -s contrib/Debian debian
+fi
+
+# -- Result --
+
+echo
+echo "ngIRCd has been configured with the following options:"
+echo
+
+# Someone please show me a better way :)  [borrowed by OpenSSH]
+B=`eval echo ${bindir}` ; B=`eval echo ${B}`
+S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
+C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
+M=`eval echo ${mandir}` ; M=`eval echo ${M}`
+D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`
+
+echo "             Target: ${target}"
+test "$target" != "$host" && echo "               Host: ${host}"
+echo "           Compiler: ${CC}"
+test -n "$CFLAGS"	&& echo "     Compiler flags: ${CFLAGS}"
+test -n "$CPPFLAGS"	&& echo " Preprocessor flags: ${CPPFLAGS}"
+test -n "$LDFLAGS"	&& echo "       Linker flags: ${LDFLAGS}"
+test -n "$LIBS"		&& echo "          Libraries: ${LIBS}"
+echo
+echo "    'ngircd' binary: $S"
+echo " Configuration file: $C"
+echo "       Manual pages: $M"
+echo "      Documentation: $D"
+echo
+
+echo $ECHO_N "     Syslog support: $ECHO_C"
+test "$x_syslog_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
+echo $ECHO_N "  Enable debug code: $ECHO_C"
+test "$x_debug_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N "   zlib compression: $ECHO_C"
+test "$x_zlib_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
+echo $ECHO_N "        IRC sniffer: $ECHO_C"
+test "$x_sniffer_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N "   Use TCP Wrappers: $ECHO_C"
+test "$x_tcpwrap_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
+echo $ECHO_N "    Strict RFC mode: $ECHO_C"
+test "$x_strict_rfc_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N " Rendezvous support: $ECHO_C"
+test "$x_rendezvous_on" = "yes"	\
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
+echo $ECHO_N "      IRC+ protocol: $ECHO_C"
+test "$x_ircplus_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N "      IDENT support: $ECHO_C"
+test "$x_identauth_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
+
+echo; echo
+
 # -eof-

contrib/Debian/Makefile.am

@@ -0,0 +1,28 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+#
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
+#
+# $Id: Makefile.am,v 1.3.2.1 2004/05/11 00:38:17 alex Exp $
+#
+
+EXTRA_DIST = rules changelog compat control copyright \
+	ngircd.init ngircd.postinst
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+clean-local:
+	rm -f ngircd.postinst.debhelper ngircd.postrm.debhelper \
+	 ngircd.prerm.debhelper ngircd.substvars
+	rm -f ngircd-full.postinst.debhelper ngircd-full.postrm.debhelper \
+	 ngircd-full.prerm.debhelper ngircd-full.substvars
+	rm -rf ngircd ngircd-full
+	rm -f files
+
+# -eof-

contrib/Debian/changelog

@@ -0,0 +1,155 @@
+ngircd (0.8.3-0ab1) unstable; urgency=high
+
+  * New "upstream release", including security fixes.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  3 Feb 2005 10:41:55 +0100
+
+ngircd (0.8.2-0ab1) unstable; urgency=high
+
+  * New "upstream release", including security fixes.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Wed, 26 Jan 2005 23:14:12 +0100
+
+ngircd (0.8.1-0ab1) unstable; urgency=low
+
+  * New "upstream release".
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 25 Dec 2004 01:18:32 +0100
+
+ngircd (0.8.0-0ab2) unstable; urgency=low
+
+  * Added missing commas to debian control file, fixes bug #56.
+    Thanks to Kevin Otte.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Thu, 15 Jul 2004 10:53:39 +0200
+
+ngircd (0.8.0-0ab1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 26 Jun 2004 11:25:59 +0200
+
+ngircd (0.7.7+HEAD-0ab5) unstable; urgency=low
+
+  * Updates from CVS HEAD branch, most notably: "INVITE- and BAN-lists
+    become synchronized between IRC+ servers when establishing new
+    connections, if the peer supports this as well."
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Mon, 26 Apr 2004 01:53:15 +0200
+
+ngircd (0.7.7+HEAD-0ab4) unstable; urgency=low
+
+  * This version includes fixes for INVITE command and the handling of the
+    invite and ban lists from CVS-HEAD.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Fri,  9 Apr 2004 23:55:13 +0200
+
+ngircd (0.7.7+HEAD-0ab3) unstable; urgency=low
+
+  * Included MODE fix from CVS-HEAD branch.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Mon,  5 Apr 2004 13:09:24 +0200
+
+ngircd (0.7.7+HEAD-0ab2) unstable; urgency=low
+
+  * Incorporated more fixes and enhancements of CVS-HEAD version,
+    e. g. better connection logging and fixed TRACE command.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 28 Feb 2004 03:20:32 +0100
+
+ngircd (0.7.7+HEAD-0ab1) unstable; urgency=low
+
+  * New upstream version. This debian package includes all features of
+    ngIRCd 0.7.7 and changes of the CVS-HEAD development tree.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  5 Feb 2004 15:23:22 +0100
+
+ngircd (0.7.6+HEAD-0ab2) unstable; urgency=low
+
+  * Included new fixes and additions from the CVS-HEAD upstream branch,
+    e. g. the setting of type of service (TOS) on sockets.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Mon, 26 Jan 2004 04:05:41 +0100
+
+ngircd (0.7.6+HEAD-0ab1) unstable; urgency=low
+
+  * Included all changes from the CVS-HEAD upstream version.
+  * Restructured debian packaging system: now there are two packages, a
+    "standard" version that includes all the default options and a "full"
+    version that additionally includes support for TCP wrappers and IDENT
+    lookups.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  1 Jan 2004 23:12:11 +0100
+
+ngircd (0.7.6-0ab1) unstable; urgency=medium
+
+  * New upstream version.
+  * Changed version numvering scheme of debian package.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Fri,  5 Dec 2003 14:26:41 +0100
+
+ngircd (0.7.5-0.2ab) unstable; urgency=low
+
+  * Updated RPM and Debian package description and configuration.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 29 Nov 2003 21:24:32 +0100
+
+ngircd (0.7.5-0.1ab) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Fri,  7 Nov 2003 21:59:58 +0100
+
+ngircd (0.7.1-0.1ab) unstable; urgency=low
+
+  * New upstream version :-)
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Fri, 18 Jul 2003 22:53:02 +0200
+
+ngircd (0.7.0-0.7ab) unstable; urgency=low
+
+  * Fixed up post installation script (added interpreter, fixed chmod call).
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sun, 13 Jul 2003 00:52:38 +0200
+
+ngircd (0.7.0-0.6ab) unstable; urgency=low
+
+  * Added /etc/default/ngircd.
+  * Included own post installation script.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 12 Jul 2003 20:31:09 +0200
+
+ngircd (0.7.0-0.5ab) unstable; urgency=low
+
+  * Enhanced init script.
+  * Included NJOIN fix from actual CVS "HEAD" branch.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Wed,  9 Jul 2003 22:40:49 +0200
+
+ngircd (0.7.0-0.4ab) unstable; urgency=low
+
+  * Reverted use of dh_installexamples.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Thu, 22 May 2003 00:15:03 +0200
+
+ngircd (0.7.0-0.3ab) unstable; urgency=low
+
+  * Removed "debian/docs" and "debian/conffiles"; debhelper takes care of
+    this for us automagically.
+  * Excluded "etc/ngircd.conf" from dh_fixperms.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Wed, 21 May 2003 23:25:05 +0200
+
+ngircd (0.7.0-0.2ab) unstable; urgency=low
+
+  * Fixed wrong variable substitution in init script.
+  * Added some CVS "Id-Tags" (but not checked in, yet).
+  * Removed own "Provides:" from control file.
+
+ -- Alexander Barton <alex@barton.de>  Wed, 21 May 2003 12:32:34 +0200
+
+ngircd (0.7.0-0.1ab) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Alexander Barton <alex@barton.de>  Wed, 21 May 2003 02:36:52 +0200

contrib/Debian/compat

@@ -0,0 +1 @@
+4

contrib/Debian/control

@@ -0,0 +1,47 @@
+Source: ngircd
+Section: net
+Priority: optional
+Maintainer: Alexander Barton <alex@barton.de>
+Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap-dev, libident-dev
+Standards-Version: 3.5.8
+
+Package: ngircd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A lightweight daemon for the Internet Relay Chat (IRC)
+ ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
+ network. It is written from scratch and is not based upon the original
+ IRCd like many others.
+ .
+ This package contains the "standard distribution", including support for
+ syslog logging and compressed server-links using zlib.
+ .
+ Advantages of ngIRCd:
+  - no problems with servers using changing/non-static IP addresses.
+  - small and lean configuration file.
+  - free, modern and open source C code.
+  - still under active development.
+ .
+ ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
+ mixed networks.
+
+Package: ngircd-full
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ngircd
+Description: A lightweight daemon for the Internet Relay Chat (IRC)
+ ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
+ network. It is written from scratch and is not based upon the original
+ IRCd like many others.
+ .
+ This package includes support for TCP wrappers and IDENT requests in
+ addition to the features of the "standard package".
+ .
+ Advantages of ngIRCd:
+  - no problems with servers using changing/non-static IP addresses.
+  - small and lean configuration file.
+  - free, modern and open source C code.
+  - still under active development.
+ .
+ ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
+ mixed networks.

contrib/Debian/copyright

@@ -0,0 +1,13 @@
+This package was debianized by Alexander Barton <alex@barton.de> on
+Tue, 20 May 2003 15:47:40 +0200.
+
+It was downloaded from ftp://Arthur.Ath.CX/pub/Users/alex/ngircd/
+
+Upstream Author: Alexander Barton <alex@barton.de>
+
+This software is copyright (c) 1999-2003 by Alexander Barton.
+
+You are free to distribute this software under the terms of the
+GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.

contrib/Debian/ngircd.default

@@ -0,0 +1,12 @@
+#
+# Defaults for ngIRCd start and stop script
+#
+# $Id: ngircd.default,v 1.1 2003/12/31 17:20:11 alex Exp $
+#
+
+# Parameters to pass to the ngircd daemon on startup, see ngircd(8) for
+# possible options (default: empty).
+
+PARAMS=""
+
+# -eof-

contrib/Debian/ngircd.init

@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# ngIRCd start and stop script for Debian-based systems
+#
+# $Id: ngircd.init,v 1.1.2.1 2004/09/06 00:36:49 alex Exp $
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/ngircd
+NAME=ngIRCd
+BASENAME=`basename $0`
+DESC="IRC daemon"
+PARAMS=""
+
+test -f /etc/default/$BASENAME && . /etc/default/$BASENAME
+
+test -x $DAEMON || exit 0
+
+Check_Config()
+{
+	$DAEMON --configtest >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Configuration of $NAME is not valide, won't (re)start!"
+		echo "Please run \"$DAEMON --configtest\" manually and fix it up ..."
+		exit 1
+	fi
+}
+
+Try_Start()
+{
+	start-stop-daemon --start --quiet --exec $DAEMON -- $PARAMS
+	if [ $? -ne 0 ]; then
+		echo "$NAME failed!"
+		exit 1
+	fi
+	echo "$NAME."
+}
+
+case "$1" in
+  start)
+	Check_Config
+	echo -n "Starting $DESC: "
+	Try_Start
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --exec $DAEMON \
+	  && echo "$NAME." \
+	  || echo "(none running)"
+	;;
+  reload|force-reload)
+	Check_Config
+	echo "Reloading $DESC configuration files."
+	start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
+	;;
+  restart)
+	Check_Config
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+	sleep 1
+	Try_Start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
+
+# -eof-

contrib/Debian/ngircd.postinst

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Debian post-installation script
+# $Id: ngircd.postinst,v 1.1 2003/12/31 17:20:11 alex Exp $
+#
+
+if [ -f /etc/ngircd/ngircd.conf ]; then
+	# make sure that configuration file is not world readable
+	chmod o= /etc/ngircd/ngircd.conf
+fi
+
+#DEBHELPER#
+
+# -eof-

contrib/Debian/rules

@@ -0,0 +1,156 @@
+#!/usr/bin/make -f
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+#
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
+#
+# debian/rules for ngIRCd
+#
+# $Id: rules,v 1.2 2004/01/01 22:24:48 alex Exp $
+#
+# Based on the sample debian/rules that uses debhelper,
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+configure-ngircd: configure
+	dh_testdir
+
+	# configure "standard" variant:
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	  --prefix=/usr \
+	  --sysconfdir=/etc/ngircd \
+	  --mandir=\$${prefix}/share/man \
+	  --with-syslog --with-zlib
+
+configure-ngircd-full: configure
+	dh_testdir
+
+	# configure "full" variant:
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	  --prefix=/usr \
+	  --sysconfdir=/etc/ngircd \
+	  --mandir=\$${prefix}/share/man \
+	  --with-syslog --with-zlib --with-tcp-wrappers --with-ident
+
+build:
+	dh_clean -k
+
+build-ngircd: build-stamp-ngircd
+build-stamp-ngircd: configure-ngircd
+	dh_testdir
+	rm -f build-stamp-*
+
+	# Add here commands to compile the "standard" package:
+	$(MAKE)
+
+	touch build-stamp-ngircd
+
+build-ngircd-full: build-stamp-ngircd-full
+build-stamp-ngircd-full: configure-ngircd-full
+	dh_testdir
+	rm -f build-stamp-*
+
+	# Add here commands to compile the "full" package:
+	$(MAKE)
+
+	touch build-stamp-ngircd-full
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp*
+	rm -f $(CURDIR)/debian/ngircd-full.default
+	rm -f $(CURDIR)/debian/ngircd-full.init
+	rm -f $(CURDIR)/debian/ngircd-full.postinst
+
+	# Add here commands to clean up after the build process:
+	-$(MAKE) clean
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	dh_clean
+
+install: install-ngircd install-ngircd-full
+
+install-ngircd: build-ngircd
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+
+	# Add here commands to install the "standard" package into debian/ngircd:
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd
+	rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL*
+	rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING*
+
+install-ngircd-full: build-ngircd-full
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+
+	# Add here commands to install the "full" package into debian/ngircd-full:
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full
+	rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/INSTALL*
+	rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/COPYING*
+	mv $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd \
+	 $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full
+
+# Build architecture-independent files here.
+binary-indep:
+	# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	ln -s $(CURDIR)/debian/ngircd.default \
+	 $(CURDIR)/debian/ngircd-full.default
+	ln -s $(CURDIR)/debian/ngircd.init \
+	 $(CURDIR)/debian/ngircd-full.init
+	ln -s $(CURDIR)/debian/ngircd.postinst \
+	 $(CURDIR)/debian/ngircd-full.postinst
+	
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -a -A ChangeLog
+	dh_installdocs -a
+	dh_installinit -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary-indep binary-arch binary install 
+
+# -eof-

contrib/MacOSX/Makefile.am

@@ -0,0 +1,20 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+#
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
+#
+# $Id: Makefile.am,v 1.1.2.1 2004/05/11 00:38:17 alex Exp $
+#
+
+clean-local:
+	rm -rf build
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+# -eof-

contrib/Makefile.am

@@ -0,0 +1,22 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+#
+# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
+# der GNU General Public License (GPL), wie von der Free Software Foundation
+# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
+# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
+# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
+# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+#
+# $Id: Makefile.am,v 1.4 2004/04/28 12:18:02 alex Exp $
+#
+
+SUBDIRS = Debian MacOSX
+
+EXTRA_DIST = README ngircd.spec systrace.policy
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+# -eof-

contrib/README

@@ -0,0 +1,27 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001-2004 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                            -- Contributions --
+
+
+MacOSX/
+ - Project file for XCode "project builder" of Mac OS X.
+
+Debian/
+ - Various files for building Debian packages.
+
+ngircd.spec
+ - RPM "spec" file.
+
+systrace.policy
+ - Systrace policy file for OpenBSD (and probably NetBSD).
+
+
+--
+$Id: README,v 1.1 2004/04/28 12:18:50 alex Exp $

contrib/ngircd.spec

@@ -0,0 +1,55 @@
+%define name    ngircd
+%define version 0.8.3
+%define release 1
+%define prefix  %{_prefix}
+
+Summary:      A lightweight daemon for the Internet Relay Chat (IRC)
+Name:         %{name}
+Version:      %{version}
+Release:      %{release}
+Copyright:    GPL
+Group:        Networking/Daemons
+URL:          http://arthur.ath.cx/~alex/ngircd/
+Source:       %{name}-%{version}.tar.gz
+Packager:     Sean Reifschneider <jafo-rpms@tummy.com>
+BuildRoot:    /var/tmp/%{name}-root
+
+%description
+ngIRCd is a free open source daemon for the Internet Relay Chat (IRC),
+developed under the GNU General Public License (GPL). It's written from
+scratch and is not based upon the original IRCd like many others.
+
+Advantages:
+ - no problems with servers using changing/non-static IP addresses.
+ - small and lean configuration file.
+ - free, modern and open source C code.
+ - still under active development.
+
+ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
+mixed networks.
+
+%prep
+%setup
+%build
+%configure
+make
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+%makeinstall
+(
+   cd "$RPM_BUILD_ROOT"
+   ( cd usr/sbin; mv *-ngircd ngircd )
+   ( cd usr/share/man/man5; mv *-ngircd.conf.5 ngircd.conf.5 )
+   ( cd usr/share/man/man8; mv *-ngircd.8 ngircd.8 )
+)
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+
+%files
+%defattr(755,root,root)
+%doc AUTHORS  COPYING  ChangeLog  INSTALL NEWS  README
+%config(noreplace) /etc
+%{_prefix}/sbin
+%{_prefix}/share/man/

contrib/systrace.policy

@@ -0,0 +1,77 @@
+#
+# Sample systrace policy for ngIRCd on OpenBSD
+# Author: Benjamin Pineau <ben@zouh.org>
+#
+# $Id: systrace.policy,v 1.1 2004/04/28 12:16:59 alex Exp $
+#
+# Tune me, put me in /etc/systrace/usr_local_bin_ngircd and start ngIRCd
+# (with root privileges) as:
+#
+#   systrace -a /usr/local/bin/ngircd
+#
+# I didn't tried this on NetBSD, but it should work as is.
+#
+# On systems with pf, it can be supplemented by strict firewall rules:
+# for a ngircd running as '$ircuser', binding on '$ircport' and accepting
+# 30 connections:
+#
+#   block out log quick proto tcp from any port $ircport to any \
+#    user != $ircuser
+#   pass in inet proto tcp from any to any port $ircport user $ircuser \
+#    keep state (max 30) flags S/SA
+#
+
+Policy: /usr/local/bin/ngircd, Emulation: native
+	native-__sysctl: permit
+	native-fsread: filename eq "/etc/malloc.conf" then permit
+	native-fsread: filename sub "/usr/share/zoneinfo/" then permit
+	native-fsread: filename eq "/usr/local/etc/ngircd.conf" then permit
+	native-fsread: filename eq "/usr/local/etc/ngircd.motd" then permit
+	native-fsread: filename eq "/etc/ngircd.conf" then permit
+	native-fsread: filename eq "/etc/ngircd.motd" then permit
+	native-fsread: filename eq "/etc/spwd.db" then deny[eperm]
+	native-fsread: filename eq "/etc/group" then permit
+	native-fsread: filename eq "/etc/resolv.conf" then permit
+	native-fsread: filename eq "/etc/localtime" then permit
+	native-fsread: filename eq "/etc/hosts" then permit
+	native-fsread: filename sub "<non-existent filename>" then deny[enoent]
+	native-socket: sockdom eq "AF_UNIX" and socktype eq "SOCK_DGRAM" then permit
+	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
+	native-bind: sockaddr match "inet-*:6667" then permit, if user != root
+	native-connect: sockaddr eq "/dev/log" then permit, if user != root
+	native-connect: sockaddr match "inet-*:53" then permit, if user != root
+	native-setsockopt: permit, if user != root
+	native-listen: permit, if user != root
+	native-accept: permit, if user != root
+	native-sendto: true then permit, if user != root
+	native-recvfrom: permit, if user != root
+	native-read: permit
+	native-pread: permit
+	native-write: permit, if user != root
+	native-mmap: permit
+	native-munmap: permit
+	native-mprotect: permit
+	native-break: permit
+	native-umask: permit
+	native-fork: permit
+	native-setsid: permit
+	native-chdir: permit
+	native-chroot: permit
+	native-setgid: gid neq "0" then permit
+	native-setuid: uid neq "0" and uname neq "root" then permit
+	native-getuid: permit
+	native-getgid: permit
+	native-gettimeofday: permit
+	native-getpid: permit
+	native-select: permit
+	native-fcntl: permit
+	native-fstat: permit
+	native-issetugid: permit
+	native-sigaction: permit
+	native-pipe: permit
+	native-sigreturn: permit
+	native-close: permit
+	native-exit: permit
+	native-fswrite: deny[eperm]
+
+# -eof-

doc/CVS.txt

@@ -1,25 +1,56 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2003 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
                                  -- CVS.txt --
 
 
-Die Sourcen des ngIRCd werden mit dem "Concurrent Versions System" (CVS)
-verwaltet. Somit koennen ohne Probleme mehrere Leute gleichzeitig die Sourcen
-bearbeitet.
+The source code of ngIRCd is maintained using the "Concurrent Versions
+System" (CVS). Thereby several developers can work with the source tree at
+the same time.
 
-Dieser Text soll in Zukunft die Grundlagen beschreiben. Tut er aber leider
-noch nicht, also frage einfach Alex direkt (siehe AUTHORS-Text), wenn du
-daran interessiert bist, Zugriff auf den Quellcode via CVS zu bekommen!
 
-[ ... more to come ... ]
+I. Anonymous read-only Access
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To access the source tree anonymously in read-only mode, follow these steps:
+
+Login to the CVS server:
+
+ $ cvs -d:pserver:anonymous@arthur.ath.cx:/usr/local/CVS/ngircd login
+
+Use "anonymous" as user name and no password (just hit Return). Now you can
+check out the sources:
+
+ $ cvs -d:pserver:anonymous@arthur.ath.cx:/usr/local/CVS/ngircd checkout ngircd
+
+Thereby a new folder "ngircd" will be created containing all the individual
+source files.
+
+This is the "working folder", all CVS commands will be executed from within
+this folder in the future.
+
+Please note: When checking out a fresh copy of ngIRCd from CVS, the
+configure script doesn't exist; you have to run the autogen.sh shell script
+(which is included in the source tree) to generate it. This requires you to
+have GNU automake and GNU autoconf installed on your system.
+
+Updating the CVS tree:
+
+ $ cvs update -d -P [<filename>]
+
+You can update a single file or the complete source tree.
+
+
+III. Write Access
+~~~~~~~~~~~~~~~~~
+If you want to contribute a couple of patches and write access to the CVS
+repository would be handy, please contact Alex Barton, <alex@barton.de>.
 
 
 -- 
-$Id: CVS.txt,v 1.4 2002/01/23 18:20:04 alex Exp $
+$Id: CVS.txt,v 1.7 2003/03/26 22:34:33 alex Exp $

doc/FAQ.txt

@@ -1,46 +1,67 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2003 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
                     -- FAQ: Frequently Asked Questions --
 
 
-I. Allgemein
-~~~~~~~~~~~~
-Q: Kann der ngIRCd im Netz zusammen mit "normalen" Servern betrieben werden?
-A: Ja. ngIRCd ist zum Original kompatibel, getestet wird dies zur Zeit mit
-   der Version 2.10.3p3 des ircd.
+I. General
+~~~~~~~~~~
+Q: Is it possible to link the ngIRCd with non-ngIRCd servers?
+A: Yes. ngIRCd is compatible to the original ircd used by IRCNet. Actually
+   this is being tested with version 2.10.3p3.
 
-Q: Gibt es eine Homepage mit Informationen und Downloads?
-A: Ja. Die URL ist <http://arthur.ath.cx/~alex/ngircd/>.
+Q: Is there a homepage with further information and downloads?
+A: Yes. Please visit <http://arthur.ath.cx/~alex/ngircd/>.
+
+Q: Why should I use ngIRCd instead of the original one?
+A: ngIRCd offers several benefits: no problems with dynamic IPs, easy to
+   configure, open source (GPL), under active development.
 
 
-II. Compilieren
+II. Compilation
 ~~~~~~~~~~~~~~~
-Q: Ich habe die Sourcen von ngIRCd ueber CVS installiert. Nun kann ich
-   ./configure nicht ausfuehren, da es nicht existiert!?
-A: Bei Builds direkt aus dem CVS-Tree muss das configure-Script zunaechst
-   durch GNU autoconf sowie die Makefile.in's durch GNU automake generiert
-   werden. Um dies zu vereinfachen existiert das Script "./autogen.sh".
-   GNU automake und GNU autoconf werden -- im Gegensatz zu Builds aus den
-   Sourcen eines .tar.gz-Archivs -- hierbei benoetigt!
+Q: I did a "CVS checkout" but can't execute ./configure because the script
+   is missing in the generated directory!?
+A: When using development versions via CVS, the configure script as well as
+   the Makefile.in templates must be generated using GNU automake and GNU
+   autoconf. To simplify this task run the ./autogen.sh script which will
+   execute the required tools for you; then continue with executing the
+   ./configure script as usual.
 
-Q: ./autogen.sh bricht mit der Meldung "autoheader: command not found" ab.
-A: GNU autoconf ist nicht installiert, wird jedoch bei Builds direkt aus
-   dem CVS-Tree benoetigt.
+Q: The ./autogen.sh script complains "aclocal: command not found".
+A: GNU automake is missing on your system but required for building CVS
+   versions of ngIRCd. Install GNU automake 1.6 or later and try again.
 
-Q: ./autogen.sh bricht mit der Meldung "autoconf: Undefined macros:
-   AC_FUNC_MALLOC" bzw. "AC_CONFIG_SRCDIR" ab.
-A: Auf dem System ist eine zu alte Version von GNU autoconf installiert.
-   Ein Update auf z.B. Version 2.52 loest dieses Problem (eine installiete
-   alte Version sollte ggf. zunaechst entfernt werden, bei RPM-Paketen z.B.
-   mit dem Befehl "rpm -e autoconf").
+Q: The ./autogen.sh script stops with "autoheader: command not found".
+A: GNU autoconf is missing on your system but required for building CVS
+   versions of ngIRCd. Install GNU autoconf 2.52 or later and try again.
+
+Q: The ./autogen.sh script fails and the message "automake: configure.in:
+   AM_INIT_AUTOMAKE must be used" is displayed.
+A: Most probably you are using version 1.5 of GNU automake which seems to be
+   incompatible to the build system of ngIRCd. Solution: upgrade to at least
+   version 1.6 of GNU automake.
+   (If you are using Debian 3.0 "Woody" you can try to downgrade to version
+   1.4 of GNU automake shipped with this distribution; it should work, too.)
+
+
+III. Bugs!?
+~~~~~~~~~~~
+Q: Is there a list of known bugs and desired feature enhancements?
+A: Yes. Have a look at the bug tracking system (Bugzilla) for ngIRCd located
+   at <http://arthur.ath.cx/bugzilla/ngircd/>. There you can file bug reports
+   and feature requests as well as search the bug database.
+
+Q: What should I do if I found a bug?
+A: Please file a bug report at <http://arthur.ath.cx/bugzilla/ngircd/>!
+   The author of the particular component will be notified automagically :-)
 
 
 -- 
-$Id: FAQ.txt,v 1.1 2002/01/23 14:05:20 alex Exp $
+$Id: FAQ.txt,v 1.7 2003/11/07 21:32:15 alex Exp $

doc/Makefile.am

@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
 #
 # Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
 # der GNU General Public License (GPL), wie von der Free Software Foundation
@@ -9,22 +9,31 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: Makefile.am,v 1.3 2002/01/02 02:40:31 alex Exp $
-#
-# $Log: Makefile.am,v $
-# Revision 1.3  2002/01/02 02:40:31  alex
-# - Copyright-Text ergaenzt.
-#
-# Revision 1.2  2001/12/31 02:45:24  alex
-# - nun werden alle generierten Dateien bei "maintainer-clean" geloescht.
-#
-# Revision 1.1  2001/12/31 02:22:29  alex
-# - Makefile.am fuer das "doc"-Verzeichnis begonnen.
+# $Id: Makefile.am,v 1.17 2003/04/22 23:50:18 alex Exp $
 #
 
-EXTRA_DIST = CVS.txt RFC.txt sample-ngircd.conf
+EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt Platforms.txt \
+	README-AUX.txt README-BeOS.txt RFC.txt sample-ngircd.conf
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in
 
+docdir = $(datadir)/doc/$(PACKAGE)
+
+documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \
+	../NEWS ../README
+
+install-data-hook:
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+	if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+	  $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
+	 fi
+	$(mkinstalldirs) $(DESTDIR)$(docdir)
+	for f in $(documents); do \
+	  $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
+	 done
+
+uninstall-hook:
+	rm -rf $(DESTDIR)$(docdir)
+
 # -eof-

doc/Platforms.txt

@@ -0,0 +1,63 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                        (c)2001-2004 Alexander Barton
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                              -- Platforms.txt --
+
+
+This file lists the status of all platforms on which the ngIRCd has been
+tested. Included is the date and version of the last "official" test and
+the name of the tester/maintainer.
+
+If you successfully compiled and tested ngIRCd on a platform that isn't
+listed here, please contact Alexander Barton, <alex@barton.de>, so that this
+list can be updated. Thanks for your help!
+
+
+                              the executable works ("runs") as expected --+
+                                tests run successfully ("make check") --+ |
+                                           ngIRCd compiles ("make") --+ | |
+                                                ./configure works --+ | | |
+                                                                    | | | |
+Platform                    Compiler     ngIRCd     Date     Tester C M T R See
+--------------------------- ------------ ---------- -------- ------ - - - - ---
+hppa/unknown/openbsd3.5     gcc 2.95.3   CVSHEAD    04-05-25 alex   Y Y Y Y
+hppa1.1/unknown/linux-gnu   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
+i386/pc/solaris2.9          gcc 3.2.2    CVSHEAD    04-02-24 alex   Y Y Y Y
+i386/unknown/freebsd5.2.1   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
+i386/unknown/gnu0.3         gcc 3.3.3    0.8.0      04-05-30 alex   Y Y n Y
+i386/unknown/netbsdelf1.6.1 gcc 2.95.3   CVSHEAD    04-02-24 alex   Y Y Y Y
+i686/pc/cygwin              gcc 3.3.1    0.8.0      04-05-30 alex   Y Y n Y
+i686/pc/linux-gnu           gcc 2.95.4   0.8.0      04-05-30 alex   Y Y Y Y (1)
+i686/pc/linux-gnu           gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y (1)
+m68k/apple/aux3.1.1         Orig. A/UX   0.7.x-CVS  03-04-22 alex   Y Y Y Y (2)
+m68k/hp/hp-ux9.10           Orig. HPUX   0.7.x-CVS  03-04-30 goetz  Y Y Y Y
+m88k/dg/dgux5.4R3.10        gcc 2.5.8    CVSHEAD    04-03-15 alex   Y Y ? ?
+powerpc/apple/darwin6.5     gcc 3.1      0.7.x-CVS  03-04-23 alex   Y Y Y Y
+powerpc/apple/darwin7.4.0   gcc 3.3      0.8.0      04-05-30 alex   Y Y Y Y
+powerpc/unknown/linux-gnu   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
+sparc/sun/solaris2.6        gcc 2.95.3   0.7.x-CVS  03-04-22 alex   Y Y Y Y
+sparc/sun/solaris2.7        gcc 3.3      0.8.0      04-05-30 alex   Y Y Y Y
+sparc/unkn./netbsdelf1.6.1  gcc 2.95.3   0.8.0      04-05-30 alex   Y Y Y Y
+
+
+Notes
+~~~~~
+(1) i686/pc/linux-gnu:
+    ngIRCd has been tested with various Linux distributions, such as SuSE,
+    RedHat, Debian, and Gentoo using Kernels 2.2.x, 2.4.x and 2.6.x with
+    various versions of the GNU C compiler (2.95.3, 3.0, 3.2, and 3.3). The
+    eldest glibc used was glibc-2.0.7. ngIRCd compiled and run on all these
+    systems without problems.
+
+(2) This compiler is an pre-ANSI C compiler, therefore the source code is
+    automatically converted using the included ansi2knr tool while building.
+			
+
+-- 
+$Id: Platforms.txt,v 1.11.2.1 2004/11/09 10:58:01 alex Exp $

doc/Protocol.txt

@@ -0,0 +1,118 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001-2003 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                              -- Protocol.txt --
+
+
+I. Compatibility
+~~~~~~~~~~~~~~~~
+
+The ngIRCd implements the Internet Relay Chat (IRC) protocol version 2.10
+as defined in RFC ("request for comment") 1459 and 2810-2813. These (and
+probably further relevant RFCs) are listed in doc/RFC.txt.
+
+Unfortunately, even the "original" ircd doesn't follow these specifications
+in all details. But because the ngIRCd should be a fully compatible
+replacement for this server ("ircd") it tries to emulate these differences.
+
+If you don't like this behavior please ./configure the ngIRCd using the
+"--enable-strict-rfc" command line option. But keep in mind: not all IRC
+clients are compatible with a server configured that way, some can't even
+connect at all! Therefore this option usually isn't desired for "normal
+server operation".
+
+
+II. The IRC+ Protocol
+~~~~~~~~~~~~~~~~~~~~~
+
+Starting with version 0.5.0, the ngIRCd extends the original IRC protocol
+as defined in RFC 2810-2813. This enhanced protocol is named "IRC+". It is
+backwards compatible to the "plain" IRC protocol and will only be used by
+the ngIRCd if it detects that the peer supports it as well.
+
+The "PASS" command is used to detect the protocol and peer versions see
+RFC 2813 (section 4.1.1) and below.
+
+
+II.1 Register new server link
+
+     Command: PASS
+  Parameters: <password> <version> <flags> [<options>]
+     Used by: servers only (with these parameters)
+
+<password> is the password for this new server link as defined in the server
+configuration which is sent to the peer or received from it.
+
+<version> consists of two parts and is at least 4, at most 14 characters
+long: the first four bytes contain the IRC protocol version number, whereas
+the first two bytes represent the major version, the last two bytes the
+minor version (the string "0210" indicates version 2.10, e.g.).
+
+The following optional(!) 10 bytes contain an implementation-dependent
+version number. Servers supporting the IRC+ protocol as defined in this
+document provide the string "-IRC+" here.
+
+Example for <version>: "0210-IRC+".
+
+<flags> consists of two parts separated with the character "|" and is at
+most 100 bytes long. The first part contains the name of the implementation
+(ngIRCd sets this to "ngircd", the original ircd to "IRC", e.g.). The second
+part is implementation-dependent and should only be parsed if the peer
+supports the IRC+ protocol as well. In this case the following syntax is
+used: "<serverversion>[:<serverflags>]".
+
+<serverversion> is an ASCII representation of the clear-text server version
+number, <serverflags> indicates the supported IRC+ protocol extensions (and
+may be empty!).
+
+The following <serverflags> are defined at the moment:
+
+- C: The server supports the CHANINFO command.
+
+- L: INVITE- and BAN-lists should be synchronized between servers: if the
+     peer understands this flag, it will send "MODE +I" and "MODE +b"
+     commands after the server link has been established.
+
+- o: IRC operators are allowed to change channel- and channel-user-modes
+     even if they aren't channel-operator of the affected channel.
+
+- Z: Compressed server links are supported by the server.
+
+Example for a complete <flags> string: "ngircd|0.7.5:CZ".
+
+The optional parameter <options> is used to propagate server options as
+defined in RFC 2813, section 4.1.1.
+
+
+II.2 Exchange channel-modes, topics, and persistent channels
+
+     Command: CHANINFO
+  Parameters: <channel> +<modes> <key> <maxusers> [<topic>]
+     Used by: servers only
+
+CHANINFO is used by servers to inform each other about a channel: its
+modes, channel key, user limits and its topic. <topic> is optional.
+
+If the channel already exists on the server receiving the CHANINFO command,
+it only adopts the <modes> (or the <topic>) if there are no modes (or topic)
+already set. It there are already values set the server ignores the
+corresponding parameter.
+
+If the channel doesn't exists at all it will be created.
+
+The parameter <key> must be ignored if a channel has no key (the parameter
+<modes> doesn't list the "k" channel mode). In this case <key> should
+contain "*" because the parameter <key> is required by the CHANINFO syntax
+and therefore can't be omitted. The parameter <limit> must be ignored when
+a channel has no user limit (the parameter <modes> doesn't list the "l"
+channel mode). In this case <limit> should be "0".
+
+
+-- 
+$Id: Protocol.txt,v 1.12 2004/04/25 15:44:10 alex Exp $

doc/README-AUX.txt

@@ -0,0 +1,67 @@
+
+                    ngIRCd - Next Generation IRC Server
+
+                     (c)2001-2003 by Alexander Barton,
+                   alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                  terms of the GNU General Public License.
+
+
+                           -- README-AUX.txt --
+
+
+Since version 0.2.2-pre Apple's A/UX belongs to the officially supported 
+platforms. It is not restricted in any way.
+
+Since version 0.5.0 ngIRCd's source compiles with the native A/UX c 
+compiler. GNU C isn't a must-have anymore.
+
+The following software packages are needed:
+
+ - GNU sed
+   Source:
+   http://www.rezepte-im-web.de/appleux/sed-3.02.tar.gz
+   ftp://arthur.ath.cx/pub/AUX/Software/Tools/sed-3.02.tar.gz
+
+   A/UX comes with /bin/sed which isn't supporting all functions needed
+   by GNU automake/autoconf.
+
+   Warning: When installing GNU sed please make sure that A/UX doesn't
+   use the old one anymore which means set the $PATH or replace /bin/sed
+   at all.
+
+ - libUTIL.a
+   Source:
+   http://ftp.mayn.de/pub/apple/apple_unix/Sys_stuff/libUTIL-2.1.tar.gz
+   ftp://arthur.ath.cx/pub/AUX/Software/Libraries/libUTIL-2.1.tar.gz
+
+   This library contains functions that are common on other UNIX
+   systems but not on A/UX e.g. memmove(), strerror() und strdup().
+
+
+After installation of these packages just do a "./configure" and "make" to
+compile ngIRCd on A/UX.
+
+
+A few hints in case of errors:
+
+ - Either there's an 'install' on your system which is completely broken
+   (so 'configure' uses its own shell script) or use a fully functionable one.
+   There's at least one binary "out there" causing problems. The one
+   of the GNU fileutils works fine:
+   ftp://arthur.ath.cx/pub/UNIX/AUX/Software/Tools/fileutils-4.0.tar.gz
+
+ - The precompiled binary of the old 'bash' shouldn't be installed within
+   /bin (better do this in /usr/local/bin) because 'configure' would
+   choose it as its shell which wouldn't work.
+
+ - Because of limitations of /bin/sh on A/UX it can't be used to create
+   the 'config.status' script. Better rename /bin/sh to /bin/sh.AUX and
+   replace it by a symbolic link to /bin/ksh (ln -s /bin/ksh /bin/sh as
+   root).
+   These procedure should'nt cause you into problems and is recommended
+   even if you don't use ngIRCd.
+
+-- 
+$Id: README-AUX.txt,v 1.8 2003/04/21 21:59:34 goetz Exp $

doc/README-BeOS.txt

@@ -0,0 +1,53 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001-2003 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                             -- README-BeOS.txt --
+
+
+      +-------------------------------------------------------------+
+      | This text is only available in german at the moment, sorry! |
+      | Contributors for this text or the BeOS port are welcome :-) |
+      +-------------------------------------------------------------+
+
+
+BeOS gehoert im Moment (noch?) nicht zu den offiziell unterstuetzten Plat-
+formen: der ngIRCd enthaelt zwar bereits einige Anpassungen an BeOS und
+compiliert auch, jedoch bricht er bei jedem Connect-Versuch eines Clients
+mit diesem Fehler ab:
+
+   select(): Bad file descriptor!
+
+Es sieht leider so aus, als ob das select() von BeOS nicht mit File-Handles
+von Pipes verschiedener Prozesse umgehen kann: sobald der Resolver asyncron
+gestartet wird, also Pipe-Handles im select() vorhanden sind, fuehrt das zu
+obiger Meldung.
+
+Theoretische "Loesung"/Workaround:
+Den Resolver unter BeOS nicht verwenden, sondern mit IP-Adressen arbeiten.
+Nachteil: der ngIRCd koennte sich nicht zu Servern verbinden, die dynamische
+Adressen benutzen -- dazu muesste er den Namen aufloesen. Ansonsten sollte
+es eigentlich zu keinen Beeintraechtigungen kommen ...
+
+Also: wenn es jemand implementieren will ... ;-))
+
+Vielleicht mache ich es auch irgendwann mal selber. Mal sehen.
+
+2002-05-19:
+Ich habe gerade damit ein wenig gespielt und den Source hier so geaendert,
+dass unter BeOS keine Resolver-Subprozesse mehr erzeugt werden, sondern mit
+den "rohen" IP-Adressen gearbeitet wird. Das funktioniert so weit auch,
+allerdings verschluckt sich BeOS nun bei anderen Funktionen, so zum Beispiel
+bei close(), wenn ein Socket eines Clients geschlossen werden soll!?
+Sehr komisch.
+Wer Interesse daran hat, das weiter zu verfolgen, der moege sich bitte mit
+mir in Verbindung setzen (alex@barton.de), ich maile gerne meine Patches zu.
+Fuer eine Aenderung im CVS ist es aber meiner Meinung nach noch zu frueh ...
+
+-- 
+$Id: README-BeOS.txt,v 1.7 2003/05/15 21:47:57 alex Exp $

doc/RFC.txt

@@ -1,16 +1,17 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2003 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
                                  -- RFC.txt --
 
 
-Das IRC-Protokoll ist in diesen RFC's (Request For Comments) dokumentiert:
+The Internet Relay Chat (IRC) protocol is documented in these Request for
+Comments (RFC), which you can get e.g. via <http://www.faqs.org/>:
 
   1459	Oikarinen, J. & D. Reed, "Internet Relay Chat Protocol",
 	May 1993, [IRC].
@@ -29,4 +30,4 @@ Das IRC-Protokoll ist in diesen RFC's (Request For Comments) dokumentiert:
 
 
 -- 
-$Id: RFC.txt,v 1.4 2002/01/23 18:20:04 alex Exp $
+$Id: RFC.txt,v 1.6 2003/03/07 20:42:20 alex Exp $

doc/SSL.txt

@@ -0,0 +1,58 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001-2004 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                                 -- SSL.txt --
+
+
+ngIRCd actually doesn't support secure connections for client-server or
+server-server links using SSL, the Secure Socket Layer, by itself. But you can
+use the stunnel(8) command to make this work.
+
+  <http://stunnel.mirt.net/>
+  <http://www.stunnel.org/>
+
+Stefan Sperling (stefan at binarchy dot net) mailed me the following text as a
+short "how-to", thanks Stefan!
+
+
+=== snip ===
+    ! This guide applies to stunnel 4.x !
+
+    Put this in your stunnel.conf:
+
+        [ircs]
+        accept = 6667
+        connect = 6668
+
+    This makes stunnel listen for incoming connections
+    on port 6667 and forward decrypted data to port 6668.
+    We call the connection 'ircs'. Stunnel will use this
+    name when logging connection attempts via syslog.
+    You can also use the name in /etc/hosts.{allow,deny}
+    if you run tcp-wrappers.
+
+    To make sure ngircd is listening on the port where
+    the decrypted data arrives, set
+
+        Ports = 6668
+
+    in your ngircd.conf.
+
+    Start stunnel and restart ngircd.
+
+    That's it.
+    Don't forget to activate ssl support in your irc client ;)
+=== snip ===
+
+
+Probably ngIRCd will include support for SSL in the future ...
+
+
+-- 
+$Id: SSL.txt,v 1.2.2.1 2005/01/26 21:47:47 alex Exp $

doc/sample-ngircd.conf

@@ -1,22 +1,160 @@
-# $Id: sample-ngircd.conf,v 1.2 2002/01/06 16:54:05 alex Exp $
+# $Id: sample-ngircd.conf,v 1.25.2.1 2004/05/07 11:24:17 alex Exp $
+
+#
+# This is a sample configuration file for the ngIRCd, which must be adepted
+# to the local preferences and needs.
+#
+# Comments are started with "#" or ";".
+#
+# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
+# server interpreted the configuration file as expected!
+#
 
 [Global]
+
+	# The [Global] section of this file is used to define the main
+	# configuration of the server, like the server name and the ports
+	# on which the server should be listening.
+	
+	# Server name in the IRC network, must contain at least one dot
+	# (".") and be unique in the IRC network. Required!
 	Name = irc.the.net
+	
+	# Info text of the server. This will be shown by WHOIS and
+	# LINKS requests for example.
 	Info = Server Info Text
-	Ports = 6667, 6668, 6669
-	MotdFile = /usr/local/etc/ngircd.motd
-	PingTimeout = 120
-	PongTimeout = 10
-	ConnectRetry = 60
+
+	# Global password for all users needed to connect to the server
+	;Password = abc
+	
+	# Information about the server and the administrator, used by the
+	# ADMIN command. Not required by server but by RFC!
+	;AdminInfo1 = Description
+	;AdminInfo2 = Location
+	;AdminEMail = admin@irc.server
+ 
+	# Ports on which the server should listen. There may be more than
+	# one port, separated with ";". (Default: 6667)
+	;Ports = 6667, 6668, 66694
+
+	# IP address on which the server should listen. (Default: empty,
+	# so the server listens on all IP addresses of the system)
+	;Listen = 1.2.3.4
+	
+	# Text file with the "message of the day" (MOTD). This message will
+	# be shown to all users connecting to the server:
+	;MotdFile = /usr/local/etc/ngircd.motd
+
+	# A simple Phrase (<256 chars) if you don't want to use a motd file.
+	# If it is set no MotdFile will be read at all.
+	;MotdPhrase = "Hello world!"
+
+	# User ID under which the server should run; you can use the name
+	# of the user or the numerical ID. ATTENTION: For this to work the
+	# server must have been started with root privileges! In addition,
+	# the configuration and MOTD files must be readable by this user,
+	# otherwise RESTART and REHASH won't work!
+	;ServerUID = 65534
+
+	# Group ID under which the ngircd should run; you can use the name
+	# of the group or the numerical ID. ATTENTION: For this to work the
+	# server must have been started with root privileges!
+	;ServerGID = 65534
+
+	# A directory to chroot in when everything is initialized. It
+	# doesn't need to be populated if ngIRCd is compiled as a static
+	# binary. By default ngIRCd won't use the chroot() feature.
+	# ATTENTION: For this to work the server must have been started
+	# with root privileges!
+	;ChrootDir = /var/empty
+
+	# After <PingTimeout> seconds of inactivity the server will send a
+	# PING to the peer to test whether it is alive or not.
+	;PingTimeout = 120
+
+	# If a client fails to answer a PING with a PONG within <PongTimeout>
+	# seconds, it will be disconnected by the server.
+	;PongTimeout = 20
+
+	# The server tries every <ConnectRetry> seconds to establish a link
+	# to not yet (or no longer) connected servers.
+	;ConnectRetry = 60
+
+	# Should IRC Operators be allowed to use the MODE command even if
+	# they are not(!) channel-operators?
+	;OperCanUseMode = no
+
+	# Maximum number of simultaneous connection the server is allowed
+	# to accept (<=0: unlimited):
+	;MaxConnections = -1
+	
+	# Maximum number of simultaneous connections from a single IP address
+	# the server will accept (<=0: unlimited):
+	;MaxConnectionsIP = 5
+
+	# Maximum number of channels a user can be member of (<=0: no limit):
+	;MaxJoins = 10
 
 [Operator]
-;	Name = TheOper
-;	Password = ThePwd
+	# [Operator] sections are used to define IRC Operators. There may be
+	# more than one [Operator] block, one for each local operator.
+	
+	# ID of the operator (may be different of the nick name)
+	;Name = TheOper
+
+	# Password of the IRC operator
+	;Password = ThePwd
 
 [Server]
-;	Host = host2.the.net
-;	Name = irc2.the.net
-;	Port = 6666
-;	Password = ThePwd
+	# Other servers are configured in [Server] sections. If you
+	# configure a port for the connection, then this ngircd tries to
+	# connect to to the other server on the given port; if not it waits
+	# for the other server to connect.
+	# There may be more than one server block.
+	#
+	# Server Groups:
+	# The ngIRCd allows "server groups": You can assign an "ID" to every
+	# server with which you want this ngIRCd to link. If a server of a
+	# group won't answer, the ngIRCd tries to connect to the next server
+	# in the given group. But the ngircd never tries to connect to two
+	# servers with the same group ID.
+	
+	# IRC name of the server
+	;Name = irc2.the.net
+   
+	# Internet host name of the peer
+	;Host = connect-to-host.the.net
+
+	# Port of the server to which the ngIRCd should connect. If you
+	# assign no port the ngIRCd waits for incoming connections.
+	;Port = 6666
+
+	# Own password for the connection. This password has to be configured
+	# as "PeerPassword" on the other server.
+	;MyPassword = MySecret
+
+	# Foreign password for this connection. This password has to be
+	# configured as "MyPassword" on the other server.
+	;PeerPassword = PeerSecret
+	
+	# Group of this server (optional)
+	;Group = 123
+
+[Channel]
+	# Pre-defined channels can be configured in [Channel] sections.
+	# Such channels are created by the server when starting up and even
+	# persist when there are no more members left.
+	# Persistent channels are marked with the mode 'P', which can be set
+	# and unset by IRC operators like other modes on the fly.
+	# There may be more than one [Channel] block.
+	
+	# Name of the channel
+	;Name = #TheName
+
+	# Topic for this channel
+	;Topic = a great topic
+	
+	# Initial channel modes
+	;Modes = tn
 
 # -eof-

man/Makefile.am

@@ -9,18 +9,12 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: Makefile.am,v 1.2 2002/01/02 02:40:15 alex Exp $
-#
-# $Log: Makefile.am,v $
-# Revision 1.2  2002/01/02 02:40:15  alex
-# - Copyright-Texte ergaenzt und aktualisiert,
-# - fehlende Dateien in Projekt aufgenommen.
-#
-# Revision 1.1  2001/12/31 16:02:12  alex
-# - Projektdateien von Mac OS X werden nun auch in die Distribution aufgenommen.
+# $Id: Makefile.am,v 1.5 2002/04/04 13:02:41 alex Exp $
 #
 
-EXTRA_DIST = project.pbxproj
+man_MANS = ngircd.conf.5 ngircd.8
+
+EXTRA_DIST = $(man_MANS)
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in

man/ngircd.8

@@ -0,0 +1,83 @@
+.\"
+.\" $Id: ngircd.8,v 1.9 2004/04/05 10:59:10 alex Exp $
+.\"
+.TH ngircd 8 "March 2003" ngircd "ngIRCd Manual"
+.SH NAME
+ngircd \- the next generation IRC daemon
+.SH SYNOPSIS
+.B ngircd [
+.I Options
+.B ]
+.SH DESCRIPTION
+.BR ngircd
+is a free open source daemon for the Internet Relay Chat (IRC),
+developed under the GNU General Public License (GPL).
+.PP
+It's written from scratch and is not based upon the original IRCd like
+many others. It is easy to configure, supports server links (even with
+original ircd's) and runs on hosts with changing IP addresses (such as
+dial-in networks).
+.PP
+Currently supported platforms (tested versions) are: AIX (3.2.5 with IBM XL
+C Compiler), A/UX (3.x, Apple pre-ANSI C Compiler and GNU C), FreeBSD
+(4.5/i386, GNU C), HP-UX (10.20, GNU C), IRIX (6.5, SGI MIPSpro C 7.30),
+Linux (2.2.x/i386, 2.4.x/i386 and 2.4.x/hppa, GNU C), Mac OS X (10.x, GNU C),
+NetBSD (1.5.2/i386 and 1.5.3/m68k, GNU C), Solaris (2.5.1 and 2.6, GNU C),
+and Windows with Cygwin (GNU C).
+.PP
+As ngIRCd relies on UNIX standards and uses GNU automake and GNU autoconf
+there are good chances that it also supports other UNIX-based operating
+systems.
+.SH OPTIONS
+The default behaviour of
+.BR ngircd
+is to read its standard configuration file (see below), to detach from the
+controlling terminal and to wait for clients.
+.PP
+You can use these options to modify this default:
+.TP
+\fB\-f\fR \fIfile\fR, \fB\-\-config\fR \fIfile\fR
+Use
+.I file
+as configuration file.
+.TP
+\fB\-n\fR, \fB\-\-nodaemon\fR
+Don't fork a child and don't detach from controlling terminal.
+All log messages go to the console.
+.TP
+\fB\-p\fR, \fB\-\-passive\fR
+Disable automatic connections to other servers. You can use the IRC command
+CONNECT later on as IRC Operator to link this ngIRCd to other servers.
+.TP
+\fB\-t\fR, \fB\-\-configtest\fR
+Read, validate and display the configuration; then exit.
+.TP
+\fB\-\-version\fR
+Output version information and exit.
+.TP
+\fB\-\-help\fR
+Display a brief help text and exit.
+.SH FILES
+.I /usr/local/etc/ngircd.conf
+.RS
+The system wide default configuration file.
+.RE
+.I /usr/local/etc/ngircd.motd
+.RS
+Default "message of the day" (MOTD).
+.RE
+.SH AUTHOR
+Alexander Barton,
+.UR mailto:alex@barton.de
+alex@barton.de
+.UE
+.br
+Homepage:
+.UR http://arthur.ath.cx/~alex/ngircd/
+http://arthur.ath.cx/~alex/ngircd/
+.UE
+.SH "SEE ALSO"
+.BR ngircd.conf (5),
+.BR ircd (8)
+.\"
+.\" -eof-

man/ngircd.conf.5

@@ -0,0 +1,231 @@
+.\"
+.\" $Id: ngircd.conf.5,v 1.12.2.1 2004/05/07 11:24:18 alex Exp $
+.\"
+.TH ngircd.conf 5 "Mai 2003" ngircd "ngIRCd Manual"
+.SH NAME
+ngircd.conf \- configuration file of ngIRCd
+.SH SYNOPSIS
+.B /usr/local/etc/ngircd.conf
+.SH DESCRIPTION
+.BR ngircd.conf
+is the configuration file for
+.BR ngircd (8)
+which you should adept to your local preferences and needs.
+.SH "FILE FORMAT"
+The file consists of sections and parameters. A section begins with the name
+of the section in square brackets and continues until the next section
+begins.
+.PP
+Sections contain parameters of the form
+.PP
+.RS
+.I name
+=
+.I value
+.RE
+.PP
+Any line beginning with a semicolon (';') or a hash ('#') character is
+treated as a comment and ignored.
+.PP
+The file format is line-based - that means, each newline-terminated line
+represents either a comment, a section name or a parameter.
+.PP
+Section and parameter names are not case sensitive.
+.SH "SECTION OVERVIEW"
+The file is separated in four blocks: [Global], [Operator], [Server],
+and [Channel].
+.PP
+In the
+.I [Global]
+section, there is the main configuration like the server name and the
+ports, on which the server should be listening. IRC operators of this
+server are defined in
+.I [Operator]
+blocks.
+.I [Server]
+is the section where server links are configured. And
+.I [Channel]
+blocks are used to configure pre-defined ("persistent") IRC channels.
+.SH [GLOBAL]
+The
+.I [Global]
+section is used to define the server main configuration, like the server
+name and the ports on which the server should be listening.
+.TP
+\fBName\fR
+Server name in the IRC network
+.TP
+\fBInfo\fR
+Info text of the server. This will be shown by WHOIS and LINKS requests for
+example.
+.TP
+\fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR
+Information about the server and the administrator, used by the ADMIN
+command.
+.TP
+\fBPorts\fR
+Ports on which the server should listen. There may be more than one port,
+separated with ';'. Default: 6667.
+.TP
+\fBListen\fR
+The ip address on which the server should listen. Default is empty, so
+the server listens on all configured ip addresses and interfaces.
+.TP
+\fBMotdFile\fR
+Text file with the "message of the day" (MOTD). This message will be shown
+to all users connecting to the server.
+.TP
+\fBMotdPhrase\fR
+A simple Phrase (<256 chars) if you don't want to use a motd file.
+If it is set no MotdFile will be read at all.
+.TP
+\fBServerUID\fR
+User ID under which the server should run; you can use the name of the user
+or the numerical ID.
+.PP
+.RS
+.B Attention:
+.br
+For this to work the server must have been
+started with root privileges! In addition, the configuration and MOTD files
+must be readable by this user, otherwise RESTART and REHASH won't work!
+.RE
+.TP
+\fBServerGID\fR
+Group ID under which the ngIRCd should run; you can use the name of the
+group or the numerical ID.
+.PP
+.RS
+.B Attention:
+.br
+For this to work the server must have
+been started with root privileges!
+.RE
+.TP
+\fBChrootDir\fR
+A directory to chroot in when everything is initialized. It doesn't need
+to be populated if ngIRCd is compiled as a static binary. By default ngIRCd
+won't use the chroot() feature.
+.PP
+.RS
+.B Attention:
+.br
+For this to work the server must have
+been started with root privileges!
+.RE
+.TP
+\fBPingTimeout\fR
+After <PingTimeout> seconds of inactivity the server will send a PING to
+the peer to test whether it is alive or not. Default: 120.
+.TP
+\fBPongTimeout\fR
+If a client fails to answer a PING with a PONG within <PongTimeout>
+seconds, it will be disconnected by the server. Default: 20.
+.TP
+\fBConnectRetry\fR
+The server tries every <ConnectRetry> seconds to establish a link to not yet
+(or no longer) connected servers. Default: 60.
+.TP
+\fBOperCanUseMode\fR
+Should IRC Operators be allowed to use the MODE command even if they are
+not(!) channel-operators? Default: no.
+.TP
+\fBMaxConnections\fR
+Maximum number of simultaneous connection the server is allowed to accept
+(<=0: unlimited). Default: -1.
+.TP
+\fBMaxConnectionsIP\fR
+Maximum number of simultaneous connections from a single IP address that
+the server will accept (<=0: unlimited). This configuration options lowers
+the risk of denial of service attacks (DoS). Default: 5.
+.TP
+\fBMaxJoins\fR
+Maximum number of channels a user can be member of (<=0: no limit).
+Default: 10.
+.SH [OPERATOR]
+.I [Operator]
+sections are used to define IRC Operators. There may be more than one
+.I [Operator]
+block, one for each local operator.
+.TP
+\fBName\fR
+ID of the operator (may be different of the nick name).
+.TP
+\fBPassword\fR
+Password of the IRC operator.
+.SH [SERVER]
+Other servers are configured in
+.I [Server]
+sections. If you configure a port for the connection, then this ngIRCd
+tries to connect to to the other server on the given port; if not, it waits
+for the other server to connect.
+.PP
+The ngIRCd allows "server groups": You can assign an "ID" to every server
+with which you want this ngIRCd to link. If a server of a group won't
+answer, the ngIRCd tries to connect to the next server in the given group.
+But ngIRCd never tries to connect to two servers with the same group ID.
+.PP
+There may be more than one
+.I [Server]
+block.
+.TP
+\fBName\fR
+IRC name of the server
+.TP
+\fBHost\fR
+Internet host name of the peer
+.TP
+\fBPort\fR
+Port of the server to which the ngIRCd should connect. If you assign no port
+the ngIRCd waits for incoming connections.
+.TP
+\fBMyPassword\fR
+Own password for this connection. This password has to be configured as
+"PeerPassword" on the other server.
+.TP
+\fBPeerPassword\fR
+Foreign password for this connection. This password has to be configured as
+"MyPassword" on the other server.
+.TP
+\fBGroup\fR
+Group of this server (optional).
+.SH [CHANNEL]
+Pre-defined channels can be configured in
+.I [Channel]
+sections. Such channels are created by the server when starting up and even
+persist when there are no more members left.
+.PP
+Persistent channels are marked with the mode 'P', which can be set and unset
+by IRC operators like other modes on the fly.
+.PP
+There may be more than one
+.I [Channel]
+block.
+.TP
+\fBName\fR
+Name of the channel
+.TP
+\fBTopic\fR
+Topic for this channel
+.TP
+\fBModes\fR
+Initial channel modes.
+.SH HINTS
+It's wise to use "ngircd --configtest" to validate the configuration file
+after changing it. See
+.BR ngircd (8)
+for details.
+.SH AUTHOR
+Alexander Barton,
+.UR mailto:alex@barton.de
+alex@barton.de
+.UE
+.br
+Homepage:
+.UR http://arthur.ath.cx/~alex/ngircd/
+http://arthur.ath.cx/~alex/ngircd/
+.UE
+.SH "SEE ALSO"
+.BR ngircd (8)
+.\"
+.\" -eof-

src/Makefile.am

@@ -2,24 +2,16 @@
 # ngIRCd -- The Next Generation IRC Daemon
 # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
 #
-# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
-# der GNU General Public License (GPL), wie von der Free Software Foundation
-# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
-# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
-# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
-# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.2 2002/01/02 02:41:11 alex Exp $
-#
-# $Log: Makefile.am,v $
-# Revision 1.2  2002/01/02 02:41:11  alex
-# - fehlenden Copyright-Text ergaenzt.
-#
-# Revision 1.1.1.1  2001/12/11 21:53:04  alex
-# Imported sources to CVS.
+# $Id: Makefile.am,v 1.5 2003/01/13 12:20:16 alex Exp $
 #
 
-SUBDIRS = ngircd
+SUBDIRS = portab tool ngircd testsuite
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in config.h config.h.in stamp-h.in

src/ngircd/Makefile.am

@@ -1,59 +1,83 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
 #
-# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
-# der GNU General Public License (GPL), wie von der Free Software Foundation
-# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
-# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
-# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
-# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+# This program is free 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 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.10 2002/01/02 02:43:50 alex Exp $
-#
-# $Log: Makefile.am,v $
-# Revision 1.10  2002/01/02 02:43:50  alex
-# - Copyright-Text ergaenzt bzw. aktualisiert.
-#
-# Revision 1.9  2001/12/31 02:18:51  alex
-# - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
-# - neuen Header "defines.h" mit (fast) allen Konstanten.
-# - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
-#
-# Revision 1.8  2001/12/30 19:25:03  alex
-# - in "noinst_HEADERS" waren einige Dateien als .c anstelle .h aufgefuehrt.
-#
-# Revision 1.7  2001/12/27 00:37:07  alex
-# - Erkennung der "portab header" geaendert, CFLAGS werden nun anders gesetzt.
-#
-# Revision 1.6  2001/12/23 21:53:54  alex
-# - Header messages.h eingefuegt.
-#
-# Revision 1.5  2001/12/21 22:25:30  alex
-# - neues Modul "parse" eingebunden.
-#
-# Revision 1.4  2001/12/14 08:14:03  alex
-# - neue Module (irc, client, channel) aufgenommen.
-#
-# Revision 1.3  2001/12/13 02:03:33  alex
-# - beim Compilieren werden nun Informationen fuer den Debugger erzeugt.
-#
-# Revision 1.2  2001/12/12 17:20:02  alex
-# - neue Sourcefiles und Header ergaenzt.
-#
-# Revision 1.1.1.1  2001/12/11 21:53:04  alex
-# - Imported sources to CVS.
+# $Id: Makefile.am,v 1.42 2003/12/04 14:05:16 alex Exp $
 #
 
+AUTOMAKE_OPTIONS = ../portab/ansi2knr
+
+INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool
+
+LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN
+
 sbin_PROGRAMS = ngircd
 
-ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c irc.c log.c \
-	parse.c tool.c
+ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c conn-zip.c conn-func.c \
+	hash.c irc.c irc-channel.c irc-info.c irc-login.c irc-mode.c irc-op.c \
+	irc-oper.c irc-server.c irc-write.c lists.c log.c match.c parse.c \
+	rendezvous.c resolve.c
 
-noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.h irc.h log.h \
-	parse.h tool.h global.h messages.h defines.h
+ngircd_LDFLAGS = -L../portab -L../tool
+
+ngircd_LDADD = -lngportab -lngtool
+
+noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.h conn-zip.h conn-func.h \
+	hash.h irc.h irc-channel.h irc-info.h irc-login.h irc-mode.h irc-op.h \
+	irc-oper.h irc-server.h irc-write.h lists.h log.h match.h parse.h \
+	rendezvous.h resolve.h \
+	messages.h defines.h
+
+clean-local:
+	rm -f check-version check-help lint.out cvs-version.*
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in
 
+check-version: Makefile
+	echo "#!/bin/sh" > check-version
+	echo "./ngircd --version | grep ngircd > /dev/null 2>&1" >> check-version
+	chmod 755 check-version
+
+check-help: Makefile
+	echo "#!/bin/sh" > check-help
+	echo "./ngircd --help | grep help > /dev/null 2>&1" >> check-help
+	chmod 755 check-help
+
+lint:
+	rm -f lint.out
+	for f in *.c; do \
+	 echo "checking $$f ..."; \
+	 splint $$f $(LINTARGS) -I./.. -I./../portab $(AM_CFLAGS) > lint.out 2>&1; \
+	 grep "no warnings" lint.out > /dev/null 2>&1; \
+	 if [ $$? -ne 0 ]; then \
+	  echo; cat lint.out; echo; \
+	 fi; \
+	done;
+
+ngircd.c: cvs-version.h
+
+irc-login.c: cvs-version.h
+
+irc-info.c: cvs-version.h
+
+cvs-version.h: cvs-date
+
+cvs-date:
+	grep VERSION ../config.h | grep "CVS" \
+	 && echo "#define CVSDATE \"$$( grep "\$$Id" $(srcdir)/*.c \
+	    | $(AWK) "{ print \$$9 }" | sort | tail -1 \
+	    | sed -e "s/\//-/g" )\"" > cvs-version.new \
+	 || echo "" > cvs-version.new
+	diff cvs-version.h cvs-version.new 2>/dev/null \
+	 || cp cvs-version.new cvs-version.h
+
+TESTS = check-version check-help
+
 # -eof-

src/ngircd/channel.c

@@ -2,106 +2,118 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: channel.c,v 1.13 2002/02/11 01:00:12 alex Exp $
- *
- * channel.c: Management der Channels
- *
- * $Log: channel.c,v $
- * Revision 1.13  2002/02/11 01:00:12  alex
- * - neue Funktionen Channel_ModeAdd(), Channel_ModeDel(), Channel_UserModes(),
- *   Channel_UserModeAdd(), Channel_UserModeDel().
- * - Modes in CL2CHAN-Struktur werden nun korrekt initialisiert.
- *
- * Revision 1.12  2002/02/06 16:48:48  alex
- * - neue Funktion Channel_Modes() und Channel_IsValidName().
- * - Channel-Namen werden (besser) validiert.
- *
- * Revision 1.11  2002/01/29 00:11:10  alex
- * - neue Funktionen Channel_FirstChannelOf() und Channel_NextChannelOf().
- *
- * Revision 1.10  2002/01/28 01:16:15  alex
- * - neue Funktionen Channel_Name(), Channel_First() und Channel_Next().
- *
- * Revision 1.9  2002/01/27 22:47:11  alex
- * - PART wird nicht mehr an den Server verschickt, von dem es empfangen wurde.
- *
- * Revision 1.8  2002/01/27 21:56:54  alex
- * - weitere Anpassungen an Chennals, v.a. ueber Server-Links.
- *
- * Revision 1.7  2002/01/27 17:14:33  alex
- * - diverse Aenderungen fuer Channels ueber mehrere Server.
- *
- * Revision 1.6  2002/01/26 18:41:55  alex
- * - CHANNEL- und CL2CHAN-Strukturen in Header verlegt,
- * - einige neue Funktionen (Channel_GetChannel(), Channel_FirstMember(), ...)
- *
- * Revision 1.5  2002/01/21 00:12:29  alex
- * - begonnen, Channels zu implementieren :-)
- *
- * Revision 1.4  2002/01/16 22:09:07  alex
- * - neue Funktion Channel_Count().
- *
- * Revision 1.3  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.2  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * Channel management
  */
 
 
 #define __channel_c__
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+static char UNUSED id[] = "$Id: channel.c,v 1.45 2004/03/11 22:16:31 alex Exp $";
+
+#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
+#include "conn-func.h"
 #include "client.h"
-#include "irc.h"
+
+#include "exp.h"
+#include "channel.h"
+
+#include "imp.h"
+#include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
+#include "hash.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 
-#include <exp.h>
-#include "channel.h"
+#include "exp.h"
+
+
+#define REMOVE_PART 0
+#define REMOVE_QUIT 1
+#define REMOVE_KICK 2
 
 
 LOCAL CHANNEL *My_Channels;
 LOCAL CL2CHAN *My_Cl2Chan;
 
 
-LOCAL CHANNEL *New_Chan( CHAR *Name );
-LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client );
-LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client );
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART );
-LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan );
-LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan );
-LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan );
+LOCAL CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+LOCAL CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+LOCAL BOOLEAN Remove_Client PARAMS(( INT Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN InformServer ));
+LOCAL CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+LOCAL CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
+LOCAL BOOLEAN Delete_Channel PARAMS(( CHANNEL *Chan ));
 
 
-GLOBAL VOID Channel_Init( VOID )
+GLOBAL VOID
+Channel_Init( VOID )
 {
 	My_Channels = NULL;
 	My_Cl2Chan = NULL;
 } /* Channel_Init */
 
 
-GLOBAL VOID Channel_Exit( VOID )
+GLOBAL VOID
+Channel_InitPredefined( VOID )
+{
+	/* Vordefinierte persistente Channels erzeugen */
+
+	CHANNEL *chan;
+	CHAR *c;
+	INT i;
+	
+	for( i = 0; i < Conf_Channel_Count; i++ )
+	{
+		/* Ist ein Name konfiguriert? */
+		if( ! Conf_Channel[i].name[0] ) continue;
+
+		/* Gueltiger Channel-Name? */
+		if( ! Channel_IsValidName( Conf_Channel[i].name ))
+		{
+			Log( LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"!", Conf_Channel[i].name );
+			continue;
+		}
+
+		/* Gibt es den Channel bereits? */
+		chan = Channel_Search( Conf_Channel[i].name );
+		if( chan )
+		{
+			Log( LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", Conf_Channel[i].name );
+			continue;
+		}
+		
+		/* Channel anlegen */
+		chan = Channel_Create( Conf_Channel[i].name );
+		if( chan )
+		{
+			Channel_ModeAdd( chan, 'P' );
+			Channel_SetTopic( chan, Conf_Channel[i].topic );
+			c = Conf_Channel[i].modes;
+			while( *c ) Channel_ModeAdd( chan, *c++ );
+			Log( LOG_INFO, "Created pre-defined channel \"%s\".", Conf_Channel[i].name );
+		}
+		else Log( LOG_ERR, "Can't create pre-defined channel \"%s\"!", Conf_Channel[i].name );
+	}
+} /* Channel_InitPredefined */
+
+
+GLOBAL VOID
+Channel_Exit( VOID )
 {
 	CHANNEL *c, *c_next;
 	CL2CHAN *cl2chan, *cl2chan_next;
@@ -126,7 +138,8 @@ GLOBAL VOID Channel_Exit( VOID )
 } /* Channel_Exit */
 
 
-GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
+GLOBAL BOOLEAN
+Channel_Join( CLIENT *Client, CHAR *Name )
 {
 	CHANNEL *chan;
 	
@@ -150,12 +163,8 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
 	else
 	{
 		/* Gibt es noch nicht? Dann neu anlegen: */
-		chan = New_Chan( Name );
+		chan = Channel_Create( Name );
 		if( ! chan ) return FALSE;
-
-		/* Verketten */
-		chan->next = My_Channels;
-		My_Channels = chan;
 	}
 
 	/* User dem Channel hinzufuegen */
@@ -164,12 +173,14 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
 } /* Channel_Join */
 
 
-GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
+GLOBAL BOOLEAN
+Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
 {
 	CHANNEL *chan;
 
 	assert( Client != NULL );
 	assert( Name != NULL );
+	assert( Reason != NULL );
 
 	/* Channel suchen */
 	chan = Channel_Search( Name );
@@ -180,31 +191,77 @@ GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *R
 	}
 
 	/* User aus Channel entfernen */
-	if( ! Remove_Client( chan, Client, Origin, Reason, TRUE )) return FALSE;
+	if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, TRUE )) return FALSE;
 	else return TRUE;
 } /* Channel_Part */
 
 
-GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason )
+GLOBAL VOID
+Channel_Kick( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
+{
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Origin != NULL );
+	assert( Name != NULL );
+	assert( Reason != NULL );
+
+	/* Channel suchen */
+	chan = Channel_Search( Name );
+	if( ! chan )
+	{
+		IRC_WriteStrClient( Origin, ERR_NOSUCHCHANNEL_MSG, Client_ID( Origin ), Name );
+		return;
+	}
+
+	/* Ist der User Mitglied in dem Channel? */
+	if( ! Channel_IsMemberOf( chan, Origin ))
+	{
+		IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
+		return;
+	}
+
+	/* Ist der User Channel-Operator? */
+	if( ! strchr( Channel_UserModes( chan, Origin ), 'o' ))
+	{
+		IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name);
+		return;
+	}
+
+	/* Ist der Ziel-User Mitglied im Channel? */
+	if( ! Channel_IsMemberOf( chan, Client ))
+	{
+		IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name );
+		return;
+	}
+
+	Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, TRUE );
+} /* Channel_Kick */
+
+
+GLOBAL VOID
+Channel_Quit( CLIENT *Client, CHAR *Reason )
 {
 	CHANNEL *c, *next_c;
 
 	assert( Client != NULL );
+	assert( Reason != NULL );
 
 	c = My_Channels;
 	while( c )
 	{
 		next_c = c->next;
-		Remove_Client( c, Client, Client_ThisServer( ), Reason, FALSE );
+		Remove_Client( REMOVE_QUIT, c, Client, Client, Reason, FALSE );
 		c = next_c;
 	}
-} /* Channel_RemoveClient */
+} /* Channel_Quit */
 
 
-GLOBAL INT Channel_Count( VOID )
+GLOBAL LONG
+Channel_Count( VOID )
 {
 	CHANNEL *c;
-	INT count;
+	LONG count;
 	
 	count = 0;
 	c = My_Channels;
@@ -217,58 +274,149 @@ GLOBAL INT Channel_Count( VOID )
 } /* Channel_Count */
 
 
-GLOBAL CHAR *Channel_Name( CHANNEL *Chan )
+GLOBAL LONG
+Channel_MemberCount( CHANNEL *Chan )
+{
+	CL2CHAN *cl2chan;
+	LONG count;
+
+	assert( Chan != NULL );
+
+	count = 0;
+	cl2chan = My_Cl2Chan;
+	while( cl2chan )
+	{
+		if( cl2chan->channel == Chan ) count++;
+		cl2chan = cl2chan->next;
+	}
+	return count;
+} /* Channel_MemberCount */
+
+
+GLOBAL INT
+Channel_CountForUser( CLIENT *Client )
+{
+	/* Count number of channels a user is member of. */
+
+	CL2CHAN *cl2chan;
+	INT count;
+	
+	assert( Client != NULL );
+	
+	count = 0;
+	cl2chan = My_Cl2Chan;
+	while( cl2chan )
+	{
+		if( cl2chan->client == Client ) count++;
+		cl2chan = cl2chan->next;
+	}
+
+	return count;
+} /* Channel_CountForUser */
+
+
+GLOBAL INT
+Channel_PCount( VOID )
+{
+	/* Count the number of persistent (mode 'P') channels */
+
+	CHANNEL *chan;
+	INT count;
+
+	count = 0;
+	chan = My_Channels;
+	while( chan )
+	{
+		if( strchr( chan->modes, 'P' )) count++;
+		chan = chan->next;
+	}
+
+	return count;
+} /* Channel_PCount */
+
+
+GLOBAL CHAR *
+Channel_Name( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->name;
 } /* Channel_Name */
 
 
-GLOBAL CHAR *Channel_Modes( CHANNEL *Chan )
+GLOBAL CHAR *
+Channel_Modes( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->modes;
 } /* Channel_Modes */
 
 
-GLOBAL CHANNEL *Channel_First( VOID )
+GLOBAL CHAR *
+Channel_Key( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->key;
+} /* Channel_Key */
+
+
+GLOBAL LONG
+Channel_MaxUsers( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->maxusers;
+} /* Channel_MaxUsers */
+
+
+GLOBAL CHANNEL *
+Channel_First( VOID )
 {
 	return My_Channels;
 } /* Channel_First */
 
 
-GLOBAL CHANNEL *Channel_Next( CHANNEL *Chan )
+GLOBAL CHANNEL *
+Channel_Next( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->next;
 } /* Channel_Next */
 
 
-GLOBAL CHANNEL *Channel_Search( CHAR *Name )
+GLOBAL CHANNEL *
+Channel_Search( CHAR *Name )
 {
 	/* Channel-Struktur suchen */
 	
 	CHANNEL *c;
+	UINT32 search_hash;
 
 	assert( Name != NULL );
+
+	search_hash = Hash( Name );
 	c = My_Channels;
 	while( c )
 	{
-		if( strcasecmp( Name, c->name ) == 0 ) return c;
+		if( search_hash == c->hash )
+		{
+			/* lt. Hash-Wert: Treffer! */
+			if( strcasecmp( Name, c->name ) == 0 ) return c;
+		}
 		c = c->next;
 	}
 	return NULL;
 } /* Channel_Search */
 
 
-GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan )
+GLOBAL CL2CHAN *
+Channel_FirstMember( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Get_First_Cl2Chan( NULL, Chan );
 } /* Channel_FirstMember */
 
 
-GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
+GLOBAL CL2CHAN *
+Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 {
 	assert( Chan != NULL );
 	assert( Cl2Chan != NULL );
@@ -276,14 +424,16 @@ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 } /* Channel_NextMember */
 
 
-GLOBAL CL2CHAN *Channel_FirstChannelOf( CLIENT *Client )
+GLOBAL CL2CHAN *
+Channel_FirstChannelOf( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Get_First_Cl2Chan( Client, NULL );
 } /* Channel_FirstChannelOf */
 
 
-GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
+GLOBAL CL2CHAN *
+Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
 {
 	assert( Client != NULL );
 	assert( Cl2Chan != NULL );
@@ -291,32 +441,47 @@ GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
 } /* Channel_NextChannelOf */
 
 
-GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan )
+GLOBAL CLIENT *
+Channel_GetClient( CL2CHAN *Cl2Chan )
 {
 	assert( Cl2Chan != NULL );
 	return Cl2Chan->client;
 } /* Channel_GetClient */
 
 
-GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan )
+GLOBAL CHANNEL *
+Channel_GetChannel( CL2CHAN *Cl2Chan )
 {
 	assert( Cl2Chan != NULL );
 	return Cl2Chan->channel;
 } /* Channel_GetChannel */
 
 
-GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name )
+GLOBAL BOOLEAN
+Channel_IsValidName( CHAR *Name )
 {
-	/* PrŸfen, ob Name als Channelname gueltig */
+	/* Pruefen, ob Name als Channelname gueltig */
+
+	CHAR *ptr, badchars[10];
 	
 	assert( Name != NULL );
 
 	if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE;
+
+	ptr = Name;
+	strcpy( badchars, " ,:\007" );
+	while( *ptr )
+	{
+		if( strchr( badchars, *ptr )) return FALSE;
+		ptr++;
+	}
+	
 	return TRUE;
 } /* Channel_IsValidName */
 
 
-GLOBAL BOOLEAN Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
 {
 	/* Mode soll gesetzt werden. TRUE wird geliefert, wenn der
 	 * Mode neu gesetzt wurde, FALSE, wenn der Channel den Mode
@@ -330,14 +495,15 @@ GLOBAL BOOLEAN Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
 	if( ! strchr( Chan->modes, x[0] ))
 	{
 		/* Client hat den Mode noch nicht -> setzen */
-		strcat( Chan->modes, x );
+		strlcat( Chan->modes, x, sizeof( Chan->modes ));
 		return TRUE;
 	}
 	else return FALSE;
 } /* Channel_ModeAdd */
 
 
-GLOBAL BOOLEAN Channel_ModeDel( CHANNEL *Chan, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_ModeDel( CHANNEL *Chan, CHAR Mode )
 {
 	/* Mode soll geloescht werden. TRUE wird geliefert, wenn der
 	 * Mode entfernt wurde, FALSE, wenn der Channel den Mode
@@ -362,7 +528,8 @@ GLOBAL BOOLEAN Channel_ModeDel( CHANNEL *Chan, CHAR Mode )
 } /* Channel_ModeDel */
 
 
-GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 {
 	/* Channel-User-Mode soll gesetzt werden. TRUE wird geliefert,
 	 * wenn der Mode neu gesetzt wurde, FALSE, wenn der User den
@@ -381,14 +548,15 @@ GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 	if( ! strchr( cl2chan->modes, x[0] ))
 	{
 		/* Client hat den Mode noch nicht -> setzen */
-		strcat( cl2chan->modes, x );
+		strlcat( cl2chan->modes, x, sizeof( cl2chan->modes ));
 		return TRUE;
 	}
 	else return FALSE;
 } /* Channel_UserModeAdd */
 
 
-GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 {
 	/* Channel-User-Mode soll geloescht werden. TRUE wird geliefert,
 	 * wenn der Mode entfernt wurde, FALSE, wenn der User den Channel-Mode
@@ -418,7 +586,8 @@ GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 } /* Channel_UserModeDel */
 
 
-GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
+GLOBAL CHAR *
+Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
 {
 	/* Channel-Modes eines Users liefern */
 	
@@ -434,32 +603,138 @@ GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
 } /* Channel_UserModes */
 
 
-LOCAL CHANNEL *New_Chan( CHAR *Name )
+GLOBAL BOOLEAN
+Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
+{
+	/* Pruefen, ob Client Mitglied in Channel ist */
+
+	assert( Chan != NULL );
+	assert( Client != NULL );
+
+	if( Get_Cl2Chan( Chan, Client )) return TRUE;
+	else return FALSE;
+} /* Channel_IsMemberOf */
+
+
+GLOBAL CHAR *
+Channel_Topic( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->topic;
+} /* Channel_Topic */
+
+
+GLOBAL VOID
+Channel_SetTopic( CHANNEL *Chan, CHAR *Topic )
+{
+	assert( Chan != NULL );
+	assert( Topic != NULL );
+	
+	strlcpy( Chan->topic, Topic, sizeof( Chan->topic ));
+} /* Channel_SetTopic */
+
+
+GLOBAL VOID
+Channel_SetModes( CHANNEL *Chan, CHAR *Modes )
+{
+	assert( Chan != NULL );
+	assert( Modes != NULL );
+
+	strlcpy( Chan->modes, Modes, sizeof( Chan->modes ));
+} /* Channel_SetModes */
+
+
+GLOBAL VOID
+Channel_SetKey( CHANNEL *Chan, CHAR *Key )
+{
+	assert( Chan != NULL );
+	assert( Key != NULL );
+
+	strlcpy( Chan->key, Key, sizeof( Chan->key ));
+	Log( LOG_DEBUG, "Channel %s: Key is now \"%s\".", Chan->name, Chan->key );
+} /* Channel_SetKey */
+
+
+GLOBAL VOID
+Channel_SetMaxUsers( CHANNEL *Chan, LONG Count )
+{
+	assert( Chan != NULL );
+
+	Chan->maxusers = Count;
+	Log( LOG_DEBUG, "Channel %s: Member limit is now %ld.", Chan->name, Chan->maxusers );
+} /* Channel_SetMaxUsers */
+
+
+GLOBAL BOOLEAN
+Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
+{
+	BOOLEAN is_member, has_voice, is_op, ok;
+
+	/* Okay, target is a channel */
+	is_member = has_voice = is_op = FALSE;
+	if( Channel_IsMemberOf( Chan, From ))
+	{
+		is_member = TRUE;
+		if( strchr( Channel_UserModes( Chan, From ), 'v' )) has_voice = TRUE;
+		if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = TRUE;
+	}
+
+	/* Check weather client is allowed to write to channel */
+	ok = TRUE;
+	if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = FALSE;
+	if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE;
+	
+	/* Is the client banned? */
+	if( Lists_CheckBanned( From, Chan ))
+	{
+		/* Client is banned, bus is he channel operator or has voice? */
+		if(( ! has_voice ) && ( ! is_op )) ok = FALSE;
+	}
+
+	if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
+
+	/* Send text */
+	if( Client_Conn( From ) > NONE ) Conn_UpdateIdle( Client_Conn( From ));
+	return IRC_WriteStrChannelPrefix( Client, Chan, From, TRUE, "PRIVMSG %s :%s", Channel_Name( Chan ), Text );
+} /* Channel_Write */
+
+
+GLOBAL CHANNEL *
+Channel_Create( CHAR *Name )
 {
 	/* Neue Channel-Struktur anlegen */
-	
+
 	CHANNEL *c;
 
 	assert( Name != NULL );
 	
-	c = malloc( sizeof( CHANNEL ));
+	c = (CHANNEL *)malloc( sizeof( CHANNEL ));
 	if( ! c )
 	{
-		Log( LOG_EMERG, "Can't allocate memory!" );
+		Log( LOG_EMERG, "Can't allocate memory! [New_Chan]" );
 		return NULL;
 	}
 	c->next = NULL;
-	strncpy( c->name, Name, CHANNEL_NAME_LEN );
+	strlcpy( c->name, Name, sizeof( c->name ));
 	c->name[CHANNEL_NAME_LEN - 1] = '\0';
 	strcpy( c->modes, "" );
+	strcpy( c->topic, "" );
+	c->hash = Hash( c->name );
+	strcpy( c->key, "" );
+	c->maxusers = 0;
 
+	/* Verketten */
+	c->next = My_Channels;
+	My_Channels = c;
+	
 	Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
 	
 	return c;
-} /* New_Chan */
+} /* Channel_Create */
 
 
-LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
+LOCAL CL2CHAN *
+Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 {
 	CL2CHAN *cl2chan;
 
@@ -476,7 +751,8 @@ LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 } /* Get_Cl2Chan */
 
 
-LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
+LOCAL CL2CHAN *
+Add_Client( CHANNEL *Chan, CLIENT *Client )
 {
 	CL2CHAN *cl2chan;
 
@@ -484,10 +760,10 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
 	assert( Client != NULL );
 
 	/* neue CL2CHAN-Struktur anlegen */
-	cl2chan = malloc( sizeof( CL2CHAN ));
+	cl2chan = (CL2CHAN *)malloc( sizeof( CL2CHAN ));
 	if( ! cl2chan )
 	{
-		Log( LOG_EMERG, "Can't allocate memory!" );
+		Log( LOG_EMERG, "Can't allocate memory! [Add_Client]" );
 		return NULL;
 	}
 	cl2chan->channel = Chan;
@@ -504,7 +780,8 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
 } /* Add_Client */
 
 
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART )
+LOCAL BOOLEAN
+Remove_Client( INT Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN InformServer )
 {
 	CL2CHAN *cl2chan, *last_cl2chan;
 	CHANNEL *c;
@@ -532,26 +809,50 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR
 	else My_Cl2Chan = cl2chan->next;
 	free( cl2chan );
 
-	if( ServerPART ) IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-	IRC_WriteStrChannelPrefix( Origin, c, Client, FALSE, "PART %s :%s", c->name, Reason );
-	if(( Client_Conn( Origin ) > NONE ) && ( Client_Type( Origin ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
+	switch( Type )
+	{
+		case REMOVE_QUIT:
+			/* QUIT: andere Server wurden bereits informiert, vgl. Client_Destroy();
+			 * hier also "nur" noch alle User in betroffenen Channeln infomieren */
+			assert( InformServer == FALSE );
+			IRC_WriteStrChannelPrefix( Origin, c, Origin, FALSE, "QUIT :%s", Reason );
+			Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+			break;
+		case REMOVE_KICK:
+			/* User wurde geKICKed: ggf. andere Server sowie alle betroffenen User
+			 * im entsprechenden Channel informieren */
+			if( InformServer ) IRC_WriteStrServersPrefix( Client_NextHop( Origin ), Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
+			IRC_WriteStrChannelPrefix( Client, c, Origin, FALSE, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
+			if(( Client_Conn( Client ) > NONE ) && ( Client_Type( Client ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Client, Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
+			Log( LOG_DEBUG, "User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID( Origin ), Reason );
+			break;
+		default:
+			/* PART */
+			if( InformServer ) IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
+			IRC_WriteStrChannelPrefix( Origin, c, Client, FALSE, "PART %s :%s", c->name, Reason );
+			if(( Client_Conn( Origin ) > NONE ) && ( Client_Type( Origin ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
+			Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+	}
 
-	Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
-
-	/* Wenn Channel nun leer: loeschen */
-	if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
+	/* Wenn Channel nun leer und nicht pre-defined: loeschen */
+	if( ! strchr( Channel_Modes( Chan ), 'P' ))
+	{
+		if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
+	}
 		
 	return TRUE;
 } /* Remove_Client */
 
 
-LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
+LOCAL CL2CHAN *
+Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
 	return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan );
 } /* Get_First_Cl2Chan */
 
 
-LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
+LOCAL CL2CHAN *
+Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 {
 	CL2CHAN *cl2chan;
 
@@ -568,7 +869,8 @@ LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channe
 } /* Get_Next_Cl2Chan */
 
 
-LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan )
+LOCAL BOOLEAN
+Delete_Channel( CHANNEL *Chan )
 {
 	/* Channel-Struktur loeschen */
 	
@@ -586,6 +888,9 @@ LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan )
 
 	Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
+	/* Invite- und Ban-Lists aufraeumen */
+	Lists_DeleteChannel( chan );
+
 	/* Neu verketten und freigeben */
 	if( last_chan ) last_chan->next = chan->next;
 	else My_Channels = chan->next;

src/ngircd/channel.h

@@ -2,71 +2,35 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: channel.h,v 1.11 2002/02/11 01:00:22 alex Exp $
+ * $Id: channel.h,v 1.26 2002/12/16 23:05:24 alex Exp $
  *
- * channel.h: Management der Channels (Header)
- *
- * $Log: channel.h,v $
- * Revision 1.11  2002/02/11 01:00:22  alex
- * - neue Funktionen Channel_ModeAdd(), Channel_ModeDel(), Channel_UserModes(),
- *   Channel_UserModeAdd(), Channel_UserModeDel().
- *
- * Revision 1.10  2002/02/06 16:49:10  alex
- * - neue Funktionen Channel_Modes() und Channel_IsValidName().
- *
- * Revision 1.9  2002/01/29 00:11:19  alex
- * - neue Funktionen Channel_FirstChannelOf() und Channel_NextChannelOf().
- *
- * Revision 1.8  2002/01/28 01:16:15  alex
- * - neue Funktionen Channel_Name(), Channel_First() und Channel_Next().
- *
- * Revision 1.7  2002/01/26 18:41:55  alex
- * - CHANNEL- und CL2CHAN-Strukturen in Header verlegt,
- * - einige neue Funktionen (Channel_GetChannel(), Channel_FirstMember(), ...)
- *
- * Revision 1.6  2002/01/21 00:11:59  alex
- * - Definition der CHANNEL-Struktur aus Header entfernt,
- * - neue Funktionen Channel_Join(), Channel_Part() und Channel_RemoveClient().
- *
- * Revision 1.5  2002/01/16 22:09:07  alex
- * - neue Funktion Channel_Count().
- *
- * Revision 1.4  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.3  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.2  2001/12/23 21:54:30  alex
- * - Konstanten um Prefix "CHANNEL_" erweitert.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * Channel management (header)
  */
 
 
 #ifndef __channel_h__
 #define __channel_h__
 
-#include "client.h"
 
+#if defined(__channel_c__) | defined(S_SPLINT_S)
 
-#ifdef __channel_c__
+#include "defines.h"
 
 typedef struct _CHANNEL
 {
 	struct _CHANNEL *next;
-	CHAR name[CHANNEL_NAME_LEN];	/* Name des Channel */
-	CHAR modes[CHANNEL_MODE_LEN];	/* Channel-Modes */
+	CHAR name[CHANNEL_NAME_LEN];	/* Name of the channel */
+	UINT32 hash;			/* Hash of the (lowecase!) name */
+	CHAR modes[CHANNEL_MODE_LEN];	/* Channel modes */
+	CHAR topic[CHANNEL_TOPIC_LEN];	/* Topic of the channel */
+	CHAR key[CLIENT_PASS_LEN];	/* Channel key ("password", mode "k" ) */
+	LONG maxusers;			/* Maximum number of members (mode "l") */
 } CHANNEL;
 
 typedef struct _CLIENT2CHAN
@@ -85,40 +49,60 @@ typedef POINTER CL2CHAN;
 #endif
 
 
-GLOBAL VOID Channel_Init( VOID );
-GLOBAL VOID Channel_Exit( VOID );
+GLOBAL VOID Channel_Init PARAMS(( VOID ));
+GLOBAL VOID Channel_InitPredefined PARAMS((  VOID ));
+GLOBAL VOID Channel_Exit PARAMS(( VOID ));
 
-GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name );
-GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason );
+GLOBAL BOOLEAN Channel_Join PARAMS(( CLIENT *Client, CHAR *Name ));
+GLOBAL BOOLEAN Channel_Part PARAMS(( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));
 
-GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason );
+GLOBAL VOID Channel_Quit PARAMS(( CLIENT *Client, CHAR *Reason ));
 
-GLOBAL INT Channel_Count( VOID );
+GLOBAL VOID Channel_Kick PARAMS((  CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));
 
-GLOBAL CHAR *Channel_Name( CHANNEL *Chan );
-GLOBAL CHAR *Channel_Modes( CHANNEL *Chan );
+GLOBAL LONG Channel_Count PARAMS(( VOID ));
+GLOBAL LONG Channel_MemberCount PARAMS(( CHANNEL *Chan ));
+GLOBAL INT Channel_CountForUser PARAMS(( CLIENT *Client ));
+GLOBAL INT Channel_PCount PARAMS(( VOID ));
 
-GLOBAL CHANNEL *Channel_Search( CHAR *Name );
+GLOBAL CHAR *Channel_Name PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Modes PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Topic PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Key PARAMS(( CHANNEL *Chan ));
+GLOBAL LONG Channel_MaxUsers PARAMS(( CHANNEL *Chan ));
 
-GLOBAL CHANNEL *Channel_First( VOID );
-GLOBAL CHANNEL *Channel_Next( CHANNEL *Chan );
+GLOBAL VOID Channel_SetTopic PARAMS(( CHANNEL *Chan, CHAR *Topic ));
+GLOBAL VOID Channel_SetModes PARAMS(( CHANNEL *Chan, CHAR *Modes ));
+GLOBAL VOID Channel_SetKey PARAMS(( CHANNEL *Chan, CHAR *Key ));
+GLOBAL VOID Channel_SetMaxUsers PARAMS(( CHANNEL *Chan, LONG Count ));
 
-GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan );
-GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan );
-GLOBAL CL2CHAN *Channel_FirstChannelOf( CLIENT *Client );
-GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan );
+GLOBAL CHANNEL *Channel_Search PARAMS(( CHAR *Name ));
 
-GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan );
-GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan );
+GLOBAL CHANNEL *Channel_First PARAMS(( VOID ));
+GLOBAL CHANNEL *Channel_Next PARAMS(( CHANNEL *Chan ));
 
-GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name );
+GLOBAL CL2CHAN *Channel_FirstMember PARAMS(( CHANNEL *Chan ));
+GLOBAL CL2CHAN *Channel_NextMember PARAMS(( CHANNEL *Chan, CL2CHAN *Cl2Chan ));
+GLOBAL CL2CHAN *Channel_FirstChannelOf PARAMS(( CLIENT *Client ));
+GLOBAL CL2CHAN *Channel_NextChannelOf PARAMS(( CLIENT *Client, CL2CHAN *Cl2Chan ));
 
-GLOBAL BOOLEAN Channel_ModeAdd( CHANNEL *Chan, CHAR Mode );
-GLOBAL BOOLEAN Channel_ModeDel( CHANNEL *Chan, CHAR Mode );
+GLOBAL CLIENT *Channel_GetClient PARAMS(( CL2CHAN *Cl2Chan ));
+GLOBAL CHANNEL *Channel_GetChannel PARAMS(( CL2CHAN *Cl2Chan ));
 
-GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode );
-GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode );
-GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client );
+GLOBAL BOOLEAN Channel_IsValidName PARAMS(( CHAR *Name ));
+
+GLOBAL BOOLEAN Channel_ModeAdd PARAMS(( CHANNEL *Chan, CHAR Mode ));
+GLOBAL BOOLEAN Channel_ModeDel PARAMS(( CHANNEL *Chan, CHAR Mode ));
+
+GLOBAL BOOLEAN Channel_UserModeAdd PARAMS(( CHANNEL *Chan, CLIENT *Client, CHAR Mode ));
+GLOBAL BOOLEAN Channel_UserModeDel PARAMS(( CHANNEL *Chan, CLIENT *Client, CHAR Mode ));
+GLOBAL CHAR *Channel_UserModes PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+
+GLOBAL BOOLEAN Channel_IsMemberOf PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+
+GLOBAL BOOLEAN Channel_Write PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text ));
+
+GLOBAL CHANNEL *Channel_Create PARAMS(( CHAR *Name ));
 
 
 #endif

src/ngircd/client.h

@@ -2,202 +2,141 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: client.h,v 1.22 2002/02/06 16:49:56 alex Exp $
+ * $Id: client.h,v 1.34 2003/01/15 14:28:25 alex Exp $
  *
- * client.h: Konfiguration des ngircd (Header)
- *
- * $Log: client.h,v $
- * Revision 1.22  2002/02/06 16:49:56  alex
- * - neue Funktion Client_IsValidNick().
- *
- * Revision 1.21  2002/01/29 00:14:49  alex
- * - neue Funktion Client_TopServer(), Client_NewXXX() angepasst.
- *
- * Revision 1.20  2002/01/21 00:06:49  alex
- * - Channel-Pointer aus Client-Struktur entfernt. Wird nun dynamisch verwaltet :-)
- *
- * Revision 1.19  2002/01/16 22:10:35  alex
- * - neue Funktionen Client_xxxCount().
- *
- * Revision 1.18  2002/01/07 23:42:12  alex
- * - Es werden fuer alle Server eigene Token generiert,
- * - QUIT von einem Server fuer einen User wird an andere Server geforwarded,
- * - ebenso NICK-Befehle, die "fremde" User einfuehren.
- *
- * Revision 1.17  2002/01/06 15:18:14  alex
- * - Loglevel und Meldungen nochmals geaendert. Level passen nun besser.
- *
- * Revision 1.16  2002/01/05 23:26:05  alex
- * - Vorbereitungen fuer Ident-Abfragen in Client-Strukturen.
- *
- * Revision 1.15  2002/01/05 20:08:17  alex
- * - neue Funktion Client_NextHop().
- *
- * Revision 1.14  2002/01/04 01:21:22  alex
- * - Client-Strukturen koennen von anderen Modulen nun nur noch ueber die
- *   enstprechenden (zum Teil neuen) Funktionen angesprochen werden.
- *
- * Revision 1.13  2002/01/03 02:28:06  alex
- * - neue Funktion Client_CheckID(), diverse Aenderungen fuer Server-Links.
- *
- * Revision 1.12  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.11  2001/12/31 15:33:13  alex
- * - neuer Befehl NAMES, kleinere Bugfixes.
- * - Bug bei PING behoben: war zu restriktiv implementiert :-)
- *
- * Revision 1.10  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.9  2001/12/29 20:18:18  alex
- * - neue Funktion Client_SetHostname().
- *
- * Revision 1.8  2001/12/29 03:10:47  alex
- * - Client-Modes implementiert; Loglevel mal wieder angepasst.
- *
- * Revision 1.7  2001/12/27 19:13:47  alex
- * - neue Funktion Client_Search(), besseres Logging.
- *
- * Revision 1.6  2001/12/27 16:54:51  alex
- * - neue Funktion Client_GetID(), liefert die "Client ID".
- *
- * Revision 1.5  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.4  2001/12/26 03:19:16  alex
- * - neue Funktion Client_Nick().
- *
- * Revision 1.3  2001/12/25 19:21:26  alex
- * - Client-Typ ("Status") besser unterteilt, My_Clients ist zudem nun global.
- *
- * Revision 1.2  2001/12/23 22:03:47  alex
- * - einige neue Funktionen,
- * - Konstanten um "CLIENT_"-Prefix erweitert.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * Client management (header)
  */
 
 
 #ifndef __client_h__
 #define __client_h__
 
-#include "conn.h"
+
+#define CLIENT_UNKNOWN 1		/* connection of unknown type */
+#define CLIENT_GOTPASS 2		/* client did send PASS */
+#define CLIENT_GOTNICK 4		/* client did send NICK */
+#define CLIENT_GOTUSER 8		/* client did send USER */
+#define CLIENT_USER 16			/* client is an IRC user */
+#define CLIENT_UNKNOWNSERVER 32		/* unregistered server connection */
+#define CLIENT_GOTPASSSERVER 64		/* client did send PASS in "server style" */
+#define CLIENT_SERVER 128		/* client is a server */
+#define CLIENT_SERVICE 256		/* client is a service */
+
+#define CLIENT_TYPE INT
 
 
-typedef enum
-{
-	CLIENT_UNKNOWN,			/* Verbindung mit (noch) unbekanntem Typ */
-	CLIENT_GOTPASS,			/* Client hat PASS gesendet */
-	CLIENT_GOTNICK,			/* Client hat NICK gesendet */
-	CLIENT_GOTUSER,			/* Client hat USER gesendet */
-	CLIENT_USER,			/* Client ist ein Benutzer (USER wurde gesendet) */
-	CLIENT_UNKNOWNSERVER,		/* unregistrierte Server-Verbindung */
-	CLIENT_GOTPASSSERVER,		/* Client hat PASS nach "Server-Art" gesendet */
-	CLIENT_SERVER,			/* Client ist ein Server */
-	CLIENT_SERVICE			/* Client ist ein Service */
-} CLIENT_TYPE;
+#if defined(__client_c__) | defined(S_SPLINT_S)
 
+#include "defines.h"
 
-#ifdef __client_c__
 typedef struct _CLIENT
 {
-	CHAR id[CLIENT_ID_LEN];		/* Nick (User) bzw. ID (Server) */
-	POINTER *next;			/* Zeiger auf naechste Client-Struktur */
-	CLIENT_TYPE type;		/* Typ des Client, vgl. CLIENT_TYPE */
-	CONN_ID conn_id;		/* ID der Connection (wenn lokal) bzw. NONE (remote) */
-	struct _CLIENT *introducer;	/* ID des Servers, der die Verbindung hat */
-	struct _CLIENT *topserver;	/* Toplevel-Servers (nur gueltig, wenn Client ein Server ist) */
-	CHAR pwd[CLIENT_PASS_LEN];	/* Passwort, welches der Client angegeben hat */
-	CHAR host[CLIENT_HOST_LEN];	/* Hostname des Client */
-	CHAR user[CLIENT_USER_LEN];	/* Benutzername ("Login") */
-	CHAR info[CLIENT_INFO_LEN];	/* Langer Benutzername (User) bzw. Infotext (Server) */
-	CHAR modes[CLIENT_MODE_LEN];	/* Client Modes */
-	INT hops, token, mytoken;	/* "Hops" und "Token" (-> SERVER-Befehl) */
-	BOOLEAN oper_by_me;		/* IRC-Operator-Status durch diesen Server? */
+	CHAR id[CLIENT_ID_LEN];		/* nick (user) / ID (server) */
+	UINT32 hash;			/* hash of lower-case ID */
+	POINTER *next;			/* pointer to next client structure */
+	CLIENT_TYPE type;		/* type of client, see CLIENT_xxx */
+	CONN_ID conn_id;		/* ID of the connection (if local) or NONE (remote) */
+	struct _CLIENT *introducer;	/* ID of the servers which the client is connected to */
+	struct _CLIENT *topserver;	/* toplevel servers (only valid if client is a server) */
+	CHAR pwd[CLIENT_PASS_LEN];	/* password received of the client */
+	CHAR host[CLIENT_HOST_LEN];	/* hostname of the client */
+	CHAR user[CLIENT_USER_LEN];	/* user name ("login") */
+	CHAR info[CLIENT_INFO_LEN];	/* long user name (user) / info text (server) */
+	CHAR modes[CLIENT_MODE_LEN];	/* client modes */
+	INT hops, token, mytoken;	/* "hops" and "Token" (see SERVER command) */
+	BOOLEAN oper_by_me;		/* client is local IRC operator on this server? */
+	CHAR away[CLIENT_AWAY_LEN];	/* AWAY text (valid if mode 'a' is set) */
+	CHAR flags[CLIENT_FLAGS_LEN];	/* flags of the client */
 } CLIENT;
+
 #else
+
 typedef POINTER CLIENT;
+
 #endif
 
 
-GLOBAL VOID Client_Init( VOID );
-GLOBAL VOID Client_Exit( VOID );
+GLOBAL VOID Client_Init PARAMS(( VOID ));
+GLOBAL VOID Client_Exit PARAMS(( VOID ));
 
-GLOBAL CLIENT *Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented );
-GLOBAL CLIENT *Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented );
-GLOBAL CLIENT *Client_NewRemoteUser( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN Idented );
-GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes, BOOLEAN Idented );
+GLOBAL CLIENT *Client_NewLocal PARAMS(( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented ));
+GLOBAL CLIENT *Client_NewRemoteServer PARAMS(( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented ));
+GLOBAL CLIENT *Client_NewRemoteUser PARAMS(( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN Idented ));
+GLOBAL CLIENT *Client_New PARAMS(( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes, BOOLEAN Idented ));
 
-GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg );
+GLOBAL VOID Client_Destroy PARAMS(( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit ));
+#ifdef CONN_MODULE
+GLOBAL VOID Client_DestroyNow PARAMS(( CLIENT *Client ));
+#endif
 
-GLOBAL CLIENT *Client_ThisServer( VOID );
+GLOBAL CLIENT *Client_ThisServer PARAMS(( VOID ));
 
-GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx );
-GLOBAL CLIENT *Client_GetFromID( CHAR *Nick );
-GLOBAL CLIENT *Client_GetFromToken( CLIENT *Client, INT Token );
+GLOBAL CLIENT *Client_GetFromConn PARAMS(( CONN_ID Idx ));
+GLOBAL CLIENT *Client_GetFromToken PARAMS(( CLIENT *Client, INT Token ));
 
-GLOBAL CLIENT *Client_Search( CHAR *ID );
-GLOBAL CLIENT *Client_First( VOID );
-GLOBAL CLIENT *Client_Next( CLIENT *c );
+GLOBAL CLIENT *Client_Search PARAMS(( CHAR *ID ));
+GLOBAL CLIENT *Client_First PARAMS(( VOID ));
+GLOBAL CLIENT *Client_Next PARAMS(( CLIENT *c ));
 
-GLOBAL INT Client_Type( CLIENT *Client );
-GLOBAL CONN_ID Client_Conn( CLIENT *Client );
-GLOBAL CHAR *Client_ID( CLIENT *Client );
-GLOBAL CHAR *Client_Mask( CLIENT *Client );
-GLOBAL CHAR *Client_Info( CLIENT *Client );
-GLOBAL CHAR *Client_User( CLIENT *Client );
-GLOBAL CHAR *Client_Hostname( CLIENT *Client );
-GLOBAL CHAR *Client_Password( CLIENT *Client );
-GLOBAL CHAR *Client_Modes( CLIENT *Client );
-GLOBAL CLIENT *Client_Introducer( CLIENT *Client );
-GLOBAL BOOLEAN Client_OperByMe( CLIENT *Client );
-GLOBAL INT Client_Hops( CLIENT *Client );
-GLOBAL INT Client_Token( CLIENT *Client );
-GLOBAL INT Client_MyToken( CLIENT *Client );
-GLOBAL CLIENT *Client_TopServer( CLIENT *Client );
-GLOBAL CLIENT *Client_NextHop( CLIENT *Client );
+GLOBAL INT Client_Type PARAMS(( CLIENT *Client ));
+GLOBAL CONN_ID Client_Conn PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_ID PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Mask PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Info PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_User PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Hostname PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Password PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Modes PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Flags PARAMS(( CLIENT *Client ));
+GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN Client_OperByMe PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_Hops PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_Token PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_MyToken PARAMS(( CLIENT *Client ));
+GLOBAL CLIENT *Client_TopServer PARAMS(( CLIENT *Client ));
+GLOBAL CLIENT *Client_NextHop PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Away PARAMS(( CLIENT *Client ));
 
-GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode );
+GLOBAL BOOLEAN Client_HasMode PARAMS(( CLIENT *Client, CHAR Mode ));
 
-GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname );
-GLOBAL VOID Client_SetID( CLIENT *Client, CHAR *Nick );
-GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented );
-GLOBAL VOID Client_SetInfo( CLIENT *Client, CHAR *Info );
-GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd );
-GLOBAL VOID Client_SetType( CLIENT *Client, INT Type );
-GLOBAL VOID Client_SetHops( CLIENT *Client, INT Hops );
-GLOBAL VOID Client_SetToken( CLIENT *Client, INT Token );
-GLOBAL VOID Client_SetOperByMe( CLIENT *Client, BOOLEAN OperByMe );
-GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes );
-GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer );
+GLOBAL VOID Client_SetHostname PARAMS(( CLIENT *Client, CHAR *Hostname ));
+GLOBAL VOID Client_SetID PARAMS(( CLIENT *Client, CHAR *Nick ));
+GLOBAL VOID Client_SetUser PARAMS(( CLIENT *Client, CHAR *User, BOOLEAN Idented ));
+GLOBAL VOID Client_SetInfo PARAMS(( CLIENT *Client, CHAR *Info ));
+GLOBAL VOID Client_SetPassword PARAMS(( CLIENT *Client, CHAR *Pwd ));
+GLOBAL VOID Client_SetType PARAMS(( CLIENT *Client, INT Type ));
+GLOBAL VOID Client_SetHops PARAMS(( CLIENT *Client, INT Hops ));
+GLOBAL VOID Client_SetToken PARAMS(( CLIENT *Client, INT Token ));
+GLOBAL VOID Client_SetOperByMe PARAMS(( CLIENT *Client, BOOLEAN OperByMe ));
+GLOBAL VOID Client_SetModes PARAMS(( CLIENT *Client, CHAR *Modes ));
+GLOBAL VOID Client_SetFlags PARAMS(( CLIENT *Client, CHAR *Flags ));
+GLOBAL VOID Client_SetIntroducer PARAMS(( CLIENT *Client, CLIENT *Introducer ));
+GLOBAL VOID Client_SetAway PARAMS(( CLIENT *Client, CHAR *Txt ));
 
-GLOBAL BOOLEAN Client_ModeAdd( CLIENT *Client, CHAR Mode );
-GLOBAL BOOLEAN Client_ModeDel( CLIENT *Client, CHAR Mode );
+GLOBAL BOOLEAN Client_ModeAdd PARAMS(( CLIENT *Client, CHAR Mode ));
+GLOBAL BOOLEAN Client_ModeDel PARAMS(( CLIENT *Client, CHAR Mode ));
 
-GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick );
-GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID );
+GLOBAL BOOLEAN Client_CheckNick PARAMS(( CLIENT *Client, CHAR *Nick ));
+GLOBAL BOOLEAN Client_CheckID PARAMS(( CLIENT *Client, CHAR *ID ));
 
-GLOBAL INT Client_UserCount( VOID );
-GLOBAL INT Client_ServiceCount( VOID );
-GLOBAL INT Client_ServerCount( VOID );
-GLOBAL INT Client_OperCount( VOID );
-GLOBAL INT Client_UnknownCount( VOID );
-GLOBAL INT Client_MyUserCount( VOID );
-GLOBAL INT Client_MyServiceCount( VOID );
-GLOBAL INT Client_MyServerCount( VOID );
+GLOBAL LONG Client_UserCount PARAMS(( VOID ));
+GLOBAL LONG Client_ServiceCount PARAMS(( VOID ));
+GLOBAL LONG Client_ServerCount PARAMS(( VOID ));
+GLOBAL LONG Client_OperCount PARAMS(( VOID ));
+GLOBAL LONG Client_UnknownCount PARAMS(( VOID ));
+GLOBAL LONG Client_MyUserCount PARAMS(( VOID ));
+GLOBAL LONG Client_MyServiceCount PARAMS(( VOID ));
+GLOBAL LONG Client_MyServerCount PARAMS(( VOID ));
+GLOBAL LONG Client_MaxUserCount PARAMS((  VOID ));
+GLOBAL LONG Client_MyMaxUserCount PARAMS((  VOID ));
 
-GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick );
+GLOBAL BOOLEAN Client_IsValidNick PARAMS(( CHAR *Nick ));
 
 
 #endif

src/ngircd/conf.h

@@ -2,44 +2,15 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conf.h,v 1.9 2002/01/03 02:27:20 alex Exp $
+ * $Id: conf.h,v 1.28.2.1 2004/05/07 11:24:18 alex Exp $
  *
- * conf.h: Konfiguration des ngircd (Header)
- *
- * $Log: conf.h,v $
- * Revision 1.9  2002/01/03 02:27:20  alex
- * - das Server-Passwort kann nun konfiguriert werden.
- *
- * Revision 1.8  2002/01/02 02:49:16  alex
- * - Konfigurationsdatei "Samba like" umgestellt.
- * - es koennen nun mehrere Server und Oprtatoren konfiguriert werden.
- *
- * Revision 1.6  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.5  2001/12/30 19:26:11  alex
- * - Unterstuetzung fuer die Konfigurationsdatei eingebaut.
- *
- * Revision 1.4  2001/12/26 22:48:53  alex
- * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
- *
- * Revision 1.3  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.2  2001/12/26 03:19:57  alex
- * - erste Konfigurations-Variablen definiert: PING/PONG-Timeout.
- *
- * Revision 1.1  2001/12/12 17:18:20  alex
- * - Modul fuer Server-Konfiguration begonnen.
+ * Configuration management (header)
  */
 
 
@@ -48,62 +19,118 @@
 
 #include <time.h>
 
+#include "defines.h"
+
 
 typedef struct _Conf_Oper
 {
-	CHAR name[CLIENT_PASS_LEN];
-	CHAR pwd[CLIENT_PASS_LEN];
+	CHAR name[CLIENT_PASS_LEN];	/* Name (ID) of IRC operator */
+	CHAR pwd[CLIENT_PASS_LEN];	/* Password */
 } CONF_OPER;
 
 typedef struct _Conf_Server
 {
-	CHAR host[HOST_LEN];
-	CHAR ip[16];
-	CHAR name[CLIENT_ID_LEN];
-	CHAR pwd[CLIENT_PASS_LEN];
-	INT port;
-	time_t lasttry;
-	RES_STAT *res_stat;
+	CHAR host[HOST_LEN];		/* Hostname */
+	CHAR ip[16];			/* IP address (Resolver) */
+	CHAR name[CLIENT_ID_LEN];	/* IRC-Client-ID */
+	CHAR pwd_in[CLIENT_PASS_LEN];	/* Password which must be received */
+	CHAR pwd_out[CLIENT_PASS_LEN];	/* Password to send to peer */
+	INT port;			/* Server port */
+	INT group;			/* Group of server */
+	time_t lasttry;			/* Last connect attempt */
+	RES_STAT *res_stat;		/* Status of the resolver */
+	INT flags;			/* Flags */
+	CONN_ID conn_id;		/* ID of server connection or NONE */
 } CONF_SERVER;
 
+typedef struct _Conf_Channel
+{
+	CHAR name[CHANNEL_NAME_LEN];	/* Name of the channel */
+	CHAR modes[CHANNEL_MODE_LEN];	/* Initial channel modes */
+	CHAR topic[CHANNEL_TOPIC_LEN];	/* Initial topic */
+} CONF_CHANNEL;
 
-/* Konfigurationsdatei */
-GLOBAL CHAR Conf_File[FNAME_LEN];
 
-/* Name ("Nick") des Servers */
+#define CONF_SFLAG_ONCE	1		/* Delete this entry after next disconnect */
+#define CONF_SFLAG_DISABLED 2		/* This server configuration entry is disabled */
+
+
+/* Name ("Nick") of the servers */
 GLOBAL CHAR Conf_ServerName[CLIENT_ID_LEN];
 
-/* Servers-Info-Text */
+/* Server info text */
 GLOBAL CHAR Conf_ServerInfo[CLIENT_INFO_LEN];
 
-/* Server-Passwort */
+/* Global server passwort */
 GLOBAL CHAR Conf_ServerPwd[CLIENT_PASS_LEN];
 
-/* Datei mit MOTD-Text */
+/* Administrative information */
+GLOBAL CHAR Conf_ServerAdmin1[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerAdmin2[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerAdminMail[CLIENT_INFO_LEN];
+
+/* File with MOTD text */
 GLOBAL CHAR Conf_MotdFile[FNAME_LEN];
 
-/* Ports, auf denen der Server Verbindungen entgegen nimmt */
-GLOBAL INT Conf_ListenPorts[MAX_LISTEN_PORTS];
+/* Phrase with MOTD text */
+GLOBAL CHAR Conf_MotdPhrase[LINE_LEN];
+
+/* Ports the server should listen on */
+GLOBAL UINT Conf_ListenPorts[MAX_LISTEN_PORTS];
 GLOBAL INT Conf_ListenPorts_Count;
 
-/* Timeouts fuer PING und PONG */
+/* Address to which the socket should be bound or empty (=all) */
+GLOBAL CHAR Conf_ListenAddress[16];
+
+/* User and group ID the server should run with */
+GLOBAL UINT Conf_UID;
+GLOBAL UINT Conf_GID;
+
+/* A directory to chroot() in */
+GLOBAL CHAR Conf_Chroot[FNAME_LEN];
+
+/* Timeouts for PING and PONG */
 GLOBAL INT Conf_PingTimeout;
 GLOBAL INT Conf_PongTimeout;
 
-/* Sekunden zwischen Verbindungsversuchen zu anderen Servern */
+/* Seconds between connect attempts to other servers */
 GLOBAL INT Conf_ConnectRetry;
 
-/* Operatoren */
+/* Operators */
 GLOBAL CONF_OPER Conf_Oper[MAX_OPERATORS];
 GLOBAL INT Conf_Oper_Count;
 
-/* Server */
+/* Servers */
 GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS];
-GLOBAL INT Conf_Server_Count;
+
+/* Pre-defined channels */
+GLOBAL CONF_CHANNEL Conf_Channel[MAX_DEFCHANNELS];
+GLOBAL INT Conf_Channel_Count;
+
+/* Are IRC operators allowed to always use MODE? */
+GLOBAL BOOLEAN Conf_OperCanMode;
+
+/* Maximum number of connections to this server */
+GLOBAL LONG Conf_MaxConnections;
+
+/* Maximum number of channels a user can join */
+GLOBAL INT Conf_MaxJoins;
+
+/* Maximum number of connections per IP address */
+GLOBAL INT Conf_MaxConnectionsIP;
 
 
-GLOBAL VOID Conf_Init( VOID );
-GLOBAL VOID Conf_Exit( VOID );
+GLOBAL VOID Conf_Init PARAMS((VOID ));
+GLOBAL VOID Conf_Rehash PARAMS((VOID ));
+GLOBAL INT Conf_Test PARAMS((VOID ));
+
+GLOBAL VOID Conf_UnsetServer PARAMS(( CONN_ID Idx ));
+GLOBAL VOID Conf_SetServer PARAMS(( INT ConfServer, CONN_ID Idx ));
+GLOBAL INT Conf_GetServer PARAMS(( CONN_ID Idx ));
+
+GLOBAL BOOLEAN Conf_EnableServer PARAMS(( CHAR *Name, INT Port ));
+GLOBAL BOOLEAN Conf_DisableServer PARAMS(( CHAR *Name ));
+GLOBAL BOOLEAN Conf_AddServer PARAMS(( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd ));
 
 
 #endif

src/ngircd/conn-func.c

@@ -0,0 +1,277 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Connection management: Global functions
+ */
+
+
+#define CONN_MODULE
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: conn-func.c,v 1.3 2003/12/26 15:55:07 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <log.h>
+
+#include "conn.h"
+
+#include "exp.h"
+#include "conn-func.h"
+
+
+GLOBAL VOID
+Conn_UpdateIdle( CONN_ID Idx )
+{
+	/* Idle-Timer zuruecksetzen */
+
+	assert( Idx > NONE );
+	My_Connections[Idx].lastprivmsg = time( NULL );
+}
+
+
+GLOBAL time_t
+Conn_GetIdle( CONN_ID Idx )
+{
+	/* Idle-Time einer Verbindung liefern (in Sekunden) */
+
+	assert( Idx > NONE );
+	return time( NULL ) - My_Connections[Idx].lastprivmsg;
+} /* Conn_GetIdle */
+
+
+GLOBAL time_t
+Conn_LastPing( CONN_ID Idx )
+{
+	/* Zeitpunkt des letzten PING liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].lastping;
+} /* Conn_LastPing */
+
+
+GLOBAL VOID
+Conn_SetPenalty( CONN_ID Idx, time_t Seconds )
+{
+	/* Penalty-Delay fuer eine Verbindung (in Sekunden) setzen;
+	 * waehrend dieser Zeit wird der entsprechende Socket vom Server
+	 * bei Lese-Operationen komplett ignoriert. Der Delay kann mit
+	 * dieser Funktion nur erhoeht, nicht aber verringert werden. */
+	
+	time_t t;
+	
+	assert( Idx > NONE );
+	assert( Seconds >= 0 );
+
+	t = time( NULL ) + Seconds;
+	if( t > My_Connections[Idx].delaytime ) My_Connections[Idx].delaytime = t;
+} /* Conn_SetPenalty */
+
+
+GLOBAL VOID
+Conn_ResetPenalty( CONN_ID Idx )
+{
+	assert( Idx > NONE );
+	My_Connections[Idx].delaytime = 0;
+} /* Conn_ResetPenalty */
+
+
+GLOBAL VOID
+Conn_ClearFlags( VOID )
+{
+	/* Alle Connection auf "nicht-markiert" setzen */
+
+	CONN_ID i;
+
+	for( i = 0; i < Pool_Size; i++ ) My_Connections[i].flag = 0;
+} /* Conn_ClearFlags */
+
+
+GLOBAL INT
+Conn_Flag( CONN_ID Idx )
+{
+	/* Ist eine Connection markiert (TRUE) oder nicht? */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].flag;
+} /* Conn_Flag */
+
+
+GLOBAL VOID
+Conn_SetFlag( CONN_ID Idx, INT Flag )
+{
+	/* Connection markieren */
+
+	assert( Idx > NONE );
+	My_Connections[Idx].flag = Flag;
+} /* Conn_SetFlag */
+
+
+GLOBAL CONN_ID
+Conn_First( VOID )
+{
+	/* Connection-Struktur der ersten Verbindung liefern;
+	 * Ist keine Verbindung vorhanden, wird NONE geliefert. */
+
+	CONN_ID i;
+	
+	for( i = 0; i < Pool_Size; i++ )
+	{
+		if( My_Connections[i].sock != NONE ) return i;
+	}
+	return NONE;
+} /* Conn_First */
+
+
+GLOBAL CONN_ID
+Conn_Next( CONN_ID Idx )
+{
+	/* Naechste Verbindungs-Struktur liefern; existiert keine
+	 * weitere, so wird NONE geliefert. */
+
+	CONN_ID i = NONE;
+
+	assert( Idx > NONE );
+	
+	for( i = Idx + 1; i < Pool_Size; i++ )
+	{
+		if( My_Connections[i].sock != NONE ) return i;
+	}
+	return NONE;
+} /* Conn_Next */
+
+
+GLOBAL VOID
+Conn_SetOption( CONN_ID Idx, INT Option )
+{
+	/* Option fuer Verbindung setzen.
+	 * Initial sind alle Optionen _nicht_ gesetzt. */
+
+	assert( Idx > NONE );
+	assert( Option != 0 );
+
+	My_Connections[Idx].options |= Option;
+} /* Conn_SetOption */
+
+
+GLOBAL VOID
+Conn_UnsetOption( CONN_ID Idx, INT Option )
+{
+	/* Option fuer Verbindung loeschen */
+
+	assert( Idx > NONE );
+	assert( Option != 0 );
+
+	My_Connections[Idx].options &= ~Option;
+} /* Conn_UnsetOption */
+
+
+GLOBAL INT
+Conn_Options( CONN_ID Idx )
+{
+	assert( Idx > NONE );
+	return My_Connections[Idx].options;
+} /* Conn_Options */
+
+
+GLOBAL time_t
+Conn_StartTime( CONN_ID Idx )
+{
+	/* Zeitpunkt des Link-Starts liefern (in Sekunden) */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].starttime;
+} /* Conn_Uptime */
+
+
+GLOBAL INT
+Conn_SendQ( CONN_ID Idx )
+{
+	/* Laenge der Daten im Schreibbuffer liefern */
+
+	assert( Idx > NONE );
+#ifdef ZLIB
+	if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.wdatalen;
+	else
+#endif
+	return My_Connections[Idx].wdatalen;
+} /* Conn_SendQ */
+
+
+GLOBAL LONG
+Conn_SendMsg( CONN_ID Idx )
+{
+	/* Anzahl gesendeter Nachrichten liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].msg_out;
+} /* Conn_SendMsg */
+
+
+GLOBAL LONG
+Conn_SendBytes( CONN_ID Idx )
+{
+	/* Anzahl gesendeter Bytes (unkomprimiert) liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].bytes_out;
+} /* Conn_SendBytes */
+
+
+GLOBAL INT
+Conn_RecvQ( CONN_ID Idx )
+{
+	/* Laenge der Daten im Lesebuffer liefern */
+
+	assert( Idx > NONE );
+#ifdef ZLIB
+	if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.rdatalen;
+	else
+#endif
+	return My_Connections[Idx].rdatalen;
+} /* Conn_RecvQ */
+
+
+GLOBAL LONG
+Conn_RecvMsg( CONN_ID Idx )
+{
+	/* Anzahl empfangener Nachrichten liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].msg_in;
+} /* Conn_RecvMsg */
+
+
+GLOBAL LONG
+Conn_RecvBytes( CONN_ID Idx )
+{
+	/* Anzahl empfangener Bytes (unkomprimiert) liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].bytes_in;
+} /* Conn_RecvBytes */
+
+
+GLOBAL VOID
+Conn_ResetWCounter( VOID )
+{
+	WCounter = 0;
+} /* Conn_ResetWCounter */
+
+
+GLOBAL LONG
+Conn_WCounter( VOID )
+{
+	return WCounter;
+} /* Conn_WCounter */
+
+
+/* -eof- */

src/ngircd/conn-func.h

@@ -0,0 +1,61 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: conn-func.h,v 1.1 2002/12/30 17:14:28 alex Exp $
+ *
+ * Connection management: Global functions (header)
+ */
+
+
+#ifndef __conn_func_h__
+#define __conn_func_h__
+
+
+/* Include the header conn.h if this header is _not_ included by any module
+ * containing connection handling functions. So other modules must only
+ * include this conn-func.h header. */
+#ifndef CONN_MODULE
+#	include "conn.h"
+#endif
+
+
+GLOBAL VOID Conn_UpdateIdle PARAMS(( CONN_ID Idx ));
+GLOBAL time_t Conn_GetIdle PARAMS(( CONN_ID Idx ));
+GLOBAL time_t Conn_LastPing PARAMS(( CONN_ID Idx ));
+GLOBAL time_t Conn_StartTime PARAMS(( CONN_ID Idx ));
+GLOBAL INT Conn_SendQ PARAMS(( CONN_ID Idx ));
+GLOBAL INT Conn_RecvQ PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_SendMsg PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_RecvMsg PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_SendBytes PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_RecvBytes PARAMS(( CONN_ID Idx ));
+
+GLOBAL VOID Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds ));
+GLOBAL VOID Conn_ResetPenalty PARAMS(( CONN_ID Idx ));
+
+GLOBAL VOID Conn_ClearFlags PARAMS(( VOID ));
+GLOBAL INT Conn_Flag PARAMS(( CONN_ID Idx ));
+GLOBAL VOID Conn_SetFlag PARAMS(( CONN_ID Idx, INT Flag ));
+
+GLOBAL CONN_ID Conn_First PARAMS(( VOID ));
+GLOBAL CONN_ID Conn_Next PARAMS(( CONN_ID Idx ));
+
+GLOBAL VOID Conn_SetOption PARAMS(( CONN_ID Idx, INT Option ));
+GLOBAL VOID Conn_UnsetOption PARAMS(( CONN_ID Idx, INT Option ));
+GLOBAL INT Conn_Options PARAMS(( CONN_ID Idx ));
+
+GLOBAL VOID Conn_ResetWCounter PARAMS(( VOID ));
+GLOBAL LONG Conn_WCounter PARAMS(( VOID ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/conn-zip.c

@@ -0,0 +1,210 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Connection compression using ZLIB
+ */
+
+
+#include "portab.h"
+
+#define CONN_MODULE
+
+
+#ifdef ZLIB
+
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.5 2004/04/25 13:55:36 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <string.h>
+#include <zlib.h>
+
+#include "conn.h"
+#include "conn-func.h"
+#include "log.h"
+
+#include "exp.h"
+#include "conn-zip.h"
+
+
+GLOBAL BOOLEAN
+Zip_InitConn( CONN_ID Idx )
+{
+	/* Kompression fuer Link initialisieren */
+
+	assert( Idx > NONE );
+
+	My_Connections[Idx].zip.in.avail_in = 0;
+	My_Connections[Idx].zip.in.total_in = 0;
+	My_Connections[Idx].zip.in.total_out = 0;
+	My_Connections[Idx].zip.in.zalloc = NULL;
+	My_Connections[Idx].zip.in.zfree = NULL;
+	My_Connections[Idx].zip.in.data_type = Z_ASCII;
+
+	if( inflateInit( &My_Connections[Idx].zip.in ) != Z_OK )
+	{
+		/* Fehler! */
+		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
+		return FALSE;
+	}
+
+	My_Connections[Idx].zip.out.total_in = 0;
+	My_Connections[Idx].zip.out.total_in = 0;
+	My_Connections[Idx].zip.out.zalloc = NULL;
+	My_Connections[Idx].zip.out.zfree = NULL;
+	My_Connections[Idx].zip.out.data_type = Z_ASCII;
+
+	if( deflateInit( &My_Connections[Idx].zip.out, Z_DEFAULT_COMPRESSION ) != Z_OK )
+	{
+		/* Fehler! */
+		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx );
+		return FALSE;
+	}
+
+	My_Connections[Idx].zip.bytes_in = My_Connections[Idx].bytes_in;
+	My_Connections[Idx].zip.bytes_out = My_Connections[Idx].bytes_out;
+
+	Log( LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx );
+	Conn_SetOption( Idx, CONN_ZIP );
+
+	return TRUE;
+} /* Zip_InitConn */
+
+
+GLOBAL BOOLEAN
+Zip_Buffer( CONN_ID Idx, CHAR *Data, INT Len )
+{
+	/* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
+	* Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
+
+	assert( Idx > NONE );
+	assert( Data != NULL );
+	assert( Len > 0 );
+
+	/* Ist noch Platz im Kompressions-Puffer? */
+	if( ZWRITEBUFFER_LEN - My_Connections[Idx].zip.wdatalen < Len + 50 )
+	{
+		/* Nein! Puffer zunaechst leeren ...*/
+		if( ! Zip_Flush( Idx )) return FALSE;
+	}
+
+	/* Daten kopieren */
+	memmove( My_Connections[Idx].zip.wbuf + My_Connections[Idx].zip.wdatalen, Data, Len );
+	My_Connections[Idx].zip.wdatalen += Len;
+
+	return TRUE;
+} /* Zip_Buffer */
+
+
+GLOBAL BOOLEAN
+Zip_Flush( CONN_ID Idx )
+{
+	/* Daten komprimieren und in Schreibpuffer kopieren.
+	* Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
+
+	INT result, out_len;
+	z_stream *out;
+
+	out = &My_Connections[Idx].zip.out;
+
+	out->next_in = (VOID *)My_Connections[Idx].zip.wbuf;
+	out->avail_in = My_Connections[Idx].zip.wdatalen;
+	out->next_out = (VOID *)(My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen);
+	out->avail_out = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen;
+
+	result = deflate( out, Z_SYNC_FLUSH );
+	if(( result != Z_OK ) || ( out->avail_in > 0 ))
+	{
+		Log( LOG_ALERT, "Compression error: code %d!?", result );
+		Conn_Close( Idx, "Compression error!", NULL, FALSE );
+		return FALSE;
+	}
+
+	out_len = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - out->avail_out;
+	My_Connections[Idx].wdatalen += out_len;
+	My_Connections[Idx].bytes_out += out_len;
+	My_Connections[Idx].zip.bytes_out += My_Connections[Idx].zip.wdatalen;
+	My_Connections[Idx].zip.wdatalen = 0;
+
+	return TRUE;
+} /* Zip_Flush */
+
+
+GLOBAL BOOLEAN
+Unzip_Buffer( CONN_ID Idx )
+{
+	/* Daten entpacken und in Lesepuffer kopieren. Bei Fehlern
+	* wird FALSE geliefert, ansonsten TRUE. Der Fall, dass keine
+	* Daten mehr zu entpacken sind, ist _kein_ Fehler! */
+
+	INT result, in_len, out_len;
+	z_stream *in;
+
+	assert( Idx > NONE );
+
+	if( My_Connections[Idx].zip.rdatalen <= 0 ) return TRUE;
+
+	in = &My_Connections[Idx].zip.in;
+
+	in->next_in = (VOID *)My_Connections[Idx].zip.rbuf;
+	in->avail_in = My_Connections[Idx].zip.rdatalen;
+	in->next_out = (VOID *)(My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen);
+	in->avail_out = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1;
+
+	result = inflate( in, Z_SYNC_FLUSH );
+	if( result != Z_OK )
+	{
+		Log( LOG_ALERT, "Decompression error: %s (code=%d, ni=%d, ai=%d, no=%d, ao=%d)!?", in->msg, result, in->next_in, in->avail_in, in->next_out, in->avail_out );
+		Conn_Close( Idx, "Decompression error!", NULL, FALSE );
+		return FALSE;
+	}
+
+	in_len = My_Connections[Idx].zip.rdatalen - in->avail_in;
+	out_len = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1 - in->avail_out;
+	My_Connections[Idx].rdatalen += out_len;
+
+	if( in->avail_in > 0 )
+	{
+		/* es konnten nicht alle Daten entpackt werden, vermutlich war
+		* im Ziel-Puffer kein Platz mehr. Umkopieren ... */
+		My_Connections[Idx].zip.rdatalen -= in_len;
+		memmove( My_Connections[Idx].zip.rbuf, My_Connections[Idx].zip.rbuf + in_len, My_Connections[Idx].zip.rdatalen );
+	}
+	else My_Connections[Idx].zip.rdatalen = 0;
+	My_Connections[Idx].zip.bytes_in += out_len;
+
+	return TRUE;
+} /* Unzip_Buffer */
+
+
+GLOBAL LONG
+Zip_SendBytes( CONN_ID Idx )
+{
+	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].zip.bytes_out;
+} /* Zip_SendBytes */
+
+
+GLOBAL LONG
+Zip_RecvBytes( CONN_ID Idx )
+{
+	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
+
+	assert( Idx > NONE );
+	return My_Connections[Idx].zip.bytes_in;
+} /* Zip_RecvBytes */
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/conn-zip.h

@@ -0,0 +1,38 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: conn-zip.h,v 1.2 2003/12/26 15:55:07 alex Exp $
+ *
+ * Connection compression using ZLIB (header)
+ */
+
+
+#ifdef ZLIB
+
+#ifndef __conn_zip_h__
+#define __conn_zip_h__
+
+
+GLOBAL BOOLEAN Zip_InitConn PARAMS(( CONN_ID Idx ));
+
+GLOBAL BOOLEAN Zip_Buffer PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
+GLOBAL BOOLEAN Zip_Flush PARAMS(( CONN_ID Idx ));
+GLOBAL BOOLEAN Unzip_Buffer PARAMS(( CONN_ID Idx ));
+
+GLOBAL LONG Zip_SendBytes PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Zip_RecvBytes PARAMS(( CONN_ID Idx ));
+
+
+#endif /* __conn_zip_h__ */
+
+#endif /* ZLIB */
+
+
+/* -eof- */

src/ngircd/conn.h

@@ -2,52 +2,15 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.h,v 1.11 2002/02/11 01:00:50 alex Exp $
+ * $Id: conn.h,v 1.32 2003/12/26 15:55:07 alex Exp $
  *
- * conn.h: Verwaltung aller Netz-Verbindungen ("connections") (Header)
- *
- * $Log: conn.h,v $
- * Revision 1.11  2002/02/11 01:00:50  alex
- * - neue Funktion Conn_LastPing().
- *
- * Revision 1.10  2002/01/06 15:18:15  alex
- * - Loglevel und Meldungen nochmals geaendert. Level passen nun besser.
- *
- * Revision 1.9  2002/01/02 02:44:36  alex
- * - neue Defines fuer max. Anzahl Server und Operatoren.
- *
- * Revision 1.8  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.7  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.6  2001/12/25 22:03:47  alex
- * - Conn_Close() eingefuehrt: war die lokale Funktion Close_Connection().
- *
- * Revision 1.5  2001/12/23 21:57:48  alex
- * - Conn_WriteStr() unterstuetzt nun variable Parameter.
- *
- * Revision 1.4  2001/12/15 00:08:27  alex
- * - neue globale Funktionen: Conn_Write() und Conn_WriteStr().
- *
- * Revision 1.3  2001/12/14 08:15:45  alex
- * - CONN_ID wird definiert.
- *
- * Revision 1.2  2001/12/13 01:33:32  alex
- * - Conn_Handler() unterstuetzt nun einen Timeout (in Sekunden).
- *
- * Revision 1.1  2001/12/12 17:18:38  alex
- * - Modul zur Verwaltung aller Netzwerk-Verbindungen begonnen.
+ * Connection management (header)
  */
 
 
@@ -55,30 +18,87 @@
 #define __conn_h__
 
 
+#include <time.h>			/* fro time_t, see below */
+
+
+#define CONN_ISCLOSING 1		/* Conn_Close() already called */
+
+#ifdef ZLIB
+#define CONN_ZIP 2			/* zlib compressed link */
+#endif
+
+
 typedef INT CONN_ID;
 
-typedef struct _Res_Stat
+
+#ifdef CONN_MODULE
+
+#include "defines.h"
+#include "resolve.h"
+
+#ifdef ZLIB
+#include <zlib.h>
+typedef struct _ZipData
 {
-	INT pid;			/* PID des Child-Prozess */
-	INT pipe[2];			/* Pipe fuer IPC */
-} RES_STAT;
+	z_stream in;			/* "Handle" for input stream */
+	z_stream out;			/* "Handle" for output stream */
+	CHAR rbuf[READBUFFER_LEN];	/* Read buffer */
+	INT rdatalen;			/* Length of data in read buffer (compressed) */
+	CHAR wbuf[WRITEBUFFER_LEN];	/* Write buffer */
+	INT wdatalen;			/* Length of data in write buffer (uncompressed) */
+	LONG bytes_in, bytes_out;	/* Counter for statistics (uncompressed!) */
+} ZIPDATA;
+#endif /* ZLIB */
+
+typedef struct _Connection
+{
+	INT sock;			/* Socket handle */
+	struct sockaddr_in addr;	/* Client address */
+	RES_STAT *res_stat;		/* Status of resolver process, if any */
+	CHAR host[HOST_LEN];		/* Hostname */
+	CHAR rbuf[READBUFFER_LEN];	/* Read buffer */
+	INT rdatalen;			/* Length of data in read buffer */
+	CHAR wbuf[WRITEBUFFER_LEN];	/* Write buffer */
+	INT wdatalen;			/* Length of data in write buffer */
+	time_t starttime;		/* Start time of link */
+	time_t lastdata;		/* Last activity */
+	time_t lastping;		/* Last PING */
+	time_t lastprivmsg;		/* Last PRIVMSG */
+	time_t delaytime;		/* Ignore link ("penalty") */
+	LONG bytes_in, bytes_out;	/* Received and sent bytes */
+	LONG msg_in, msg_out;		/* Received and sent IRC messages */
+	INT flag;			/* Flag (see "irc-write" module) */
+	INT options;			/* Link options */
+#ifdef ZLIB
+	ZIPDATA zip;			/* Compression information */
+#endif  /* ZLIB */
+} CONNECTION;
+
+GLOBAL CONNECTION *My_Connections;
+GLOBAL CONN_ID Pool_Size;
+GLOBAL LONG WCounter;
+
+#endif /* CONN_MODULE */
 
 
-GLOBAL VOID Conn_Init( VOID );
-GLOBAL VOID Conn_Exit( VOID );
+GLOBAL VOID Conn_Init PARAMS((VOID ));
+GLOBAL VOID Conn_Exit PARAMS(( VOID ));
 
-GLOBAL BOOLEAN Conn_NewListener( CONST INT Port );
+GLOBAL INT Conn_InitListeners PARAMS(( VOID ));
+GLOBAL VOID Conn_ExitListeners PARAMS(( VOID ));
 
-GLOBAL VOID Conn_Handler( INT Timeout );
+GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port ));
 
-GLOBAL BOOLEAN Conn_Write( CONN_ID Idx, CHAR *Data, INT Len );
-GLOBAL BOOLEAN Conn_WriteStr( CONN_ID Idx, CHAR *Format, ... );
+GLOBAL VOID Conn_Handler PARAMS(( VOID ));
 
-GLOBAL VOID Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient );
+GLOBAL BOOLEAN Conn_Write PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
+GLOBAL BOOLEAN Conn_WriteStr PARAMS(( CONN_ID Idx, CHAR *Format, ... ));
 
-GLOBAL VOID Conn_UpdateIdle( CONN_ID Idx );
-GLOBAL INT32 Conn_GetIdle( CONN_ID Idx );
-GLOBAL INT32 Conn_LastPing( CONN_ID Idx );
+GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));
+
+GLOBAL VOID Conn_SyncServerStruct PARAMS(( VOID ));
+
+GLOBAL INT Conn_MaxFD;
 
 
 #endif

src/ngircd/defines.h

@@ -1,47 +1,16 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: defines.h,v 1.9 2002/02/13 23:04:27 alex Exp $
+ * $Id: defines.h,v 1.45.2.1 2004/05/07 11:24:18 alex Exp $
  *
- * defines.h: (globale) Konstanten
- *
- * $Log: defines.h,v $
- * Revision 1.9  2002/02/13 23:04:27  alex
- * - CHANMODES um Operator (o) und Voiced User (v) ergaenzt.
- *
- * Revision 1.8  2002/02/13 17:45:57  alex
- * - unterstuetzte User- und Channel-Modes stehen nun in Konstanten.
- *
- * Revision 1.7  2002/01/22 17:15:39  alex
- * - die Fehlermeldung "interrupted system call" sollte nicht mehr auftreten.
- *
- * Revision 1.6  2002/01/21 00:03:16  alex
- * - neue Konstante CHANNEL_MODE_LEN.
- *
- * Revision 1.5  2002/01/18 15:51:44  alex
- * - Server-Verbinungen werden beim Start erst nach kurzer Pause aufgebaut.
- *
- * Revision 1.4  2002/01/07 15:29:53  alex
- * - PASSSERVERADD definiert, wird beim PASS-Befehl an Server verwendet.
- *
- * Revision 1.3  2002/01/03 02:24:00  alex
- * - Protokollversion und Suffix definiert.
- *
- * Revision 1.2  2002/01/02 02:44:36  alex
- * - neue Defines fuer max. Anzahl Server und Operatoren.
- *
- * Revision 1.1  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
+ * Global defines of ngIRCd.
  */
 
 #ifndef __defines_h__
@@ -58,11 +27,15 @@
 
 #define MAX_LISTEN_PORTS 16		/* max. Anzahl von Listen-Ports */
 
-#define MAX_OPERATORS 8			/* max. Anzahl konfigurierbarer Operatoren */
+#define MAX_OPERATORS 16		/* max. Anzahl konfigurierbarer Operatoren */
 
-#define MAX_SERVERS 8			/* max. Anzahl konfigurierbarer Server ("Peers") */
+#define MAX_SERVERS 16			/* max. Anzahl konfigurierbarer Server ("Peers") */
 
-#define MAX_CONNECTIONS 100		/* max. Anzahl von Verbindungen an diesem Server */
+#define MAX_DEFCHANNELS 16		/* max. Anzahl vorkonfigurierbarerr Channels */
+
+#define MAX_SERVICES 8			/* maximum number of configurable services */
+
+#define CONNECTION_POOL 100		/* Anzahl Verbindungs-Strukturen, die blockweise alloziert werden */
 
 #define CLIENT_ID_LEN 64		/* max. ID-Laenge; vgl. RFC 2812, 1.1 und 1.2.1 */
 #define CLIENT_NICK_LEN 10		/* max. Nick-Laenge; vgl. RFC 2812, 1.2.1 */
@@ -72,24 +45,58 @@
 #define CLIENT_HOST_LEN 64		/* max. Laenge des Hostname */
 #define CLIENT_MODE_LEN 8		/* max. Laenge der Client-Modes */
 #define CLIENT_INFO_LEN 64		/* max. Infotext-Laenge (Server) */
+#define CLIENT_AWAY_LEN 128		/* max. Laenger der AWAY-Nachricht */
+#define CLIENT_FLAGS_LEN 100		/* max. Laenger der Client-Flags */
 
 #define CHANNEL_NAME_LEN 51		/* max. Laenge eines Channel-Namens, vgl. RFC 2812, 1.3 */
 #define CHANNEL_MODE_LEN 8		/* max. Laenge der Channel-Modes */
+#define CHANNEL_TOPIC_LEN 128		/* max. Laenge eines Channel-Topics */
 
 #define COMMAND_LEN 513			/* max. Laenge eines Befehls, vgl. RFC 2812, 3.2 */
 
-#define READBUFFER_LEN 2 * COMMAND_LEN	/* Laenge des Lesepuffers je Verbindung (Bytes) */
+#define READBUFFER_LEN 2048		/* Laenge des Lesepuffers je Verbindung (Bytes) */
 #define WRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers je Verbindung (Bytes) */
 
-#define PROTOVER "0210"			/* implementierte Protokoll-Version (RFC 2813, 4.1.1) */
-#define PROTOSUFFIX "-ngIRCd"		/* Protokoll-Suffix (RFC 2813, 4.1.1) */
+#ifdef ZLIB
+#define ZREADBUFFER_LEN 1024		/* Laenge des Lesepuffers je Verbindung (Bytes) */
+#define ZWRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers fuer Kompression (Bytes) */
+#endif
 
-#define PASSSERVERADD PROTOVER""PROTOSUFFIX" IRC|"PACKAGE"-"VERSION" P"
+#define PROTOVER "0210"			/* implementierte Protokoll-Version (RFC 2813, 4.1.1) */
+#define PROTOIRC "-IRC"			/* Protokoll-Suffix (RFC 2813, 4.1.1) */
+#define PROTOIRCPLUS "-IRC+"		/* Protokoll-Suffix fŸr IRC+-Protokoll */
+
+#ifdef IRCPLUS
+# define IRCPLUSFLAGS "CL"		/* IRC+-Flags, die immer zutreffen */
+#endif
 
 #define STARTUP_DELAY 1			/* Erst n Sek. nach Start zu anderen Servern verbinden */
+#define RECONNECT_DELAY 3		/* Server-Links erst nach 3 Sekunden versuchen, wieder aufzubauen */
 
-#define USERMODES "io"			/* unterstuetzte User-Modes */
-#define CHANMODES "amnopqstv"		/* unterstuetzte Channel-Modes */
+#define USERMODES "aios"		/* unterstuetzte User-Modes */
+#define CHANMODES "biklImnoPtv"		/* unterstuetzte Channel-Modes */
+
+#define CONNECTED TRUE			/* fuer die irc-xxx-Module */
+#define DISCONNECTED FALSE
+
+#define DEFAULT_AWAY_MSG "Away"		/* Away-Meldung fuer User von anderen Servern */
+
+#define CONFIG_FILE "/ngircd.conf"
+#define MOTD_FILE "/ngircd.motd"
+#define MOTD_PHRASE ""
+#define CHROOT_DIR ""
+
+#define ERROR_DIR "/tmp"
+
+#define MAX_LOG_MSG_LEN 256		/* max. Laenge einer Log-Meldung */
+
+#define TOKEN_OUTBOUND -2		/* Kennzeichnung fuer ausgehende Server-Links im Aufbau */
+
+#define NOTICE_TXTPREFIX ""		/* Kennzeichnung fuer Server-NOTICEs an User */
+
+#ifdef RENDEZVOUS
+#define RENDEZVOUS_TYPE "_ircu._tcp."	/* Service type to register with Rendezvous */
+#endif
 
 
 #endif

src/ngircd/global.h

@@ -1,58 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- *
- * $Id: global.h,v 1.6 2002/01/05 15:55:11 alex Exp $
- *
- * global.h: Globaler Header, wir in jedes(!) Modul eingebunden.
- *
- * $Log: global.h,v $
- * Revision 1.6  2002/01/05 15:55:11  alex
- * - Wrapper fuer inet_aton(): liefert immer Fehler.
- *
- * Revision 1.5  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.4  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.3  2001/12/14 08:14:34  alex
- * - NONE als -1 definiert. Macht den Source lesbarer ;-)
- *
- * Revision 1.2  2001/12/12 01:58:53  alex
- * - Test auf socklen_t verbessert.
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * Imported sources to CVS.
- */
-
-
-#ifndef __global_h__
-#define __global_h__
-
-
-#include "config.h"
-#include "defines.h"
-
-#ifndef HAVE_socklen_t
-#define socklen_t int			/* u.a. fuer Mac OS X */
-#endif
-
-#ifndef HAVE_INET_ATON
-#define inet_aton( opt, bind ) 0
-#endif
-
-
-#endif
-
-
-/* -eof- */

src/ngircd/hash.c

@@ -0,0 +1,126 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Hash calculation
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: hash.c,v 1.9 2002/12/26 16:25:43 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <string.h>
+
+#include "defines.h"
+#include "log.h"
+#include "tool.h"
+
+#include "exp.h"
+#include "hash.h"
+
+
+LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
+
+
+GLOBAL UINT32
+Hash( CHAR *String )
+{
+	/* Hash-Wert ueber String berechnen */
+
+	CHAR buffer[LINE_LEN];
+
+	strlcpy( buffer, String, sizeof( buffer ));
+	return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
+} /* Hash */
+
+
+/*
+ * Die hier verwendete Hash-Funktion stammt aus lookup2.c von Bob Jenkins
+ * (URL: <http://burtleburtle.net/bob/c/lookup2.c>). Aus dem Header:
+ * --------------------------------------------------------------------
+ * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
+ * hash(), hash2(), hash3, and mix() are externally useful functions.
+ * Routines to test the hash are included if SELF_TEST is defined.
+ * You can use this free for any purpose.  It has no warranty.
+ * --------------------------------------------------------------------
+ * nicht alle seiner Funktionen werden hier genutzt.
+ */
+
+
+#define hashsize(n) ((UINT32)1<<(n))
+#define hashmask(n) (hashsize(n)-1)
+
+#define mix(a,b,c) \
+{ \
+	a -= b; a -= c; a ^= (c>>13); \
+	b -= c; b -= a; b ^= (a<<8);  \
+	c -= a; c -= b; c ^= (b>>13); \
+	a -= b; a -= c; a ^= (c>>12); \
+	b -= c; b -= a; b ^= (a<<16); \
+	c -= a; c -= b; c ^= (b>>5);  \
+	a -= b; a -= c; a ^= (c>>3);  \
+	b -= c; b -= a; b ^= (a<<10); \
+	c -= a; c -= b; c ^= (b>>15); \
+} /* mix */
+
+
+LOCAL UINT32
+jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
+{
+	/* k: the key
+	 * length: length of the key
+	 * initval: the previous hash, or an arbitrary value
+	 */
+
+	register UINT32 a,b,c,len;
+
+	/* Set up the internal state */
+	len = length;
+	a = b = 0x9e3779b9;	/* the golden ratio; an arbitrary value */
+	c = initval;		/* the previous hash value */
+
+	/* handle most of the key */
+	while (len >= 12)
+	{
+		a += (k[0] +((UINT32)k[1]<<8) +((UINT32)k[2]<<16) +((UINT32)k[3]<<24));
+		b += (k[4] +((UINT32)k[5]<<8) +((UINT32)k[6]<<16) +((UINT32)k[7]<<24));
+		c += (k[8] +((UINT32)k[9]<<8) +((UINT32)k[10]<<16)+((UINT32)k[11]<<24));
+		mix(a,b,c);
+		k += 12; len -= 12;
+	}
+
+	/* handle the last 11 bytes */
+	c += length;
+	switch( (INT)len )	/* all the case statements fall through */
+	{
+		case 11: c+=((UINT32)k[10]<<24);
+		case 10: c+=((UINT32)k[9]<<16);
+		case 9 : c+=((UINT32)k[8]<<8);
+		/* the first byte of c is reserved for the length */
+		case 8 : b+=((UINT32)k[7]<<24);
+		case 7 : b+=((UINT32)k[6]<<16);
+		case 6 : b+=((UINT32)k[5]<<8);
+		case 5 : b+=k[4];
+		case 4 : a+=((UINT32)k[3]<<24);
+		case 3 : a+=((UINT32)k[2]<<16);
+		case 2 : a+=((UINT32)k[1]<<8);
+		case 1 : a+=k[0];
+		/* case 0: nothing left to add */
+	}
+	mix(a,b,c);
+
+	/* report the result */
+	return c;
+} /* jenkins_hash */
+
+
+/* -eof- */

src/ngircd/hash.h

@@ -0,0 +1,27 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: hash.h,v 1.4 2002/12/12 12:23:43 alex Exp $
+ *
+ * Hash calculation (header)
+ */
+
+
+#ifndef __hash_h__
+#define __hash_h__
+
+
+GLOBAL UINT32 Hash PARAMS((CHAR *String ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-channel.c

@@ -0,0 +1,466 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * IRC channel commands
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.27 2004/04/09 20:46:48 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "defines.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "lists.h"
+#include "log.h"
+#include "match.h"
+#include "messages.h"
+#include "parse.h"
+#include "irc-info.h"
+#include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
+
+#include "exp.h"
+#include "irc-channel.h"
+
+
+GLOBAL BOOLEAN
+IRC_JOIN( CLIENT *Client, REQUEST *Req )
+{
+	CHAR *channame, *key, *flags, *topic, modes[8];
+	BOOLEAN is_new_chan, is_invited, is_banned;
+	CLIENT *target;
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Bad number of arguments? */
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Who is the sender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* Are channel keys given? */
+	if( Req->argc > 1 ) key = Req->argv[1];
+	else key = NULL;
+
+	/* Channel-Namen durchgehen */
+	chan = NULL;
+	channame = strtok( Req->argv[0], "," );
+	while( channame )
+	{
+		chan = NULL; flags = NULL;
+
+		/* wird der Channel neu angelegt? */
+		if( Channel_Search( channame )) is_new_chan = FALSE;
+		else is_new_chan = TRUE;
+
+		/* Hat ein Server Channel-User-Modes uebergeben? */
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			/* Channel-Flags extrahieren */
+			flags = strchr( channame, 0x7 );
+			if( flags )
+			{
+				*flags = '\0';
+				flags++;
+			}
+		}
+
+		/* Local client? */
+		if( Client_Type( Client ) == CLIENT_USER )
+		{
+			/* Test if the user has reached his maximum channel count */
+			if( Client_Type( Client ) == CLIENT_USER )
+			{
+				if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
+				{
+					IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
+					return CONNECTED;
+				}
+			}
+
+			/* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
+			if( is_new_chan )
+			{
+				/* Erster User im Channel: Operator-Flag setzen */
+				flags = "o";
+			}
+			else
+			{
+				/* Existierenden Channel suchen */
+				chan = Channel_Search( channame );
+				assert( chan != NULL );
+
+				is_banned = Lists_CheckBanned( target, chan );
+				is_invited = Lists_CheckInvited( target, chan );
+
+				/* Testen, ob Client gebanned ist */
+				if(( is_banned == TRUE ) &&  ( is_invited == FALSE ))
+				{
+					/* Client ist gebanned (und nicht invited): */
+					IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
+
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
+
+				/* Ist der Channel "invite-only"? */
+				if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
+				{
+					/* Channel ist "invite-only" und Client wurde nicht invited: */
+					IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
+
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
+
+				/* Is the channel protected by a key? */
+				if(( strchr( Channel_Modes( chan ), 'k' )) && ( strcmp( Channel_Key( chan ), key ? key : "" ) != 0 ))
+				{
+					/* Bad channel key! */
+					IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
+
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
+
+				/* Are there already too many members? */
+				if(( strchr( Channel_Modes( chan ), 'l' )) && ( Channel_MaxUsers( chan ) <= Channel_MemberCount( chan )))
+				{
+					/* Bad channel key! */
+					IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
+
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
+			}
+		}
+		else
+		{
+			/* Remote server: we don't need to know whether the
+			 * client is invited or not, but we have to make sure
+			 * that the "one shot" entries (generated by INVITE
+			 * commands) in this list become deleted when a user
+			 * joins a channel this way. */
+			chan = Channel_Search( channame );
+			if( chan != NULL ) (VOID)Lists_CheckInvited( target, chan );
+		}
+
+		/* Channel joinen (und ggf. anlegen) */
+		if( ! Channel_Join( target, channame ))
+		{
+			/* naechsten Namen ermitteln */
+			channame = strtok( NULL, "," );
+			continue;
+		}
+		if( ! chan ) chan = Channel_Search( channame );
+		assert( chan != NULL );
+
+		/* Modes setzen (wenn vorhanden) */
+		while( flags && *flags )
+		{
+			Channel_UserModeAdd( chan, target, *flags );
+			flags++;
+		}
+
+		/* Wenn persistenter Channel und IRC-Operator: zum Channel-OP machen */
+		if(( strchr( Channel_Modes( chan ), 'P' )) && ( strchr( Client_Modes( target ), 'o' ))) Channel_UserModeAdd( chan, target, 'o' );
+
+		/* Muessen Modes an andere Server gemeldet werden? */
+		strlcpy( &modes[1], Channel_UserModes( chan, target ), sizeof( modes ) - 1 );
+		if( modes[1] ) modes[0] = 0x7;
+		else modes[0] = '\0';
+
+		/* An andere Server weiterleiten */
+		IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes );
+
+		/* im Channel bekannt machen */
+		IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame );
+		if( modes[1] )
+		{
+			/* Modes im Channel bekannt machen */
+			IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], Client_ID( target ));
+		}
+
+		if( Client_Type( Client ) == CLIENT_USER )
+		{
+			/* an Client bestaetigen */
+			IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
+
+			/* Topic an Client schicken */
+			topic = Channel_Topic( chan );
+			if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+
+			/* Mitglieder an Client Melden */
+			IRC_Send_NAMES( Client, chan );
+			IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
+		}
+
+		/* naechsten Namen ermitteln */
+		channame = strtok( NULL, "," );
+	}
+	return CONNECTED;
+} /* IRC_JOIN */
+
+
+GLOBAL BOOLEAN
+IRC_PART( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target;
+	CHAR *chan;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Wer ist der Absender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* Channel-Namen durchgehen */
+	chan = strtok( Req->argv[0], "," );
+	while( chan )
+	{
+		if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target )))
+		{
+			/* naechsten Namen ermitteln */
+			chan = strtok( NULL, "," );
+			continue;
+		}
+
+		/* naechsten Namen ermitteln */
+		chan = strtok( NULL, "," );
+	}
+	return CONNECTED;
+} /* IRC_PART */
+
+
+GLOBAL BOOLEAN
+IRC_TOPIC( CLIENT *Client, REQUEST *Req )
+{
+	CHANNEL *chan;
+	CLIENT *from;
+	CHAR *topic;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* Welcher Channel? */
+	chan = Channel_Search( Req->argv[0] );
+	if( ! chan ) return IRC_WriteStrClient( from, ERR_NOSUCHCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+
+	/* Ist der User Mitglied in dem Channel? */
+	if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+
+	if( Req->argc == 1 )
+	{
+		/* Topic erfragen */
+		topic = Channel_Topic( chan );
+		if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
+		else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
+	}
+
+	if( strchr( Channel_Modes( chan ), 't' ))
+	{
+		/* Topic Lock. Ist der User ein Channel Operator? */
+		if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
+	}
+
+	/* Topic setzen */
+	Channel_SetTopic( chan, Req->argv[1] );
+	Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
+
+	/* im Channel bekannt machen und an Server weiterleiten */
+	IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
+	IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
+
+	if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
+	else return CONNECTED;
+} /* IRC_TOPIC */
+
+
+GLOBAL BOOLEAN
+IRC_LIST( CLIENT *Client, REQUEST *Req )
+{
+	CHAR *pattern;
+	CHANNEL *chan;
+	CLIENT *from, *target;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	if( Req->argc > 0 ) pattern = strtok( Req->argv[0], "," );
+	else pattern = "*";
+
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+
+	if( Req->argc == 2 )
+	{
+		/* an anderen Server forwarden */
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+
+		if( target != Client_ThisServer( ))
+		{
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] );
+		}
+	}
+	
+	while( pattern )
+	{
+		/* alle Channel durchgehen */
+		chan = Channel_First( );
+		while( chan )
+		{
+			/* Passt die Suchmaske auf diesen Channel? */
+			if( Match( pattern, Channel_Name( chan )))
+			{
+				/* Treffer! */
+				if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+			}
+			chan = Channel_Next( chan );
+		}
+		
+		/* naechsten Namen ermitteln */
+		if( Req->argc > 0 ) pattern = strtok( NULL, "," );
+		else pattern = NULL;
+	}
+	
+	return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from );
+} /* IRC_LIST */
+
+
+GLOBAL BOOLEAN
+IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
+{
+	CHAR modes_add[COMMAND_LEN], l[16], *ptr;
+	CLIENT *from;
+	CHANNEL *chan;
+	INT arg_topic;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Bad number of parameters? */
+	if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Compatibility kludge */
+	if( Req->argc == 5 ) arg_topic = 4;
+	else if( Req->argc == 3 ) arg_topic = 2;
+	else arg_topic = -1;
+
+	/* Search origin */
+	from = Client_Search( Req->prefix );
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* Search or create channel */
+	chan = Channel_Search( Req->argv[0] );
+	if( ! chan ) chan = Channel_Create( Req->argv[0] );
+	if( ! chan ) return CONNECTED;
+
+	if( Req->argv[1][0] == '+' )
+	{
+		ptr = Channel_Modes( chan );
+		if( ! *ptr )
+		{
+			/* OK, this channel doesn't have modes jet, set the received ones: */
+			Channel_SetModes( chan, &Req->argv[1][1] );
+
+			if( Req->argc == 5 )
+			{
+				if( strchr( Channel_Modes( chan ), 'k' )) Channel_SetKey( chan, Req->argv[2] );
+				if( strchr( Channel_Modes( chan ), 'l' )) Channel_SetMaxUsers( chan, atol( Req->argv[3] ));
+			}
+			else
+			{
+				/* Delete modes which we never want to inherit */
+				Channel_ModeDel( chan, 'l' );
+				Channel_ModeDel( chan, 'k' );
+			}
+
+			strcpy( modes_add, "" );
+			ptr = Channel_Modes( chan );
+			while( *ptr )
+			{
+				if( *ptr == 'l' )
+				{
+					snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan ));
+					strlcat( modes_add, l, sizeof( modes_add ));
+				}
+				if( *ptr == 'k' )
+				{
+					strlcat( modes_add, " ", sizeof( modes_add ));
+					strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add ));
+				}
+	     			ptr++;
+			}
+			
+			/* Inform members of this channel */
+			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
+		}
+	}
+	else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" );
+
+	if( arg_topic > 0 )
+	{
+		/* We got a topic */
+		ptr = Channel_Topic( chan );
+		if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
+		{
+			/* OK, there is no topic jet */
+			Channel_SetTopic( chan, Req->argv[arg_topic] );
+			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan ));
+		}
+	}
+
+	/* Forward CHANINFO to other serevrs */
+	if( Req->argc == 5 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2], Req->argv[3], Req->argv[4] );
+	else if( Req->argc == 3 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
+	else IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s", Req->argv[0], Req->argv[1] );
+
+	return CONNECTED;
+} /* IRC_CHANINFO */
+
+
+/* -eof- */

src/ngircd/irc-channel.h

@@ -0,0 +1,33 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-channel.h,v 1.6 2002/12/12 12:23:43 alex Exp $
+ *
+ * IRC channel commands (header)
+ */
+
+
+#ifndef __irc_channel_h__
+#define __irc_channel_h__
+
+
+GLOBAL BOOLEAN IRC_JOIN PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PART PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_TOPIC PARAMS((CLIENT *Client, REQUEST *Req ));
+
+GLOBAL BOOLEAN IRC_LIST PARAMS((CLIENT *Client, REQUEST *Req ));
+
+GLOBAL BOOLEAN IRC_CHANINFO PARAMS((CLIENT *Client, REQUEST *Req ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-info.c

@@ -0,0 +1,912 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * IRC info commands
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-info.c,v 1.21.2.2 2005/01/24 14:22:30 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+
+#include "ngircd.h"
+#include "cvs-version.h"
+#include "conn-func.h"
+#include "conn-zip.h"
+#include "client.h"
+#include "channel.h"
+#include "resolve.h"
+#include "conf.h"
+#include "defines.h"
+#include "log.h"
+#include "messages.h"
+#include "tool.h"
+#include "parse.h"
+#include "irc-write.h"
+
+#include "exp.h"
+#include "irc-info.h"
+
+
+GLOBAL BOOLEAN
+IRC_ADMIN(CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *prefix;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Ziel suchen */
+	if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
+	else target = Client_ThisServer( );
+
+	/* Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix );
+	else prefix = Client;
+	if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* An anderen Server weiterleiten? */
+	if( target != Client_ThisServer( ))
+	{
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
+
+		/* forwarden */
+		IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
+		return CONNECTED;
+	}
+
+	/* mit Versionsinfo antworten */
+	if( ! IRC_WriteStrClient( Client, RPL_ADMINME_MSG, Client_ID( prefix ), Conf_ServerName )) return DISCONNECTED;
+	if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC1_MSG, Client_ID( prefix ), Conf_ServerAdmin1 )) return DISCONNECTED;
+	if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED;
+	if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED;
+
+	IRC_SetPenalty( Client, 1 );
+	return CONNECTED;
+} /* IRC_ADMIN */
+
+
+GLOBAL BOOLEAN
+IRC_ISON( CLIENT *Client, REQUEST *Req )
+{
+	CHAR rpl[COMMAND_LEN];
+	CLIENT *c;
+	CHAR *ptr;
+	INT i;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	strcpy( rpl, RPL_ISON_MSG );
+	for( i = 0; i < Req->argc; i++ )
+	{
+		ptr = strtok( Req->argv[i], " " );
+		while( ptr )
+		{
+			ngt_TrimStr( ptr );
+			c = Client_Search( ptr );
+			if( c && ( Client_Type( c ) == CLIENT_USER ))
+			{
+				/* Dieser Nick ist "online" */
+				strlcat( rpl, ptr, sizeof( rpl ));
+				strlcat( rpl, " ", sizeof( rpl ));
+			}
+			ptr = strtok( NULL, " " );
+		}
+	}
+	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
+
+	return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+} /* IRC_ISON */
+
+
+GLOBAL BOOLEAN
+IRC_LINKS( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *from, *c;
+	CHAR *mask;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Server-Mask ermitteln */
+	if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1];
+	else mask = "*";
+
+	/* Absender ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* An anderen Server forwarden? */
+	if( Req->argc == 2 )
+	{
+		target = Client_Search( Req->argv[0] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+		else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] );
+	}
+
+	/* Wer ist der Absender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	c = Client_First( );
+	while( c )
+	{
+		if( Client_Type( c ) == CLIENT_SERVER )
+		{
+			if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+		}
+		c = Client_Next( c );
+	}
+	
+	IRC_SetPenalty( target, 1 );
+	return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask );
+} /* IRC_LINKS */
+
+
+GLOBAL BOOLEAN
+IRC_LUSERS( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *from;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Absender ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* An anderen Server forwarden? */
+	if( Req->argc == 2 )
+	{
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+		else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LUSERS %s %s", Req->argv[0], Req->argv[1] );
+	}
+
+	/* Wer ist der Absender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	IRC_Send_LUSERS( target );
+
+	IRC_SetPenalty( target, 1 );
+	return CONNECTED;
+} /* IRC_LUSERS */
+
+
+GLOBAL BOOLEAN
+IRC_MOTD( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *from, *target;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	if( Req->argc == 1 )
+	{
+		/* an anderen Server forwarden */
+		target = Client_Search( Req->argv[0] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+
+		if( target != Client_ThisServer( ))
+		{
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "MOTD %s", Req->argv[0] );
+		}
+	}
+
+	IRC_SetPenalty( from, 3 );
+	return IRC_Show_MOTD( from );
+} /* IRC_MOTD */
+
+
+GLOBAL BOOLEAN
+IRC_NAMES( CLIENT *Client, REQUEST *Req )
+{
+	CHAR rpl[COMMAND_LEN], *ptr;
+	CLIENT *target, *from, *c;
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	if( Req->argc == 2 )
+	{
+		/* an anderen Server forwarden */
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+
+		if( target != Client_ThisServer( ))
+		{
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "NAMES %s :%s", Req->argv[0], Req->argv[1] );
+		}
+	}
+
+	if( Req->argc > 0 )
+	{
+		/* bestimmte Channels durchgehen */
+		ptr = strtok( Req->argv[0], "," );
+		while( ptr )
+		{
+			chan = Channel_Search( ptr );
+			if( chan )
+			{
+				/* Namen ausgeben */
+				if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
+			}
+			if( ! IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), ptr )) return DISCONNECTED;
+
+			/* naechsten Namen ermitteln */
+			ptr = strtok( NULL, "," );
+		}
+		return CONNECTED;
+	}
+
+	/* alle Channels durchgehen */
+	chan = Channel_First( );
+	while( chan )
+	{
+		/* Namen ausgeben */
+		if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
+
+		/* naechster Channel */
+		chan = Channel_Next( chan );
+	}
+
+	/* Nun noch alle Clients ausgeben, die in keinem Channel sind */
+	c = Client_First( );
+	snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
+	while( c )
+	{
+		if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' )))
+		{
+			/* Okay, das ist ein User: anhaengen */
+			if( rpl[strlen( rpl ) - 1] != ':' ) strlcat( rpl, " ", sizeof( rpl ));
+			strlcat( rpl, Client_ID( c ), sizeof( rpl ));
+
+			if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
+			{
+				/* Zeile wird zu lang: senden! */
+				if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
+				snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
+			}
+		}
+
+		/* naechster Client */
+		c = Client_Next( c );
+	}
+	if( rpl[strlen( rpl ) - 1] != ':')
+	{
+		/* es wurden User gefunden */
+		if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
+	}
+
+	IRC_SetPenalty( from, 1 );
+	return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
+} /* IRC_NAMES */
+
+
+GLOBAL BOOLEAN
+IRC_STATS( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *from, *target, *cl;
+	CONN_ID con;
+	CHAR query;
+	COMMAND *cmd;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	if( Req->argc == 2 )
+	{
+		/* an anderen Server forwarden */
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+
+		if( target != Client_ThisServer( ))
+		{
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "STATS %s %s", Req->argv[0], Req->argv[1] );
+		}
+	}
+
+	if( Req->argc > 0 ) query = Req->argv[0][0] ? Req->argv[0][0] : '*';
+	else query = '*';
+
+	switch ( query )
+	{
+		case 'l':	/* Links */
+		case 'L':
+			con = Conn_First( );
+			while( con != NONE )
+			{
+				cl = Client_GetFromConn( con );
+				if( cl && (( Client_Type( cl ) == CLIENT_SERVER ) || ( cl == Client )))
+				{
+					/* Server link or our own connection */
+#ifdef ZLIB
+					if( Conn_Options( con ) & CONN_ZIP )
+					{
+						if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFOZIP_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Zip_SendBytes( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Zip_RecvBytes( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED;
+					}
+					else
+#endif
+					{
+						if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFO_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED;
+					}
+				}
+				con = Conn_Next( con );
+			}
+			break;
+		case 'm':	/* IRC-Befehle */
+		case 'M':
+			cmd = Parse_GetCommandStruct( );
+			while( cmd->name )
+			{
+				if( cmd->lcount > 0 || cmd->rcount > 0 )
+				{
+					if( ! IRC_WriteStrClient( from, RPL_STATSCOMMANDS_MSG, Client_ID( from ), cmd->name, cmd->lcount, cmd->bytes, cmd->rcount )) return DISCONNECTED;
+				}
+				cmd++;
+			}
+			break;
+	}
+
+	IRC_SetPenalty( from, 2 );
+	return IRC_WriteStrClient( from, RPL_ENDOFSTATS_MSG, Client_ID( from ), query );
+} /* IRC_STATS */
+
+
+GLOBAL BOOLEAN
+IRC_TIME( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *from, *target;
+	CHAR t_str[64];
+	time_t t;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	if( Req->argc == 1 )
+	{
+		/* an anderen Server forwarden */
+		target = Client_Search( Req->argv[0] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+		if( target != Client_ThisServer( ))
+		{
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "TIME %s", Req->argv[0] );
+		}
+	}
+
+	t = time( NULL );
+	(VOID)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %Z", localtime( &t ));
+	return IRC_WriteStrClient( from, RPL_TIME_MSG, Client_ID( from ), Client_ID( Client_ThisServer( )), t_str );
+} /* IRC_TIME */
+
+
+GLOBAL BOOLEAN
+IRC_USERHOST( CLIENT *Client, REQUEST *Req )
+{
+	CHAR rpl[COMMAND_LEN];
+	CLIENT *c;
+	INT max, i;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	if( Req->argc > 5 ) max = 5;
+	else max = Req->argc;
+
+	strcpy( rpl, RPL_USERHOST_MSG );
+	for( i = 0; i < max; i++ )
+	{
+		c = Client_Search( Req->argv[i] );
+		if( c && ( Client_Type( c ) == CLIENT_USER ))
+		{
+			/* Dieser Nick ist "online" */
+			strlcat( rpl, Client_ID( c ), sizeof( rpl ));
+			if( Client_HasMode( c, 'o' )) strlcat( rpl, "*", sizeof( rpl ));
+			strlcat( rpl, "=", sizeof( rpl ));
+			if( Client_HasMode( c, 'a' )) strlcat( rpl, "-", sizeof( rpl ));
+			else strlcat( rpl, "+", sizeof( rpl ));
+			strlcat( rpl, Client_User( c ), sizeof( rpl ));
+			strlcat( rpl, "@", sizeof( rpl ));
+			strlcat( rpl, Client_Hostname( c ), sizeof( rpl ));
+			strlcat( rpl, " ", sizeof( rpl ));
+		}
+	}
+	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
+
+	return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+} /* IRC_USERHOST */
+
+
+GLOBAL BOOLEAN
+IRC_VERSION( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *prefix;
+#ifdef CVSDATE
+	CHAR ver[12], vertxt[30];
+#endif
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Ziel suchen */
+	if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
+	else target = Client_ThisServer( );
+
+	/* Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix );
+	else prefix = Client;
+	if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* An anderen Server weiterleiten? */
+	if( target != Client_ThisServer( ))
+	{
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
+
+		/* forwarden */
+		IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] );
+		return CONNECTED;
+	}
+
+	/* mit Versionsinfo antworten */
+	IRC_SetPenalty( Client, 1 );
+#ifdef CVSDATE
+	strlcpy( ver, CVSDATE, sizeof( ver ));
+	strncpy( ver + 4, ver + 5, 2 );
+	strncpy( ver + 6, ver + 8, 3 );
+	snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver );
+	return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, vertxt, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+#else
+	return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+#endif
+} /* IRC_VERSION */
+
+
+GLOBAL BOOLEAN
+IRC_WHO( CLIENT *Client, REQUEST *Req )
+{
+	BOOLEAN ok, only_ops;
+	CHAR flags[8], *ptr;
+	CL2CHAN *cl2chan;
+	CHANNEL *chan;
+	CLIENT *c;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	only_ops = FALSE;
+	chan = NULL;
+
+	if( Req->argc == 2 )
+	{
+		/* Nur OPs anzeigen? */
+		if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = TRUE;
+#ifdef STRICT_RFC
+		else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#endif
+	}
+
+	if( Req->argc >= 1 )
+	{
+		/* wurde ein Channel oder Nick-Mask angegeben? */
+		chan = Channel_Search( Req->argv[0] );
+	}
+
+	if( chan )
+	{
+		/* User eines Channels ausgeben */
+		if( ! IRC_Send_WHO( Client, chan, only_ops )) return DISCONNECTED;
+	}
+
+	c = Client_First( );
+	while( c )
+	{
+		if(( Client_Type( c ) == CLIENT_USER ) && ( ! strchr( Client_Modes( c ), 'i' )))
+		{
+			ok = FALSE;
+			if( Req->argc == 0 ) ok = TRUE;
+			else
+			{
+				if( strcasecmp( Req->argv[0], Client_ID( c )) == 0 ) ok = TRUE;
+				else if( strcmp( Req->argv[0], "0" ) == 0 ) ok = TRUE;
+			}
+
+			if( ok && (( ! only_ops ) || ( strchr( Client_Modes( c ), 'o' ))))
+			{
+				/* Flags zusammenbasteln */
+				strcpy( flags, "H" );
+				if( strchr( Client_Modes( c ), 'o' )) strlcat( flags, "*", sizeof( flags ));
+
+				/* ausgeben */
+				cl2chan = Channel_FirstChannelOf( c );
+				if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan ));
+				else ptr = "*";
+				if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), ptr, Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+			}
+		}
+
+		/* naechster Client */
+		c = Client_Next( c );
+	}
+
+	if( chan ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Channel_Name( chan ));
+	else if( Req->argc == 0 ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), "*" );
+	else return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Req->argv[0] );
+} /* IRC_WHO */
+
+
+GLOBAL BOOLEAN
+IRC_WHOIS( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *from, *target, *c;
+	CHAR str[LINE_LEN + 1];
+	CL2CHAN *cl2chan;
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Bad number of parameters? */
+	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Search client */
+	c = Client_Search( Req->argv[Req->argc - 1] );
+	if(( ! c ) || ( Client_Type( c ) != CLIENT_USER )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[Req->argc - 1] );
+
+	/* Search sender of the WHOIS */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+	/* Forward to other server? */
+	if( Req->argc > 1 )
+	{
+		/* Search target server (can be specified as nick of that server!) */
+		target = Client_Search( Req->argv[0] );
+		if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+	}
+	else target = Client_ThisServer( );
+
+	assert( target != NULL );
+
+	if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] );
+
+	/* Nick, user and name */
+	if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED;
+
+	/* Server */
+	if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;
+
+	/* Channels */
+	snprintf( str, sizeof( str ), RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
+	cl2chan = Channel_FirstChannelOf( c );
+	while( cl2chan )
+	{
+		chan = Channel_GetChannel( cl2chan );
+		assert( chan != NULL );
+
+		/* Concatenate channel names */
+		if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str ));
+		if( strchr( Channel_UserModes( chan, c ), 'o' )) strlcat( str, "@", sizeof( str ));
+		else if( strchr( Channel_UserModes( chan, c ), 'v' )) strlcat( str, "+", sizeof( str ));
+		strlcat( str, Channel_Name( chan ), sizeof( str ));
+
+		if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
+		{
+			/* Line becomes too long: send it! */
+			if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+			snprintf( str, sizeof( str ), RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
+		}
+
+		/* next */
+		cl2chan = Channel_NextChannelOf( c, cl2chan );
+	}
+	if( str[strlen( str ) - 1] != ':')
+	{
+		/* There is data left to send: */
+		if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+	}
+
+	/* IRC-Operator? */
+	if( Client_HasMode( c, 'o' ))
+	{
+		if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED;
+	}
+
+	/* Idle (only local clients) */
+	if( Client_Conn( c ) > NONE )
+	{
+		if( ! IRC_WriteStrClient( from, RPL_WHOISIDLE_MSG, Client_ID( from ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED;
+	}
+
+	/* Away? */
+	if( Client_HasMode( c, 'a' ))
+	{
+		if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( c ), Client_Away( c ))) return DISCONNECTED;
+	}
+
+	/* End of Whois */
+	return IRC_WriteStrClient( from, RPL_ENDOFWHOIS_MSG, Client_ID( from ), Client_ID( c ));
+} /* IRC_WHOIS */
+
+
+GLOBAL BOOLEAN
+IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
+{
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* ... */
+
+	return CONNECTED;
+} /* IRC_WHOWAS */
+
+
+GLOBAL BOOLEAN
+IRC_Send_LUSERS( CLIENT *Client )
+{
+	LONG cnt;
+
+	assert( Client != NULL );
+
+	/* Users, services and serevers in the network */
+	if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED;
+
+	/* Number of IRC operators */
+	cnt = Client_OperCount( );
+	if( cnt > 0 )
+	{
+		if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
+	}
+
+	/* Unknown connections */
+	cnt = Client_UnknownCount( );
+	if( cnt > 0 )
+	{
+		if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
+	}
+
+	/* Number of created channels */
+	if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED;
+
+	/* Number of local users, services and servers */
+	if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED;
+
+#ifndef STRICT_RFC
+	/* Maximum number of local users */
+	if( ! IRC_WriteStrClient( Client, RPL_LOCALUSERS_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyMaxUserCount( ))) return DISCONNECTED;
+	/* Maximum number of users in the network */
+	if( ! IRC_WriteStrClient( Client, RPL_NETUSERS_MSG, Client_ID( Client ), Client_UserCount( ), Client_MaxUserCount( ))) return DISCONNECTED;
+#endif
+	
+	return CONNECTED;
+} /* IRC_Send_LUSERS */
+
+
+GLOBAL BOOLEAN
+IRC_Show_MOTD( CLIENT *Client )
+{
+	BOOLEAN ok;
+	CHAR line[127];
+	FILE *fd;
+	UINT line_len;
+
+	assert( Client != NULL );
+
+	if( Conf_MotdPhrase[0] )
+	{
+		if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED;
+		if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), Conf_MotdPhrase )) return DISCONNECTED;
+		return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ));
+	}
+
+	fd = fopen( Conf_MotdFile, "r" );
+	if( ! fd )
+	{
+		Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno ));
+		return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) );
+	}
+
+	if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED;
+	while( TRUE )
+	{
+		if( ! fgets( line, sizeof( line ), fd )) break;
+
+		line_len = strlen( line );
+		if( line_len > 0 ) line_len--;
+		if( line[line_len] == '\n' ) line[line_len] = '\0';
+
+		if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
+		{
+			fclose( fd );
+			return FALSE;
+		}
+	}
+	ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) );
+
+	fclose( fd );
+
+	return ok;
+} /* IRC_Show_MOTD */
+
+
+GLOBAL BOOLEAN
+IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
+{
+	BOOLEAN is_visible, is_member;
+	CHAR str[LINE_LEN + 1];
+	CL2CHAN *cl2chan;
+	CLIENT *cl;
+
+	assert( Client != NULL );
+	assert( Chan != NULL );
+
+	if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE;
+	else is_member = FALSE;
+
+	/* Alle Mitglieder suchen */
+	snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+	cl2chan = Channel_FirstMember( Chan );
+	while( cl2chan )
+	{
+		cl = Channel_GetClient( cl2chan );
+
+		if( strchr( Client_Modes( cl ), 'i' )) is_visible = FALSE;
+		else is_visible = TRUE;
+
+		if( is_member || is_visible )
+		{
+			/* Nick anhaengen */
+			if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str ));
+			if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strlcat( str, "@", sizeof( str ));
+			else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strlcat( str, "+", sizeof( str ));
+			strlcat( str, Client_ID( cl ), sizeof( str ));
+
+			if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
+			{
+				/* Zeile wird zu lang: senden! */
+				if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+				snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+			}
+		}
+
+		/* naechstes Mitglied suchen */
+		cl2chan = Channel_NextMember( Chan, cl2chan );
+	}
+	if( str[strlen( str ) - 1] != ':')
+	{
+		/* Es sind noch Daten da, die gesendet werden muessen */
+		if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+	}
+
+	return CONNECTED;
+} /* IRC_Send_NAMES */
+
+
+GLOBAL BOOLEAN
+IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
+{
+	BOOLEAN is_visible, is_member;
+	CL2CHAN *cl2chan;
+	CHAR flags[8];
+	CLIENT *c;
+
+	assert( Client != NULL );
+	assert( Chan != NULL );
+
+	if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE;
+	else is_member = FALSE;
+
+	/* Alle Mitglieder suchen */
+	cl2chan = Channel_FirstMember( Chan );
+	while( cl2chan )
+	{
+		c = Channel_GetClient( cl2chan );
+
+		if( strchr( Client_Modes( c ), 'i' )) is_visible = FALSE;
+		else is_visible = TRUE;
+
+		if( is_member || is_visible )
+		{
+			/* Flags zusammenbasteln */
+			strcpy( flags, "H" );
+			if( strchr( Client_Modes( c ), 'o' )) strlcat( flags, "*", sizeof( flags ));
+			if( strchr( Channel_UserModes( Chan, c ), 'o' )) strlcat( flags, "@", sizeof( flags ));
+			else if( strchr( Channel_UserModes( Chan, c ), 'v' )) strlcat( flags, "+", sizeof( flags ));
+
+			/* ausgeben */
+			if(( ! OnlyOps ) || ( strchr( Client_Modes( c ), 'o' )))
+			{
+				if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), Channel_Name( Chan ), Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+			}
+		}
+
+		/* naechstes Mitglied suchen */
+		cl2chan = Channel_NextMember( Chan, cl2chan );
+	}
+	return CONNECTED;
+} /* IRC_Send_WHO */
+
+
+/* -eof- */

src/ngircd/irc-info.h

@@ -0,0 +1,44 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-info.h,v 1.2 2002/12/12 12:23:43 alex Exp $
+ *
+ * IRC info commands (header)
+ */
+
+
+#ifndef __irc_info_h__
+#define __irc_info_h__
+
+
+GLOBAL BOOLEAN IRC_ADMIN PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_ISON PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LINKS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LUSERS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_MOTD PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NAMES PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_STATS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_TIME PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_USERHOST PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_VERSION PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHO PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHOIS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHOWAS PARAMS(( CLIENT *Client, REQUEST *Req ));
+
+GLOBAL BOOLEAN IRC_Send_LUSERS PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Send_NAMES PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+GLOBAL BOOLEAN IRC_Show_MOTD PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Send_WHO PARAMS(( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-login.c

@@ -0,0 +1,522 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Login and logout
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-login.c,v 1.40 2004/03/11 22:16:31 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include "ngircd.h"
+#include "resolve.h"
+#include "conn-func.h"
+#include "conf.h"
+#include "client.h"
+#include "channel.h"
+#include "log.h"
+#include "messages.h"
+#include "parse.h"
+#include "irc.h"
+#include "irc-info.h"
+#include "irc-write.h"
+#include "cvs-version.h"
+
+#include "exp.h"
+#include "irc-login.h"
+
+
+LOCAL BOOLEAN Hello_User PARAMS(( CLIENT *Client ));
+LOCAL VOID Kill_Nick PARAMS(( CHAR *Nick, CHAR *Reason ));
+
+
+GLOBAL BOOLEAN
+IRC_PASS( CLIENT *Client, REQUEST *Req )
+{
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Fehler liefern, wenn kein lokaler Client */
+	if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command );
+	
+	if(( Client_Type( Client ) == CLIENT_UNKNOWN ) && ( Req->argc == 1))
+	{
+		/* noch nicht registrierte unbekannte Verbindung */
+		Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client_Conn( Client ));
+
+		/* Passwort speichern */
+		Client_SetPassword( Client, Req->argv[0] );
+
+		Client_SetType( Client, CLIENT_GOTPASS );
+		return CONNECTED;
+	}
+	else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
+	{
+		CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
+		INT protohigh, protolow;
+
+		/* noch nicht registrierte Server-Verbindung */
+		Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client ));
+
+		/* Passwort speichern */
+		Client_SetPassword( Client, Req->argv[0] );
+
+		/* Protokollversion ermitteln */
+		if( strlen( Req->argv[1] ) >= 4 )
+		{
+			c2 = Req->argv[1][2];
+			c4 = Req->argv[1][4];
+
+			Req->argv[1][4] = '\0';
+			protolow = atoi( &Req->argv[1][2] );
+			Req->argv[1][2] = '\0';
+			protohigh = atoi( Req->argv[1] );
+			
+			Req->argv[1][2] = c2;
+			Req->argv[1][4] = c4;
+		}			
+		else protohigh = protolow = 0;
+
+		/* Protokoll-Typ */
+		if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4];
+		else type = NULL;
+
+		/* IRC-Flags (nach RFC 2813) */
+		if( Req->argc >= 4 ) ircflags = Req->argv[3];
+		else ircflags = "";
+
+		/* Implementation, Version und ngIRCd-Flags */
+		impl = Req->argv[2];
+		ptr = strchr( impl, '|' );
+		if( ptr ) *ptr = '\0';
+
+		if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 ))
+		{
+			/* auf der anderen Seite laeuft ein Server, der
+			 * ebenfalls das IRC+-Protokoll versteht */
+			serverver = ptr + 1;
+			flags = strchr( serverver, ':' );
+			if( flags )
+			{
+				*flags = '\0';
+				flags++;
+			}
+			else flags = "";
+			Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
+		}
+		else
+		{
+			/* auf der anderen Seite laeuft ein Server, der
+			 * nur das Originalprotokoll unterstuetzt */
+			serverver = "";
+			if( strchr( ircflags, 'Z' )) flags = "Z";
+			else flags = "";
+			Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
+		}
+
+		Client_SetType( Client, CLIENT_GOTPASSSERVER );
+		Client_SetFlags( Client, flags );
+
+		return CONNECTED;
+	}
+	else if(( Client_Type( Client ) == CLIENT_UNKNOWN  ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
+	{
+		/* Falsche Anzahl Parameter? */
+		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	}
+	else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
+} /* IRC_PASS */
+
+
+GLOBAL BOOLEAN
+IRC_NICK( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *intr_c, *target, *c;
+	CHAR *modes;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */
+#ifndef STRICT_RFC
+	if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+#else
+	if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+#endif
+	{
+		/* User-Registrierung bzw. Nick-Aenderung */
+
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		/* "Ziel-Client" ermitteln */
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			target = Client_Search( Req->prefix );
+			if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+		}
+		else
+		{
+			/* Ist der Client "restricted"? */
+			if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
+			target = Client;
+		}
+
+#ifndef STRICT_RFC
+		/* Wenn der Client zu seinem eigenen Nick wechseln will, so machen
+		 * wir nichts. So macht es das Original und mind. Snak hat probleme,
+		 * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
+		if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
+#endif
+
+		/* pruefen, ob Nick bereits vergeben. Speziallfall: der Client
+		 * will nur die Gross- und Kleinschreibung aendern. Das darf
+		 * er natuerlich machen :-) */
+		if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 )
+		{
+			if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED;
+		}
+
+		if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER ))
+		{
+			/* Neuer Client */
+			Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", Client_Conn( Client ));
+
+			/* Client-Nick registrieren */
+			Client_SetID( target, Req->argv[0] );
+
+			/* schon ein USER da? Dann registrieren! */
+			if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client );
+			else Client_SetType( Client, CLIENT_GOTNICK );
+		}
+		else
+		{
+			/* Nick-Aenderung */
+			if( Client_Conn( target ) > NONE )
+			{
+				/* lokaler Client */
+				Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_Conn( target ), Client_ID( target ), Req->argv[0] );
+			}
+			else
+			{
+				/* Remote-Client */
+				Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
+			}
+
+			/* alle betroffenen User und Server ueber Nick-Aenderung informieren */
+			if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
+			IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
+			IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] );
+			
+			/* neuen Client-Nick speichern */
+			Client_SetID( target, Req->argv[0] );
+			IRC_SetPenalty( target, 2 );
+		}
+
+		return CONNECTED;
+	}
+	else if( Client_Type( Client ) == CLIENT_SERVER )
+	{
+		/* Server fuehrt neuen Client ein */
+
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		/* Nick ueberpruefen */
+		c = Client_Search( Req->argv[0] );
+		if( c )
+		{
+			/* Der neue Nick ist auf diesem Server bereits registriert:
+			 * sowohl der neue, als auch der alte Client muessen nun
+			 * disconnectiert werden. */
+			Log( LOG_ERR, "Server %s introduces already registered nick \"%s\"!", Client_ID( Client ), Req->argv[0] );
+			Kill_Nick( Req->argv[0], "Nick collision" );
+			return CONNECTED;
+		}
+
+		/* Server, zu dem der Client connectiert ist, suchen */
+		intr_c = Client_GetFromToken( Client, atoi( Req->argv[4] ));
+		if( ! intr_c )
+		{
+			Log( LOG_ERR, "Server %s introduces nick \"%s\" on unknown server!?", Client_ID( Client ), Req->argv[0] );
+			Kill_Nick( Req->argv[0], "Unknown server" );
+			return CONNECTED;
+		}
+
+		/* Neue Client-Struktur anlegen */
+		c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], TRUE );
+		if( ! c )
+		{
+			/* Eine neue Client-Struktur konnte nicht angelegt werden.
+			 * Der Client muss disconnectiert werden, damit der Netz-
+			 * status konsistent bleibt. */
+			Log( LOG_ALERT, "Can't create client structure! (on connection %d)", Client_Conn( Client ));
+			Kill_Nick( Req->argv[0], "Server error" );
+			return CONNECTED;
+		}
+
+		modes = Client_Modes( c );
+		if( *modes ) Log( LOG_DEBUG, "User \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", Client_Mask( c ), modes, Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
+		else Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_Mask( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
+
+		/* Andere Server, ausser dem Introducer, informieren */
+		IRC_WriteStrServersPrefix( Client, Client, "NICK %s %d %s %s %d %s :%s", Req->argv[0], atoi( Req->argv[1] ) + 1, Req->argv[2], Req->argv[3], Client_MyToken( intr_c ), Req->argv[5], Req->argv[6] );
+
+		return CONNECTED;
+	}
+	else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
+} /* IRC_NICK */
+
+
+GLOBAL BOOLEAN
+IRC_USER( CLIENT *Client, REQUEST *Req )
+{
+#ifdef IDENTAUTH
+	CHAR *ptr;
+#endif
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+#ifndef STRICT_RFC
+	if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_UNKNOWN )
+#else
+	if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS )
+#endif
+	{
+		/* Wrong number of parameters? */
+		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		/* User name */
+#ifdef IDENTAUTH
+		ptr = Client_User( Client );
+		if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], FALSE );
+#else
+		Client_SetUser( Client, Req->argv[0], FALSE );
+#endif
+
+		/* "Real name" or user info text: Don't set it to the empty string, the original ircd
+		 * can't deal with such "real names" (e. g. "USER user * * :") ... */
+		if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] );
+		else Client_SetInfo( Client, "-" );
+
+		Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client ));
+		if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client );
+		else Client_SetType( Client, CLIENT_GOTUSER );
+		return CONNECTED;
+	}
+	else if( Client_Type( Client ) == CLIENT_USER || Client_Type( Client ) == CLIENT_SERVER || Client_Type( Client ) == CLIENT_SERVICE )
+	{
+		return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
+	}
+	else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+} /* IRC_USER */
+
+
+GLOBAL BOOLEAN
+IRC_QUIT( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if ( Client_Type( Client ) == CLIENT_SERVER )
+	{
+		/* Server */
+
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		target = Client_Search( Req->prefix );
+		if( ! target )
+		{
+			/* Den Client kennen wir nicht (mehr), also nichts zu tun. */
+			Log( LOG_WARNING, "Got QUIT from %s for unknown client!?", Client_ID( Client ));
+			return CONNECTED;
+		}
+
+		if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, TRUE );
+		else Client_Destroy( target, "Got QUIT command.", Req->argv[0], TRUE );
+
+		return CONNECTED;
+	}
+	else
+	{
+		/* User, Service, oder noch nicht registriert */
+		
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
+		else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
+		
+		return DISCONNECTED;
+	}
+} /* IRC_QUIT */
+
+
+GLOBAL BOOLEAN
+IRC_PING( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *from;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
+#ifdef STRICT_RFC
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#endif
+
+	if( Req->argc > 1 )
+	{
+		/* es wurde ein Ziel-Client angegeben */
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+		if( target != Client_ThisServer( ))
+		{
+			/* ok, forwarden */
+			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+			else from = Client;
+			if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+			return IRC_WriteStrClientPrefix( target, from, "PING %s :%s", Client_ID( from ), Req->argv[1] );
+		}
+	}
+
+	Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client ));
+	return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client ));
+} /* IRC_PING */
+
+
+GLOBAL BOOLEAN
+IRC_PONG( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *from;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* forwarden? */
+	if( Req->argc == 2 )
+	{
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+		if( target != Client_ThisServer( ))
+		{
+			/* ok, forwarden */
+			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+			else from = Client;
+			if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+			return IRC_WriteStrClientPrefix( target, from, "PONG %s :%s", Client_ID( from ), Req->argv[1] );
+		}
+	}
+
+	/* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
+	 * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
+
+	if( Client_Conn( Client ) > NONE ) Log( LOG_DEBUG, "Connection %d: received PONG. Lag: %ld seconds.", Client_Conn( Client ), time( NULL ) - Conn_LastPing( Client_Conn( Client )));
+	else Log( LOG_DEBUG, "Connection %d: received PONG.", Client_Conn( Client ));
+
+	return CONNECTED;
+} /* IRC_PONG */
+
+
+LOCAL BOOLEAN
+Hello_User( CLIENT *Client )
+{
+#ifdef CVSDATE
+	CHAR ver[12], vertxt[30];
+#endif
+
+	assert( Client != NULL );
+
+	/* Check password ... */
+	if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 )
+	{
+		/* Bad password! */
+		Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client ));
+		Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
+		return DISCONNECTED;
+	}
+
+	Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client ));
+
+	/* Inform other servers */
+	IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
+
+	/* Welcome :-) */
+	if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
+
+	/* Version and system type */
+#ifdef CVSDATE
+        strlcpy( ver, CVSDATE, sizeof( ver ));
+        strncpy( ver + 4, ver + 5, 2 );
+        strncpy( ver + 6, ver + 8, 3 );
+	snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver );
+	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
+#else
+	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
+#endif
+
+	if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
+#ifdef CVSDATE
+	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, USERMODES, CHANMODES )) return FALSE;	
+#else
+	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return FALSE;
+#endif
+
+	/* Features */
+	if( ! IRC_WriteStrClient( Client, RPL_ISUPPORT_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, CHANNEL_TOPIC_LEN - 1, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED;
+
+	Client_SetType( Client, CLIENT_USER );
+
+	if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED;
+	if( ! IRC_Show_MOTD( Client )) return DISCONNECTED;
+
+	/* Suspend the client for a second ... */
+	IRC_SetPenalty( Client, 1 );
+
+	return CONNECTED;
+} /* Hello_User */
+
+
+LOCAL VOID
+Kill_Nick( CHAR *Nick, CHAR *Reason )
+{
+	REQUEST r;
+
+	assert( Nick != NULL );
+	assert( Reason != NULL );
+
+	r.prefix = (CHAR *)Client_ThisServer( );
+	r.argv[0] = Nick;
+	r.argv[1] = Reason;
+	r.argc = 2;
+
+	Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason );
+	IRC_KILL( Client_ThisServer( ), &r );
+} /* Kill_Nick */
+
+
+/* -eof- */

src/ngircd/irc-login.h

@@ -0,0 +1,32 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-login.h,v 1.5 2002/12/12 12:23:43 alex Exp $
+ *
+ * Login and logout (header)
+ */
+
+
+#ifndef __irc_login_h__
+#define __irc_login_h__
+
+
+GLOBAL BOOLEAN IRC_PASS PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NICK PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_USER PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PING PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-mode.c

@@ -0,0 +1,732 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * IRC commands for mode changes (MODE, AWAY, ...)
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.35 2004/04/25 15:42:05 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "defines.h"
+#include "irc-write.h"
+#include "lists.h"
+#include "log.h"
+#include "parse.h"
+#include "messages.h"
+#include "resolve.h"
+#include "conf.h"
+
+#include "exp.h"
+#include "irc-mode.h"
+
+
+LOCAL BOOLEAN Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
+LOCAL BOOLEAN Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
+
+LOCAL BOOLEAN Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+LOCAL BOOLEAN Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+
+LOCAL BOOLEAN Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+LOCAL BOOLEAN Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+
+LOCAL BOOLEAN Send_ListChange PARAMS(( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask ));
+
+
+GLOBAL BOOLEAN
+IRC_MODE( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *cl, *origin;
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* No parameters? */
+	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Origin for answers */
+	if( Client_Type( Client ) == CLIENT_SERVER )
+	{
+		origin = Client_Search( Req->prefix );
+		if( ! origin ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	}
+	else origin = Client;
+	
+	/* Channel or user mode? */
+	cl = chan = NULL;
+	if( Client_IsValidNick( Req->argv[0] )) cl = Client_Search( Req->argv[0] );
+	if( Channel_IsValidName( Req->argv[0] )) chan = Channel_Search( Req->argv[0] );
+
+	if( cl ) return Client_Mode( Client, Req, origin, cl );
+	if( chan ) return Channel_Mode( Client, Req, origin, chan );
+
+	/* No target found! */
+	return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+} /* IRC_MODE */
+
+
+LOCAL BOOLEAN
+Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
+{
+	/* Handle client mode requests */
+
+	CHAR the_modes[COMMAND_LEN], x[2], *mode_ptr;
+	BOOLEAN ok, set;
+	INT mode_arg;
+
+	/* Is the client allowed to request or change the modes? */
+	if( Client_Type( Client ) == CLIENT_USER )
+	{
+		/* Users are only allowed to manipulate their own modes! */
+		if( Target != Client ) return IRC_WriteStrClient( Client, ERR_USERSDONTMATCH_MSG, Client_ID( Client ));
+	}
+
+	/* Mode request: let's answer it :-) */
+	if( Req->argc == 1 ) return IRC_WriteStrClient( Origin, RPL_UMODEIS_MSG, Client_ID( Origin ), Client_Modes( Target ));
+
+	mode_arg = 1;
+	mode_ptr = Req->argv[mode_arg];
+
+	/* Initial state: set or unset modes? */
+	if( *mode_ptr == '+' ) set = TRUE;
+	else if( *mode_ptr == '-' ) set = FALSE;
+	else return IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Origin ));
+
+	/* Prepare reply string */
+	if( set ) strcpy( the_modes, "+" );
+	else strcpy( the_modes, "-" );
+
+	x[1] = '\0';
+	ok = CONNECTED;
+	while( mode_ptr )
+	{
+		mode_ptr++;
+		if( ! *mode_ptr )
+		{
+			/* Try next argument if there's any */
+			mode_arg++;
+			if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg];
+			else break;
+		}
+		
+		switch( *mode_ptr )
+		{
+			case '+':
+			case '-':
+				if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set )))
+				{
+					/* Action modifier ("+"/"-") must be changed ... */
+					if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' ))
+					{
+						/* Adjust last action modifier in result */
+						the_modes[strlen( the_modes ) - 1] = *mode_ptr;
+					}
+					else
+					{
+						/* Append modifier character to result string */
+						x[0] = *mode_ptr;
+						strlcat( the_modes, x, sizeof( the_modes ));
+					}
+					if( *mode_ptr == '+' ) set = TRUE;
+					else set = FALSE;
+				}
+				continue;
+		}
+		
+		/* Validate modes */
+		x[0] = '\0';
+		switch( *mode_ptr )
+		{
+			case 'a':
+				/* Away */
+				if( Client_Type( Client ) == CLIENT_SERVER )
+				{
+					x[0] = 'a';
+					Client_SetAway( Client, DEFAULT_AWAY_MSG );
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+				break;
+			case 'i':
+				/* Invisible */
+				x[0] = 'i';
+				break;
+			case 'o':
+				/* IRC operator (only unsetable!) */
+				if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER ))
+				{
+					Client_SetOperByMe( Target, FALSE );
+					x[0] = 'o';
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+				break;
+			case 'r':
+				/* Restricted (only setable) */
+				if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r';
+				else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
+				break;
+			case 's':
+				/* Server messages */
+				x[0] = 's';
+				break;
+			default:
+				Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ));
+				if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
+				x[0] = '\0';
+				goto client_exit;
+		}
+		if( ! ok ) break;
+
+		/* Is there a valid mode change? */
+		if( ! x[0] ) continue;
+
+		if( set )
+		{
+			/* Set mode */
+			if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
+
+		}
+		else
+		{
+			/* Unset mode */
+			if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
+		}		
+	}
+client_exit:
+	
+	/* Are there changed modes? */
+	if( the_modes[1] )
+	{
+		/* Remoce needless action modifier characters */
+		if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0';
+
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			/* Forward modes to other servers */
+			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes );
+		}
+		else
+		{
+			/* Send reply to client and inform other servers */
+			ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes );
+			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes );
+		}
+		Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( Target ), Client_Modes( Target ));
+	}
+	
+	IRC_SetPenalty( Client, 1 );	
+	return ok;
+} /* Client_Mode */
+
+
+LOCAL BOOLEAN
+Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
+{
+	/* Handle channel and channel-user modes */
+
+	CHAR the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
+	BOOLEAN ok, set, modeok, skiponce;
+	INT mode_arg, arg_arg;
+	CLIENT *client;
+	LONG l;
+
+	/* Mode request: let's answer it :-) */
+	if( Req->argc == 1 )
+	{
+		/* Member or not? -- That's the question! */
+		if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), Channel_Modes( Channel ));
+
+		/* The sender is a member: generate extended reply */
+		strlcpy( the_modes, Channel_Modes( Channel ), sizeof( the_modes ));
+		mode_ptr = the_modes;
+		strcpy( the_args, "" );
+		while( *mode_ptr )
+		{
+			switch( *mode_ptr )
+			{
+				case 'l':
+					snprintf( argadd, sizeof( argadd ), " %ld", Channel_MaxUsers( Channel ));
+					strlcat( the_args, argadd, sizeof( the_args ));
+					break;
+				case 'k':
+					strlcat( the_args, " ", sizeof( the_args ));
+					strlcat( the_args, Channel_Key( Channel ), sizeof( the_args ));
+					break;
+			}
+			mode_ptr++;
+		}
+		if( the_args[0] ) strlcat( the_modes, the_args, sizeof( the_modes ));
+
+		return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), the_modes );
+	}
+
+	/* Is the user allowed to change modes? */
+	if( Client_Type( Client ) == CLIENT_USER )
+	{
+		/* Is the originating user on that channel? */
+		if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+
+		/* Is he channel operator? */
+		if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = TRUE;
+		else modeok = FALSE;
+		if( Conf_OperCanMode )
+		{
+			/* auch IRC-Operatoren duerfen MODE verwenden */
+			if( Client_OperByMe( Origin )) modeok = TRUE;
+		}
+	}
+	else modeok = TRUE;
+
+	mode_arg = 1;
+	mode_ptr = Req->argv[mode_arg];
+	if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1;
+	else arg_arg = -1;
+
+	/* Initial state: set or unset modes? */
+	skiponce = FALSE;
+	if( *mode_ptr == '-' ) set = FALSE;
+	else if( *mode_ptr == '+' ) set = TRUE;
+	else set = skiponce = TRUE;
+
+	/* Prepare reply string */
+	if( set ) strcpy( the_modes, "+" );
+	else strcpy( the_modes, "-" );
+	strcpy( the_args, " " );
+
+	x[1] = '\0';
+	ok = CONNECTED;
+	while( mode_ptr )
+	{
+		if( ! skiponce ) mode_ptr++;
+		if( ! *mode_ptr )
+		{
+			/* Try next argument if there's any */
+			if( arg_arg > mode_arg ) mode_arg = arg_arg;
+			else mode_arg++;
+			if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg];
+			else break;
+			if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1;
+			else arg_arg = -1;
+		}
+		skiponce = FALSE;
+
+		switch( *mode_ptr )
+		{
+			case '+':
+			case '-':
+				if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set )))
+				{
+					/* Action modifier ("+"/"-") must be changed ... */
+					if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' ))
+					{
+						/* Adjust last action modifier in result */
+						the_modes[strlen( the_modes ) - 1] = *mode_ptr;
+					}
+					else
+					{
+						/* Append modifier character to result string */
+						x[0] = *mode_ptr;
+						strlcat( the_modes, x, sizeof( the_modes ));
+					}
+					if( *mode_ptr == '+' ) set = TRUE;
+					else set = FALSE;
+				}
+				continue;
+		}
+
+		/* Are there arguments left? */
+		if( arg_arg >= Req->argc ) arg_arg = -1;
+
+		/* Validate modes */
+		x[0] = '\0';
+		argadd[0] = '\0';
+		client = NULL;
+		switch( *mode_ptr )
+		{
+			/* Channel modes */
+			case 'i':
+				/* Invite-Only */
+				if( modeok ) x[0] = 'i';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 'm':
+				/* Moderated */
+				if( modeok ) x[0] = 'm';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 'n':
+				/* kein Schreiben in den Channel von aussen */
+				if( modeok ) x[0] = 'n';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 't':
+				/* Topic Lock */
+				if( modeok ) x[0] = 't';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 'P':
+				/* Persistent channel */
+				if( modeok )
+				{
+					if( set && ( ! Client_OperByMe( Client )))
+					{
+						/* Only IRC operators are allowed to set P mode */
+						ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+					}
+					else x[0] = 'P';
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+
+			/* Channel user modes */
+			case 'o':
+				/* Channel operator */
+			case 'v':
+				/* Voice */
+				if( arg_arg > mode_arg )
+				{
+					if( modeok )
+					{
+						client = Client_Search( Req->argv[arg_arg] );
+						if( client ) x[0] = *mode_ptr;
+						else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] );
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+				break;
+			case 'k':
+				/* Channel key */
+				if( ! set )
+				{
+					if( modeok ) x[0] = *mode_ptr;
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					break;
+				}
+				if( arg_arg > mode_arg )
+				{
+					if( modeok )
+					{
+						Channel_ModeDel( Channel, 'k' );
+						Channel_SetKey( Channel, Req->argv[arg_arg] );
+						strlcpy( argadd, Channel_Key( Channel ), sizeof( argadd ));
+						x[0] = *mode_ptr;
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+				break;
+			case 'l':
+				/* Member limit */
+				if( ! set )
+				{
+					if( modeok ) x[0] = *mode_ptr;
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					break;
+				}
+				if( arg_arg > mode_arg )
+				{
+					if( modeok )
+					{
+						l = atol( Req->argv[arg_arg] );
+						if( l > 0 && l < 0xFFFF )
+						{
+							Channel_ModeDel( Channel, 'l' );
+							Channel_SetMaxUsers( Channel, l );
+							snprintf( argadd, sizeof( argadd ), "%ld", l );
+							x[0] = *mode_ptr;
+						}
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+				break;
+
+			/* Channel lists */
+			case 'I':
+				/* Invite lists */
+				if( arg_arg > mode_arg )
+				{
+					/* modify list */
+					if( modeok )
+					{
+						if( set ) Add_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
+						else Del_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else Lists_ShowInvites( Origin, Channel );
+				break;
+			case 'b':
+				/* Ban lists */
+				if( arg_arg > mode_arg )
+				{
+					/* modify list */
+					if( modeok )
+					{
+						if( set ) Add_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
+						else Del_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else Lists_ShowBans( Origin, Channel );
+				break;
+
+			default:
+				Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel ));
+				if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
+				x[0] = '\0';
+				goto chan_exit;
+		}
+		if( ! ok ) break;
+
+		/* Is there a valid mode change? */
+		if( ! x[0] ) continue;
+
+		/* Validate target client */
+		if( client && ( ! Channel_IsMemberOf( Channel, client )))
+		{
+			if( ! IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( client ), Channel_Name( Channel ))) break;
+			continue;
+		}
+
+		if( set )
+		{
+			/* Set mode */
+			if( client )
+			{
+				/* Channel-User-Mode */
+				if( Channel_UserModeAdd( Channel, client, x[0] ))
+				{
+					strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+					strlcat( the_args, " ", sizeof( the_args ));
+					strlcat( the_modes, x, sizeof( the_modes ));
+					Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
+				}
+			}
+			else
+			{
+				/* Channel-Mode */
+				if( Channel_ModeAdd( Channel, x[0] ))
+				{
+					strlcat( the_modes, x, sizeof( the_modes ));
+					Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
+				}
+			}
+		}
+		else
+		{
+			/* Unset mode */
+			if( client )
+			{
+				/* Channel-User-Mode */
+				if( Channel_UserModeDel( Channel, client, x[0] ))
+				{
+					strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+					strlcat( the_args, " ", sizeof( the_args ));
+					strlcat( the_modes, x, sizeof( the_modes ));
+					Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
+				}
+			}
+			else
+			{
+				/* Channel-Mode */
+				if( Channel_ModeDel( Channel, x[0] ))
+				{
+					strlcat( the_modes, x, sizeof( the_modes ));
+					Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
+				}
+			}
+		}
+
+		/* Are there additional arguments to add? */
+		if( argadd[0] )
+		{
+			if( the_args[strlen( the_args ) - 1] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
+			strlcat( the_args, argadd, sizeof( the_args ));
+		}
+	}
+chan_exit:
+
+	/* Are there changed modes? */
+	if( the_modes[1] )
+	{
+		/* Clean up mode string */
+		if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0';
+
+		/* Clean up argument string if there are none */
+		if( ! the_args[1] ) the_args[0] = '\0';
+
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			/* Forward mode changes to channel users and other servers */
+			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+			IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+		}
+		else
+		{
+			/* Send reply to client and inform other servers and channel users */
+			ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+			IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+		}
+	}
+
+	IRC_SetPenalty( Client, 1 );
+	return CONNECTED;
+} /* Channel_Mode */
+
+
+GLOBAL BOOLEAN
+IRC_AWAY( CLIENT *Client, REQUEST *Req )
+{
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	if(( Req->argc == 1 ) && (Req->argv[0][0] ))
+	{
+		/* AWAY setzen */
+		Client_SetAway( Client, Req->argv[0] );
+		Client_ModeAdd( Client, 'a' );
+		IRC_WriteStrServersPrefix( Client, Client, "MODE %s :+a", Client_ID( Client ));
+		return IRC_WriteStrClient( Client, RPL_NOWAWAY_MSG, Client_ID( Client ));
+	}
+	else
+	{
+		/* AWAY loeschen */
+		Client_ModeDel( Client, 'a' );
+		IRC_WriteStrServersPrefix( Client, Client, "MODE %s :-a", Client_ID( Client ));
+		return IRC_WriteStrClient( Client, RPL_UNAWAY_MSG, Client_ID( Client ));
+	}
+} /* IRC_AWAY */
+
+
+LOCAL BOOLEAN
+Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+	BOOLEAN already;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+
+	already = Lists_IsInviteEntry( mask, Channel );
+	
+	if( ! Lists_AddInvited( mask, Channel, FALSE )) return CONNECTED;
+	
+	if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+
+	return Send_ListChange( "+I", Prefix, Client, Channel, mask );
+} /* Add_Invite */
+
+
+LOCAL BOOLEAN
+Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+	BOOLEAN already;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+
+	already = Lists_IsBanEntry( mask, Channel );
+
+	if( ! Lists_AddBanned( mask, Channel )) return CONNECTED;
+
+	if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+
+	return Send_ListChange( "+b", Prefix, Client, Channel, mask );
+} /* Add_Ban */
+
+
+LOCAL BOOLEAN
+Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+	Lists_DelInvited( mask, Channel );
+	return Send_ListChange( "-I", Prefix, Client, Channel, mask );
+} /* Del_Invite */
+
+
+LOCAL BOOLEAN
+Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+	Lists_DelBanned( mask, Channel );
+	return Send_ListChange( "-b", Prefix, Client, Channel, mask );
+} /* Del_Ban */
+
+
+LOCAL BOOLEAN
+Send_ListChange( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask )
+{
+	/* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */
+
+	BOOLEAN ok;
+
+	if( Client_Type( Client ) == CLIENT_USER )
+	{
+		/* Bestaetigung an Client */
+		ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
+	}
+	else ok = TRUE;
+
+	/* an andere Server */
+	IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
+
+	/* und lokale User im Channel */
+	IRC_WriteStrChannelPrefix( Client, Channel, Prefix, FALSE, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
+	
+	return ok;
+} /* Send_ListChange */
+
+
+/* -eof- */

src/ngircd/irc-mode.h

@@ -0,0 +1,28 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-mode.h,v 1.5 2002/12/12 12:23:43 alex Exp $
+ *
+ * IRC commands for mode changes (header)
+ */
+
+
+#ifndef __irc_mode_h__
+#define __irc_mode_h__
+
+
+GLOBAL BOOLEAN IRC_MODE PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_AWAY PARAMS((CLIENT *Client, REQUEST *Req ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-op.c

@@ -0,0 +1,126 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Channel operator commands
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-op.c,v 1.13 2004/04/09 21:41:52 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "defines.h"
+#include "irc-write.h"
+#include "lists.h"
+#include "log.h"
+#include "messages.h"
+#include "parse.h"
+
+#include "exp.h"
+#include "irc-op.h"
+
+
+GLOBAL BOOLEAN
+IRC_KICK( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *from;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	
+	/* Ziel-User suchen */
+	target = Client_Search( Req->argv[1] );
+	if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[1] );
+
+	Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from ));
+	return CONNECTED;
+} /* IRC_KICK */	
+
+
+GLOBAL BOOLEAN
+IRC_INVITE( CLIENT *Client, REQUEST *Req )
+{
+	CHANNEL *chan;
+	CLIENT *target, *from;
+	BOOLEAN remember = FALSE;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Wrong number of parameters? */
+	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	
+	/* Search user */
+	target = Client_Search( Req->argv[0] );
+	if(( ! target ) || ( Client_Type( target ) != CLIENT_USER )) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+
+	chan = Channel_Search( Req->argv[1] );
+
+	if( chan )
+	{
+		/* Channel exists. Is the user a valid member of the channel? */
+		if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] );
+
+		/* Is the channel "invite-only"? */
+		if( strchr( Channel_Modes( chan ), 'i' ))
+		{
+			/* Yes. The user must be channel operator! */
+			if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
+			remember = TRUE;
+		}
+
+		/* Is the target user already member of the channel? */
+		if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] );
+
+		/* If the target user is banned on that channel: remember invite */
+		if( Lists_CheckBanned( target, chan )) remember = TRUE;
+
+		if( remember )
+		{
+			/* We must memember this invite */
+			if( ! Lists_AddInvited( Client_Mask( target ), chan, TRUE )) return CONNECTED;
+		}
+	}
+
+	Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
+	
+	/* Inform target client */
+	IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] );
+
+	if( Client_Conn( target ) > NONE )
+	{
+		/* The target user is local, so we have to send the status code */
+		if( ! IRC_WriteStrClientPrefix( from, target, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED;
+	}
+	
+	return CONNECTED;
+} /* IRC_INVITE */
+
+
+/* -eof- */

src/ngircd/irc-op.h

@@ -0,0 +1,28 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-op.h,v 1.3 2002/12/12 12:23:43 alex Exp $
+ *
+ * Channel operator commands (header)
+ */
+
+
+#ifndef __irc_op_h__
+#define __irc_op_h__
+
+
+GLOBAL BOOLEAN IRC_KICK PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_INVITE PARAMS(( CLIENT *Client, REQUEST *Req ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-oper.c

@@ -0,0 +1,207 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * IRC operator commands
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-oper.c,v 1.17 2002/12/31 16:10:55 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ngircd.h"
+#include "resolve.h"
+#include "conn.h"
+#include "conf.h"
+#include "client.h"
+#include "channel.h"
+#include "irc-write.h"
+#include "log.h"
+#include "messages.h"
+#include "parse.h"
+
+#include <exp.h>
+#include "irc-oper.h"
+
+
+GLOBAL BOOLEAN
+IRC_OPER( CLIENT *Client, REQUEST *Req )
+{
+	INT i;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Operator suchen */
+	for( i = 0; i < Conf_Oper_Count; i++)
+	{
+		if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break;
+	}
+	if( i >= Conf_Oper_Count )
+	{
+		Log( LOG_WARNING, "Got invalid OPER from \"%s\": Name \"%s\" not configured!", Client_Mask( Client ), Req->argv[0] );
+		return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+	}
+
+	/* Stimmt das Passwort? */
+	if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )
+	{
+		Log( LOG_WARNING, "Got invalid OPER from \"%s\": Bad password for \"%s\"!", Client_Mask( Client ), Conf_Oper[i].name );
+		return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+	}
+
+	if( ! Client_HasMode( Client, 'o' ))
+	{
+		/* noch kein o-Mode gesetzt */
+		Client_ModeAdd( Client, 'o' );
+		if( ! IRC_WriteStrClient( Client, "MODE %s :+o", Client_ID( Client ))) return DISCONNECTED;
+		IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client ));
+	}
+
+	if( ! Client_OperByMe( Client )) Log( LOG_NOTICE|LOG_snotice, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client ));
+
+	Client_SetOperByMe( Client, TRUE );
+	return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client ));
+} /* IRC_OPER */
+
+
+GLOBAL BOOLEAN
+IRC_DIE( CLIENT *Client, REQUEST *Req )
+{
+	/* Shut down server */
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Not a local IRC operator? */
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+	
+	/* Bad number of parameters? */
+	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\" ...", Client_Mask( Client ));
+	NGIRCd_SignalQuit = TRUE;
+	return CONNECTED;
+} /* IRC_DIE */
+
+
+GLOBAL BOOLEAN
+IRC_REHASH( CLIENT *Client, REQUEST *Req )
+{
+	/* Reload configuration file */
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Not a local IRC operator? */
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+
+	/* Bad number of parameters? */
+	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client ));
+	NGIRCd_SignalRehash = TRUE;
+	
+	return CONNECTED;
+} /* IRC_REHASH */
+
+
+GLOBAL BOOLEAN
+IRC_RESTART( CLIENT *Client, REQUEST *Req )
+{
+	/* Restart IRC server (fork a new process) */
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Not a local IRC operator? */
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+
+	/* Bad number of parameters? */
+	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask( Client ));
+	NGIRCd_SignalRestart = TRUE;
+	return CONNECTED;
+} /* IRC_RESTART */
+
+
+GLOBAL BOOLEAN
+IRC_CONNECT(CLIENT *Client, REQUEST *Req )
+{
+	/* Connect configured or new server */
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Not a local IRC operator? */
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+
+	/* Bad number of parameters? */
+	if(( Req->argc != 2 ) && ( Req->argc != 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	/* Invalid port number? */
+	if( atoi( Req->argv[1] ) < 1 )  return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	Log( LOG_NOTICE|LOG_snotice, "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask( Client ), Req->argv[0]);
+
+	if( Req->argc == 2 )
+	{
+		/* Connect configured server */
+		if( ! Conf_EnableServer( Req->argv[0], atoi( Req->argv[1] ))) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+	}
+	else
+	{
+		/* Add server */
+		if( ! Conf_AddServer( Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], Req->argv[4] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+	}
+	return CONNECTED;
+} /* IRC_CONNECT */
+
+
+GLOBAL BOOLEAN
+IRC_DISCONNECT(CLIENT *Client, REQUEST *Req )
+{
+	/* Disconnect and disable configured server */
+
+	CONN_ID my_conn;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Not a local IRC operator? */
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+
+	/* Bad number of parameters? */
+	if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	Log( LOG_NOTICE|LOG_snotice, "Got DISCONNECT command from \"%s\" for0 \"%s\".", Client_Mask( Client ), Req->argv[0]);
+
+	/* Save ID of this connection */
+	my_conn = Client_Conn( Client );
+
+	/* Connect configured server */
+	if( ! Conf_DisableServer( Req->argv[0] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+	/* Are we still connected or were we killed, too? */
+	if( Client_GetFromConn( my_conn )) return CONNECTED;
+	else return DISCONNECTED;
+} /* IRC_CONNECT */
+
+
+/* -eof- */

src/ngircd/irc-oper.h

@@ -0,0 +1,32 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-oper.h,v 1.10 2002/12/31 16:11:06 alex Exp $
+ *
+ * IRC operator commands (header)
+ */
+
+
+#ifndef __irc_oper_h__
+#define __irc_oper_h__
+
+
+GLOBAL BOOLEAN IRC_OPER PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_DIE PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_REHASH PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_RESTART PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_CONNECT PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_DISCONNECT PARAMS((CLIENT *Client, REQUEST *Req ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-server.c

@@ -0,0 +1,427 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * IRC commands for server links
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-server.c,v 1.36.2.1 2004/05/15 23:52:17 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include "defines.h"
+#include "resolve.h"
+#include "conn.h"
+#include "conn-zip.h"
+#include "conf.h"
+#include "client.h"
+#include "channel.h"
+#include "irc-write.h"
+#include "lists.h"
+#include "log.h"
+#include "messages.h"
+#include "parse.h"
+#include "ngircd.h"
+
+#include "exp.h"
+#include "irc-server.h"
+
+
+GLOBAL BOOLEAN
+IRC_SERVER( CLIENT *Client, REQUEST *Req )
+{
+	CHAR str[LINE_LEN], *ptr, *modes, *topic;
+	CLIENT *from, *c, *cl;
+	CL2CHAN *cl2chan;
+	INT max_hops, i;
+	CHANNEL *chan;
+	BOOLEAN ok;
+	CONN_ID con;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Fehler liefern, wenn kein lokaler Client */
+	if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command );
+
+	if( Client_Type( Client ) == CLIENT_GOTPASSSERVER )
+	{
+		/* Verbindung soll als Server-Server-Verbindung registriert werden */
+		Log( LOG_DEBUG, "Connection %d: got SERVER command (new server link) ...", Client_Conn( Client ));
+
+		/* Falsche Anzahl Parameter? */
+		if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		/* Ist dieser Server bei uns konfiguriert? */
+		for( i = 0; i < MAX_SERVERS; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
+		if( i >= MAX_SERVERS )
+		{
+			/* Server ist nicht konfiguriert! */
+			Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
+			Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", TRUE );
+			return DISCONNECTED;
+		}
+		if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 )
+		{
+			/* Falsches Passwort */
+			Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
+			Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
+			return DISCONNECTED;
+		}
+		
+		/* Ist ein Server mit dieser ID bereits registriert? */
+		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
+
+		/* Server-Strukturen fuellen ;-) */
+		Client_SetID( Client, Req->argv[0] );
+		Client_SetHops( Client, 1 );
+		Client_SetInfo( Client, Req->argv[Req->argc - 1] );
+
+		/* Meldet sich der Server bei uns an (d.h., bauen nicht wir
+		 * selber die Verbindung zu einem anderen Server auf)? */
+		con = Client_Conn( Client );
+		if( Client_Token( Client ) != TOKEN_OUTBOUND )
+		{
+			/* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */
+			ok = TRUE;
+			if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd_out, NGIRCd_ProtoID )) ok = FALSE;
+			else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
+			if( ! ok )
+			{
+				Conn_Close( con, "Unexpected server behavior!", NULL, FALSE );
+				return DISCONNECTED;
+			}
+			Client_SetIntroducer( Client, Client );
+			Client_SetToken( Client, 1 );
+		}
+		else
+		{
+			/* Ausgehende verbindung, SERVER und PASS wurden von uns bereits
+			 * an die Gegenseite uerbermittelt */
+			Client_SetToken( Client, atoi( Req->argv[1] ));
+		}
+
+		Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), con );
+
+		Client_SetType( Client, CLIENT_SERVER );
+		Conf_SetServer( i, con );
+
+#ifdef ZLIB
+		/* Kompression initialisieren, wenn erforderlich */
+		if( strchr( Client_Flags( Client ), 'Z' ))
+		{
+			if( ! Zip_InitConn( con ))
+			{
+				/* Fehler! */
+				Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, FALSE );
+				return DISCONNECTED;
+			}
+		}
+#endif
+
+		/* maximalen Hop Count ermitteln */
+		max_hops = 0;
+		c = Client_First( );
+		while( c )
+		{
+			if( Client_Hops( c ) > max_hops ) max_hops = Client_Hops( c );
+			c = Client_Next( c );
+		}
+		
+		/* Alle bisherigen Server dem neuen Server bekannt machen,
+		 * die bisherigen Server ueber den neuen informierenn */
+		for( i = 0; i < ( max_hops + 1 ); i++ )
+		{
+			c = Client_First( );
+			while( c )
+			{
+				if(( Client_Type( c ) == CLIENT_SERVER ) && ( c != Client ) && ( c != Client_ThisServer( )) && ( Client_Hops( c ) == i ))
+				{
+					if( Client_Conn( c ) > NONE )
+					{
+						/* Dem gefundenen Server gleich den neuen
+						 * Server bekannt machen */
+						if( ! IRC_WriteStrClient( c, "SERVER %s %d %d :%s", Client_ID( Client ), Client_Hops( Client ) + 1, Client_MyToken( Client ), Client_Info( Client ))) return DISCONNECTED;
+					}
+					
+					/* Den neuen Server ueber den alten informieren */
+					if( ! IRC_WriteStrClientPrefix( Client, Client_Hops( c ) == 1 ? Client_ThisServer( ) : Client_Introducer( c ), "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ))) return DISCONNECTED;
+				}
+				c = Client_Next( c );
+			}
+		}
+
+		/* alle User dem neuen Server bekannt machen */
+		c = Client_First( );
+		while( c )
+		{
+			if( Client_Type( c ) == CLIENT_USER )
+			{
+				/* User an neuen Server melden */
+				if( ! IRC_WriteStrClient( Client, "NICK %s %d %s %s %d +%s :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_User( c ), Client_Hostname( c ), Client_MyToken( Client_Introducer( c )), Client_Modes( c ), Client_Info( c ))) return DISCONNECTED;
+			}
+			c = Client_Next( c );
+		}
+
+		/* Channels dem neuen Server bekannt machen */
+		chan = Channel_First( );
+		while( chan )
+		{
+#ifdef IRCPLUS
+			/* Send CHANINFO if the peer supports it */
+			if( strchr( Client_Flags( Client ), 'C' ))
+			{
+#ifdef DEBUG
+				Log( LOG_DEBUG, "Sending CHANINFO commands ..." );
+#endif
+				modes = Channel_Modes( chan );
+				topic = Channel_Topic( chan );
+
+				if( *modes || *topic )
+				{
+					/* send CHANINFO */
+					if(( ! strchr( Channel_Modes( chan ), 'k' )) && ( ! strchr( Channel_Modes( chan ), 'l' )) && ( ! *topic ))
+					{
+						/* "CHANINFO <chan> +<modes>" */
+						if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s", Channel_Name( chan ), modes )) return DISCONNECTED;
+					}
+					else if(( ! strchr( Channel_Modes( chan ), 'k' )) && ( ! strchr( Channel_Modes( chan ), 'l' )))
+					{
+						/* "CHANINFO <chan> +<modes> :<topic>" */
+						if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), modes, topic )) return DISCONNECTED;
+					}
+					else
+					{
+						/* "CHANINFO <chan> +<modes> <key> <limit> :<topic>" */
+						if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s %s %ld :%s", Channel_Name( chan ), modes, strchr( Channel_Modes( chan ), 'k' ) ? Channel_Key( chan ) : "*", strchr( Channel_Modes( chan ), 'l' ) ? Channel_MaxUsers( chan ) : 0L, topic )) return DISCONNECTED;
+					}
+				}
+			}
+#endif
+
+			/* alle Member suchen */
+			cl2chan = Channel_FirstMember( chan );
+			snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan ));
+			while( cl2chan )
+			{
+				cl = Channel_GetClient( cl2chan );
+				assert( cl != NULL );
+
+				/* Nick, ggf. mit Modes, anhaengen */
+				if( str[strlen( str ) - 1] != ':' ) strlcat( str, ",", sizeof( str ));
+				if( strchr( Channel_UserModes( chan, cl ), 'v' )) strlcat( str, "+", sizeof( str ));
+				if( strchr( Channel_UserModes( chan, cl ), 'o' )) strlcat( str, "@", sizeof( str ));
+				strlcat( str, Client_ID( cl ), sizeof( str ));
+
+				if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 8 ))
+				{
+					/* Zeile senden */
+					if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+					snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan ));
+				}
+				
+				cl2chan = Channel_NextMember( chan, cl2chan );
+			}
+
+			/* noch Daten da? */
+			if( str[strlen( str ) - 1] != ':')
+			{
+				/* Ja; Also senden ... */
+				if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+			}
+
+#ifdef IRCPLUS
+			if( strchr( Client_Flags( Client ), 'L' ))
+			{
+#ifdef DEBUG
+				Log( LOG_DEBUG, "Synchronizing INVITE- and BAN-lists ..." );
+#endif
+				/* Synchronize INVITE- and BAN-lists */
+				if( ! Lists_SendInvites( Client )) return DISCONNECTED;
+				if( ! Lists_SendBans( Client )) return DISCONNECTED;
+			}
+#endif
+
+			/* naechsten Channel suchen */
+			chan = Channel_Next( chan );
+		}
+		
+		return CONNECTED;
+	}
+	else if( Client_Type( Client ) == CLIENT_SERVER )
+	{
+		/* Neuer Server wird im Netz angekuendigt */
+
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		/* Ist ein Server mit dieser ID bereits registriert? */
+		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
+
+		/* Ueberfluessige Hostnamen aus Info-Text entfernen */
+		ptr = strchr( Req->argv[3] + 2, '[' );
+		if( ! ptr ) ptr = Req->argv[3];
+
+		from = Client_Search( Req->prefix );
+		if( ! from )
+		{
+			/* Hm, Server, der diesen einfuehrt, ist nicht bekannt!? */
+			Log( LOG_ALERT, "Unknown ID in prefix of SERVER: \"%s\"! (on connection %d)", Req->prefix, Client_Conn( Client ));
+			Conn_Close( Client_Conn( Client ), NULL, "Unknown ID in prefix of SERVER", TRUE );
+			return DISCONNECTED;
+		}
+
+		/* Neue Client-Struktur anlegen */
+		c = Client_NewRemoteServer( Client, Req->argv[0], from, atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, TRUE );
+		if( ! c )
+		{
+			/* Neue Client-Struktur konnte nicht angelegt werden */
+			Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client ));
+			Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", TRUE );
+			return DISCONNECTED;
+		}
+
+		/* Log-Meldung zusammenbauen und ausgeben */
+		if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) snprintf( str, sizeof( str ), "connected to %s, ", Client_ID( from ));
+		else strcpy( str, "" );
+		Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
+
+		/* Andere Server informieren */
+		IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ));
+
+		return CONNECTED;
+	}
+	else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+} /* IRC_SERVER */
+
+
+GLOBAL BOOLEAN
+IRC_NJOIN( CLIENT *Client, REQUEST *Req )
+{
+	CHAR nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8];
+	BOOLEAN is_op, is_voiced;
+	CHANNEL *chan;
+	CLIENT *c;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	strlcpy( nick_in, Req->argv[1], sizeof( nick_in ));
+	strcpy( nick_out, "" );
+
+	channame = Req->argv[0];
+	ptr = strtok( nick_in, "," );
+	while( ptr )
+	{
+		is_op = is_voiced = FALSE;
+		
+		/* Prefixe abschneiden */
+		while(( *ptr == '@' ) || ( *ptr == '+' ))
+		{
+			if( *ptr == '@' ) is_op = TRUE;
+			if( *ptr == '+' ) is_voiced = TRUE;
+			ptr++;
+		}
+
+		c = Client_Search( ptr );
+		if( c )
+		{
+			Channel_Join( c, channame );
+			chan = Channel_Search( channame );
+			assert( chan != NULL );
+			
+			if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
+			if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
+
+			/* im Channel bekannt machen */
+			IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame );
+
+			/* Channel-User-Modes setzen */
+			strlcpy( modes, Channel_UserModes( chan, c ), sizeof( modes ));
+			if( modes[0] )
+			{
+				/* Modes im Channel bekannt machen */
+				IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
+			}
+
+			if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out ));
+			if( is_op ) strlcat( nick_out, "@", sizeof( nick_out ));
+			if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out ));
+			strlcat( nick_out, ptr, sizeof( nick_out ));
+		}
+		else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
+		
+		/* naechsten Nick suchen */
+		ptr = strtok( NULL, "," );
+	}
+
+	/* an andere Server weiterleiten */
+	if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out );
+
+	return CONNECTED;
+} /* IRC_NJOIN */
+
+
+GLOBAL BOOLEAN
+IRC_SQUIT( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target;
+	CHAR msg[LINE_LEN + 64];
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	Log( LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID( Client ), Req->argv[0], Req->argv[1] );
+
+	target = Client_Search( Req->argv[0] );
+	if( ! target )
+	{
+		/* Den Server kennen wir nicht (mehr), also nichts zu tun. */
+		Log( LOG_WARNING, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
+		return CONNECTED;
+	}
+
+	if( Req->argv[1][0] )
+	{
+		if( strlen( Req->argv[1] ) > LINE_LEN ) Req->argv[1][LINE_LEN] = '\0';
+		snprintf( msg, sizeof( msg ), "%s (SQUIT from %s).", Req->argv[1], Client_ID( Client ));
+	}
+	else snprintf( msg, sizeof( msg ), "Got SQUIT from %s.", Client_ID( Client ));
+
+	if( Client_Conn( target ) > NONE )
+	{
+		/* dieser Server hat die Connection */
+		if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), msg, Req->argv[1], TRUE );
+		else Conn_Close( Client_Conn( target ), msg, NULL, TRUE );
+		return DISCONNECTED;
+	}
+	else
+	{
+		/* Verbindung hielt anderer Server */
+		Client_Destroy( target, msg, Req->argv[1], FALSE );
+		return CONNECTED;
+	}
+} /* IRC_SQUIT */
+
+
+/* -eof- */

src/ngircd/irc-server.h

@@ -0,0 +1,29 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-server.h,v 1.4 2002/12/12 12:23:43 alex Exp $
+ *
+ * IRC commands for server links (header)
+ */
+
+
+#ifndef __irc_server_h__
+#define __irc_server_h__
+
+
+GLOBAL BOOLEAN IRC_SERVER PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NJOIN PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_SQUIT PARAMS((CLIENT *Client, REQUEST *Req ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc-write.c

@@ -0,0 +1,424 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Sending IRC commands over the network
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: irc-write.c,v 1.15 2003/11/05 23:24:48 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "conn-func.h"
+#include "client.h"
+#include "channel.h"
+#include "defines.h"
+
+#include "exp.h"
+#include "irc-write.h"
+
+
+#define SEND_TO_USER 1
+#define SEND_TO_SERVER 2
+
+
+LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
+
+
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrClient( Client, Format, va_alist )
+CLIENT *Client;
+CHAR *Format;
+va_dcl
+#endif
+{
+	CHAR buffer[1000];
+	BOOLEAN ok = CONNECTED;
+	va_list ap;
+
+	assert( Client != NULL );
+	assert( Format != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	/* an den Client selber */
+	ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), "%s", buffer );
+
+	return ok;
+} /* IRC_WriteStrClient */
+
+
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrClientPrefix( Client, Prefix, Format, va_alist )
+CLIENT *Client;
+CLIENT *Prefix;
+CHAR *Format;
+va_dcl
+#endif
+{
+	/* Text an Clients, lokal bzw. remote, senden. */
+
+	CHAR buffer[1000];
+	va_list ap;
+
+	assert( Client != NULL );
+	assert( Format != NULL );
+	assert( Prefix != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Get_Prefix( Client_NextHop( Client ), Prefix ), buffer );
+} /* IRC_WriteStrClientPrefix */
+
+
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrChannel( Client, Chan, Remote, Format, va_alist )
+CLIENT *Client;
+CHANNEL *Chan;
+BOOLEAN Remote;
+CHAR *Format;
+va_dcl
+#endif
+{
+	CHAR buffer[1000];
+	va_list ap;
+
+	assert( Client != NULL );
+	assert( Format != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, "%s", buffer );
+} /* IRC_WriteStrChannel */
+
+
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrChannelPrefix( Client, Chan, Prefix, Remote, Format, va_alist )
+CLIENT *Client;
+CHANNEL *Chan;
+CLIENT *Prefix;
+BOOLEAN Remote;
+CHAR *Format;
+va_dcl
+#endif
+{
+	BOOLEAN ok = CONNECTED;
+	CHAR buffer[1000];
+	CL2CHAN *cl2chan;
+	CONN_ID conn;
+	CLIENT *c;
+	va_list ap;
+
+	assert( Client != NULL );
+	assert( Chan != NULL );
+	assert( Prefix != NULL );
+	assert( Format != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap  );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	Conn_ClearFlags( );
+
+	/* An alle Clients, die in den selben Channels sind.
+	 * Dabei aber nur einmal je Remote-Server */
+	cl2chan = Channel_FirstMember( Chan );
+	while( cl2chan )
+	{
+		c = Channel_GetClient( cl2chan );
+		if( ! Remote )
+		{
+			if( Client_Conn( c ) <= NONE ) c = NULL;
+			else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL;
+		}
+		if( c ) c = Client_NextHop( c );
+			
+		if( c && ( c != Client ))
+		{
+			/* Ok, anderer Client */
+			conn = Client_Conn( c );
+			if( Client_Type( c ) == CLIENT_SERVER )	Conn_SetFlag( conn, SEND_TO_SERVER );
+			else Conn_SetFlag( conn, SEND_TO_USER );
+		}
+		cl2chan = Channel_NextMember( Chan, cl2chan );
+	}
+
+	/* Senden: alle Verbindungen durchgehen ... */
+	conn = Conn_First( );
+	while( conn != NONE )
+	{
+		/* muessen Daten ueber diese Verbindung verschickt werden? */
+		if( Conn_Flag( conn ) == SEND_TO_SERVER) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer );
+		else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
+		if( ! ok ) break;
+
+		/* naechste Verbindung testen */
+		conn = Conn_Next( conn );
+	}
+
+	return ok;
+} /* IRC_WriteStrChannelPrefix */
+
+
+#ifdef PROTOTYPES
+GLOBAL VOID
+IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... )
+#else
+GLOBAL VOID
+IRC_WriteStrServers( ExceptOf, Format, va_alist )
+CLIENT *ExceptOf;
+CHAR *Format;
+va_dcl
+#endif
+{
+	CHAR buffer[1000];
+	va_list ap;
+
+	assert( Format != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	/* an den Client selber */
+	IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), "%s", buffer );
+} /* IRC_WriteStrServers */
+
+
+#ifdef PROTOTYPES
+GLOBAL VOID
+IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... )
+#else
+GLOBAL VOID
+IRC_WriteStrServersPrefix( ExceptOf, Prefix, Format, va_alist )
+CLIENT *ExceptOf;
+CLIENT *Prefix;
+CHAR *Format;
+va_dcl
+#endif
+{
+	CHAR buffer[1000];
+	va_list ap;
+
+	assert( Format != NULL );
+	assert( Prefix != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', "%s", buffer );
+} /* IRC_WriteStrServersPrefix */
+	
+
+#ifdef PROTOTYPES
+GLOBAL VOID
+IRC_WriteStrServersPrefixFlag( CLIENT *ExceptOf, CLIENT *Prefix, CHAR Flag, CHAR *Format, ... )
+#else
+GLOBAL VOID
+IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, Flag, Format, va_alist )
+CLIENT *ExceptOf;
+CLIENT *Prefix;
+CHAR Flag;
+CHAR *Format;
+va_dcl
+#endif
+{
+	CHAR buffer[1000];
+	CLIENT *c;
+	va_list ap;
+	
+	assert( Format != NULL );
+	assert( Prefix != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+	
+	c = Client_First( );
+	while( c )
+	{
+		if(( Client_Type( c ) == CLIENT_SERVER ) && ( Client_Conn( c ) > NONE ) && ( c != Client_ThisServer( )) && ( c != ExceptOf ))
+		{
+			/* Ziel-Server gefunden. Nun noch pruefen, ob Flags stimmen */
+			if(( Flag == '\0' ) || ( strchr( Client_Flags( c ), Flag ) != NULL )) IRC_WriteStrClientPrefix( c, Prefix, "%s", buffer );
+		}
+		c = Client_Next( c );
+	}
+} /* IRC_WriteStrServersPrefixFlag */
+
+
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrRelatedPrefix( Client, Prefix, Remote, Format, va_alist )
+CLIENT *Client;
+CLIENT *Prefix;
+BOOLEAN Remote;
+CHAR *Format;
+va_dcl
+#endif
+{
+	BOOLEAN ok = CONNECTED;
+	CL2CHAN *chan_cl2chan, *cl2chan;
+	CHAR buffer[1000];
+	CHANNEL *chan;
+	CONN_ID conn;
+	va_list ap;
+	CLIENT *c;
+
+	assert( Client != NULL );
+	assert( Prefix != NULL );
+	assert( Format != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	/* initialisieren */
+	Conn_ClearFlags( );
+
+	/* An alle Clients, die in einem Channel mit dem "Ausloeser" sind,
+	 * den Text schicken. An Remote-Server aber jeweils nur einmal. */
+	chan_cl2chan = Channel_FirstChannelOf( Client );
+	while( chan_cl2chan )
+	{
+		/* Channel des Users durchsuchen */
+		chan = Channel_GetChannel( chan_cl2chan );
+		cl2chan = Channel_FirstMember( chan );
+		while( cl2chan )
+		{
+			c = Channel_GetClient( cl2chan );
+			if( ! Remote )
+			{
+				if( Client_Conn( c ) <= NONE ) c = NULL;
+				else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL;
+			}
+			if( c ) c = Client_NextHop( c );
+
+			if( c && ( c != Client ))
+			{
+				/* Ok, anderer Client */
+				conn = Client_Conn( c );
+				if( Client_Type( c ) == CLIENT_SERVER ) Conn_SetFlag( conn, SEND_TO_SERVER );
+				else Conn_SetFlag( conn, SEND_TO_USER );
+			}
+			cl2chan = Channel_NextMember( chan, cl2chan );
+		}
+		
+		/* naechsten Channel */
+		chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan );
+	}
+
+	/* Senden: alle Verbindungen durchgehen ... */
+	conn = Conn_First( );
+	while( conn != NONE )
+	{
+		/* muessen ueber diese Verbindung Daten gesendet werden? */
+		if( Conn_Flag( conn ) == SEND_TO_SERVER ) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer );
+		else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
+		if( ! ok ) break;
+
+		/* naechste Verbindung testen */
+		conn = Conn_Next( conn );
+	}
+	return ok;
+} /* IRC_WriteStrRelatedPrefix */
+
+
+GLOBAL VOID
+IRC_SetPenalty( CLIENT *Client, INT Seconds )
+{
+	CONN_ID c;
+	
+	assert( Client != NULL );
+	assert( Seconds > 0 );
+	
+	if( Client_Type( Client ) == CLIENT_SERVER ) return;
+	
+	c = Client_Conn( Client );
+	if( c > NONE ) Conn_SetPenalty( c, Seconds );		
+} /* IRC_SetPenalty */
+
+
+LOCAL CHAR *
+Get_Prefix( CLIENT *Target, CLIENT *Client )
+{
+	assert( Target != NULL );
+	assert( Client != NULL );
+
+	if( Client_Type( Target ) == CLIENT_SERVER ) return Client_ID( Client );
+	else return Client_Mask( Client );
+} /* Get_Prefix */
+
+
+/* -eof- */

src/ngircd/irc-write.h

@@ -0,0 +1,39 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: irc-write.h,v 1.6 2003/11/05 23:24:48 alex Exp $
+ *
+ * Sending IRC commands over the network (header)
+ */
+
+
+#ifndef __irc_write_h__
+#define __irc_write_h__
+
+
+GLOBAL BOOLEAN IRC_WriteStrClient PARAMS(( CLIENT *Client, CHAR *Format, ... ));
+GLOBAL BOOLEAN IRC_WriteStrClientPrefix PARAMS(( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... ));
+
+GLOBAL BOOLEAN IRC_WriteStrChannel PARAMS(( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... ));
+GLOBAL BOOLEAN IRC_WriteStrChannelPrefix PARAMS(( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ));
+
+GLOBAL VOID IRC_WriteStrServers PARAMS(( CLIENT *ExceptOf, CHAR *Format, ... ));
+GLOBAL VOID IRC_WriteStrServersPrefix PARAMS(( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... ));
+GLOBAL VOID IRC_WriteStrServersPrefixFlag PARAMS(( CLIENT *ExceptOf, CLIENT *Prefix, CHAR Flag, CHAR *Format, ... ));
+
+GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix PARAMS(( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ));
+
+GLOBAL VOID IRC_SetPenalty PARAMS(( CLIENT *Client, INT Seconds ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/irc.h

@@ -2,141 +2,28 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc.h,v 1.21 2002/01/27 21:53:57 alex Exp $
+ * $Id: irc.h,v 1.38 2003/01/15 13:49:20 alex Exp $
  *
- * irc.h: IRC-Befehle (Header)
- *
- * $Log: irc.h,v $
- * Revision 1.21  2002/01/27 21:53:57  alex
- * - IRC_WriteStrServersPrefixID() und IRC_WriteStrClientPrefixID() wieder entfernt.
- *
- * Revision 1.20  2002/01/27 17:15:49  alex
- * - anderungen an den Funktions-Prototypen von IRC_WriteStrChannel() und
- *   IRC_WriteStrChannelPrefix(),
- * - neue: IRC_WriteStrClientPrefixID() und IRC_WriteStrServersPrefixID().
- *
- * Revision 1.19  2002/01/26 18:43:11  alex
- * - neue Funktionen IRC_WriteStrChannelPrefix() und IRC_WriteStrChannel(),
- *   die IRC_Write_xxx_Related() sind dafuer entfallen.
- * - IRC_PRIVMSG() kann nun auch mit Channels als Ziel umgehen.
- *
- * Revision 1.18  2002/01/21 00:04:13  alex
- * - neue Funktionen IRC_JOIN, IRC_PART, IRC_WriteStrRelatedPrefix und
- *   IRC_WriteStrRelatedChannelPrefix().
- *
- * Revision 1.17  2002/01/11 23:50:55  alex
- * - LINKS implementiert, LUSERS begonnen.
- *
- * Revision 1.16  2002/01/05 19:15:03  alex
- * - Fehlerpruefung bei select() in der "Hauptschleife" korrigiert.
- *
- * Revision 1.15  2002/01/04 17:58:21  alex
- * - IRC_WriteStrXXX()-Funktionen angepasst; neuer Befehl SQUIT.
- *
- * Revision 1.14  2002/01/03 02:26:07  alex
- * - neue Befehle SERVER und NJOIN begonnen.
- *
- * Revision 1.13  2002/01/02 02:51:39  alex
- * - Copyright-Texte angepasst.
- * - neuer Befehl "ERROR".
- *
- * Revision 1.11  2001/12/31 15:33:13  alex
- * - neuer Befehl NAMES, kleinere Bugfixes.
- * - Bug bei PING behoben: war zu restriktiv implementiert :-)
- *
- * Revision 1.10  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.9  2001/12/29 03:09:31  alex
- * - Neue Funktion IRC_MODE() implementiert.
- *
- * Revision 1.8  2001/12/27 19:17:26  alex
- * - neue Befehle PRIVMSG, NOTICE, PING.
- *
- * Revision 1.7  2001/12/27 16:55:41  alex
- * - neu: IRC_WriteStrRelated(), Aenderungen auch in IRC_WriteStrClient().
- *
- * Revision 1.6  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.5  2001/12/26 03:21:46  alex
- * - PING/PONG-Befehle implementiert,
- * - Meldungen ueberarbeitet: enthalten nun (fast) immer den Nick.
- *
- * Revision 1.4  2001/12/25 22:02:42  alex
- * - neuer IRC-Befehl "/QUIT". Verbessertes Logging & Debug-Ausgaben.
- *
- * Revision 1.3  2001/12/25 19:19:30  alex
- * - bessere Fehler-Abfragen, diverse Bugfixes.
- * - Nicks werden nur einmal vergeben :-)
- * - /MOTD wird unterstuetzt.
- *
- * Revision 1.2  2001/12/23 21:57:16  alex
- * - erste IRC-Befehle zu implementieren begonnen.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * IRC commands (header)
  */
 
 
 #ifndef __irc_h__
 #define __irc_h__
 
-#include "parse.h"
-#include "channel.h"
 
-
-GLOBAL VOID IRC_Init( VOID );
-GLOBAL VOID IRC_Exit( VOID );
-
-GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... );
-GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... );
-GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... );
-GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... );
-GLOBAL VOID IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... );
-GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... );
-
-GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_DIE( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_RESTART( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req );
-
-GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req );
-GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req );
+GLOBAL BOOLEAN IRC_ERROR PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_KILL PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NOTICE PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PRIVMSG PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_TRACE PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_HELP PARAMS(( CLIENT *Client, REQUEST *Req ));
 
 
 #endif

src/ngircd/lists.c

@@ -0,0 +1,488 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Management of IRC lists: ban, invite, ...
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: lists.c,v 1.15.2.1 2005/01/26 13:27:01 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+
+#include "defines.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "log.h"
+#include "match.h"
+#include "messages.h"
+#include "irc-write.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include "exp.h"
+#include "lists.h"
+
+
+#define MASK_LEN 2*CLIENT_HOST_LEN
+
+
+typedef struct _C2C
+{
+	struct _C2C *next;
+	CHAR mask[MASK_LEN];
+	CHANNEL *channel;
+	BOOLEAN onlyonce;
+} C2C;
+
+
+LOCAL C2C *My_Invites, *My_Bans;
+
+
+LOCAL C2C *New_C2C PARAMS(( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ));
+
+LOCAL BOOLEAN Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
+LOCAL BOOLEAN Already_Registered PARAMS(( C2C *Cl2Chan, CHAR *Mask, CHANNEL *Chan ));
+
+
+
+GLOBAL VOID
+Lists_Init( VOID )
+{
+	/* Modul initialisieren */
+
+	My_Invites = My_Bans = NULL;
+} /* Lists_Init */
+
+
+GLOBAL VOID
+Lists_Exit( VOID )
+{
+	/* Modul abmelden */
+
+	C2C *c2c, *next;
+
+	/* Invite-Lists freigeben */
+	c2c = My_Invites;
+	while( c2c )
+	{
+		next = c2c->next;
+		free( c2c );
+		c2c = next;
+	}
+
+	/* Ban-Lists freigeben */
+	c2c = My_Bans;
+	while( c2c )
+	{
+		next = c2c->next;
+		free( c2c );
+		c2c = next;
+	}
+} /* Lists_Exit */
+
+
+GLOBAL BOOLEAN
+Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan )
+{
+	return Check_List( &My_Invites, Client, Chan );
+} /* Lists_CheckInvited */
+
+
+GLOBAL BOOLEAN
+Lists_IsInviteEntry( CHAR *Mask, CHANNEL *Chan )
+{
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+	
+	return Already_Registered( My_Invites, Mask, Chan );
+} /* Lists_IsInviteEntry */
+
+
+GLOBAL BOOLEAN
+Lists_AddInvited( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+{
+	C2C *c2c;
+
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+
+	if( Already_Registered( My_Invites, Mask, Chan )) return TRUE;
+	
+	c2c = New_C2C( Mask, Chan, OnlyOnce );
+	if( ! c2c )
+	{
+		Log( LOG_ERR, "Can't add new invite list entry!" );
+		return FALSE;
+	}
+
+	/* verketten */
+	c2c->next = My_Invites;
+	My_Invites = c2c;
+
+	Log( LOG_DEBUG, "Added \"%s\" to invite list for \"%s\".", Mask, Channel_Name( Chan ));
+	return TRUE;
+} /* Lists_AddInvited */
+
+
+GLOBAL VOID
+Lists_DelInvited( CHAR *Mask, CHANNEL *Chan )
+{
+	C2C *c2c, *last, *next;
+
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+
+	last = NULL;
+	c2c = My_Invites;
+	while( c2c )
+	{
+		next = c2c->next;
+		if(( c2c->channel == Chan ) && ( strcasecmp( c2c->mask, Mask ) == 0 ))
+		{
+			/* dieser Eintrag muss geloescht werden */
+			Log( LOG_DEBUG, "Deleted \"%s\" from invite list for \"%s\"." , c2c->mask, Channel_Name( Chan ));
+			if( last ) last->next = next;
+			else My_Invites = next;
+			free( c2c );
+		}
+		else last = c2c;
+		c2c = next;
+	}
+} /* Lists_DelInvited */
+
+
+GLOBAL BOOLEAN
+Lists_ShowInvites( CLIENT *Client, CHANNEL *Channel )
+{
+	C2C *c2c;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+
+	c2c = My_Invites;
+	while( c2c )
+	{
+		if( c2c->channel == Channel )
+		{
+			/* Eintrag fuer Channel gefunden; ausgeben: */
+			if( ! IRC_WriteStrClient( Client, RPL_INVITELIST_MSG, Client_ID( Client ), Channel_Name( Channel ), c2c->mask )) return DISCONNECTED;
+		}
+		c2c = c2c->next;
+	}
+	return IRC_WriteStrClient( Client, RPL_ENDOFINVITELIST_MSG, Client_ID( Client ), Channel_Name( Channel ));
+} /* Lists_ShowInvites */
+
+
+GLOBAL BOOLEAN
+Lists_SendInvites( CLIENT *Client )
+{
+	C2C *c2c;
+	
+	assert( Client != NULL );
+	
+	c2c = My_Invites;
+	while( c2c )
+	{
+		if( ! IRC_WriteStrClient( Client, "MODE %s +I %s", Channel_Name( c2c->channel ), c2c->mask )) return DISCONNECTED;
+		c2c = c2c->next;
+	}
+	return CONNECTED;
+} /* Lists_SendInvites */
+
+
+GLOBAL BOOLEAN
+Lists_SendBans( CLIENT *Client )
+{
+	C2C *c2c;
+	
+	assert( Client != NULL );
+	
+	c2c = My_Bans;
+	while( c2c )
+	{
+		if( ! IRC_WriteStrClient( Client, "MODE %s +b %s", Channel_Name( c2c->channel ), c2c->mask )) return DISCONNECTED;
+		c2c = c2c->next;
+	}
+	return CONNECTED;
+} /* Lists_SendBans */
+
+
+GLOBAL BOOLEAN
+Lists_CheckBanned( CLIENT *Client, CHANNEL *Chan )
+{
+	return Check_List( &My_Bans, Client, Chan );
+} /* Lists_CheckBanned */
+
+
+GLOBAL BOOLEAN
+Lists_IsBanEntry( CHAR *Mask, CHANNEL *Chan )
+{
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+	
+	return Already_Registered( My_Bans, Mask, Chan );
+} /* Lists_IsBanEntry */
+
+
+GLOBAL BOOLEAN
+Lists_AddBanned( CHAR *Mask, CHANNEL *Chan )
+{
+	C2C *c2c;
+
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+
+	if( Already_Registered( My_Bans, Mask, Chan )) return TRUE;
+
+	c2c = New_C2C( Mask, Chan, FALSE );
+	if( ! c2c )
+	{
+		Log( LOG_ERR, "Can't add new ban list entry!" );
+		return FALSE;
+	}
+
+	/* verketten */
+	c2c->next = My_Bans;
+	My_Bans = c2c;
+
+	Log( LOG_DEBUG, "Added \"%s\" to ban list for \"%s\".", Mask, Channel_Name( Chan ));
+	return TRUE;
+} /* Lists_AddBanned */
+
+
+GLOBAL VOID
+Lists_DelBanned( CHAR *Mask, CHANNEL *Chan )
+{
+	C2C *c2c, *last, *next;
+
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+
+	last = NULL;
+	c2c = My_Bans;
+	while( c2c )
+	{
+		next = c2c->next;
+		if(( c2c->channel == Chan ) && ( strcasecmp( c2c->mask, Mask ) == 0 ))
+		{
+			/* dieser Eintrag muss geloescht werden */
+			Log( LOG_DEBUG, "Deleted \"%s\" from ban list for \"%s\"." , c2c->mask, Channel_Name( Chan ));
+			if( last ) last->next = next;
+			else My_Bans = next;
+			free( c2c );
+		}
+		else last = c2c;
+		c2c = next;
+	}
+} /* Lists_DelBanned */
+
+
+GLOBAL BOOLEAN
+Lists_ShowBans( CLIENT *Client, CHANNEL *Channel )
+{
+	C2C *c2c;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+
+	c2c = My_Bans;
+	while( c2c )
+	{
+		if( c2c->channel == Channel )
+		{
+			/* Eintrag fuer Channel gefunden; ausgeben: */
+			if( ! IRC_WriteStrClient( Client, RPL_BANLIST_MSG, Client_ID( Client ), Channel_Name( Channel ), c2c->mask )) return DISCONNECTED;
+		}
+		c2c = c2c->next;
+	}
+	return IRC_WriteStrClient( Client, RPL_ENDOFBANLIST_MSG, Client_ID( Client ), Channel_Name( Channel ));
+} /* Lists_ShowBans */
+
+
+GLOBAL VOID
+Lists_DeleteChannel( CHANNEL *Chan )
+{
+	/* Channel wurde geloescht, Invite- und Ban-Lists aufraeumen */
+
+	C2C *c2c, *last, *next;
+
+	/* Invite-List */
+	last = NULL;
+	c2c = My_Invites;
+	while( c2c )
+	{
+		next = c2c->next;
+		if( c2c->channel == Chan )
+		{
+			/* dieser Eintrag muss geloescht werden */
+			Log( LOG_DEBUG, "Deleted \"%s\" from invite list for \"%s\"." , c2c->mask, Channel_Name( Chan ));
+			if( last ) last->next = next;
+			else My_Invites = next;
+			free( c2c );
+		}
+		else last = c2c;
+		c2c = next;
+	}
+
+	/* Ban-List */
+	last = NULL;
+	c2c = My_Bans;
+	while( c2c )
+	{
+		next = c2c->next;
+		if( c2c->channel == Chan )
+		{
+			/* dieser Eintrag muss geloescht werden */
+			Log( LOG_DEBUG, "Deleted \"%s\" from ban list for \"%s\"." , c2c->mask, Channel_Name( Chan ));
+			if( last ) last->next = next;
+			else My_Bans = next;
+			free( c2c );
+		}
+		else last = c2c;
+		c2c = next;
+	}
+} /* Lists_DeleteChannel */
+
+
+GLOBAL CHAR *
+Lists_MakeMask( CHAR *Pattern )
+{
+	/* This function generats a valid IRC mask of "any" string. This
+	 * mask is only valid until the next call to Lists_MakeMask(),
+	 * because a single global buffer is used. You have to copy the
+	 * generated mask to some sane location yourself! */
+
+	STATIC CHAR TheMask[MASK_LEN];
+	CHAR *excl, *at;
+
+	assert( Pattern != NULL );
+
+	excl = strchr( Pattern, '!' );
+	at = strchr( Pattern, '@' );
+
+	if(( at ) && ( at < excl )) excl = NULL;
+
+	if(( ! at ) && ( ! excl ))
+	{
+		/* Neither "!" nor "@" found: use string as nick name */
+		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 );
+		strlcat( TheMask, "!*@*", sizeof( TheMask ));
+		return TheMask;
+	}
+
+	if(( ! at ) && ( excl ))
+	{
+		/* Domain part is missing */
+		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 3 );
+		strlcat( TheMask, "@*", sizeof( TheMask ));
+		return TheMask;
+	}
+
+	if(( at ) && ( ! excl ))
+	{
+		/* User name is missing */
+		*at = '\0'; at++;
+		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 );
+		strlcat( TheMask, "!*@", sizeof( TheMask ));
+		strlcat( TheMask, at, sizeof( TheMask ));
+		return TheMask;
+	}
+
+	/* All parts (nick, user and domain name) are given */
+	strlcpy( TheMask, Pattern, sizeof( TheMask ));
+	return TheMask;
+} /* Lists_MakeMask */
+
+
+LOCAL C2C *
+New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+{
+	C2C *c2c;
+	
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+
+	/* Speicher fuer Eintrag anfordern */
+	c2c = (C2C *)malloc( sizeof( C2C ));
+	if( ! c2c )
+	{
+		Log( LOG_EMERG, "Can't allocate memory! [New_C2C]" );
+		return NULL;
+	}
+
+	strlcpy( c2c->mask, Mask, sizeof( c2c->mask ));
+	c2c->channel = Chan;
+	c2c->onlyonce = OnlyOnce;
+
+	return c2c;
+} /* New_C2C */
+
+
+LOCAL BOOLEAN
+Check_List( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan )
+{
+	C2C *c2c, *last;
+
+	assert( Cl2Chan != NULL );
+	assert( Client != NULL );
+	assert( Chan != NULL );
+
+	c2c = *Cl2Chan;
+	last = NULL;
+
+	while( c2c )
+	{
+		if( c2c->channel == Chan )
+		{
+			/* Ok, richtiger Channel. Passt die Maske? */
+			if( Match( c2c->mask, Client_Mask( Client )))
+			{
+				/* Treffer! */
+				if( c2c->onlyonce )
+				{
+					/* Eintrag loeschen */
+					Log( LOG_DEBUG, "Deleted \"%s\" from %s list for \"%s\".", c2c->mask, *Cl2Chan == My_Invites ? "invite" : "ban", Channel_Name( Chan ));
+					if( last ) last->next = c2c->next;
+					else *Cl2Chan = c2c->next;
+					free( c2c );
+				}
+				return TRUE;
+			}
+		}
+		last = c2c;
+		c2c = c2c->next;
+	}
+
+	return FALSE;
+} /* Check_List */
+
+
+LOCAL BOOLEAN
+Already_Registered( C2C *List, CHAR *Mask, CHANNEL *Chan )
+{
+	C2C *c2c;
+
+	c2c = List;
+	while( c2c )
+	{
+		if(( c2c->channel == Chan ) && ( strcasecmp( c2c->mask, Mask ) == 0 )) return TRUE;
+		c2c = c2c->next;
+	}
+	return FALSE;
+} /* Already_Registered */
+
+
+/* -eof- */

src/ngircd/lists.h

@@ -0,0 +1,46 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: lists.h,v 1.11 2004/04/25 15:40:19 alex Exp $
+ *
+ * Management of IRC lists: ban, invite, ... (header)
+ */
+
+
+#ifndef __lists_h__
+#define __lists_h__
+
+
+GLOBAL VOID Lists_Init PARAMS(( VOID ));
+GLOBAL VOID Lists_Exit PARAMS(( VOID ));
+
+GLOBAL BOOLEAN Lists_CheckInvited PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+GLOBAL BOOLEAN Lists_AddInvited PARAMS(( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ));
+GLOBAL VOID Lists_DelInvited PARAMS(( CHAR *Mask, CHANNEL *Chan ));
+GLOBAL BOOLEAN Lists_ShowInvites PARAMS(( CLIENT *Client, CHANNEL *Channel ));
+GLOBAL BOOLEAN Lists_SendInvites PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN Lists_IsInviteEntry PARAMS(( CHAR *Mask, CHANNEL *Chan ));
+
+GLOBAL BOOLEAN Lists_CheckBanned PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+GLOBAL BOOLEAN Lists_AddBanned PARAMS(( CHAR *Mask, CHANNEL *Chan ));
+GLOBAL VOID Lists_DelBanned PARAMS(( CHAR *Mask, CHANNEL *Chan ));
+GLOBAL BOOLEAN Lists_ShowBans PARAMS(( CLIENT *Client, CHANNEL *Channel ));
+GLOBAL BOOLEAN Lists_SendBans PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN Lists_IsBanEntry PARAMS(( CHAR *Mask, CHANNEL *Chan ));
+
+GLOBAL VOID Lists_DeleteChannel PARAMS(( CHANNEL *Chan ));
+
+GLOBAL CHAR *Lists_MakeMask PARAMS(( CHAR *Pattern ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/log.c

@@ -2,123 +2,168 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: log.c,v 1.17 2002/01/11 14:45:37 alex Exp $
- *
- * log.c: Logging-Funktionen
- *
- * $Log: log.c,v $
- * Revision 1.17  2002/01/11 14:45:37  alex
- * - Anpassungen an neue Kommandozeilen-Optionen "--debug" und "--nodaemon".
- *
- * Revision 1.16  2002/01/05 15:54:40  alex
- * - syslog() etc. wurde verwendet, auch wenn USE_SYSLOG nicht definiert war.
- *
- * Revision 1.15  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.14  2002/01/01 18:01:43  alex
- * - Architektur und Betriebssystem in Start-Meldung aufgenommen.
- *
- * Revision 1.13  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.12  2001/12/29 20:16:31  alex
- * - Log-Funktionen fuer Resolver-Sub-Prozess implementiert.
- *
- * Revision 1.11  2001/12/29 03:08:49  alex
- * - neue configure-Option "--enable-strict-rfc".
- *
- * Revision 1.10  2001/12/27 01:44:49  alex
- * - die Verwendung von syslog kann nun abgeschaltet werden.
- *
- * Revision 1.9  2001/12/26 03:22:16  alex
- * - string.h wird nun includiert.
- *
- * Revision 1.8  2001/12/25 23:13:00  alex
- * - Versionsstring bei Programmstart verbessert.
- *
- * Revision 1.7  2001/12/25 22:04:26  alex
- * - Aenderungen an den Debug- und Logging-Funktionen.
- *
- * Revision 1.6  2001/12/25 19:20:39  alex
- * - es wird nun die Facility LOG_LOCAL5 zum Loggen verwendet.
- *
- * Revision 1.5  2001/12/15 00:07:56  alex
- * - Log-Level der Start- und Stop-Meldungen angehoben.
- *
- * Revision 1.4  2001/12/13 02:04:16  alex
- * - boesen "Speicherschiesser" in Log() gefixt.
- *
- * Revision 1.3  2001/12/12 23:31:24  alex
- * - Zum Loggen wird nun auch syslog verwendet.
- *
- * Revision 1.2  2001/12/12 17:19:12  alex
- * - in Log-Meldungen wird nun auch der Level der Meldung ausgegeben.
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
+ * Logging functions
  */
 
 
-#define MAX_LOG_MSG_LEN 256
+#include "portab.h"
 
+static char UNUSED id[] = "$Id: log.c,v 1.44.2.4 2005/02/03 09:27:09 alex Exp $";
 
-#include <portab.h>
-#include "global.h"
-
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
 #include <syslog.h>
 #endif
 
-#include "global.h"
 #include "ngircd.h"
+#include "defines.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "irc-write.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "log.h"
 
 
-GLOBAL VOID Log_Init( VOID )
+LOCAL CHAR Error_File[FNAME_LEN];
+LOCAL CHAR Init_Txt[127];
+
+
+LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
+
+
+GLOBAL VOID
+Log_Init( VOID )
 {
-#ifdef USE_SYSLOG
-	openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#ifdef SYSLOG
+	/* Syslog initialisieren */
+	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
+
+	/* Hello World! */
 	Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
+	  
+	/* Informationen uebern den "Operation Mode" */
+	strcpy( Init_Txt, "" );
+#ifdef DEBUG
+	if( NGIRCd_Debug )
+	{
+		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
+		strcat( Init_Txt, "debug-mode" );
+	}
+#endif
+	if( NGIRCd_NoDaemon )
+	{
+		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
+		strcat( Init_Txt, "no-daemon-mode" );
+	}
+	if( NGIRCd_Passive )
+	{
+		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
+		strcat( Init_Txt, "passive-mode" );
+	}
+#ifdef SNIFFER
+	if( NGIRCd_Sniffer )
+	{
+		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
+		strcat( Init_Txt, "network sniffer" );
+	}
+#endif
+	if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
+
+	Error_File[0] = '\0';
 } /* Log_Init */
 
 
-GLOBAL VOID Log_Exit( VOID )
+GLOBAL VOID
+Log_InitErrorfile( VOID )
 {
-	Log( LOG_NOTICE, PACKAGE" done.");
-#ifdef USE_SYSLOG
+	/* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
+	 * landen z.B. alle Ausgaben von assert()-Aufrufen. */
+
+	/* Dateiname zusammen bauen */
+	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( ));
+
+	/* stderr umlenken */
+	fflush( stderr );
+	if( ! freopen( Error_File, "w", stderr ))
+	{
+		Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno ));
+		return;
+	}
+
+	/* Einige Infos in das Error-File schreiben */
+	fputs( ctime( &NGIRCd_Start ), stderr );
+	fprintf( stderr, "%s started.\n", NGIRCd_Version( ));
+	fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
+	fflush( stderr );
+
+	Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
+} /* Log_InitErrfile */
+
+
+GLOBAL VOID
+Log_Exit( VOID )
+{
+	/* Good Bye! */
+	if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
+	else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
+
+	if( Error_File[0] )
+	{
+		/* Error-File (stderr) loeschen */
+		if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
+	}
+
+#ifdef SYSLOG
+	/* syslog abmelden */
 	closelog( );
 #endif
 } /* Log_Exit */
 
 
-GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL VOID
+Log( INT Level, CONST CHAR *Format, ... )
+#else
+GLOBAL VOID
+Log( Level, Format, va_alist )
+INT Level;
+CONST CHAR *Format;
+va_dcl
+#endif
 {
 	/* Eintrag in Logfile(s) schreiben */
 
 	CHAR msg[MAX_LOG_MSG_LEN];
+	BOOLEAN snotice;
 	va_list ap;
 
 	assert( Format != NULL );
 
+	if( Level & LOG_snotice )
+	{
+		/* Notice an User mit "s" Mode */
+		snotice = TRUE;
+		Level &= ~LOG_snotice;
+	}
+	else snotice = FALSE;
+
 #ifdef DEBUG
 	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -126,44 +171,76 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
 #endif
 
 	/* String mit variablen Argumenten zusammenbauen ... */
+#ifdef PROTOTYPES
 	va_start( ap, Format );
-	vsnprintf( msg, MAX_LOG_MSG_LEN - 1, Format, ap );
-	msg[MAX_LOG_MSG_LEN - 1] = '\0';
+#else
+	va_start( ap );
+#endif
+	vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
+	va_end( ap );
 
-	/* ... und ausgeben */
-	if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
-#ifdef USE_SYSLOG
-	syslog( Level, msg );
+	if( NGIRCd_NoDaemon )
+	{
+		/* auf Konsole ausgeben */
+		fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+		fflush( stdout );
+	}
+#ifdef SYSLOG
+	else
+	{
+		/* Syslog */
+		syslog( Level, "%s", msg );
+	}
 #endif
 
-	va_end( ap );
+	if( Level <= LOG_CRIT )
+	{
+		/* Kritische Meldungen in Error-File (stderr) */
+		fprintf( stderr, "%s\n", msg );
+		fflush( stderr );
+	}
+
+	if( snotice )
+	{
+		/* NOTICE an lokale User mit "s"-Mode */
+		Wall_ServerNotice( msg );
+	}
 } /* Log */
 
 
-GLOBAL VOID Log_Init_Resolver( VOID )
+GLOBAL VOID
+Log_Init_Resolver( VOID )
 {
-#ifdef USE_SYSLOG
-	openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#ifdef SYSLOG
+	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
+	Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
 } /* Log_Init_Resolver */
 
 
-GLOBAL VOID Log_Exit_Resolver( VOID )
+GLOBAL VOID
+Log_Exit_Resolver( VOID )
 {
-#ifdef USE_SYSLOG
+	Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+#ifdef SYSLOG
 	closelog( );
 #endif
 } /* Log_Exit_Resolver */
 
 
-GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL VOID
+Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+#else
+GLOBAL VOID
+Log_Resolver( Level, Format, va_alist )
+CONST INT Level;
+CONST CHAR *Format;
+va_dcl
+#endif
 {
 	/* Eintrag des Resolver in Logfile(s) schreiben */
 
-#ifndef USE_SYSLOG
-	return;
-#else
-
 	CHAR msg[MAX_LOG_MSG_LEN];
 	va_list ap;
 
@@ -176,16 +253,43 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 #endif
 
 	/* String mit variablen Argumenten zusammenbauen ... */
+#ifdef PROTOTYPES
 	va_start( ap, Format );
-	vsnprintf( msg, MAX_LOG_MSG_LEN - 1, Format, ap );
-	msg[MAX_LOG_MSG_LEN - 1] = '\0';
-
-	/* ... und ausgeben */
-	syslog( Level, msg );
-
+#else
+	va_start( ap );
+#endif
+	vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
 	va_end( ap );
+
+	/* Output */
+	if( NGIRCd_NoDaemon )
+	{
+		/* Output to console */
+		fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+		fflush( stdout );
+	}
+#ifdef SYSLOG
+	else syslog( Level, "%s", msg );
 #endif
 } /* Log_Resolver */
 
 
+LOCAL VOID
+Wall_ServerNotice( CHAR *Msg )
+{
+	/* Server-Notice an entsprechende User verschicken */
+
+	CLIENT *c;
+
+	assert( Msg != NULL );
+
+	c = Client_First( );
+	while( c )
+	{
+		if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg );
+		c = Client_Next( c );
+	}
+} /* Wall_ServerNotice */
+
+
 /* -eof- */

src/ngircd/log.h

@@ -2,40 +2,15 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: log.h,v 1.7 2002/01/02 02:42:58 alex Exp $
+ * $Id: log.h,v 1.14 2003/12/26 15:55:07 alex Exp $
  *
- * log.h: Logging-Funktionen (Header)
- *
- * $Log: log.h,v $
- * Revision 1.7  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.6  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.5  2001/12/29 20:16:31  alex
- * - Log-Funktionen fuer Resolver-Sub-Prozess implementiert.
- *
- * Revision 1.4  2001/12/27 01:44:49  alex
- * - die Verwendung von syslog kann nun abgeschaltet werden.
- *
- * Revision 1.3  2001/12/12 23:31:24  alex
- * - Zum Loggen wird nun auch syslog verwendet.
- *
- * Revision 1.2  2001/12/12 17:19:29  alex
- * - LOG_ERR heisst nun LOG_ERROR.
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
+ * Logging functions (header)
  */
 
 
@@ -43,7 +18,7 @@
 #define __log_h__
 
 
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
 #	include <syslog.h>
 #else
 #	define LOG_EMERG 0
@@ -57,15 +32,19 @@
 #endif
 
 
-GLOBAL VOID Log_Init( VOID );
-GLOBAL VOID Log_Exit( VOID );
+#define LOG_snotice 1024
 
-GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... );
 
-GLOBAL VOID Log_Init_Resolver( VOID );
-GLOBAL VOID Log_Exit_Resolver( VOID );
+GLOBAL VOID Log_Init PARAMS((VOID ));
+GLOBAL VOID Log_Exit PARAMS((VOID ));
 
-GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... );
+GLOBAL VOID Log_InitErrorfile PARAMS((VOID ));
+GLOBAL VOID Log PARAMS((INT Level, CONST CHAR *Format, ... ));
+
+GLOBAL VOID Log_Init_Resolver PARAMS((VOID ));
+GLOBAL VOID Log_Exit_Resolver PARAMS((VOID ));
+
+GLOBAL VOID Log_Resolver PARAMS((CONST INT Level, CONST CHAR *Format, ... ));
 
 
 #endif

src/ngircd/match.c

@@ -0,0 +1,253 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Wildcard pattern matching
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: match.c,v 1.2 2002/12/12 12:24:18 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <string.h>
+
+#include "exp.h"
+#include "match.h"
+
+
+/*
+ * Die Pattern-Matching-Funkionen [Matche(), Matche_After_Star()] basieren
+ * auf Versionen von J. Kercheval. Die Version 1.1 wurde am 12.03.1991 als
+ * "public domain" freigegeben:
+ * <http://www.snippets.org/snippets/portable/MATCH+C.php3>
+ */
+
+
+LOCAL INT Matche PARAMS(( REGISTER CHAR *p, REGISTER CHAR *t ));
+LOCAL INT Matche_After_Star PARAMS(( REGISTER CHAR *p, REGISTER CHAR *t ));
+
+
+#define MATCH_PATTERN	6	/* bad pattern */
+#define MATCH_LITERAL	5	/* match failure on literal match */
+#define MATCH_RANGE	4	/* match failure on [..] construct */
+#define MATCH_ABORT	3	/* premature end of text string */
+#define MATCH_END	2	/* premature end of pattern string */
+#define MATCH_VALID	1	/* valid match */
+
+
+GLOBAL BOOLEAN
+Match( CHAR *Pattern, CHAR *String )
+{
+	/* Pattern mit String vergleichen */
+	if( Matche( Pattern, String ) == MATCH_VALID ) return TRUE;
+	else return FALSE;
+} /* Match */
+
+
+LOCAL INT
+Matche( REGISTER CHAR *p, REGISTER CHAR *t )
+{
+	REGISTER CHAR range_start, range_end;
+	BOOLEAN invert;
+	BOOLEAN member_match;
+	BOOLEAN loop;
+
+	for( ; *p; p++, t++ )
+	{
+		/* if this is the end of the text then this is the end of the match */
+		if( ! *t )
+		{
+			return ( *p == '*' && *++p == '\0' ) ? MATCH_VALID : MATCH_ABORT;
+		}
+
+		/* determine and react to pattern type */
+		switch( *p )
+		{
+			case '?':	/* single any character match */
+				break;
+
+			case '*':	/* multiple any character match */
+				return Matche_After_Star( p, t );
+
+			case '[':	/* [..] construct, single member/exclusion character match */
+				/* move to beginning of range */
+				p++;
+
+				/* check if this is a member match or exclusion match */
+				invert = FALSE;
+				if( *p == '!' || *p == '^' )
+				{
+					invert = TRUE;
+					p++;
+				}
+
+				/* if closing bracket here or at range start then we have a malformed pattern */
+				if ( *p == ']' ) return MATCH_PATTERN;
+
+				member_match = FALSE;
+				loop = TRUE;
+
+				while( loop )
+				{
+					/* if end of construct then loop is done */
+					if( *p == ']' )
+					{
+						loop = FALSE;
+						continue;
+					}
+
+					/* matching a '!', '^', '-', '\' or a ']' */
+					if( *p == '\\' ) range_start = range_end = *++p;
+					else  range_start = range_end = *p;
+
+					/* if end of pattern then bad pattern (Missing ']') */
+					if( ! *p ) return MATCH_PATTERN;
+
+					/* check for range bar */
+					if( *++p == '-' )
+					{
+						/* get the range end */
+						range_end = *++p;
+
+						/* if end of pattern or construct then bad pattern */
+						if( range_end == '\0' || range_end == ']' ) return MATCH_PATTERN;
+
+						/* special character range end */
+						if( range_end == '\\' )
+						{
+							range_end = *++p;
+
+							/* if end of text then we have a bad pattern */
+							if ( ! range_end ) return MATCH_PATTERN;
+						}
+
+						/* move just beyond this range */
+						p++;
+					}
+
+					/* if the text character is in range then match found. make sure the range
+					 * letters have the proper relationship to one another before comparison */
+					if( range_start < range_end )
+					{
+						if( *t >= range_start && *t <= range_end )
+						{
+							member_match = TRUE;
+							loop = FALSE;
+						}
+					}
+					else
+					{
+						if( *t >= range_end && *t <= range_start )
+						{
+							member_match = TRUE;
+							loop = FALSE;
+						}
+					}
+				}
+
+				/* if there was a match in an exclusion set then no match */
+				/* if there was no match in a member set then no match */
+				if(( invert && member_match ) || ! ( invert || member_match )) return MATCH_RANGE;
+
+				/* if this is not an exclusion then skip the rest of the [...]
+				 * construct that already matched. */
+				if( member_match )
+				{
+					while( *p != ']' )
+					{
+						/* bad pattern (Missing ']') */
+						if( ! *p ) return MATCH_PATTERN;
+
+						/* skip exact match */
+						if( *p == '\\' )
+						{
+							p++;
+
+							/* if end of text then we have a bad pattern */
+							if( ! *p ) return MATCH_PATTERN;
+						}
+
+						/* move to next pattern char */
+						p++;
+					}
+				}
+				break;
+			case '\\':	/* next character is quoted and must match exactly */
+				/* move pattern pointer to quoted char and fall through */
+				p++;
+
+				/* if end of text then we have a bad pattern */
+				if( ! *p ) return MATCH_PATTERN;
+
+				/* must match this character exactly */
+			default:
+				if( *p != *t ) return MATCH_LITERAL;
+		}
+	}
+	/* if end of text not reached then the pattern fails */
+
+	if( *t ) return MATCH_END;
+	else return MATCH_VALID;
+} /* Matche */
+
+
+LOCAL INT
+Matche_After_Star( REGISTER CHAR *p, REGISTER CHAR *t )
+{
+	REGISTER INT nextp, match = 0;
+
+	/* pass over existing ? and * in pattern */
+	while( *p == '?' || *p == '*' )
+	{
+		/* take one char for each ? and + */
+		if (*p == '?')
+		{
+			/* if end of text then no match */
+			if( ! *t++ ) return MATCH_ABORT;
+		}
+
+		/* move to next char in pattern */
+		p++;
+	}
+
+	/* if end of pattern we have matched regardless of text left */
+	if( ! *p ) return MATCH_VALID;
+
+	/* get the next character to match which must be a literal or '[' */
+	nextp = *p;
+	if( nextp == '\\' )
+	{
+		nextp = p[1];
+
+		/* if end of text then we have a bad pattern */
+		if( ! nextp ) return MATCH_PATTERN;
+	}
+
+	/* Continue until we run out of text or definite result seen */
+	do
+	{
+		/* a precondition for matching is that the next character
+		 * in the pattern match the next character in the text or that
+		 * the next pattern char is the beginning of a range.  Increment
+		 * text pointer as we go here */
+		if( nextp == *t || nextp == '[' ) match = Matche( p, t );
+
+		/* if the end of text is reached then no match */
+		if( ! *t++ ) match = MATCH_ABORT;
+	} while( match != MATCH_VALID && match != MATCH_ABORT && match != MATCH_PATTERN );
+
+	/* return result */
+	return match;
+} /* Matche_After_Star */
+
+
+/* -eof- */

src/ngircd/match.h

@@ -0,0 +1,27 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: match.h,v 1.2 2002/12/12 12:23:43 alex Exp $
+ *
+ * Wildcard pattern matching (header)
+ */
+
+
+#ifndef __match_h__
+#define __match_h__
+
+
+GLOBAL BOOLEAN Match PARAMS(( CHAR *Pattern, CHAR *String ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/messages.h

@@ -1,108 +1,16 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: messages.h,v 1.28 2002/02/13 23:04:50 alex Exp $
+ * $Id: messages.h,v 1.66 2004/02/28 02:18:16 alex Exp $
  *
- * irc.h: IRC-Befehle (Header)
- *
- * $Log: messages.h,v $
- * Revision 1.28  2002/02/13 23:04:50  alex
- * - RPL_MYINFO_MSG korrigiert.
- *
- * Revision 1.27  2002/02/13 17:45:57  alex
- * - unterstuetzte User- und Channel-Modes stehen nun in Konstanten.
- *
- * Revision 1.26  2002/02/11 23:33:12  alex
- * - neue Message ERR_CHANOPRIVSNEEDED_MSG definiert.
- *
- * Revision 1.25  2002/02/11 15:48:39  alex
- * - neue Nachricht RPL_CHANNELMODEIS definiert.
- *
- * Revision 1.24  2002/02/06 16:51:39  alex
- * - neue Text-Konstante RPL_UMODEISCHAN_MSG.
- *
- * Revision 1.23  2002/01/29 00:14:05  alex
- * - RPL_WHOISCHANNELS_MSG korrigiert.
- *
- * Revision 1.22  2002/01/28 13:06:19  alex
- * - RPL_NAMREPLY_MSG an tatsaechliche Implementierung angepasst ;-)
- *
- * Revision 1.21  2002/01/27 17:13:37  alex
- * - neue Defines fuer RPL_TOPIC und RPL_NOTOPIC.
- *
- * Revision 1.20  2002/01/21 00:02:34  alex
- * - ERR_NOSUCHCHANNEL hinzugefuegt.
- *
- * Revision 1.19  2002/01/16 22:09:52  alex
- * - RPL_LUSERME_MSG erweitert, kleinere Aenderungen.
- *
- * Revision 1.18  2002/01/11 23:50:55  alex
- * - LINKS implementiert, LUSERS begonnen.
- *
- * Revision 1.17  2002/01/05 23:23:44  alex
- * - neue Nachricht ERR_NOSUCHSERVER_MSG definiert.
- *
- * Revision 1.16  2002/01/03 02:24:21  alex
- * - neue Message ERR_NOTREGISTEREDSERVER_MSG.
- *
- * Revision 1.15  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.14  2001/12/31 16:00:57  alex
- * - "o" zu den unterstuetzten Modes hinzugefuegt.
- *
- * Revision 1.13  2001/12/31 15:33:13  alex
- * - neuer Befehl NAMES, kleinere Bugfixes.
- * - Bug bei PING behoben: war zu restriktiv implementiert :-)
- *
- * Revision 1.12  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.11  2001/12/30 19:25:39  alex
- * - RPL_MYINFO_MSG um unterstuetzte User-Modes ergaengz.
- *
- * Revision 1.10  2001/12/30 11:42:00  alex
- * - der Server meldet nun eine ordentliche "Start-Zeit".
- *
- * Revision 1.9  2001/12/29 03:06:56  alex
- * - Texte ergaenzt, einige Bugs behoben (Leerzeichen falsch gesetzt, z.B.)
- *
- * Revision 1.8  2001/12/27 19:17:26  alex
- * - neue Befehle PRIVMSG, NOTICE, PING.
- *
- * Revision 1.7  2001/12/27 16:56:06  alex
- * - RPL_WELCOME an Client_GetID() angepasst.
- *
- * Revision 1.6  2001/12/26 22:48:53  alex
- * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
- *
- * Revision 1.5  2001/12/26 03:51:13  alex
- * - in ERR_NOTREGISTERED_MSG fehlte ein "%s" - jetzt steht auch hier der Nick.
- *
- * Revision 1.4  2001/12/26 03:22:40  alex
- * - Format der Meldungen ueberarbeitet: fast immer ist nun der Nick enthalten.
- *
- * Revision 1.3  2001/12/25 19:20:11  alex
- * - neue Message: ERR_NICKNAMEINUSE[_MSG].
- *
- * Revision 1.2  2001/12/24 01:30:46  alex
- * - einige Messages korrigiert, andere ergaenzt (u.a. fuer MOTD).
- *
- * Revision 1.1  2001/12/23 21:53:32  alex
- * - Ich habe diesen Header begonnen.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * IRC numerics (Header)
  */
 
 
@@ -110,155 +18,108 @@
 #define __messages_h__
 
 
-#define RPL_WELCOME			"001"
-#define RPL_WELCOME_MSG			RPL_WELCOME" %s :Welcome to the Internet Relay Network %s"
+#define RPL_WELCOME_MSG			"001 %s :Welcome to the Internet Relay Network %s"
+#define RPL_YOURHOST_MSG		"002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)"
+#define RPL_CREATED_MSG			"003 %s :This server has been started %s"
+#define RPL_MYINFO_MSG			"004 %s %s ngircd-%s %s %s"
+#define RPL_ISUPPORT_MSG		"005 %s NICKLEN=%d TOPICLEN=%d AWAYLEN=%d MAXCHANNELS=%d :are supported on this server"
 
-#define RPL_YOURHOST			"002"
-#define RPL_YOURHOST_MSG		RPL_YOURHOST" %s :Your host is %s, running ngircd "VERSION"-"P_OSNAME"/"P_ARCHNAME
+#define RPL_TRACELINK_MSG		"200 %s Link %s-%s %s %s V%s %ld %d %d"
+#define RPL_TRACEOPERATOR_MSG		"204 %s Oper 2 :%s"
+#define RPL_TRACESERVER_MSG		"206 %s Serv 1 0S 0C %s[%s@%s] *!*@%s :V%s"
+#define RPL_STATSLINKINFO_MSG		"211 %s %s %d %ld %ld %ld %ld :%ld"
+#define RPL_STATSCOMMANDS_MSG		"212 %s %s %ld %ld %ld"
+#define RPL_ENDOFSTATS_MSG		"219 %s %c :End of STATS report"
+#define RPL_UMODEIS_MSG			"221 %s +%s"
+#define RPL_LUSERCLIENT_MSG		"251 %s :There are %ld users and %ld services on %ld servers"
+#define RPL_LUSEROP_MSG			"252 %s %ld :operator(s) online"
+#define RPL_LUSERUNKNOWN_MSG		"253 %s %ld :unknown connection(s)"
+#define RPL_LUSERCHANNELS_MSG		"254 %s %ld :channels formed"
+#define RPL_LUSERME_MSG			"255 %s :I have %ld users, %ld services and %ld servers"
+#define RPL_ADMINME_MSG			"256 %s %s :Administrative info"
+#define RPL_ADMINLOC1_MSG		"257 %s :%s"
+#define RPL_ADMINLOC2_MSG		"258 %s :%s"
+#define RPL_ADMINEMAIL_MSG		"259 %s :%s"
+#define RPL_TRACEEND_MSG		"262 %s %s %s-%s.%s :End of TRACE"
+#define RPL_LOCALUSERS_MSG		"265 %s :Current local users: %ld, Max: %ld"
+#define RPL_NETUSERS_MSG		"266 %s :Current global users: %ld, Max: %ld"
 
-#define RPL_CREATED			"003"
-#define RPL_CREATED_MSG			RPL_CREATED" %s :This server was started %s"
+#define RPL_AWAY_MSG			"301 %s %s :%s"
+#define RPL_USERHOST_MSG		"302 %s :"
+#define RPL_ISON_MSG			"303 %s :"
+#define RPL_UNAWAY_MSG			"305 %s :You are no longer marked as being away"
+#define RPL_NOWAWAY_MSG			"306 %s :You have been marked as being away"
+#define RPL_WHOISUSER_MSG		"311 %s %s %s %s * :%s"
+#define RPL_WHOISSERVER_MSG		"312 %s %s %s :%s"
+#define RPL_WHOISOPERATOR_MSG		"313 %s %s :is an IRC operator"
+#define RPL_WHOWASUSER_MSG		"314 %s %s %s %s * :%s"
+#define RPL_ENDOFWHO_MSG		"315 %s %s :End of WHO list"
+#define RPL_WHOISIDLE_MSG		"317 %s %s %ld :seconds idle"
+#define RPL_ENDOFWHOIS_MSG		"318 %s %s :End of WHOIS list"
+#define RPL_WHOISCHANNELS_MSG		"319 %s %s :"
+#define RPL_LIST_MSG			"322 %s %s %ld :%s"
+#define RPL_LISTEND_MSG			"323 %s :End of LIST"
+#define RPL_CHANNELMODEIS_MSG		"324 %s %s +%s"
+#define RPL_NOTOPIC_MSG			"331 %s %s :No topic is set"
+#define RPL_TOPIC_MSG			"332 %s %s :%s"
+#define RPL_INVITING_MSG		"341 %s %s %s"
+#define RPL_INVITELIST_MSG		"346 %s %s %s"
+#define RPL_ENDOFINVITELIST_MSG		"347 %s %s :End of channel invite list"
+#define RPL_VERSION_MSG			"351 %s %s-%s.%s %s :%s"
+#define RPL_WHOREPLY_MSG		"352 %s %s %s %s %s %s %s :%d %s"
+#define RPL_NAMREPLY_MSG		"353 %s %s %s :"
+#define RPL_LINKS_MSG			"364 %s %s %s :%d %s"
+#define RPL_ENDOFLINKS_MSG		"365 %s %s :End of LINKS list"
+#define RPL_ENDOFNAMES_MSG		"366 %s %s :End of NAMES list"
+#define RPL_BANLIST_MSG			"367 %s %s %s"
+#define RPL_ENDOFBANLIST_MSG		"368 %s %s :End of channel ban list"
+#define RPL_ENDOFWHOWAS_MSG		"369 %s %s :End of WHOWAS list"
+#define RPL_MOTD_MSG			"372 %s :- %s"
+#define RPL_MOTDSTART_MSG		"375 %s :- %s message of the day"
+#define RPL_ENDOFMOTD_MSG		"376 %s :End of MOTD command"
+#define RPL_YOUREOPER_MSG		"381 %s :You are now an IRC Operator"
+#define RPL_YOURESERVICE_MSG		"383 %s :You are service %s"
+#define RPL_TIME_MSG			"391 %s %s :%s"
 
-#define RPL_MYINFO			"004"
-#define RPL_MYINFO_MSG			RPL_MYINFO" %s :%s ngircd-"VERSION" "USERMODES" "CHANMODES
+#define ERR_NOSUCHNICK_MSG		"401 %s %s :No such nick or channel name"
+#define ERR_NOSUCHSERVER_MSG		"402 %s %s :No such server"
+#define ERR_NOSUCHCHANNEL_MSG		"403 %s %s :No such channel"
+#define ERR_CANNOTSENDTOCHAN_MSG	"404 %s %s :Cannot send to channel"
+#define ERR_TOOMANYCHANNELS_MSG		"405 %s %s :You have joined too many channels"
+#define ERR_WASNOSUCHNICK_MSG		"406 %s %s :There was no such nickname"
+#define ERR_NOORIGIN_MSG		"409 %s :No origin specified"
+#define ERR_NORECIPIENT_MSG		"411 %s :No receipient given (%s)"
+#define ERR_NOTEXTTOSEND_MSG		"412 %s :No text to send"
+#define ERR_UNKNOWNCOMMAND_MSG		"421 %s %s :Unknown command"
+#define ERR_NOMOTD_MSG			"422 %s :MOTD file is missing"
+#define ERR_ERRONEUSNICKNAME_MSG	"432 %s %s :Erroneous nickname"
+#define ERR_NICKNAMEINUSE_MSG		"433 %s %s :Nickname already in use"
+#define ERR_USERNOTINCHANNEL_MSG	"441 %s %s %s :They aren't on that channel"
+#define ERR_NOTONCHANNEL_MSG		"442 %s %s :You are not on that channel"
+#define ERR_USERONCHANNEL_MSG		"443 %s %s %s :is already on channel"
+#define ERR_NOTREGISTERED_MSG		"451 %s :Connection not registered"
+#define ERR_NOTREGISTEREDSERVER_MSG	"451 %s :Connection not registered as server link"
+#define ERR_NEEDMOREPARAMS_MSG		"461 %s %s :Syntax error"
+#define ERR_ALREADYREGISTRED_MSG	"462 %s :Connection already registered"
+#define ERR_PASSWDMISMATCH_MSG		"464 %s :Invalid password"
+#define ERR_CHANNELISFULL_MSG		"471 %s %s :Cannot join channel (+l)"
+#define ERR_UNKNOWNMODE_MSG		"472 %s: %c :is unknown mode char for %s"
+#define ERR_INVITEONLYCHAN_MSG		"473 %s %s :Cannot join channel (+i)"
+#define ERR_BANNEDFROMCHAN_MSG		"474 %s %s :Cannot join channel (+b)"
+#define ERR_BADCHANNELKEY_MSG		"475 %s %s :Cannot join channel (+k)"
+#define ERR_NOPRIVILEGES_MSG		"481 %s :Permission denied"
+#define ERR_CHANOPRIVSNEEDED_MSG	"482 %s %s :You are not channel operator"
+#define ERR_CANTKILLSERVER_MSG		"483 %s :You can't kill a server!"
+#define ERR_RESTRICTED_MSG		"484 %s :Your connection is restricted"
+#define ERR_NOOPERHOST_MSG		"491 %s :Not configured for your host"
 
-#define RPL_LUSERCLIENT			"251"
-#define RPL_LUSERCLIENT_MSG		RPL_LUSERCLIENT" %s :There are %d users and %d services on %d servers"
+#define ERR_UMODEUNKNOWNFLAG_MSG	"501 %s :Unknown mode"
+#define ERR_UMODEUNKNOWNFLAG2_MSG	"501 %s :Unknown mode \"%c%c\""
+#define ERR_USERSDONTMATCH_MSG		"502 %s :Can't set/get mode for other users"
 
-#define RPL_LUSEROP			"252"
-#define RPL_LUSEROP_MSG			RPL_LUSEROP" %s %d :operator(s) online"
-
-#define RPL_LUSERUNKNOWN		"253"
-#define	RPL_LUSERUNKNOWN_MSG		RPL_LUSERUNKNOWN" %s %d :unknown connection(s)"
-
-#define RPL_LUSERCHANNELS		"254"
-#define RPL_LUSERCHANNELS_MSG		RPL_LUSERCHANNELS" %s %d :channels formed"
-
-#define RPL_LUSERME			"255"
-#define	RPL_LUSERME_MSG			RPL_LUSERME" %s :I have %d users, %d services and %d servers"
-
-#define RPL_MOTDSTART			"375"
-#define RPL_MOTDSTART_MSG		RPL_MOTDSTART" %s :- %s message of the day"
-
-#define RPL_MOTD			"372"
-#define RPL_MOTD_MSG			RPL_MOTD" %s :- %s"
-
-#define RPL_ENDOFMOTD			"376"
-#define RPL_ENDOFMOTD_MSG		RPL_ENDOFMOTD" %s :End of MOTD command"
-
-#define RPL_UMODEIS			"211"
-#define RPL_UMODEIS_MSG			RPL_UMODEIS" %s +%s"
-
-#define RPL_USERHOST			"302"
-#define RPL_USERHOST_MSG		RPL_USERHOST" %s :"
-
-#define RPL_ISON			"303"
-#define RPL_ISON_MSG			RPL_ISON" %s :"
-
-#define RPL_WHOISUSER			"311"
-#define RPL_WHOISUSER_MSG		RPL_WHOISUSER" %s %s %s %s * :%s"
-
-#define RPL_WHOISSERVER			"312"
-#define RPL_WHOISSERVER_MSG		RPL_WHOISSERVER" %s %s %s :%s"
-
-#define RPL_WHOISOPERATOR		"313"
-#define RPL_WHOISOPERATOR_MSG		RPL_WHOISOPERATOR" %s %s :is an IRC operator"
-
-#define RPL_WHOISIDLE			"317"
-#define RPL_WHOISIDLE_MSG		RPL_WHOISIDLE" %s %s %ld :seconds idle"
-
-#define RPL_ENDOFWHOIS			"318"
-#define RPL_ENDOFWHOIS_MSG		RPL_ENDOFWHOIS" %s %s :End of WHOIS list"
-
-#define RPL_WHOISCHANNELS		"319"
-#define RPL_WHOISCHANNELS_MSG		RPL_WHOISCHANNELS" %s %s :"
-
-#define RPL_CHANNELMODEIS		"324"
-#define RPL_CHANNELMODEIS_MSG		RPL_CHANNELMODEIS" %s %s +%s"
-
-#define RPL_NOTOPIC			"331"
-#define RPL_NOTOPIC_MSG			RPL_NOTOPIC" %s %s :No topic is set"
-
-#define RPL_TOPIC			"332"
-#define RPL_TOPIC_MSG			RPL_TOPIC" %s %s :%s"
-
-#define RPL_NAMREPLY			"353"
-#define RPL_NAMREPLY_MSG		RPL_NAMREPLY" %s %s %s :"
-
-#define RPL_LINKS			"364"
-#define RPL_LINKS_MSG			RPL_LINKS" %s %s %s :%d %s"
-
-#define RPL_ENDOFLINKS			"365"
-#define RPL_ENDOFLINKS_MSG		RPL_ENDOFLINKS" %s %s :End of LINKS list"
-
-#define RPL_ENDOFNAMES			"366"
-#define RPL_ENDOFNAMES_MSG		RPL_ENDOFNAMES" %s %s :End of NAMES list"
-
-
-#define RPL_YOUREOPER			"381"
-#define RPL_YOUREOPER_MSG		RPL_YOUREOPER" %s :You are now an IRC Operator"
-
-
-#define ERR_NOSUCHNICK			"401"
-#define ERR_NOSUCHNICK_MSG		ERR_NOSUCHNICK" %s %s :No such nick or channel name"
-
-#define ERR_NOSUCHSERVER		"402"
-#define ERR_NOSUCHSERVER_MSG		ERR_NOSUCHSERVER" %s %s :No such server"
-
-#define ERR_NOSUCHCHANNEL		"403"
-#define ERR_NOSUCHCHANNEL_MSG		ERR_NOSUCHCHANNEL" %s %s :No such channel"
-
-#define ERR_NOORIGIN			"409"
-#define ERR_NOORIGIN_MSG		ERR_NOORIGIN" %s :No origin specified"
-
-#define ERR_NORECIPIENT			"411"
-#define ERR_NORECIPIENT_MSG		ERR_NORECIPIENT" %s :No receipient given (%s)"
-
-#define ERR_NOTEXTTOSEND		"412"
-#define ERR_NOTEXTTOSEND_MSG		ERR_NOTEXTTOSEND" %s :No text to send"
-
-#define ERR_UNKNOWNCOMMAND		"421"
-#define ERR_UNKNOWNCOMMAND_MSG		ERR_UNKNOWNCOMMAND" %s %s :Unknown command"
-
-#define ERR_NOMOTD			"422"
-#define ERR_NOMOTD_MSG			ERR_NOMOTD" %s :MOTD file is missing"
-
-#define ERR_ERRONEUSNICKNAME		"432"
-#define ERR_ERRONEUSNICKNAME_MSG	ERR_ERRONEUSNICKNAME" %s %s :Erroneous nickname"
-
-#define ERR_NICKNAMEINUSE		"433"
-#define ERR_NICKNAMEINUSE_MSG		ERR_NICKNAMEINUSE" %s %s :Nickname already in use"
-
-#define ERR_NEEDMOREPARAMS		"461"
-#define ERR_NEEDMOREPARAMS_MSG		ERR_NEEDMOREPARAMS" %s %s :Syntax error"
-
-#define ERR_ALREADYREGISTRED		"462"
-#define ERR_ALREADYREGISTRED_MSG	ERR_ALREADYREGISTRED" %s :Connection already registered"
-
-#define ERR_PASSWDMISMATCH		"464"
-#define ERR_PASSWDMISMATCH_MSG		ERR_PASSWDMISMATCH" %s: Invalid password"
-
-#define ERR_NOTREGISTERED		"451"
-#define ERR_NOTREGISTERED_MSG		ERR_NOTREGISTERED" %s :Connection not registered"
-#define ERR_NOTREGISTEREDSERVER_MSG	ERR_NOTREGISTERED" %s :Connection not registered as server link"
-
-#define ERR_NOPRIVILEGES		"481"
-#define ERR_NOPRIVILEGES_MSG		ERR_NOPRIVILEGES" %s :Permission denied"
-
-#define ERR_CHANOPRIVSNEEDED		"482"
-#define ERR_CHANOPRIVSNEEDED_MSG	ERR_CHANOPRIVSNEEDED" %s %s :You are not channel operator"
-
-#define ERR_RESTRICTED			"484"
-#define ERR_RESTRICTED_MSG		ERR_RESTRICTED" %s :Your connection is restricted"
-
-#define ERR_NOOPERHOST			"491"
-#define ERR_NOOPERHOST_MSG		ERR_NOOPERHOST" %s :Not configured for your host"
-
-#define ERR_UMODEUNKNOWNFLAG		"501"
-#define ERR_UMODEUNKNOWNFLAG_MSG	ERR_UMODEUNKNOWNFLAG" %s :Unknown mode flag"
-
-#define ERR_USERSDONTMATCH		"502"
-#define ERR_USERSDONTMATCH_MSG		ERR_USERSDONTMATCH" %s :Can't set/get mode for other users"
+#ifdef ZLIB
+#define RPL_STATSLINKINFOZIP_MSG	"211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld"
+#endif
 
 
 #endif

src/ngircd/ngircd.c

@@ -1,147 +1,84 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: ngircd.c,v 1.22 2002/01/22 17:15:39 alex Exp $
- *
- * ngircd.c: Hier beginnt alles ;-)
- *
- * $Log: ngircd.c,v $
- * Revision 1.22  2002/01/22 17:15:39  alex
- * - die Fehlermeldung "interrupted system call" sollte nicht mehr auftreten.
- *
- * Revision 1.21  2002/01/21 00:02:11  alex
- * - Hilfetexte korrigiert und ergaenzt (Sniffer).
- *
- * Revision 1.20  2002/01/18 11:12:11  alex
- * - der Sniffer wird nun nur noch aktiviert, wenn auf Kommandozeile angegeben.
- *
- * Revision 1.19  2002/01/12 00:17:28  alex
- * - ngIRCd wandelt sich nun selber in einen Daemon (Hintergrundprozess) um.
- *
- * Revision 1.18  2002/01/11 14:45:18  alex
- * - Kommandozeilen-Parser implementiert: Debug- und No-Daemon-Modus, Hilfe.
- *
- * Revision 1.17  2002/01/02 02:51:16  alex
- * - Signal-Handler fuer SIGCHLD: so sollten Zombies nicht mehr vorkommen.
- *
- * Revision 1.15  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.14  2001/12/30 19:26:12  alex
- * - Unterstuetzung fuer die Konfigurationsdatei eingebaut.
- *
- * Revision 1.13  2001/12/30 11:42:00  alex
- * - der Server meldet nun eine ordentliche "Start-Zeit".
- *
- * Revision 1.12  2001/12/29 03:07:36  alex
- * - einige Loglevel geaendert.
- *
- * Revision 1.11  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.10  2001/12/24 01:34:38  alex
- * - Signal-Handler aufgeraeumt; u.a. SIGPIPE wird nun korrekt ignoriert.
- *
- * Revision 1.9  2001/12/21 22:24:50  alex
- * - neues Modul "parse" wird initialisiert und abgemeldet.
- *
- * Revision 1.8  2001/12/14 08:15:26  alex
- * - neue Module (irc, client, channel) werden an- und abgemeldet.
- * - zweiter Listen-Socket wird zu Testzwecken konfiguriert.
- *
- * Revision 1.7  2001/12/13 01:31:46  alex
- * - Conn_Handler() wird nun mit einem Timeout aufgerufen.
- *
- * Revision 1.6  2001/12/12 23:30:42  alex
- * - Log-Meldungen an syslog angepasst.
- * - NGIRCd_Quit ist nun das Flag zum Beenden des ngircd.
- *
- * Revision 1.5  2001/12/12 17:21:21  alex
- * - mehr Unterfunktionen eingebaut, Modul besser strukturiert & dokumentiert.
- * - Anpassungen an neue Module.
- *
- * Revision 1.4  2001/12/12 01:58:53  alex
- * - Test auf socklen_t verbessert.
- *
- * Revision 1.3  2001/12/12 01:40:39  alex
- * - ein paar mehr Kommentare; Variablennamen verstaendlicher gemacht.
- * - fehlenden Header <arpa/inet.h> ergaenz.
- * - SIGINT und SIGQUIT werden nun ebenfalls behandelt.
- *
- * Revision 1.2  2001/12/11 22:04:21  alex
- * - Test auf stdint.h (HAVE_STDINT_H) hinzugefuegt.
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
+ * Main program -- main()
  */
 
 
-#define PORTAB_CHECK_TYPES		/* Prueffunktion einbinden, s.u. */
+#include "portab.h"
 
+static char UNUSED id[] = "$Id: ngircd.c,v 1.83.2.3 2005/01/26 22:02:36 alex Exp $";
 
-#include <portab.h>
-#include "global.h"
-
-#include <imp.h>
-
+#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <pwd.h>
+#include <grp.h>
 
-#include "channel.h"
-#include "client.h"
-#include "conf.h"
+#include "defines.h"
+#include "resolve.h"
 #include "conn.h"
-#include "irc.h"
+#include "client.h"
+#include "channel.h"
+#include "conf.h"
+#include "cvs-version.h"
+#include "lists.h"
 #include "log.h"
 #include "parse.h"
+#include "irc.h"
 
-#include <exp.h>
+#ifdef RENDEZVOUS
+#include "rendezvous.h"
+#endif
+
+#include "exp.h"
 #include "ngircd.h"
 
 
-LOCAL VOID Initialize_Signal_Handler( VOID );
-LOCAL VOID Signal_Handler( INT Signal );
+LOCAL VOID Initialize_Signal_Handler PARAMS(( VOID ));
+LOCAL VOID Signal_Handler PARAMS(( INT Signal ));
 
-LOCAL VOID Initialize_Listen_Ports( VOID );
-
-LOCAL VOID Show_Version( VOID );
-LOCAL VOID Show_Help( VOID );
+LOCAL VOID Show_Version PARAMS(( VOID ));
+LOCAL VOID Show_Help PARAMS(( VOID ));
 
 
-GLOBAL INT main( INT argc, CONST CHAR *argv[] )
+GLOBAL int
+main( int argc, const char *argv[] )
 {
-	BOOLEAN ok;
-	INT pid, i, n;
+	struct passwd *pwd;
+	struct group *grp;
+	BOOLEAN ok, configtest = FALSE;
+	LONG pid, n;
+	INT i;
 
-	/* Datentypen der portab-Library ueberpruefen */
-	portab_check_types( );
+	umask( 0077 );
 
-	NGIRCd_Restart = FALSE;
-	NGIRCd_Quit = FALSE;
-	NGIRCd_NoDaemon = FALSE;
+	NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = FALSE;
+	NGIRCd_NoDaemon = NGIRCd_Passive = FALSE;
 #ifdef DEBUG
 	NGIRCd_Debug = FALSE;
 #endif
 #ifdef SNIFFER
 	NGIRCd_Sniffer = FALSE;
 #endif
+	strlcpy( NGIRCd_ConfFile, SYSCONFDIR, sizeof( NGIRCd_ConfFile ));
+	strlcat( NGIRCd_ConfFile, CONFIG_FILE, sizeof( NGIRCd_ConfFile ));
 
 	/* Kommandozeile parsen */
 	for( i = 1; i < argc; i++ )
@@ -151,16 +88,21 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 		{
 			/* Lange Option */
 
-			if( strcmp( argv[i], "--help" ) == 0 )
+			if( strcmp( argv[i], "--config" ) == 0 )
 			{
-				Show_Version( ); puts( "" );
-				Show_Help( ); puts( "" );
-				exit( 1 );
+				if( i + 1 < argc )
+				{
+					/* Ok, there's an parameter left */
+					strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile ));
+
+					/* next parameter */
+					i++; ok = TRUE;
+				}
 			}
-			if( strcmp( argv[i], "--version" ) == 0 )
+			if( strcmp( argv[i], "--configtest" ) == 0 )
 			{
-				Show_Version( );
-				exit( 1 );
+				configtest = TRUE;
+				ok = TRUE;
 			}
 #ifdef DEBUG
 			if( strcmp( argv[i], "--debug" ) == 0 )
@@ -169,6 +111,22 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 				ok = TRUE;
 			}
 #endif
+			if( strcmp( argv[i], "--help" ) == 0 )
+			{
+				Show_Version( );
+				puts( "" ); Show_Help( ); puts( "" );
+				exit( 1 );
+			}
+			if( strcmp( argv[i], "--nodaemon" ) == 0 )
+			{
+				NGIRCd_NoDaemon = TRUE;
+				ok = TRUE;
+			}
+			if( strcmp( argv[i], "--passive" ) == 0 )
+			{
+				NGIRCd_Passive = TRUE;
+				ok = TRUE;
+			}
 #ifdef SNIFFER
 			if( strcmp( argv[i], "--sniffer" ) == 0 )
 			{
@@ -176,17 +134,17 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 				ok = TRUE;
 			}
 #endif
-			if( strcmp( argv[i], "--nodaemon" ) == 0 )
+			if( strcmp( argv[i], "--version" ) == 0 )
 			{
-				NGIRCd_NoDaemon = TRUE;
-				ok = TRUE;
+				Show_Version( );
+				exit( 1 );
 			}
 		}
 		else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' ))
 		{
 			/* Kurze Option */
 			
-			for( n = 1; n < strlen( argv[i] ); n++ )
+			for( n = 1; n < (LONG)strlen( argv[i] ); n++ )
 			{
 				ok = FALSE;
 #ifdef DEBUG
@@ -196,6 +154,28 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 					ok = TRUE;
 				}
 #endif
+				if( argv[i][n] == 'f' )
+				{
+					if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
+					{
+						/* Ok, next character is a blank */
+						strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile ));
+
+						/* go to the following parameter */
+						i++; n = (LONG)strlen( argv[i] );
+						ok = TRUE;
+					}
+				}
+				if( argv[i][n] == 'n' )
+				{
+					NGIRCd_NoDaemon = TRUE;
+					ok = TRUE;
+				}
+				if( argv[i][n] == 'p' )
+				{
+					NGIRCd_Passive = TRUE;
+					ok = TRUE;
+				}
 #ifdef SNIFFER
 				if( argv[i][n] == 's' )
 				{
@@ -203,16 +183,16 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 					ok = TRUE;
 				}
 #endif
-				if( argv[i][n] == 'n' )
+				if( argv[i][n] == 't' )
 				{
-					NGIRCd_NoDaemon = TRUE;
+					configtest = TRUE;
 					ok = TRUE;
 				}
 
 				if( ! ok )
 				{
-					printf( PACKAGE": invalid option \"-%c\"!\n", argv[i][n] );
-					puts( "Try \""PACKAGE" --help\" for more information." );
+					printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
+					printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
 					exit( 1 );
 				}
 			}
@@ -220,14 +200,66 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 		}
 		if( ! ok )
 		{
-			printf( PACKAGE": invalid option \"%s\"!\n", argv[i] );
-			puts( "Try \""PACKAGE" --help\" for more information." );
+			printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] );
+			printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
 			exit( 1 );
 		}
 	}
 
-	while( ! NGIRCd_Quit )
+	/* Debug-Level (fuer IRC-Befehl "VERSION") ermitteln */
+	strcpy( NGIRCd_DebugLevel, "" );
+#ifdef DEBUG
+	if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
+#endif
+#ifdef SNIFFER
+	if( NGIRCd_Sniffer )
 	{
+		NGIRCd_Debug = TRUE;
+		strcpy( NGIRCd_DebugLevel, "2" );
+	}
+#endif
+
+	/* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */
+	if( configtest )
+	{
+		Show_Version( ); puts( "" );
+		exit( Conf_Test( ));
+	}
+	
+	while( ! NGIRCd_SignalQuit )
+	{
+		/* Initialize global variables */
+		NGIRCd_Start = time( NULL );
+		(VOID)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
+
+		NGIRCd_SignalRehash = FALSE;
+		NGIRCd_SignalRestart = FALSE;
+		NGIRCd_SignalQuit = FALSE;
+
+		/* Initialize modules, part I */
+		Log_Init( );
+		Conf_Init( );
+
+		if( Conf_Chroot[0] )
+		{
+			/* Chroot */
+			if( chdir( Conf_Chroot ) != 0 ) Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno ));
+
+			if( chroot( Conf_Chroot ) != 0 ) Log( LOG_ERR, "Can't change root directory to \"%s\": %s", Conf_Chroot, strerror( errno ));
+			else Log( LOG_INFO, "Changed root and working directory to \"%s\".", Conf_Chroot );
+		}
+
+		if( Conf_GID != 0 )
+		{
+			/* Set new group ID */
+			if( setgid( Conf_GID ) != 0 ) Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno ));
+		}
+		if( Conf_UID != 0 )
+		{
+			/* Set new user ID */
+			if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror( errno ));
+		}
+
 		/* In der Regel wird ein Sub-Prozess ge-fork()'t, der
 		 * nicht mehr mit dem Terminal verbunden ist. Mit der
 		 * Option "--nodaemon" kann dies (z.B. zum Debuggen)
@@ -235,7 +267,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 		if( ! NGIRCd_NoDaemon )
 		{
 			/* Daemon im Hintergrund erzeugen */
-			pid = fork( );
+			pid = (LONG)fork( );
 			if( pid > 0 )
 			{
 				/* "alter" Prozess */
@@ -244,112 +276,241 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 			if( pid < 0 )
 			{
 				/* Fehler */
-				printf( PACKAGE": Can't fork: %s!\nFatal error, exiting now ...", strerror( errno ));
+				printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE_NAME, strerror( errno ));
 				exit( 1 );
 			}
-			setsid( );
+
+			/* Child-Prozess initialisieren */
+			(VOID)setsid( );
 			chdir( "/" );
 		}
-	
-		/* Globale Variablen initialisieren */
-		NGIRCd_Start = time( NULL );
-		strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
-		NGIRCd_Restart = FALSE;
-		NGIRCd_Quit = FALSE;
 
-		/* Module initialisieren */
-		Log_Init( );
-		Conf_Init( );
-		Parse_Init( );
-		IRC_Init( );
+		/* Initialize modules, part II: these functions are eventually
+		 * called with already dropped privileges ... */
+		Resolve_Init( );
+		Lists_Init( );
 		Channel_Init( );
 		Client_Init( );
+#ifdef RENDEZVOUS
+		Rendezvous_Init( );
+#endif
 		Conn_Init( );
 
+		/* Show user, group, and PID of the running daemon */
+		pwd = getpwuid( getuid( )); grp = getgrgid( getgid( ));
+		Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", pwd ? pwd->pw_name : "unknown", (LONG)getuid( ), grp ? grp->gr_name : "unknown", (LONG)getgid( ), (LONG)getpid( ));
+
+		/* Redirect stderr handle to "error file" for debugging.
+		 * But don't try to write in the chroot jail, since it's more 
+		 * secure to have a chroot dir not writable by the daemon.
+		 */
+		if( ! Conf_Chroot[0] ) Log_InitErrorfile( );
+
 		/* Signal-Handler initialisieren */
 		Initialize_Signal_Handler( );
 
-		/* Listen-Ports initialisieren */
-		Initialize_Listen_Ports( );
+		/* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd
+		 * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags
+		 * sind in doc/Protocol.txt beschrieben. */
+#ifdef IRCPLUS
+		sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS );
+#ifdef ZLIB
+		strcat( NGIRCd_ProtoID, "Z" );
+#endif
+		if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
+#else
+		sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION );
+#endif
+		strcat( NGIRCd_ProtoID, " P" );
+#ifdef ZLIB
+		strcat( NGIRCd_ProtoID, "Z" );
+#endif
+		Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
 
-		/* Hauptschleife */
-		while( TRUE )
+		/* Vordefinierte Channels anlegen */
+		Channel_InitPredefined( );
+
+		/* Listen-Ports initialisieren */
+		if( Conn_InitListeners( ) < 1 )
 		{
-			if( NGIRCd_Quit || NGIRCd_Restart ) break;
-			Conn_Handler( 5 );
+			Log( LOG_ALERT, "Server isn't listening on a single port!" );
+			Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
+			exit( 1 );
 		}
+		
+		/* Hauptschleife */
+		Conn_Handler( );
 
 		/* Alles abmelden */
 		Conn_Exit( );
+#ifdef RENDEZVOUS
+		Rendezvous_Exit( );
+#endif
 		Client_Exit( );
 		Channel_Exit( );
-		IRC_Exit( );
-		Parse_Exit( );
-		Conf_Exit( );
+		Lists_Exit( );
 		Log_Exit( );
 	}
+
 	return 0;
 } /* main */
 
 
-GLOBAL CHAR *NGIRCd_Version( VOID )
+GLOBAL CHAR *
+NGIRCd_Version( VOID )
 {
 	STATIC CHAR version[126];
-	CHAR txt[64];
-
-	strcpy( txt, "" );
-
-#ifdef USE_SYSLOG
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "SYSLOG" );
+	
+#ifdef CVSDATE
+	sprintf( version, "%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition( ));
+#else
+	sprintf( version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition( ));
 #endif
-#ifdef STRICT_RFC
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "RFC" );
-#endif
-#ifdef DEBUG
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "DEBUG" );
-#endif
-#ifdef SNIFFER
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "SNIFFER" );
-#endif
-
-	sprintf( version, PACKAGE" version "VERSION"%s-"P_OSNAME"/"P_ARCHNAME, txt );
 	return version;
 } /* NGIRCd_Version */
 
 
-LOCAL VOID Initialize_Signal_Handler( VOID )
+GLOBAL CHAR *
+NGIRCd_VersionAddition( VOID )
+{
+	STATIC CHAR txt[200];
+
+	strcpy( txt, "" );
+
+#ifdef SYSLOG
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "SYSLOG" );
+#endif
+#ifdef ZLIB
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "ZLIB" );
+#endif
+#ifdef TCPWRAP
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "TCPWRAP" );
+#endif
+#ifdef RENDEZVOUS
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "RENDEZVOUS" );
+#endif
+#ifdef IDENTAUTH
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "IDENT" );
+#endif
+#ifdef DEBUG
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "DEBUG" );
+#endif
+#ifdef SNIFFER
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "SNIFFER" );
+#endif
+#ifdef STRICT_RFC
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "RFC" );
+#endif
+#ifdef IRCPLUS
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "IRCPLUS" );
+#endif
+	
+	if( txt[0] ) strlcat( txt, "-", sizeof( txt ));
+	strlcat( txt, TARGET_CPU, sizeof( txt ));
+	strlcat( txt, "/", sizeof( txt ));
+	strlcat( txt, TARGET_VENDOR, sizeof( txt ));
+	strlcat( txt, "/", sizeof( txt ));
+	strlcat( txt, TARGET_OS, sizeof( txt ));
+
+	return txt;
+} /* NGIRCd_VersionAddition */
+
+
+GLOBAL VOID
+NGIRCd_Rehash( VOID )
+{
+	CHAR old_name[CLIENT_ID_LEN];
+
+	Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
+	NGIRCd_SignalRehash = FALSE;
+
+	/* Close down all listening sockets */
+	Conn_ExitListeners( );
+
+	/* Remember old server name */
+	strcpy( old_name, Conf_ServerName );
+
+	/* Re-read configuration ... */
+	Conf_Rehash( );
+
+	/* Recover old server name: it can't be changed during run-time */
+	if( strcmp( old_name, Conf_ServerName ) != 0 )
+	{
+		strcpy( Conf_ServerName, old_name );
+		Log( LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name." );
+	}
+
+	/* Create new pre-defined channels */
+	Channel_InitPredefined( );
+	
+	/* Start listening on sockets */
+	Conn_InitListeners( );
+
+	/* Sync configuration with established connections */
+	Conn_SyncServerStruct( );
+
+	Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." );
+} /* NGIRCd_Rehash */
+
+
+LOCAL VOID
+Initialize_Signal_Handler( VOID )
 {
 	/* Signal-Handler initialisieren: einige Signale
 	 * werden ignoriert, andere speziell behandelt. */
 
+#ifdef HAVE_SIGACTION
+	/* sigaction() ist vorhanden */
+
 	struct sigaction saction;
 
 	/* Signal-Struktur initialisieren */
 	memset( &saction, 0, sizeof( saction ));
 	saction.sa_handler = Signal_Handler;
-	saction.sa_flags = SA_RESTART;
+#ifdef SA_RESTART
+	saction.sa_flags |= SA_RESTART;
+#endif
+#ifdef SA_NOCLDWAIT
+	saction.sa_flags |= SA_NOCLDWAIT;
+#endif
 
 	/* Signal-Handler einhaengen */
 	sigaction( SIGINT, &saction, NULL );
 	sigaction( SIGQUIT, &saction, NULL );
 	sigaction( SIGTERM, &saction, NULL);
+	sigaction( SIGHUP, &saction, NULL);
 	sigaction( SIGCHLD, &saction, NULL);
 
 	/* einige Signale ignorieren */
 	saction.sa_handler = SIG_IGN;
 	sigaction( SIGPIPE, &saction, NULL );
+#else
+	/* kein sigaction() vorhanden */
+
+	/* Signal-Handler einhaengen */
+	signal( SIGINT, Signal_Handler );
+	signal( SIGQUIT, Signal_Handler );
+	signal( SIGTERM, Signal_Handler );
+	signal( SIGHUP, Signal_Handler );
+	signal( SIGCHLD, Signal_Handler );
+
+	/* einige Signale ignorieren */
+	signal( SIGPIPE, SIG_IGN );
+#endif
 } /* Initialize_Signal_Handler */
 
 
-LOCAL VOID Signal_Handler( INT Signal )
+LOCAL VOID
+Signal_Handler( INT Signal )
 {
 	/* Signal-Handler. Dieser wird aufgerufen, wenn eines der Signale eintrifft,
 	 * fuer das wir uns registriert haben (vgl. Initialize_Signal_Handler). Die
@@ -361,63 +522,51 @@ LOCAL VOID Signal_Handler( INT Signal )
 		case SIGINT:
 		case SIGQUIT:
 			/* wir soll(t)en uns wohl beenden ... */
-			Log( LOG_WARNING, "Got signal %d, terminating now ...", Signal );
-			NGIRCd_Quit = TRUE;
+			NGIRCd_SignalQuit = TRUE;
+			break;
+		case SIGHUP:
+			/* Konfiguration neu einlesen: */
+			NGIRCd_SignalRehash = TRUE;
 			break;
 		case SIGCHLD:
 			/* Child-Prozess wurde beendet. Zombies vermeiden: */
 			while( waitpid( -1, NULL, WNOHANG ) > 0);
 			break;
+#ifdef DEBUG
 		default:
 			/* unbekanntes bzw. unbehandeltes Signal */
-			Log( LOG_NOTICE, "Got signal %d! Ignored.", Signal );
+			Log( LOG_DEBUG, "Got signal %d! Ignored.", Signal );
+#endif
 	}
 } /* Signal_Handler */
 
 
-LOCAL VOID Initialize_Listen_Ports( VOID )
-{
-	/* Ports, auf denen der Server Verbindungen entgegennehmen
-	 * soll, initialisieren */
-	
-	INT created, i;
-
-	created = 0;
-	for( i = 0; i < Conf_ListenPorts_Count; i++ )
-	{
-		if( Conn_NewListener( Conf_ListenPorts[i] )) created++;
-		else Log( LOG_ERR, "Can't listen on port %d!", Conf_ListenPorts[i] );
-	}
-
-	if( created < 1 )
-	{
-		Log( LOG_ALERT, "Server isn't listening on a single port!" );
-		Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" );
-		exit( 1 );
-	}
-} /* Initialize_Listen_Ports */
-
-
-LOCAL VOID Show_Version( VOID )
+LOCAL VOID
+Show_Version( VOID )
 {
 	puts( NGIRCd_Version( ));
-	puts( "Copyright (c)2001,2002 by Alexander Barton (alex@barton.de).\n" );
+	puts( "Copyright (c)2001-2005 by Alexander Barton (<alex@barton.de>)." );
+	puts( "Homepage: <http://arthur.ath.cx/~alex/ngircd/>\n" );
 	puts( "This is free software; see the source for copying conditions. There is NO" );
 	puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );
 } /* Show_Version */
 
 
-LOCAL VOID Show_Help( VOID )
+LOCAL VOID
+Show_Help( VOID )
 {
 #ifdef DEBUG
-	puts( "  -d, --debug       log extra debug messages" );
+	puts( "  -d, --debug        log extra debug messages" );
 #endif
-        puts( "  -n, --nodaemon    don't fork and don't detatch from controlling terminal" );
+	puts( "  -f, --config <f>   use file <f> as configuration file" );
+        puts( "  -n, --nodaemon     don't fork and don't detach from controlling terminal" );
+        puts( "  -p, --passive      disable automatic connections to other servers" );
 #ifdef SNIFFER
-	puts( "  -s, --sniffer     enable network sniffer and display all IRC traffic" );
+	puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );
 #endif
- 	puts( "      --version     output version information and exit" );
-	puts( "      --help        display this help and exit" );
+	puts( "  -t, --configtest   read, validate and display configuration; then exit" );
+ 	puts( "      --version      output version information and exit" );
+	puts( "      --help         display this help and exit" );
 } /* Show_Help */
 
 

src/ngircd/ngircd.h

@@ -2,43 +2,15 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: ngircd.h,v 1.8 2002/01/18 11:12:11 alex Exp $
+ * $Id: ngircd.h,v 1.19 2002/12/26 16:48:14 alex Exp $
  *
- * ngircd.h: Prototypen aus dem "Haupt-Modul"
- *
- * $Log: ngircd.h,v $
- * Revision 1.8  2002/01/18 11:12:11  alex
- * - der Sniffer wird nun nur noch aktiviert, wenn auf Kommandozeile angegeben.
- *
- * Revision 1.7  2002/01/11 14:45:18  alex
- * - Kommandozeilen-Parser implementiert: Debug- und No-Daemon-Modus, Hilfe.
- *
- * Revision 1.6  2002/01/02 02:44:37  alex
- * - neue Defines fuer max. Anzahl Server und Operatoren.
- *
- * Revision 1.5  2001/12/31 03:06:03  alex
- * - das #include fuer time.h hat noch gefehlt.
- *
- * Revision 1.4  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.3  2001/12/30 11:42:00  alex
- * - der Server meldet nun eine ordentliche "Start-Zeit".
- *
- * Revision 1.2  2001/12/12 23:30:01  alex
- * - NGIRCd_Quit ist nun das globale Flag zum Beenden des ngircd.
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
+ * Prototypes of the "main module".
  */
 
 
@@ -47,6 +19,8 @@
 
 #include <time.h>
 
+#include "defines.h"
+
 
 GLOBAL time_t NGIRCd_Start;		/* Startzeitpunkt des Daemon */
 GLOBAL CHAR NGIRCd_StartStr[64];
@@ -61,11 +35,23 @@ GLOBAL BOOLEAN NGIRCd_Sniffer;		/* Sniffer aktivieren */
 
 GLOBAL BOOLEAN NGIRCd_NoDaemon;		/* nicht im Hintergrund laufen */
 
-GLOBAL BOOLEAN NGIRCd_Quit;		/* TRUE: ngIRCd beenden */
-GLOBAL BOOLEAN NGIRCd_Restart;		/* TRUE: neu starten */
+GLOBAL BOOLEAN NGIRCd_Passive;		/* nicht zu anderen Servern connecten */
+
+GLOBAL BOOLEAN NGIRCd_SignalQuit;	/* TRUE: quit server*/
+GLOBAL BOOLEAN NGIRCd_SignalRestart;	/* TRUE: restart server */
+GLOBAL BOOLEAN NGIRCd_SignalRehash;	/* TRUE: reload configuration */
+
+GLOBAL CHAR NGIRCd_DebugLevel[2];	/* Debug-Level fuer IRC_VERSION() */
+
+GLOBAL CHAR NGIRCd_ConfFile[FNAME_LEN];	/* Konfigurationsdatei */
+
+GLOBAL CHAR NGIRCd_ProtoID[COMMAND_LEN];/* Protokoll- und Server-Identifikation */
 
 
-GLOBAL CHAR *NGIRCd_Version( VOID );
+GLOBAL CHAR *NGIRCd_Version PARAMS((VOID ));
+GLOBAL CHAR *NGIRCd_VersionAddition PARAMS((VOID ));
+
+GLOBAL VOID NGIRCd_Rehash PARAMS(( VOID ));
 
 
 #endif

src/ngircd/parse.c

@@ -2,138 +2,122 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: parse.c,v 1.22 2002/01/21 00:01:37 alex Exp $
- *
- * parse.c: Parsen der Client-Anfragen
- *
- * $Log: parse.c,v $
- * Revision 1.22  2002/01/21 00:01:37  alex
- * - neue Befehle JOIN und PART.
- *
- * Revision 1.21  2002/01/18 11:12:11  alex
- * - der Sniffer wird nun nur noch aktiviert, wenn auf Kommandozeile angegeben.
- *
- * Revision 1.20  2002/01/11 23:50:55  alex
- * - LINKS implementiert, LUSERS begonnen.
- *
- * Revision 1.19  2002/01/09 01:08:42  alex
- * - Parses handhabt Leerzeichen zw. Parametern nun etwas "lockerer".
- *
- * Revision 1.18  2002/01/07 15:29:11  alex
- * - Status-Codes an den Server selber werden ignoriert, besseres Logging.
- *
- * Revision 1.17  2002/01/06 17:41:44  alex
- * - die Fehlermeldung "unbekannter Befehl" hatte ein falsches Format.
- *
- * Revision 1.16  2002/01/05 23:23:20  alex
- * - generisches Forwarding von Zahlen-Statuscodes implementiert.
- *
- * Revision 1.15  2002/01/05 01:42:08  alex
- * - an Server werden keine ERRORS mehr wegen unbekannter Befehle geschickt.
- *
- * Revision 1.14  2002/01/04 17:56:45  alex
- * - neuer Befehl SQUIT.
- *
- * Revision 1.13  2002/01/04 01:20:02  alex
- * - Client-Strukruren werden nur noch ueber Funktionen angesprochen.
- *
- * Revision 1.12  2002/01/03 02:24:49  alex
- * - neue Befehle NJOIN und SERVER begonnen.
- *
- * Revision 1.11  2002/01/02 02:43:22  alex
- * - Copyright-Texte aktualisiert.
- * - neuer Befehl ERROR.
- *
- * Revision 1.10  2001/12/31 15:33:13  alex
- * - neuer Befehl NAMES, kleinere Bugfixes.
- * - Bug bei PING behoben: war zu restriktiv implementiert :-)
- *
- * Revision 1.9  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.8  2001/12/29 03:08:19  alex
- * - Fuehrende und folgende Leerzeichen etc. in Requests werden geloescht.
- * - Logmeldungen (mal wieder) ein wenig angepasst.
- *
- * Revision 1.7  2001/12/27 19:13:21  alex
- * - neue Befehle NOTICE und PRIVMSG.
- * - Debug-Logging ein wenig reduziert.
- *
- * Revision 1.6  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.5  2001/12/26 03:23:03  alex
- * - PING/PONG-Befehle implementiert.
- *
- * Revision 1.4  2001/12/25 22:04:26  alex
- * - Aenderungen an den Debug- und Logging-Funktionen.
- *
- * Revision 1.3  2001/12/25 19:18:36  alex
- * - Gross- und Kleinschreibung der IRC-Befehle wird ignoriert.
- * - bessere Debug-Ausgaben.
- *
- * Revision 1.2  2001/12/23 21:56:47  alex
- * - bessere Debug-Ausgaben,
- * - Bug im Parameter-Parser behoben (bei "langem" Parameter)
- * - erste IRC-Befehle werden erkannt :-)
- *
- * Revision 1.1  2001/12/21 23:53:16  alex
- * - Modul zum Parsen von Client-Requests begonnen.
+ * IRC command parser and validator
  */
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+static char UNUSED id[] = "$Id: parse.c,v 1.60 2004/01/17 03:17:49 alex Exp $";
+
+#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 
 #include "ngircd.h"
+#include "defines.h"
+#include "conn-func.h"
 #include "client.h"
-#include "conn.h"
-#include "irc.h"
+#include "channel.h"
 #include "log.h"
 #include "messages.h"
 #include "tool.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "parse.h"
 
+#include "imp.h"
+#include "irc.h"
+#include "irc-channel.h"
+#include "irc-info.h"
+#include "irc-login.h"
+#include "irc-mode.h"
+#include "irc-op.h"
+#include "irc-oper.h"
+#include "irc-server.h"
+#include "irc-write.h"
 
-LOCAL VOID Init_Request( REQUEST *Req );
-
-LOCAL BOOLEAN Parse_Error( CONN_ID Idx, CHAR *Error );
-
-LOCAL BOOLEAN Validate_Prefix( REQUEST *Req );
-LOCAL BOOLEAN Validate_Command( REQUEST *Req );
-LOCAL BOOLEAN Validate_Args( REQUEST *Req );
-
-LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req );
+#include "exp.h"
 
 
-GLOBAL VOID Parse_Init( VOID )
+COMMAND My_Commands[] =
 {
-} /* Parse_Init */
+	{ "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 },
+	{ "CONNECT", IRC_CONNECT, CLIENT_USER, 0, 0, 0 },
+	{ "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 },
+	{ "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 },
+	{ "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 },
+	{ "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 },
+	{ "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "ISON", IRC_ISON, CLIENT_USER, 0, 0, 0 },
+	{ "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "NICK", IRC_NICK, 0xFFFF, 0, 0, 0 },
+	{ "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0, 0, 0 },
+	{ "NOTICE", IRC_NOTICE, 0xFFFF, 0, 0, 0 },
+	{ "OPER", IRC_OPER, CLIENT_USER, 0, 0, 0 },
+	{ "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 },
+	{ "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 },
+	{ "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 },
+	{ "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 },
+	{ "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 },
+	{ "SQUIT", IRC_SQUIT, CLIENT_SERVER, 0, 0, 0 },
+	{ "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "USER", IRC_USER, 0xFFFF, 0, 0, 0 },
+	{ "USERHOST", IRC_USERHOST, CLIENT_USER, 0, 0, 0 },
+	{ "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "WHO", IRC_WHO, CLIENT_USER, 0, 0, 0 },
+	{ "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+	{ "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+#ifdef IRCPLUS
+	{ "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 },
+#endif
+	{ NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
+};
 
 
-GLOBAL VOID Parse_Exit( VOID )
+LOCAL VOID Init_Request PARAMS(( REQUEST *Req ));
+
+LOCAL BOOLEAN Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
+LOCAL BOOLEAN Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
+LOCAL BOOLEAN Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
+
+LOCAL BOOLEAN Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
+
+
+GLOBAL COMMAND *
+Parse_GetCommandStruct( VOID )
 {
-} /* Parse_Exit */
+	return My_Commands;
+} /* Parse_GetCommandStruct */
 
 
-GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
+GLOBAL BOOLEAN
+Parse_Request( CONN_ID Idx, CHAR *Request )
 {
 	/* Client-Request parsen. Bei einem schwerwiegenden Fehler wird
 	 * die Verbindung geschlossen und FALSE geliefert.
@@ -141,6 +125,7 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
 
 	REQUEST req;
 	CHAR *start, *ptr;
+	BOOLEAN closed;
 
 	assert( Idx >= 0 );
 	assert( Request != NULL );
@@ -148,7 +133,7 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
 #ifdef SNIFFER
 	if( NGIRCd_Sniffer ) Log( LOG_DEBUG, " <- connection %d: '%s'.", Idx, Request );
 #endif
-	
+
 	Init_Request( &req );
 
 	/* Fuehrendes und folgendes "Geraffel" verwerfen */
@@ -160,7 +145,11 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
 		/* Prefix vorhanden */
 		req.prefix = Request + 1;
 		ptr = strchr( Request, ' ' );
-		if( ! ptr ) return Parse_Error( Idx, "Prefix without command!?" );
+		if( ! ptr )
+		{
+			Log( LOG_DEBUG, "Connection %d: Parse error: prefix without command!?", Idx );
+			return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" );
+		}
 		*ptr = '\0';
 #ifndef STRICT_RFC
 		/* multiple Leerzeichen als Trenner zwischen
@@ -171,8 +160,6 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
 	}
 	else start = Request;
 
-	if( ! Validate_Prefix( &req )) return Parse_Error( Idx, "Invalid prefix");
-
 	/* Befehl */
 	ptr = strchr( start, ' ' );
 	if( ptr )
@@ -180,14 +167,12 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
 		*ptr = '\0';
 #ifndef STRICT_RFC
 		/* multiple Leerzeichen als Trenner vor
-		*Parametertrennern ignorieren */
+		 * Parametern ignorieren */
 		while( *(ptr + 1) == ' ' ) ptr++;
 #endif
 	}
 	req.command = start;
 
-	if( ! Validate_Command( &req )) return Parse_Error( Idx, "Invalid command" );
-
 	/* Argumente, Parameter */
 	if( ptr )
 	{
@@ -215,29 +200,33 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request )
 #endif
 				}
 			}
-			
+
 			req.argc++;
 
 			if( start[0] == ':' ) break;
 			if( req.argc > 14 ) break;
-			
+
 			if( ptr ) start = ptr + 1;
 			else start = NULL;
 		}
 	}
-	
-	if( ! Validate_Args( &req )) return Parse_Error( Idx, "Invalid argument(s)" );
+
+	/* Daten validieren */
+	if( ! Validate_Prefix( Idx, &req, &closed )) return ! closed;
+	if( ! Validate_Command( Idx, &req, &closed )) return ! closed;
+	if( ! Validate_Args( Idx, &req, &closed )) return ! closed;
 
 	return Handle_Request( Idx, &req );
 } /* Parse_Request */
 
 
-LOCAL VOID Init_Request( REQUEST *Req )
+LOCAL VOID
+Init_Request( REQUEST *Req )
 {
 	/* Neue Request-Struktur initialisieren */
 
 	INT i;
-	
+
 	assert( Req != NULL );
 
 	Req->prefix = NULL;
@@ -247,48 +236,91 @@ LOCAL VOID Init_Request( REQUEST *Req )
 } /* Init_Request */
 
 
-LOCAL BOOLEAN Parse_Error( CONN_ID Idx, CHAR *Error )
+LOCAL BOOLEAN
+Validate_Prefix( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )
 {
-	/* Fehler beim Parsen. Fehlermeldung an den Client schicken.
-	 * TRUE: Connection wurde durch diese Funktion nicht geschlossen,
-	 * FALSE: Connection wurde terminiert. */
-	
+	CLIENT *client, *c;
+
 	assert( Idx >= 0 );
-	assert( Error != NULL );
-
-	Log( LOG_DEBUG, "Connection %d: Parse error: %s", Idx, Error );
-	return Conn_WriteStr( Idx, "ERROR :Parse error: %s", Error );
-} /* Parse_Error */
-
-
-LOCAL BOOLEAN Validate_Prefix( REQUEST *Req )
-{
 	assert( Req != NULL );
+
+	*Closed = FALSE;
+
+	/* ist ueberhaupt ein Prefix vorhanden? */
+	if( ! Req->prefix ) return TRUE;
+
+	/* Client-Struktur der Connection ermitteln */
+	client = Client_GetFromConn( Idx );
+	assert( client != NULL );
+
+	/* nur validieren, wenn bereits registrierte Verbindung */
+	if(( Client_Type( client ) != CLIENT_USER ) && ( Client_Type( client ) != CLIENT_SERVER ) && ( Client_Type( client ) != CLIENT_SERVICE ))
+	{
+		/* noch nicht registrierte Verbindung.
+		 * Das Prefix wird ignoriert. */
+		Req->prefix = NULL;
+		return TRUE;
+	}
+
+	/* pruefen, ob der im Prefix angegebene Client bekannt ist */
+	c = Client_Search( Req->prefix );
+	if( ! c )
+	{
+		/* im Prefix angegebener Client ist nicht bekannt */
+		Log( LOG_ERR, "Invalid prefix \"%s\", client not known (connection %d, command %s)!?", Req->prefix, Idx, Req->command );
+		if( ! Conn_WriteStr( Idx, "ERROR :Invalid prefix \"%s\", client not known!?", Req->prefix )) *Closed = TRUE;
+		return FALSE;
+	}
+
+	/* pruefen, ob der Client mit dem angegebenen Prefix in Richtung
+	 * des Senders liegt, d.h. sicherstellen, dass das Prefix nicht
+	 * gefaelscht ist */
+	if( Client_NextHop( c ) != client )
+	{
+		/* das angegebene Prefix ist aus dieser Richtung, also
+		 * aus der gegebenen Connection, ungueltig! */
+		Log( LOG_ERR, "Spoofed prefix \"%s\" from \"%s\" (connection %d, command %s)!", Req->prefix, Client_Mask( Client_GetFromConn( Idx )), Idx, Req->command );
+		Conn_Close( Idx, NULL, "Spoofed prefix", TRUE );
+		*Closed = TRUE;
+		return FALSE;
+	}
+
 	return TRUE;
 } /* Validate_Prefix */
 
 
-LOCAL BOOLEAN Validate_Command( REQUEST *Req )
+LOCAL BOOLEAN
+Validate_Command( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )
 {
+	assert( Idx >= 0 );
 	assert( Req != NULL );
+	*Closed = FALSE;
+
 	return TRUE;
 } /* Validate_Comman */
 
 
-LOCAL BOOLEAN Validate_Args( REQUEST *Req )
+LOCAL BOOLEAN
+Validate_Args( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )
 {
+	assert( Idx >= 0 );
 	assert( Req != NULL );
+	*Closed = FALSE;
+
 	return TRUE;
 } /* Validate_Args */
 
 
-LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req )
+LOCAL BOOLEAN
+Handle_Request( CONN_ID Idx, REQUEST *Req )
 {
 	/* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler
 	 * wird die Verbindung geschlossen und FALSE geliefert. */
 
 	CLIENT *client, *target, *prefix;
 	CHAR str[LINE_LEN];
+	BOOLEAN result;
+	COMMAND *cmd;
 	INT i;
 
 	assert( Idx >= 0 );
@@ -298,81 +330,87 @@ LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req )
 	client = Client_GetFromConn( Idx );
 	assert( client != NULL );
 
-	/* Statuscode, der geforwarded werden muss? */
-	if(( strlen( Req->command ) == 3 ) && ( atoi( Req->command ) > 100 ))
+	/* Statuscode? */
+	if(( Client_Type( client ) == CLIENT_SERVER ) && ( strlen( Req->command ) == 3 ) && ( atoi( Req->command ) > 100 ))
 	{
-		/* Befehl ist ein Statuscode */
+		/* Command is a status code from an other server */
 
-		/* Zielserver ermitteln */
-		if(( Client_Type( client ) == CLIENT_SERVER ) && ( Req->argc > 0 )) target = Client_GetFromID( Req->argv[0] );
+		/* Determine target */
+		if( Req->argc > 0 ) target = Client_Search( Req->argv[0] );
 		else target = NULL;
 		if( ! target )
 		{
-			if( target ) Log( LOG_WARNING, "Unknown target for status code: \"%s\"", Req->argv[0] );
-			else Log( LOG_WARNING, "Unknown target for status code!" );
+			/* Status code without target!? */
+			if( Req->argc > 0 ) Log( LOG_WARNING, "Unknown target for status code %s: \"%s\"", Req->command, Req->argv[0] );
+			else Log( LOG_WARNING, "Unknown target for status code %s!", Req->command );
 			return TRUE;
 		}
 		if( target == Client_ThisServer( ))
 		{
+			/* This server is the target, ignore it */
 			Log( LOG_DEBUG, "Ignored status code %s from \"%s\".", Req->command, Client_ID( client ));
 			return TRUE;
 		}
 
-		/* Quell-Client ermitteln */
+		/* Determine source */
 		if( ! Req->prefix[0] )
 		{
-			Log( LOG_WARNING, "Got status code without prefix!?" );
+			/* Oops, no prefix!? */
+			Log( LOG_WARNING, "Got status code %s from \"%s\" without prefix!?", Req->command, Client_ID( client ));
 			return TRUE;
 		}
-		else prefix = Client_GetFromID( Req->prefix );
+		else prefix = Client_Search( Req->prefix );
 		if( ! prefix )
 		{
-			Log( LOG_WARNING, "Got status code from unknown source: \"%s\"", Req->prefix );
+			/* Oops, unknown prefix!? */
+			Log( LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix );
 			return TRUE;
 		}
 
-		/* Statuscode weiterleiten */
-		strcpy( str, Req->command );
+		/* Forward status code */
+		strlcpy( str, Req->command, sizeof( str ));
 		for( i = 0; i < Req->argc; i++ )
 		{
-			if( i < Req->argc - 1 ) strcat( str, " " );
-			else strcat( str, " :" );
-			strcat( str, Req->argv[i] );
+			if( i < Req->argc - 1 ) strlcat( str, " ", sizeof( str ));
+			else strlcat( str, " :", sizeof( str ));
+			strlcat( str, Req->argv[i], sizeof( str ));
 		}
-		return IRC_WriteStrClientPrefix( target, prefix, str );
+		return IRC_WriteStrClientPrefix( target, prefix, "%s", str );
 	}
 
-	if( strcasecmp( Req->command, "PASS" ) == 0 ) return IRC_PASS( client, Req );
-	else if( strcasecmp( Req->command, "NICK" ) == 0 ) return IRC_NICK( client, Req );
-	else if( strcasecmp( Req->command, "USER" ) == 0 ) return IRC_USER( client, Req );
-	else if( strcasecmp( Req->command, "SERVER" ) == 0 ) return IRC_SERVER( client, Req );
-	else if( strcasecmp( Req->command, "NJOIN" ) == 0 ) return IRC_NJOIN( client, Req );
-	else if( strcasecmp( Req->command, "QUIT" ) == 0 ) return IRC_QUIT( client, Req );
-	else if( strcasecmp( Req->command, "SQUIT" ) == 0 ) return IRC_SQUIT( client, Req );
-	else if( strcasecmp( Req->command, "PING" ) == 0 ) return IRC_PING( client, Req );
-	else if( strcasecmp( Req->command, "PONG" ) == 0 ) return IRC_PONG( client, Req );
-	else if( strcasecmp( Req->command, "MOTD" ) == 0 ) return IRC_MOTD( client, Req );
-	else if( strcasecmp( Req->command, "PRIVMSG" ) == 0 ) return IRC_PRIVMSG( client, Req );
-	else if( strcasecmp( Req->command, "NOTICE" ) == 0 ) return IRC_NOTICE( client, Req );
-	else if( strcasecmp( Req->command, "MODE" ) == 0 ) return IRC_MODE( client, Req );
-	else if( strcasecmp( Req->command, "NAMES" ) == 0 ) return IRC_NAMES( client, Req );
-	else if( strcasecmp( Req->command, "ISON" ) == 0 ) return IRC_ISON( client, Req );
-	else if( strcasecmp( Req->command, "WHOIS" ) == 0 ) return IRC_WHOIS( client, Req );
-	else if( strcasecmp( Req->command, "USERHOST" ) == 0 ) return IRC_USERHOST( client, Req );
-	else if( strcasecmp( Req->command, "OPER" ) == 0 ) return IRC_OPER( client, Req );
-	else if( strcasecmp( Req->command, "DIE" ) == 0 ) return IRC_DIE( client, Req );
-	else if( strcasecmp( Req->command, "RESTART" ) == 0 ) return IRC_RESTART( client, Req );
-	else if( strcasecmp( Req->command, "ERROR" ) == 0 ) return IRC_ERROR( client, Req );
-	else if( strcasecmp( Req->command, "LUSERS" ) == 0 ) return IRC_LUSERS( client, Req );
-	else if( strcasecmp( Req->command, "LINKS" ) == 0 ) return IRC_LINKS( client, Req );
-	else if( strcasecmp( Req->command, "JOIN" ) == 0 ) return IRC_JOIN( client, Req );
-	else if( strcasecmp( Req->command, "PART" ) == 0 ) return IRC_PART( client, Req );
+	cmd = My_Commands;
+	while( cmd->name )
+	{
+		/* Befehl suchen */
+		if( strcasecmp( Req->command, cmd->name ) != 0 )
+		{
+			cmd++; continue;
+		}
+
+		if( Client_Type( client ) & cmd->type )
+		{
+			/* Command is allowed for this client: call it and count produced bytes */
+			Conn_ResetWCounter( );
+			result = (cmd->function)( client, Req );
+			cmd->bytes += Conn_WCounter( );
+
+			/* Adjust counters */
+			if( Client_Type( client ) != CLIENT_SERVER ) cmd->lcount++;
+			else cmd->rcount++;
+
+			return result;
+		}
+		else
+		{
+			/* Befehl ist fuer diesen Client-Typ nicht erlaubt! */
+			return IRC_WriteStrClient( client, ERR_NOTREGISTERED_MSG, Client_ID( client ));
+		}
+	}
 	
 	/* Unbekannter Befehl */
-	if( Client_Type( client ) != CLIENT_SERVER ) IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command );
 	Log( LOG_DEBUG, "Connection %d: Unknown command \"%s\", %d %s,%s prefix.", Client_Conn( client ), Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" );
-
-	return TRUE;
+	if( Client_Type( client ) != CLIENT_SERVER ) return IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command );
+	else return TRUE;
 } /* Handle_Request */
 
 

src/ngircd/parse.h

@@ -2,39 +2,21 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: parse.h,v 1.4 2002/01/02 02:43:50 alex Exp $
+ * $Id: parse.h,v 1.10 2003/01/03 22:03:51 alex Exp $
  *
- * parse.h: Parsen der Client-Anfragen (Header)
- *
- * $Log: parse.h,v $
- * Revision 1.4  2002/01/02 02:43:50  alex
- * - Copyright-Text ergaenzt bzw. aktualisiert.
- *
- * Revision 1.3  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.2  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.1  2001/12/21 23:53:16  alex
- * - Modul zum Parsen von Client-Requests begonnen.
+ * IRC command parser and validator (header)
  */
 
 
 #ifndef __parse_h__
 #define __parse_h__
 
-#include "conn.h"
-
 
 typedef struct _REQUEST			/* vgl. RFC 2812, 2.3 */
 {
@@ -45,10 +27,19 @@ typedef struct _REQUEST			/* vgl. RFC 2812, 2.3 */
 } REQUEST;
 
 
-GLOBAL VOID Parse_Init( VOID );
-GLOBAL VOID Parse_Exit( VOID );
+typedef struct _COMMAND
+{
+	CHAR *name;		/* command name */
+	BOOLEAN (*function) PARAMS(( CLIENT *Client, REQUEST *Request ));
+	CLIENT_TYPE type;	/* valid client types (bit mask) */
+	LONG lcount, rcount;	/* number of local and remote calls */
+	LONG bytes;		/* number of bytes created */
+} COMMAND;
 
-GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request );
+
+GLOBAL BOOLEAN Parse_Request PARAMS((CONN_ID Idx, CHAR *Request ));
+
+GLOBAL COMMAND *Parse_GetCommandStruct PARAMS(( VOID ));
 
 
 #endif

src/ngircd/rendezvous.c

@@ -0,0 +1,229 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Rendezvous service registration (using Mach Ports, e.g. Mac OS X)
+ */
+
+
+#include "portab.h"
+
+#ifdef RENDEZVOUS
+
+
+static char UNUSED id[] = "$Id: rendezvous.c,v 1.2 2003/03/27 01:24:32 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef HAVE_MACH_PORT_H
+#include "mach/port.h"
+#include "mach/message.h"
+#endif
+
+#ifdef HAVE_DNSSERVICEDISCOVERY_DNSSERVICEDISCOVERY_H
+#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
+#endif
+
+#include "defines.h"
+#include "log.h"
+
+#include "exp.h"
+#include "rendezvous.h"
+
+
+typedef struct _service
+{
+	dns_service_discovery_ref Discovery_Ref;
+	mach_port_t Mach_Port;
+	CHAR Desc[CLIENT_ID_LEN];
+} SERVICE;
+
+
+LOCAL VOID Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrCode, VOID *Context );
+LOCAL VOID Unregister( INT Idx );
+
+
+#define MAX_RENDEZVOUS 1000
+#define MAX_MACH_MSG_SIZE 512
+
+
+LOCAL SERVICE My_Rendezvous[MAX_RENDEZVOUS];
+
+
+GLOBAL VOID Rendezvous_Init( VOID )
+{
+	/* Initialize structures */
+
+	INT i;
+
+	for( i = 0; i < MAX_RENDEZVOUS; i++ )
+	{
+		My_Rendezvous[i].Discovery_Ref = 0;
+		My_Rendezvous[i].Mach_Port = 0;
+	}
+} /* Rendezvous_Init */
+
+
+GLOBAL VOID Rendezvous_Exit( VOID )
+{
+	/* Clean up & exit module */
+
+	INT i;
+
+	for( i = 0; i < MAX_RENDEZVOUS; i++ )
+	{
+		if( My_Rendezvous[i].Discovery_Ref ) Unregister( i );
+	}
+} /* Rendezvous_Exit */
+
+
+GLOBAL BOOLEAN Rendezvous_Register( CHAR *Name, CHAR *Type, UINT Port )
+{
+	/* Register new service */
+
+	INT i;
+
+	/* Search free port structure */
+	for( i = 0; i < MAX_RENDEZVOUS; i++ ) if( ! My_Rendezvous[i].Discovery_Ref ) break;
+	if( i >= MAX_RENDEZVOUS )
+	{
+		Log( LOG_ERR, "Can't register \"%s\" with Rendezvous: limit (%d) reached!", Name, MAX_RENDEZVOUS );
+		return FALSE;
+	}
+	strlcpy( My_Rendezvous[i].Desc, Name, sizeof( My_Rendezvous[i].Desc ));
+	
+	/* Register new service */
+	My_Rendezvous[i].Discovery_Ref = DNSServiceRegistrationCreate( Name, Type, "", htonl( Port ), "", Registration_Reply_Handler, My_Rendezvous[i].Desc );
+	if( ! My_Rendezvous[i].Discovery_Ref )
+	{
+		Log( LOG_ERR, "Can't register \"%s\" with Rendezvous: can't register service!", My_Rendezvous[i].Desc );
+		return FALSE;
+	}
+	
+	/* Get and save the corresponding Mach Port */
+	My_Rendezvous[i].Mach_Port = DNSServiceDiscoveryMachPort( My_Rendezvous[i].Discovery_Ref );
+	if( ! My_Rendezvous[i].Mach_Port )
+	{
+		Log( LOG_ERR, "Can't register \"%s\" with Rendezvous: got no Mach Port!", My_Rendezvous[i].Desc );
+		/* Here we actually leek a descriptor :-( */
+		My_Rendezvous[i].Discovery_Ref = 0;
+		return FALSE;
+	}
+
+	Log( LOG_DEBUG, "Rendezvous: Registering \"%s\" ...", My_Rendezvous[i].Desc );
+	return TRUE;
+} /* Rendezvous_Register */
+
+
+GLOBAL BOOLEAN Rendezvous_Unregister( CHAR *Name )
+{
+	/* Unregister service from rendezvous */
+
+	INT i;
+	BOOLEAN ok;
+
+	ok = FALSE;
+	for( i = 0; i < MAX_RENDEZVOUS; i++ )
+	{
+		if( strcmp( Name, My_Rendezvous[i].Desc ) == 0 )
+		{
+			Unregister( i );
+			ok = TRUE;
+		}
+	}
+
+	return ok;
+} /* Rendezvous_Unregister */
+
+
+GLOBAL VOID Rendezvous_UnregisterListeners( VOID )
+{
+	/* Unregister all our listening sockets from Rendezvous */
+
+	INT i;
+
+	for( i = 0; i < MAX_RENDEZVOUS; i++ )
+	{
+		if( My_Rendezvous[i].Discovery_Ref ) Unregister( i );
+	}
+} /* Rendezvous_UnregisterListeners */
+
+
+GLOBAL VOID Rendezvous_Handler( VOID )
+{
+	/* Handle all Rendezvous stuff; this function must be called
+	 * periodically from the run loop of the main program */
+
+	INT i;
+	CHAR buffer[MAX_MACH_MSG_SIZE];
+	mach_msg_return_t result;
+	mach_msg_header_t *msg;
+
+	for( i = 0; i < MAX_RENDEZVOUS; i++ )
+	{
+		if( ! My_Rendezvous[i].Discovery_Ref ) continue;
+
+		/* Read message from Mach Port */
+		msg = (mach_msg_header_t *)buffer;
+		result = mach_msg( msg, MACH_RCV_MSG|MACH_RCV_TIMEOUT, 0, MAX_MACH_MSG_SIZE, My_Rendezvous[i].Mach_Port, 1, 0 );
+
+		/* Handle message */
+		if( result == MACH_MSG_SUCCESS ) DNSServiceDiscovery_handleReply( msg );
+#ifdef DEBUG
+		else if( result != MACH_RCV_TIMED_OUT ) Log( LOG_DEBUG, "mach_msg(): %ld", (LONG)result );
+#endif
+	}
+} /* Rendezvous_Handler */
+
+
+LOCAL VOID Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrCode, VOID *Context )
+{
+	CHAR txt[50];
+
+	if( ErrCode == kDNSServiceDiscoveryNoError )
+	{
+		/* Success! */
+		Log( LOG_INFO, "Successfully registered \"%s\" with Rendezvous.", Context ? Context : "NULL" );
+		return;
+	}
+
+	switch( ErrCode )
+	{
+		case kDNSServiceDiscoveryAlreadyRegistered:
+			strcpy( txt, "name already registered!" );
+			break;
+		case kDNSServiceDiscoveryNameConflict:
+			strcpy( txt, "name conflict!" );
+			break;
+		default:
+			sprintf( txt, "error code %ld!", (LONG)ErrCode );
+	}
+
+	Log( LOG_INFO, "Can't register \"%s\" with Rendezvous: %s", Context ? Context : "NULL", txt );
+} /* Registration_Reply_Handler */
+
+
+LOCAL VOID Unregister( INT Idx )
+{
+	/* Unregister service */
+
+	DNSServiceDiscoveryDeallocate( My_Rendezvous[Idx].Discovery_Ref );
+	Log( LOG_INFO, "Unregistered \"%s\" from Rendezvous.", My_Rendezvous[Idx].Desc );
+	My_Rendezvous[Idx].Discovery_Ref = 0;
+} /* Unregister */
+
+
+#endif	/* RENDEZVOUS */
+
+
+/* -eof- */

src/ngircd/rendezvous.h

@@ -0,0 +1,39 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: rendezvous.h,v 1.1 2003/02/23 12:02:26 alex Exp $
+ *
+ * "Rendezvous" functions (Header)
+ */
+
+
+#ifdef RENDEZVOUS
+
+#ifndef __rdezvous_h__
+#define __rdezvous_h__
+
+
+GLOBAL VOID Rendezvous_Init( VOID );
+GLOBAL VOID Rendezvous_Exit( VOID );
+
+GLOBAL BOOLEAN Rendezvous_Register( CHAR *Name, CHAR *Type, UINT Port );
+
+GLOBAL BOOLEAN Rendezvous_Unregister( CHAR *Name );
+GLOBAL VOID Rendezvous_UnregisterListeners( VOID );
+
+GLOBAL VOID Rendezvous_Handler( VOID );
+
+
+#endif	/* __rdezvous_h__ */
+
+#endif	/* RENDEZVOUS */
+
+
+/* -eof- */

src/ngircd/resolve.c

@@ -0,0 +1,317 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Asynchronous resolver
+ */
+
+
+#include "portab.h"
+
+static char UNUSED id[] = "$Id: resolve.c,v 1.8.2.1 2004/05/15 23:52:17 alex Exp $";
+
+#include "imp.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#ifdef IDENTAUTH
+#ifdef HAVE_IDENT_H
+#include <ident.h>
+#endif
+#endif
+
+#include "conn.h"
+#include "defines.h"
+#include "log.h"
+
+#include "exp.h"
+#include "resolve.h"
+
+
+#ifdef IDENTAUTH
+LOCAL VOID Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, INT Sock, INT w_fd ));
+#else
+LOCAL VOID Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, INT w_fd ));
+#endif
+
+LOCAL VOID Do_ResolveName PARAMS(( CHAR *Host, INT w_fd ));
+
+#ifdef h_errno
+LOCAL CHAR *Get_Error PARAMS(( INT H_Error ));
+#endif
+
+
+GLOBAL VOID
+Resolve_Init( VOID )
+{
+	/* Initialize module */
+
+	FD_ZERO( &Resolver_FDs );
+} /* Resolve_Init */
+
+
+#ifdef IDENTAUTH
+GLOBAL RES_STAT *
+Resolve_Addr( struct sockaddr_in *Addr, int Sock )
+#else
+GLOBAL RES_STAT *
+Resolve_Addr( struct sockaddr_in *Addr )
+#endif
+{
+	/* Resolve IP (asynchronous!). On errors, e.g. if the child process
+	 * can't be forked, this functions returns NULL. */
+
+	RES_STAT *s;
+	INT pid;
+
+	/* Allocate memory */
+	s = (RES_STAT *)malloc( sizeof( RES_STAT ));
+	if( ! s )
+	{
+		Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" );
+		return NULL;
+	}
+
+	/* Initialize pipe for result */
+	if( pipe( s->pipe ) != 0 )
+	{
+		free( s );
+		Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
+		return NULL;
+	}
+
+	/* For sub-process */
+	pid = fork( );
+	if( pid > 0 )
+	{
+		/* Main process */
+		Log( LOG_DEBUG, "Resolver for %s created (PID %d).", inet_ntoa( Addr->sin_addr ), pid );
+		FD_SET( s->pipe[0], &Resolver_FDs );
+		if( s->pipe[0] > Conn_MaxFD ) Conn_MaxFD = s->pipe[0];
+		s->pid = pid;
+		s->stage = 0;
+		s->bufpos = 0;
+		return s;
+	}
+	else if( pid == 0 )
+	{
+		/* Sub process */
+		Log_Init_Resolver( );
+#ifdef IDENTAUTH
+		Do_ResolveAddr( Addr, Sock, s->pipe[1] );
+#else
+		Do_ResolveAddr( Addr, s->pipe[1] );
+#endif
+		Log_Exit_Resolver( );
+		exit( 0 );
+	}
+	else
+	{
+		/* Error! */
+		free( s );
+		Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
+		return NULL;
+	}
+} /* Resolve_Addr */
+
+
+GLOBAL RES_STAT *
+Resolve_Name( CHAR *Host )
+{
+	/* Resolve hostname (asynchronous!). On errors, e.g. if the child
+	 * process can't be forked, this functions returns NULL. */
+
+	RES_STAT *s;
+	INT pid;
+
+	/* Allocate memory */
+	s = (RES_STAT *)malloc( sizeof( RES_STAT ));
+	if( ! s )
+	{
+		Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Name]" );
+		return NULL;
+	}
+
+	/* Initialize the pipe for the result */
+	if( pipe( s->pipe ) != 0 )
+	{
+		free( s );
+		Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
+		return NULL;
+	}
+
+	/* Fork sub-process */
+	pid = fork( );
+	if( pid > 0 )
+	{
+		/* Main process */
+		Log( LOG_DEBUG, "Resolver for \"%s\" created (PID %d).", Host, pid );
+		FD_SET( s->pipe[0], &Resolver_FDs );
+		if( s->pipe[0] > Conn_MaxFD ) Conn_MaxFD = s->pipe[0];
+		s->pid = pid;
+		s->stage = 0;
+		s->bufpos = 0;
+		return s;
+	}
+	else if( pid == 0 )
+	{
+		/* Sub process */
+		Log_Init_Resolver( );
+		Do_ResolveName( Host, s->pipe[1] );
+		Log_Exit_Resolver( );
+		exit( 0 );
+	}
+	else
+	{
+		/* Error! */
+		free( s );
+		Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
+		return NULL;
+	}
+} /* Resolve_Name */
+
+
+#ifdef IDENTAUTH
+LOCAL VOID
+Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, INT w_fd )
+#else
+LOCAL VOID
+Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
+#endif
+{
+	/* Resolver sub-process: resolve IP address and write result into
+	 * pipe to parent. */
+
+	CHAR hostname[HOST_LEN];
+	struct hostent *h;
+	INT len;
+#ifdef IDENTAUTH
+	CHAR *res;
+#endif
+
+	/* Resolve IP address */
+	Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr ));
+	h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET );
+	if( h ) strlcpy( hostname, h->h_name, sizeof( hostname ));
+	else
+	{
+#ifdef h_errno
+		Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\": %s!", inet_ntoa( Addr->sin_addr ), Get_Error( h_errno ));
+#else
+		Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\"!", inet_ntoa( Addr->sin_addr ));
+#endif	
+		strlcpy( hostname, inet_ntoa( Addr->sin_addr ), sizeof( hostname ));
+	}
+	Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname );
+
+	/* Write resolver result into pipe to parent */
+	len = strlen( hostname ); 
+	hostname[len] = '\n'; len++;
+	if( (size_t)write( w_fd, hostname, len ) != (size_t)len )
+	{
+		Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno ));
+		close( w_fd );
+		return;
+	}
+
+#ifdef IDENTAUTH
+	/* Do "IDENT" (aka "AUTH") lookup and write result to parent */
+	Log_Resolver( LOG_DEBUG, "Doing IDENT lookup on socket %d ...", Sock );
+	res = ident_id( Sock, 10 );
+	Log_Resolver( LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"", Sock, res ? res : "" );
+
+	/* Write IDENT result into pipe to parent */
+	len = strlen( res ? res : "" );
+	if( res != NULL ) res[len] = '\n';
+	len++;
+	if( (size_t)write( w_fd, res ? res : "\n", len ) != (size_t)len )
+	{
+		Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent (IDENT): %s!", strerror( errno ));
+		close( w_fd );
+	}
+	free( res );
+#endif
+} /* Do_ResolveAddr */
+
+
+LOCAL VOID
+Do_ResolveName( CHAR *Host, INT w_fd )
+{
+	/* Resolver sub-process: resolve name and write result into pipe
+	 * to parent. */
+
+	CHAR ip[16];
+	struct hostent *h;
+	struct in_addr *addr;
+	INT len;
+
+	Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host );
+
+	/* Resolve hostname */
+	h = gethostbyname( Host );
+	if( h )
+	{
+		addr = (struct in_addr *)h->h_addr;
+		strlcpy( ip, inet_ntoa( *addr ), sizeof( ip ));
+	}
+	else
+	{
+#ifdef h_errno
+		Log_Resolver( LOG_WARNING, "Can't resolve \"%s\": %s!", Host, Get_Error( h_errno ));
+#else
+		Log_Resolver( LOG_WARNING, "Can't resolve \"%s\"!", Host );
+#endif
+		strcpy( ip, "" );
+	}
+	if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip );
+
+	/* Write result into pipe to parent */
+	len = strlen( ip );
+	ip[len] = '\n'; len++;
+	if( (size_t)write( w_fd, ip, len ) != (size_t)len )
+	{
+		Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno ));
+		close( w_fd );
+	}
+} /* Do_ResolveName */
+
+
+#ifdef h_errno
+
+LOCAL CHAR *
+Get_Error( INT H_Error )
+{
+	/* Get error message for H_Error */
+
+	switch( H_Error )
+	{
+		case HOST_NOT_FOUND:
+			return "host not found";
+		case NO_DATA:
+			return "name valid but no IP address defined";
+		case NO_RECOVERY:
+			return "name server error";
+		case TRY_AGAIN:
+			return "name server temporary not available";
+		default:
+			return "unknown error";
+	}
+} /* Get_Error */
+
+#endif
+
+
+/* -eof- */

src/ngircd/resolve.h

@@ -0,0 +1,55 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: resolve.h,v 1.6.2.1 2004/05/15 23:52:17 alex Exp $
+ *
+ * Asynchronous resolver (header)
+ */
+
+
+#ifndef __resolve_h__
+#define __resolve_h__
+
+
+#ifdef HAVE_SYS_SELECT_H
+#	include <sys/select.h>
+#endif
+#include <sys/types.h>
+#include <netinet/in.h>
+
+
+typedef struct _Res_Stat
+{
+	INT pid;			/* PID des Child-Prozess */
+	INT pipe[2];			/* Pipe fuer IPC */
+	INT stage;			/* Hostname/IP(0) or IDENT(1)? */
+	INT bufpos;			/* Position in buffer */
+	CHAR buffer[HOST_LEN];		/* Buffer */
+} RES_STAT;
+
+
+GLOBAL fd_set Resolver_FDs;
+
+
+GLOBAL VOID Resolve_Init PARAMS(( VOID ));
+
+#ifdef IDENTAUTH
+GLOBAL RES_STAT *Resolve_Addr PARAMS(( struct sockaddr_in *Addr, int Sock ));
+#else
+GLOBAL RES_STAT *Resolve_Addr PARAMS(( struct sockaddr_in *Addr ));
+#endif
+
+GLOBAL RES_STAT *Resolve_Name PARAMS(( CHAR *Host ));
+
+
+#endif
+
+
+/* -eof- */

src/ngircd/tool.c

@@ -1,76 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- *
- * $Id: tool.c,v 1.6 2002/01/02 02:42:58 alex Exp $
- *
- * tool.c: Hilfsfunktionen, ggf. Platformabhaengig
- *
- * $Log: tool.c,v $
- * Revision 1.6  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.5  2001/12/31 02:44:36  alex
- * - ngt_TrimStr() hatte noch einen boesen Bug: evtl. wurde ueber den Start
- *   des Strings nach vorne(!) hinaus gelesen. Hopsa!
- *
- * Revision 1.4  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.3  2001/12/29 03:05:34  alex
- * - Funktionsnamen etwas konsequenter umbenannt :-)
- *
- * Revision 1.2  2001/12/12 17:20:33  alex
- * - Tool-Funktionen haben nun das Praefix "ngt_".
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
- */
-
-
-#include <portab.h>
-#include "global.h"
-
-#include <imp.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <exp.h>
-#include "tool.h"
-
-
-GLOBAL VOID ngt_TrimStr( CHAR *String )
-{
-	/* Mit ngt_TrimStr() werden fuehrende und folgende Leerzeichen,
-	 * Tabulatoren und Zeilenumbrueche (ASCII 10 und ASCII 13) aus
-	 * dem String entfernt. */
-	
-	CHAR *start, *ptr;
-
-	assert( String != NULL );
-
-	start = String;
-	
-	/* Zeichen am Anfang pruefen ... */
-	while(( *start == ' ' ) || ( *start == 9 )) start++;
-	
-	/* Zeichen am Ende pruefen ... */
-	ptr = strchr( start, '\0' ) - 1;
-	while((( *ptr == ' ' ) || ( *ptr == 9 ) || ( *ptr == 10 ) || ( *ptr == 13 )) && ptr >= start ) ptr--;
-	*(++ptr) = '\0';
-
-	memmove( String, start, strlen( start ) + 1 );
-} /* ngt_TrimStr */
-
-
-/* -eof- */

src/ngircd/tool.h

@@ -1,46 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- *
- * $Id: tool.h,v 1.5 2002/01/02 02:42:58 alex Exp $
- *
- * log.h: Hilfsfunktionen (Header)
- *
- * $Log: tool.h,v $
- * Revision 1.5  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.4  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.3  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.2  2001/12/12 17:20:33  alex
- * - Tool-Funktionen haben nun das Praefix "ngt_".
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
- */
-
-
-#ifndef __tool_h__
-#define __tool_h__
-
-
-GLOBAL VOID ngt_TrimStr( CHAR *String );
-
-
-#endif
-
-
-/* -eof- */

src/portab/Makefile.am

@@ -9,24 +9,28 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: Makefile.am,v 1.3 2002/01/02 02:40:15 alex Exp $
-#
-# $Log: Makefile.am,v $
-# Revision 1.3  2002/01/02 02:40:15  alex
-# - Copyright-Texte ergaenzt und aktualisiert,
-# - fehlende Dateien in Projekt aufgenommen.
-#
-# Revision 1.2  2001/12/31 16:02:12  alex
-# - Projektdateien von Mac OS X werden nun auch in die Distribution aufgenommen.
-#
-# Revision 1.1  2001/12/12 17:21:58  alex
-# - Projektdatei fuer den Mac OS X Project Builder erstellt.
+# $Id: Makefile.am,v 1.7 2003/01/03 22:04:14 alex Exp $
 #
 
-SUBDIRS = ngircd.pbproj
+AUTOMAKE_OPTIONS = ansi2knr
+
+noinst_LIBRARIES = libngportab.a
+
+libngportab_a_SOURCES = strlcpy.c vsnprintf.c
+
+check_PROGRAMS = portabtest
+
+portabtest_SOURCES = portabtest.c
+
+portabtest_LDFLAGS = -L.
+
+portabtest_LDADD = -lngportab
+
+noinst_HEADERS = imp.h exp.h portab.h
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in
-	rm -rf build
+
+TESTS = portabtest
 
 # -eof-

src/portab/ansi2knr.1

@@ -0,0 +1,36 @@
+.TH ANSI2KNR 1 "19 Jan 1996"
+.SH NAME
+ansi2knr \- convert ANSI C to Kernighan & Ritchie C
+.SH SYNOPSIS
+.I ansi2knr
+[--varargs] input_file [output_file]
+.SH DESCRIPTION
+If no output_file is supplied, output goes to stdout.
+.br
+There are no error messages.
+.sp
+.I ansi2knr
+recognizes function definitions by seeing a non-keyword identifier at the left
+margin, followed by a left parenthesis, with a right parenthesis as the last
+character on the line, and with a left brace as the first token on the
+following line (ignoring possible intervening comments).  It will recognize a
+multi-line header provided that no intervening line ends with a left or right
+brace or a semicolon.  These algorithms ignore whitespace and comments, except
+that the function name must be the first thing on the line.
+.sp
+The following constructs will confuse it:
+.br
+     - Any other construct that starts at the left margin and follows the
+above syntax (such as a macro or function call).
+.br
+     - Some macros that tinker with the syntax of the function header.
+.sp
+The --varargs switch is obsolete, and is recognized only for
+backwards compatibility.  The present version of
+.I ansi2knr
+will always attempt to convert a ... argument to va_alist and va_dcl.
+.SH AUTHOR
+L. Peter Deutsch <ghost@aladdin.com> wrote the original ansi2knr and
+continues to maintain the current version; most of the code in the current
+version is his work.  ansi2knr also includes contributions by Francois
+Pinard <pinard@iro.umontreal.ca> and Jim Avera <jima@netcom.com>.

src/portab/ansi2knr.c

@@ -0,0 +1,738 @@
+/* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */
+
+/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
+
+/*
+ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY.  No author or distributor accepts responsibility to anyone for the
+consequences of using it or for whether it serves any particular purpose or
+works at all, unless he says so in writing.  Refer to the GNU General Public
+License (the "GPL") for full details.
+
+Everyone is granted permission to copy, modify and redistribute ansi2knr,
+but only under the conditions described in the GPL.  A copy of this license
+is supposed to have been given to you along with ansi2knr so you can know
+your rights and responsibilities.  It should be in a file named COPYLEFT,
+or, if there is no file named COPYLEFT, a file named COPYING.  Among other
+things, the copyright notice and this notice must be preserved on all
+copies.
+
+We explicitly state here what we believe is already implied by the GPL: if
+the ansi2knr program is distributed as a separate set of sources and a
+separate executable file which are aggregated on a storage medium together
+with another program, this in itself does not bring the other program under
+the GPL, nor does the mere fact that such a program or the procedures for
+constructing it invoke the ansi2knr executable bring any other part of the
+program under the GPL.
+*/
+
+/*
+ * Usage:
+	ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]
+ * --filename provides the file name for the #line directive in the output,
+ * overriding input_file (if present).
+ * If no input_file is supplied, input is read from stdin.
+ * If no output_file is supplied, output goes to stdout.
+ * There are no error messages.
+ *
+ * ansi2knr recognizes function definitions by seeing a non-keyword
+ * identifier at the left margin, followed by a left parenthesis, with a
+ * right parenthesis as the last character on the line, and with a left
+ * brace as the first token on the following line (ignoring possible
+ * intervening comments and/or preprocessor directives), except that a line
+ * consisting of only
+ *	identifier1(identifier2)
+ * will not be considered a function definition unless identifier2 is
+ * the word "void", and a line consisting of
+ *	identifier1(identifier2, <<arbitrary>>)
+ * will not be considered a function definition.
+ * ansi2knr will recognize a multi-line header provided that no intervening
+ * line ends with a left or right brace or a semicolon.  These algorithms
+ * ignore whitespace, comments, and preprocessor directives, except that
+ * the function name must be the first thing on the line.  The following
+ * constructs will confuse it:
+ *	- Any other construct that starts at the left margin and
+ *	    follows the above syntax (such as a macro or function call).
+ *	- Some macros that tinker with the syntax of function headers.
+ */
+
+/*
+ * The original and principal author of ansi2knr is L. Peter Deutsch
+ * <ghost@aladdin.com>.  Other authors are noted in the change history
+ * that follows (in reverse chronological order):
+
+	lpd 2000-04-12 backs out Eggert's changes because of bugs:
+	- concatlits didn't declare the type of its bufend argument;
+	- concatlits didn't't recognize when it was inside a comment;
+	- scanstring could scan backward past the beginning of the string; when
+	- the check for \ + newline in scanstring was unnecessary.
+
+	2000-03-05  Paul Eggert  <eggert@twinsun.com>
+
+	Add support for concatenated string literals.
+	* ansi2knr.c (concatlits): New decl.
+	(main): Invoke concatlits to concatenate string literals.
+	(scanstring): Handle backslash-newline correctly.  Work with
+	character constants.  Fix bug when scanning backwards through
+	backslash-quote.  Check for unterminated strings.
+	(convert1): Parse character constants, too.
+	(appendline, concatlits): New functions.
+	* ansi2knr.1: Document this.
+
+	lpd 1999-08-17 added code to allow preprocessor directives
+		wherever comments are allowed
+	lpd 1999-04-12 added minor fixes from Pavel Roskin
+		<pavel_roskin@geocities.com> for clean compilation with
+		gcc -W -Wall
+	lpd 1999-03-22 added hack to recognize lines consisting of
+		identifier1(identifier2, xxx) as *not* being procedures
+	lpd 1999-02-03 made indentation of preprocessor commands consistent
+	lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
+		endless loop; quoted strings within an argument list
+		confused the parser
+	lpd 1999-01-24 added a check for write errors on the output,
+		suggested by Jim Meyering <meyering@ascend.com>
+	lpd 1998-11-09 added further hack to recognize identifier(void)
+		as being a procedure
+	lpd 1998-10-23 added hack to recognize lines consisting of
+		identifier1(identifier2) as *not* being procedures
+	lpd 1997-12-08 made input_file optional; only closes input and/or
+		output file if not stdin or stdout respectively; prints
+		usage message on stderr rather than stdout; adds
+		--filename switch (changes suggested by
+		<ceder@lysator.liu.se>)
+	lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with
+		compilers that don't understand void, as suggested by
+		Tom Lane
+	lpd 1996-01-15 changed to require that the first non-comment token
+		on the line following a function header be a left brace,
+		to reduce sensitivity to macros, as suggested by Tom Lane
+		<tgl@sss.pgh.pa.us>
+	lpd 1995-06-22 removed #ifndefs whose sole purpose was to define
+		undefined preprocessor symbols as 0; changed all #ifdefs
+		for configuration symbols to #ifs
+	lpd 1995-04-05 changed copyright notice to make it clear that
+		including ansi2knr in a program does not bring the entire
+		program under the GPL
+	lpd 1994-12-18 added conditionals for systems where ctype macros
+		don't handle 8-bit characters properly, suggested by
+		Francois Pinard <pinard@iro.umontreal.ca>;
+		removed --varargs switch (this is now the default)
+	lpd 1994-10-10 removed CONFIG_BROKETS conditional
+	lpd 1994-07-16 added some conditionals to help GNU `configure',
+		suggested by Francois Pinard <pinard@iro.umontreal.ca>;
+		properly erase prototype args in function parameters,
+		contributed by Jim Avera <jima@netcom.com>;
+		correct error in writeblanks (it shouldn't erase EOLs)
+	lpd 1989-xx-xx original version
+ */
+
+/* Most of the conditionals here are to make ansi2knr work with */
+/* or without the GNU configure machinery. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+
+#if HAVE_CONFIG_H
+
+/*
+   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
+   This will define HAVE_CONFIG_H and so, activate the following lines.
+ */
+
+# if STDC_HEADERS || HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
+#else /* not HAVE_CONFIG_H */
+
+/* Otherwise do it the hard way */
+
+# ifdef BSD
+#  include <strings.h>
+# else
+#  ifdef VMS
+    extern int strlen(), strncmp();
+#  else
+#   include <string.h>
+#  endif
+# endif
+
+#endif /* not HAVE_CONFIG_H */
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+/*
+   malloc and free should be declared in stdlib.h,
+   but if you've got a K&R compiler, they probably aren't.
+ */
+# ifdef MSDOS
+#  include <malloc.h>
+# else
+#  ifdef VMS
+     extern char *malloc();
+     extern void free();
+#  else
+     extern char *malloc();
+     extern int free();
+#  endif
+# endif
+
+#endif
+
+/* Define NULL (for *very* old compilers). */
+#ifndef NULL
+# define NULL (0)
+#endif
+
+/*
+ * The ctype macros don't always handle 8-bit characters correctly.
+ * Compensate for this here.
+ */
+#ifdef isascii
+# undef HAVE_ISASCII		/* just in case */
+# define HAVE_ISASCII 1
+#else
+#endif
+#if STDC_HEADERS || !HAVE_ISASCII
+# define is_ascii(c) 1
+#else
+# define is_ascii(c) isascii(c)
+#endif
+
+#define is_space(c) (is_ascii(c) && isspace(c))
+#define is_alpha(c) (is_ascii(c) && isalpha(c))
+#define is_alnum(c) (is_ascii(c) && isalnum(c))
+
+/* Scanning macros */
+#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
+#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
+
+/* Forward references */
+char *ppdirforward();
+char *ppdirbackward();
+char *skipspace();
+char *scanstring();
+int writeblanks();
+int test1();
+int convert1();
+
+/* The main program */
+int
+main(argc, argv)
+    int argc;
+    char *argv[];
+{	FILE *in = stdin;
+	FILE *out = stdout;
+	char *filename = 0;
+	char *program_name = argv[0];
+	char *output_name = 0;
+#define bufsize 5000			/* arbitrary size */
+	char *buf;
+	char *line;
+	char *more;
+	char *usage =
+	  "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n";
+	/*
+	 * In previous versions, ansi2knr recognized a --varargs switch.
+	 * If this switch was supplied, ansi2knr would attempt to convert
+	 * a ... argument to va_alist and va_dcl; if this switch was not
+	 * supplied, ansi2knr would simply drop any such arguments.
+	 * Now, ansi2knr always does this conversion, and we only
+	 * check for this switch for backward compatibility.
+	 */
+	int convert_varargs = 1;
+	int output_error;
+
+	while ( argc > 1 && argv[1][0] == '-' ) {
+	  if ( !strcmp(argv[1], "--varargs") ) {
+	    convert_varargs = 1;
+	    argc--;
+	    argv++;
+	    continue;
+	  }
+	  if ( !strcmp(argv[1], "--filename") && argc > 2 ) {
+	    filename = argv[2];
+	    argc -= 2;
+	    argv += 2;
+	    continue;
+	  }
+	  fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
+		  argv[1]);
+	  fprintf(stderr, usage);
+	  exit(1);
+	}
+	switch ( argc )
+	   {
+	default:
+		fprintf(stderr, usage);
+		exit(0);
+	case 3:
+		output_name = argv[2];
+		out = fopen(output_name, "w");
+		if ( out == NULL ) {
+		  fprintf(stderr, "%s: Cannot open output file %s\n",
+			  program_name, output_name);
+		  exit(1);
+		}
+		/* falls through */
+	case 2:
+		in = fopen(argv[1], "r");
+		if ( in == NULL ) {
+		  fprintf(stderr, "%s: Cannot open input file %s\n",
+			  program_name, argv[1]);
+		  exit(1);
+		}
+		if ( filename == 0 )
+		  filename = argv[1];
+		/* falls through */
+	case 1:
+		break;
+	   }
+	if ( filename )
+	  fprintf(out, "#line 1 \"%s\"\n", filename);
+	buf = malloc(bufsize);
+	if ( buf == NULL )
+	   {
+		fprintf(stderr, "Unable to allocate read buffer!\n");
+		exit(1);
+	   }
+	line = buf;
+	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
+	   {
+test:		line += strlen(line);
+		switch ( test1(buf) )
+		   {
+		case 2:			/* a function header */
+			convert1(buf, out, 1, convert_varargs);
+			break;
+		case 1:			/* a function */
+			/* Check for a { at the start of the next line. */
+			more = ++line;
+f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
+			  goto wl;
+			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
+			  goto wl;
+			switch ( *skipspace(ppdirforward(more), 1) )
+			  {
+			  case '{':
+			    /* Definitely a function header. */
+			    convert1(buf, out, 0, convert_varargs);
+			    fputs(more, out);
+			    break;
+			  case 0:
+			    /* The next line was blank or a comment: */
+			    /* keep scanning for a non-comment. */
+			    line += strlen(line);
+			    goto f;
+			  default:
+			    /* buf isn't a function header, but */
+			    /* more might be. */
+			    fputs(buf, out);
+			    strcpy(buf, more);
+			    line = buf;
+			    goto test;
+			  }
+			break;
+		case -1:		/* maybe the start of a function */
+			if ( line != buf + (bufsize - 1) ) /* overflow check */
+			  continue;
+			/* falls through */
+		default:		/* not a function */
+wl:			fputs(buf, out);
+			break;
+		   }
+		line = buf;
+	   }
+	if ( line != buf )
+	  fputs(buf, out);
+	free(buf);
+	if ( output_name ) {
+	  output_error = ferror(out);
+	  output_error |= fclose(out);
+	} else {		/* out == stdout */
+	  fflush(out);
+	  output_error = ferror(out);
+	}
+	if ( output_error ) {
+	  fprintf(stderr, "%s: error writing to %s\n", program_name,
+		  (output_name ? output_name : "stdout"));
+	  exit(1);
+	}
+	if ( in != stdin )
+	  fclose(in);
+	return 0;
+}
+
+/*
+ * Skip forward or backward over one or more preprocessor directives.
+ */
+char *
+ppdirforward(p)
+    char *p;
+{
+    for (; *p == '#'; ++p) {
+	for (; *p != '\r' && *p != '\n'; ++p)
+	    if (*p == 0)
+		return p;
+	if (*p == '\r' && p[1] == '\n')
+	    ++p;
+    }
+    return p;
+}
+char *
+ppdirbackward(p, limit)
+    char *p;
+    char *limit;
+{
+    char *np = p;
+
+    for (;; p = --np) {
+	if (*np == '\n' && np[-1] == '\r')
+	    --np;
+	for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
+	    if (np[-1] == 0)
+		return np;
+	if (*np != '#')
+	    return p;
+    }
+}
+
+/*
+ * Skip over whitespace, comments, and preprocessor directives,
+ * in either direction.
+ */
+char *
+skipspace(p, dir)
+    char *p;
+    int dir;			/* 1 for forward, -1 for backward */
+{
+    for ( ; ; ) {
+	while ( is_space(*p) )
+	    p += dir;
+	if ( !(*p == '/' && p[dir] == '*') )
+	    break;
+	p += dir;  p += dir;
+	while ( !(*p == '*' && p[dir] == '/') ) {
+	    if ( *p == 0 )
+		return p;	/* multi-line comment?? */
+	    p += dir;
+	}
+	p += dir;  p += dir;
+    }
+    return p;
+}
+
+/* Scan over a quoted string, in either direction. */
+char *
+scanstring(p, dir)
+    char *p;
+    int dir;
+{
+    for (p += dir; ; p += dir)
+	if (*p == '"' && p[-dir] != '\\')
+	    return p + dir;
+}
+
+/*
+ * Write blanks over part of a string.
+ * Don't overwrite end-of-line characters.
+ */
+int
+writeblanks(start, end)
+    char *start;
+    char *end;
+{	char *p;
+	for ( p = start; p < end; p++ )
+	  if ( *p != '\r' && *p != '\n' )
+	    *p = ' ';
+	return 0;
+}
+
+/*
+ * Test whether the string in buf is a function definition.
+ * The string may contain and/or end with a newline.
+ * Return as follows:
+ *	0 - definitely not a function definition;
+ *	1 - definitely a function definition;
+ *	2 - definitely a function prototype (NOT USED);
+ *	-1 - may be the beginning of a function definition,
+ *		append another line and look again.
+ * The reason we don't attempt to convert function prototypes is that
+ * Ghostscript's declaration-generating macros look too much like
+ * prototypes, and confuse the algorithms.
+ */
+int
+test1(buf)
+    char *buf;
+{	char *p = buf;
+	char *bend;
+	char *endfn;
+	int contin;
+
+	if ( !isidfirstchar(*p) )
+	  return 0;		/* no name at left margin */
+	bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
+	switch ( *bend )
+	   {
+	   case ';': contin = 0 /*2*/; break;
+	   case ')': contin = 1; break;
+	   case '{': return 0;		/* not a function */
+	   case '}': return 0;		/* not a function */
+	   default: contin = -1;
+	   }
+	while ( isidchar(*p) )
+	  p++;
+	endfn = p;
+	p = skipspace(p, 1);
+	if ( *p++ != '(' )
+	  return 0;		/* not a function */
+	p = skipspace(p, 1);
+	if ( *p == ')' )
+	  return 0;		/* no parameters */
+	/* Check that the apparent function name isn't a keyword. */
+	/* We only need to check for keywords that could be followed */
+	/* by a left parenthesis (which, unfortunately, is most of them). */
+	   {	static char *words[] =
+		   {	"asm", "auto", "case", "char", "const", "double",
+			"extern", "float", "for", "if", "int", "long",
+			"register", "return", "short", "signed", "sizeof",
+			"static", "switch", "typedef", "unsigned",
+			"void", "volatile", "while", 0
+		   };
+		char **key = words;
+		char *kp;
+		unsigned len = endfn - buf;
+
+		while ( (kp = *key) != 0 )
+		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
+			  return 0;	/* name is a keyword */
+			key++;
+		   }
+	   }
+	   {
+	       char *id = p;
+	       int len;
+	       /*
+		* Check for identifier1(identifier2) and not
+		* identifier1(void), or identifier1(identifier2, xxxx).
+		*/
+
+	       while ( isidchar(*p) )
+		   p++;
+	       len = p - id;
+	       p = skipspace(p, 1);
+	       if (*p == ',' ||
+		   (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
+		   )
+		   return 0;	/* not a function */
+	   }
+	/*
+	 * If the last significant character was a ), we need to count
+	 * parentheses, because it might be part of a formal parameter
+	 * that is a procedure.
+	 */
+	if (contin > 0) {
+	    int level = 0;
+
+	    for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1))
+		level += (*p == '(' ? 1 : *p == ')' ? -1 : 0);
+	    if (level > 0)
+		contin = -1;
+	}
+	return contin;
+}
+
+/* Convert a recognized function definition or header to K&R syntax. */
+int
+convert1(buf, out, header, convert_varargs)
+    char *buf;
+    FILE *out;
+    int header;			/* Boolean */
+    int convert_varargs;	/* Boolean */
+{	char *endfn;
+	char *p;
+	/*
+	 * The breaks table contains pointers to the beginning and end
+	 * of each argument.
+	 */
+	char **breaks;
+	unsigned num_breaks = 2;	/* for testing */
+	char **btop;
+	char **bp;
+	char **ap;
+	char *vararg = 0;
+
+	/* Pre-ANSI implementations don't agree on whether strchr */
+	/* is called strchr or index, so we open-code it here. */
+	for ( endfn = buf; *(endfn++) != '('; )
+	  ;
+top:	p = endfn;
+	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
+	if ( breaks == NULL )
+	   {	/* Couldn't allocate break table, give up */
+		fprintf(stderr, "Unable to allocate break table!\n");
+		fputs(buf, out);
+		return -1;
+	   }
+	btop = breaks + num_breaks * 2 - 2;
+	bp = breaks;
+	/* Parse the argument list */
+	do
+	   {	int level = 0;
+		char *lp = NULL;
+		char *rp = NULL;
+		char *end = NULL;
+
+		if ( bp >= btop )
+		   {	/* Filled up break table. */
+			/* Allocate a bigger one and start over. */
+			free((char *)breaks);
+			num_breaks <<= 1;
+			goto top;
+		   }
+		*bp++ = p;
+		/* Find the end of the argument */
+		for ( ; end == NULL; p++ )
+		   {	switch(*p)
+			   {
+			   case ',':
+				if ( !level ) end = p;
+				break;
+			   case '(':
+				if ( !level ) lp = p;
+				level++;
+				break;
+			   case ')':
+				if ( --level < 0 ) end = p;
+				else rp = p;
+				break;
+			   case '/':
+				if (p[1] == '*')
+				    p = skipspace(p, 1) - 1;
+				break;
+			   case '"':
+			       p = scanstring(p, 1) - 1;
+			       break;
+			   default:
+				;
+			   }
+		   }
+		/* Erase any embedded prototype parameters. */
+		if ( lp && rp )
+		  writeblanks(lp + 1, rp);
+		p--;			/* back up over terminator */
+		/* Find the name being declared. */
+		/* This is complicated because of procedure and */
+		/* array modifiers. */
+		for ( ; ; )
+		   {	p = skipspace(p - 1, -1);
+			switch ( *p )
+			   {
+			   case ']':	/* skip array dimension(s) */
+			   case ')':	/* skip procedure args OR name */
+			   {	int level = 1;
+				while ( level )
+				 switch ( *--p )
+				   {
+				   case ']': case ')':
+				       level++;
+				       break;
+				   case '[': case '(':
+				       level--;
+				       break;
+				   case '/':
+				       if (p > buf && p[-1] == '*')
+					   p = skipspace(p, -1) + 1;
+				       break;
+				   case '"':
+				       p = scanstring(p, -1) + 1;
+				       break;
+				   default: ;
+				   }
+			   }
+				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
+				   {	/* We found the name being declared */
+					while ( !isidfirstchar(*p) )
+					  p = skipspace(p, 1) + 1;
+					goto found;
+				   }
+				break;
+			   default:
+				goto found;
+			   }
+		   }
+found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
+		  {	if ( convert_varargs )
+			  {	*bp++ = "va_alist";
+				vararg = p-2;
+			  }
+			else
+			  {	p++;
+				if ( bp == breaks + 1 )	/* sole argument */
+				  writeblanks(breaks[0], p);
+				else
+				  writeblanks(bp[-1] - 1, p);
+				bp--;
+			  }
+		   }
+		else
+		   {	while ( isidchar(*p) ) p--;
+			*bp++ = p+1;
+		   }
+		p = end;
+	   }
+	while ( *p++ == ',' );
+	*bp = p;
+	/* Make a special check for 'void' arglist */
+	if ( bp == breaks+2 )
+	   {	p = skipspace(breaks[0], 1);
+		if ( !strncmp(p, "void", 4) )
+		   {	p = skipspace(p+4, 1);
+			if ( p == breaks[2] - 1 )
+			   {	bp = breaks;	/* yup, pretend arglist is empty */
+				writeblanks(breaks[0], p + 1);
+			   }
+		   }
+	   }
+	/* Put out the function name and left parenthesis. */
+	p = buf;
+	while ( p != endfn ) putc(*p, out), p++;
+	/* Put out the declaration. */
+	if ( header )
+	  {	fputs(");", out);
+		for ( p = breaks[0]; *p; p++ )
+		  if ( *p == '\r' || *p == '\n' )
+		    putc(*p, out);
+	  }
+	else
+	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
+		  {	p = *ap;
+			while ( isidchar(*p) )
+			  putc(*p, out), p++;
+			if ( ap < bp - 1 )
+			  fputs(", ", out);
+		  }
+		fputs(")  ", out);
+		/* Put out the argument declarations */
+		for ( ap = breaks+2; ap <= bp; ap += 2 )
+		  (*ap)[-1] = ';';
+		if ( vararg != 0 )
+		  {	*vararg = 0;
+			fputs(breaks[0], out);		/* any prior args */
+			fputs("va_dcl", out);		/* the final arg */
+			fputs(bp[0], out);
+		  }
+		else
+		  fputs(breaks[0], out);
+	  }
+	free((char *)breaks);
+	return 0;
+}

src/portab/exp.h

@@ -0,0 +1,22 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
+ * der GNU General Public License (GPL), wie von der Free Software Foundation
+ * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
+ * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
+ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
+ * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ *
+ * $Id: exp.h,v 1.1 2002/03/12 14:36:44 alex Exp $
+ *
+ * exp.h: "Export Header"
+ */
+
+
+#undef GLOBAL
+#define GLOBAL
+
+
+/* -eof- */

src/portab/imp.h

@@ -0,0 +1,22 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ *
+ * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
+ * der GNU General Public License (GPL), wie von der Free Software Foundation
+ * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
+ * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
+ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
+ * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ *
+ * $Id: imp.h,v 1.1 2002/03/12 14:36:44 alex Exp $
+ *
+ * imp.h: "Import Header"
+ */
+
+
+#undef GLOBAL
+#define GLOBAL extern
+
+
+/* -eof- */

src/portab/portab.h

@@ -0,0 +1,161 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ *
+ * This program is free 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 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: portab.h,v 1.17 2004/03/15 19:26:39 alex Exp $
+ *
+ * Portability functions and declarations (header for libngbportab).
+ */
+
+
+#ifndef __PORTAB__
+#define __PORTAB__
+
+
+#include "config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+
+/* compiler features */
+
+#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
+# define PUNUSED(x) __attribute__ ((unused)) x
+# define UNUSED     __attribute__ ((unused))
+#else
+# define PUNUSED(x) x
+# define UNUSED
+#endif
+
+#ifndef PARAMS
+# if PROTOTYPES
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+
+/* keywords */
+
+#define EXTERN extern
+#define STATIC static
+#define LOCAL static
+#define CONST const
+#define REGISTER register
+
+
+/* datatypes */
+
+#ifndef PROTOTYPES
+# ifndef signed
+#  define signed
+# endif
+#endif
+
+typedef void VOID;
+typedef void POINTER;
+
+typedef signed int INT;
+typedef unsigned int UINT;
+typedef signed long LONG;
+typedef unsigned long ULONG;
+
+typedef signed char INT8;
+typedef unsigned char UINT8;
+typedef signed short INT16;
+typedef unsigned short UINT16;
+typedef signed long INT32;
+typedef unsigned long UINT32;
+
+typedef double DOUBLE;
+typedef float FLOAT;
+
+typedef char CHAR;
+
+typedef UINT8 BOOLEAN;
+
+#undef TRUE
+#define TRUE (BOOLEAN)1
+
+#undef FALSE
+#define FALSE (BOOLEAN)0
+
+#undef NULL
+#ifdef PROTOTYPES
+# define NULL (VOID *)0
+#else
+# define NULL 0L
+#endif
+
+#undef GLOBAL
+#define GLOBAL
+
+
+/* SPLint */
+
+
+#ifdef S_SPLINT_S
+#include "splint.h"
+#endif
+
+
+/* target constants  */
+
+#ifndef TARGET_OS
+#define TARGET_OS "unknown"
+#endif
+
+#ifndef TARGET_CPU
+#define TARGET_CPU "unknown"
+#endif
+
+#ifndef TARGET_VENDOR
+#define TARGET_VENDOR "unknown"
+#endif
+
+
+/* configure options */
+
+#ifndef HAVE_socklen_t
+#define socklen_t int			/* u.a. fuer Mac OS X */
+#endif
+
+#ifndef HAVE_SNPRINTF
+EXTERN INT snprintf PARAMS(( CHAR *str, size_t count, CONST CHAR *fmt, ... ));
+#endif
+
+#ifndef HAVE_STRLCAT
+EXTERN size_t strlcat PARAMS(( CHAR *dst, CONST CHAR *src, size_t size ));
+#endif
+
+#ifndef HAVE_STRLCPY
+EXTERN size_t strlcpy PARAMS(( CHAR *dst, CONST CHAR *src, size_t size ));
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#include <stdarg.h>
+EXTERN INT vsnprintf PARAMS(( CHAR *str, size_t count, CONST CHAR *fmt, va_list args ));
+#endif
+
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME PACKAGE
+#endif
+
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION VERSION
+#endif
+
+
+#endif
+
+
+/* -eof- */