- Dokumentation aktualisiert.

- Handle_Buffer() liefert nun ein Ergebnis. (beides aus HEAD)

AUTHORS

@@ -1,35 +1,13 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                        (c)2001-2005 Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                       -- AUTHORS and CONTRIBUTORS --
+                           -- AUTHORS / Autoren --
 
 
-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 $
+Alexander Barton, alex@arthur.ath.cx

ChangeLog

@@ -1,263 +1,21 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                       (c)2001-2005 Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                               -- ChangeLog --
+                        -- ChangeLog / Aenderungen --
 
 
-ngIRCd 0.8.3 (2005-02-03)
+ngIRCd 0.5.x-CVS
 
-  - 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
 
@@ -515,6 +273,7 @@ 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
@@ -561,4 +320,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.233.2.20 2005/02/03 10:16:25 alex Exp $
+$Id: ChangeLog,v 1.87.2.18 2002/11/29 11:42:24 alex Exp $

INSTALL

@@ -1,180 +1,148 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2004 by Alexander Barton,
+                      (c)2001,2002 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.
-
-                                -- INSTALL --
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
+                         -- INSTALL / Installation --
                          
-
-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"!).
+                      Ilja Osthoff, <ilja@glide.ath.cx>
 
 
-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.
+ +-----------------------------------------------------------------------+
+ | Please note: English translations of some of the german documentation |
+ | files can be found in the directory "doc/en" -- please have a look!   |
+ +-----------------------------------------------------------------------+
 
 
-1): "autogen.sh"
-
-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.
-
-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!
-
-
-2): "./configure"
-
-The configure-script is used to detect local system dependencies.
-
-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.
-
-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.
-
-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).
-
-
-3): "make"
-
-The make command uses the Makefiles produced by configure and compiles the
-ngIRCd daemon.
-
-
-4): "make install"
-
-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. Useful make-targets
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The Makefile produced by the configure-script contains always these useful
-targets:
-
- - clean: delete every product from the compiler/linker
-   next step: -> make
-
- - distclean: the above plus erase all generated Makefiles
-   next step: -> ./configure
-
- - 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
+I. Standard-Installation
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-These parameters could be passed to the ngIRCd:
+ngIRCd ist fuer UNIXoide-Systeme konzipiert worden, das bedeutet, dass die
+Installation auf einem modernen UNIX-aehnlichen System kein Problem dar-
+stellen sollte. Das System muss nur von GNU automake und GNU autoconf
+("configure") unterstuetzt werden.
+
+Die Standard-Installation sieht so aus:
+
+   1) tar xzf ngircd-<Version>.tar.gz
+   2) cd ngircd-<Version>
+   3) ./autogen.sh	[nur erforderlich, wenn ueber CVS bezogen]
+   4) ./configure
+   5) make
+   6) make install
+
+
+zu 3): "autogen.sh"
+
+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 immer, wenn der Source-Code ueber CVS
+bezogen wurde.
+
+Dieser Absatz ist also eigentlich ausschliesslich fuer Entwickler interessant.
+
+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.
+
+(nochmal: "Endanwender" mussen diesen Schritt i.d.R. nicht ausfuehren!)
+
+
+zu 4): "./configure"
+
+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.
+
+
+zu 5): "make"
+
+Der make-Befehl bearbeitet die vom configure-Script erzeugten Makefile's und
+uebersetzt den ngIRCd.
+
+
+zu 6): "make install"
+
+Mit "make install" wird der Server und ggf. eine Beispiels-Konfiguration
+im System installiert; hierzu sind in der Regel root-Rechte erforderlich.
+Eine bereits vorhandene Konfigurationsdatei wird nie ueberschrieben.
+
+Folgende Dateien werden installiert:
+
+- /usr/local/sbin/ngircd: ausfuehrbarer Server
+- /usr/local/etc/ngircd.conf: Beispiel-Konfiguration, wenn nicht vorhanden
+
+
+II. Nuetzliche make-Targets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Die vom configure-Script erzeugten Makefile's enthalten immer die folgenden
+nuetzlichen Targets:
+
+ - clean: alle Erzeugnisse des Compilers/Linkers loeschen.
+   Naechster Schritt: -> make
+
+ - distclean: zusaetzliche alle Makefile's loeschen.
+   Naechster Schritt: -> ./configure
+
+ - maintainer-clean: alle automat. erzeugten Dateien loeschen.
+   Naechster Schritt: -> ./autogen.sh
+
+
+
+III. Konfigurationsdatei ngircd.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In der Konfigurationsdatei werden Kommentare durch "#" oder durch ";"
+eingeleitet. Dieses dient nur der besseren Lesbarkeit.
+
+Die Datei ist in drei Abschnitte unterteilt: [Global], [Operator] und
+[Server]. Im [Global]-Teil werden die grundlegenden Einstellungen vor-
+genommen, z.B. der Server-Name und die Ports, auf denen er Verbindungen
+annehmen soll. In [Operator]-Abschnitten werden Server-Operatoren fest-
+gelegt und unter [Server] werden die Einstellungen fuer die Verbindung
+mit anderen Servern konfiguriert.
+
+Die Bedeutung der einzelnen Variablen ist in der Beispiel-Konfiguration
+"doc/sample-ngircd.conf" erklaert, die bei "make install" auch als
+"ngircd.conf" in /usr/local/etc installiert wird, wenn dort noch keine
+Konfigurationsdatei vorhanden ist.
+
+
+IV. Kommandozeilen-Optionen
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Folgende Parameter koennen dem ngIRCd u.a. uebergeben werden:
 
 -f, --config <file>
-	The daemon uses the file <file> as configuration file rather than
-	the standard configuration /usr/local/etc/ngircd.conf.
+	Der Daemon wird angewiesen, statt der Standard-Konfigurationsdatei
+	/usr/local/etc/ngircd.conf die Datei <file> einzulesen.
 
 -n, --nodaemon
-	ngIRCd should be running as a foreground process.
+	ngIRCd soll im Fordergrund laufen; alle Meldungen werden zusaetzlich
+	zum Syslog auch auf der Konsole ausgegeben.
 
 -p, --passive
-	Server-links won't be automatically established.
+	Verbindungen zu anderen Servern (wie in der Konfigurationsdatei in
+	[Server]-Abschnitten definiert) werden nicht automatisch hergestellt.
 
--t, --configtest
-	Reads, validates and dumps the configuration file as interpreted
-	by the server. Then exits.
+--configtest
+	Die Konfigurationsdatei wird eingelesen, ueberprueft und so aus-
+	gegeben, wie sie vom ngIRCd interpretiert wurde. Danach beendet
+	sich der Server wieder.
 
-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.
+Mit dem Parameter "--help" werden alle unterstuetzten Parameter angezeigt,
+mit "--version" die Versionsnummer. Bei beiden Parametern beendet sich der
+Server nach der Ausgabe wieder.
 
 
 -- 
-$Id: INSTALL,v 1.18.2.2 2004/09/03 20:02:02 alex Exp $
+$Id: INSTALL,v 1.8 2002/09/16 11:03:05 alex Exp $

MacOSX/Makefile.am

@@ -0,0 +1,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.
+#
+# $Id: Makefile.am,v 1.4 2002/03/12 14:37:51 alex Exp $
+#
+
+SUBDIRS = ngircd.pbproj
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+	rm -rf build
+
+# -eof-

MacOSX/ngircd.pbproj/Makefile.am

@@ -0,0 +1,20 @@
+#
+# 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: Makefile.am,v 1.3 2002/03/12 14:37:51 alex Exp $
+#
+
+EXTRA_DIST = project.pbxproj
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+# -eof-

Makefile.am

@@ -1,28 +1,26 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+# 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.
+# 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.14.2.1 2004/05/11 00:38:17 alex Exp $
+# $Id: Makefile.am,v 1.9.2.1 2002/10/03 16:13:38 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = doc src man contrib
-
-clean-local:
-	rm -f build-stamp*
+SUBDIRS = doc MacOSX src man contrib
 
 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 debian
+	rm -f config.log
 
 lint:
 	make -C src/ngircd lint
@@ -30,8 +28,4 @@ lint:
 rpm: distcheck
 	rpm -ta ngircd-*.tar.gz
 
-deb:
-	[ -f debian/rules ] || ln -s contrib/Debian debian
-	dpkg-buildpackage -rfakeroot
-
 # -eof-

NEWS

@@ -1,94 +1,15 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2004 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                                  -- NEWS --
+                           -- NEWS / Neuigkeiten --
 
 
-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
@@ -97,15 +18,15 @@ ngIRCd 0.5.0, 20.09.2002
     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,
+    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+-
+  - 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"):
+  - 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.
 
@@ -189,4 +110,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: NEWS,v 1.64.2.3 2004/06/26 09:12:38 alex Exp $
+$Id: NEWS,v 1.38.2.4 2002/10/03 16:09:50 alex Exp $

README

@@ -1,87 +1,105 @@
-
+ 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2004 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                                -- README --
+                           -- README / Liesmich --
                            
                       Ilja Osthoff, <ilja@glide.ath.cx>
 
 
-I. Introduction
-~~~~~~~~~~~~~~~
+ +-----------------------------------------------------------------------+
+ | Please note: English translations of some of the german documentation |
+ | files can be found in the directory "doc/en" -- please have a look!   |
+ +-----------------------------------------------------------------------+
 
-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.
+
+I. Einfuehrung
+~~~~~~~~~~~~~~
+
+ngIRCd ist ein Open-Source-Server fuer den Internet Relay Chat (IRC), der
+unter der GNU General Public License (http://www.gnu.org/licenses/gpl.html)
+entwickelt wird. ngIRCd steht fuer "next generation IRC daemon", er ist von
+Grund auf neu geschrieben, also nicht wie die meisten anderen IRCd's vom
+Urvater, dem Daemon des IRCNet abgeleitet.
 
 
 II. Status
 ~~~~~~~~~~~
 
-At present, the ngIRCd is under active development, some features are not
-implemented, some only partly.
+Zur Zeit befindet sich der ngIRCd noch in Entwicklung, manche Features sind
+noch nicht implementiert, andere nur teilweise.
 
-Till today (more or less complete) implemented IRC-commands:
+Bisher (mehr oder wenig vollstaendig) implementierte IRC-Befehle:
 
-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.
+ADMIN, AWAY, CHANINFO, CONNECT, DIE, ERROR, INVITE, ISON, JOIN, KICK, KILL,
+LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, NOTICE, OPER, PART,
+PASS, PING, PONG, PRIVMSG, QUIT, RESTART, SERVER, SQUIT, TOPIC, USERHOST,
+USER, VERSION, WHO, WHOIS.
 
 
-III. Features (or: why use ngIRCd?)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+III. Features (oder: warum gerade 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).
+- keine Probleme mit Servern, deren IP-Adresse dynamisch ist,
+- einfache, uebersichtliche Konfigurationsdatei,
+- frei verfuegbarer C-Quellcode.
+- ngIRCd wird aktiv weiterentwickelt.
+- unterstuetzte Plattformen (getestete Version): AIX (3.2.5), A/UX (3.0.1),
+  FreeBSD/i386 (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 mit Cygwin.
 
 
-IV. Documentation
+IV. Dokumentation
 ~~~~~~~~~~~~~~~~~
 
-More documentation can be found in the "doc/" directory and the homepage of
-the ngIRCd: <http://arthur.ath.cx/~alex/ngircd/>.
+Im Paket enthalten ist u.a.:
+
+- README: das Dokument, das Du gerade liest :-)
+- INSTALL: Hinweise zur Installation des ngIRCd
+- NEWS: sagt der Name schon :-)
+- ChangeLog: die komplette History des ngIRCd
+- doc/FAQ.txt: haeufige Fragen und Antworten zum ngIRCd
+- doc/CVS.txt: Hinweise zum CVS-System
+- doc/RFC.txt: Infos ueber die RFC's
+- doc/sample-ngircd.conf: Beispiel-Konfigurationsdatei
+- doc/README-AUX.txt: Installationshinweise fuer A/UX
+- doc/README-BeOS.txt: dito fuer BeOS
+
+- doc/en/: englischsprachige Dokumentation
 
 
-V. Download
-~~~~~~~~~~~
+V. Bezugsquellen
+~~~~~~~~~~~~~~~~
 
-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.
+Die Homepage des ngIRCd ist: <http://arthur.ath.cx/~alex/ngircd>; dort
+findest du immer die neusten Informationen ueber den ngIRCd und die aktuellen
+freigegebenen ("stabilen") Releases.
 
-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".
+Falls du dich fuer die aktuellen Entwicklungs-Versionen (die jedoch nicht
+immer "stabil" sind) interessierst, dann lese bitte den Punkt "CVS" auf der
+Homepage und die Datei "doc/CVS.txt", die die Verwendung des "Concurrent
+Versioning System" (CVS) beschreibt.
 
 
 VI. Bugs
 ~~~~~~~~
 
-If you find bugs in the ngIRCd (which might be there :-), please report
-them at the following URL:
+Wenn du im ngIRCd Bugs finden solltest (so was soll ja auch vorkommen :-),
+dann lege bitte einen Bug-Report ueber diese URL an:
 
 <http://arthur.ath.cx/~alex/ngircd/#bugs>
 
-There you can read about known bugs and limitations, too.
+Dort kannst du dich auch ueber bekannte Fehler informieren.
 
-If you have critics, patches or something else, please feel free to post a
-mail to: <alex@barton.de> or <alex@arthur.ath.cx>
+Falls du noch Anregungen, Kritik, Patches etc. pp. zum ngIRCd hast, dann
+bitte einfach eine Mail an <alex@barton.de> oder <alex@arthur.ath.cx>
+schreiben.
 
 
 -- 
-$Id: README,v 1.18.2.1 2004/05/07 11:24:17 alex Exp $
+$Id: README,v 1.13 2002/09/16 11:03:05 alex Exp $

autogen.sh

@@ -1,183 +1,16 @@
 #!/bin/sh
 #
-# 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: autogen.sh,v 1.12 2004/04/05 12:02:21 alex Exp $
+# $Id: autogen.sh,v 1.3 2002/03/12 14:37:51 alex Exp $
 #
 
-#
-# 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
+if [ -f configure ]; then
+	echo "autogen.sh: configure-Skript existiert bereits ..."
 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-

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2004-11-12'
+timestamp='2002-03-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -88,42 +88,30 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
 
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 
+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -154,7 +142,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
@@ -180,38 +167,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -227,76 +197,83 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
+	fi
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	eval $set_cc_for_build
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		case `./$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -319,12 +296,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -342,13 +313,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -417,9 +381,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -458,20 +419,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -544,7 +500,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -642,21 +599,11 @@ EOF
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -690,7 +637,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -748,26 +696,21 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -789,17 +732,14 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
+    x86:Interix*:3*)
+	echo i386-pc-interix3
 	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
+	echo i386-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -811,33 +751,16 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
-	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit 0 ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -848,37 +771,19 @@ EOF
 	#undef CPU
 	#undef mips
 	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
+	CPU=mipsel 
 	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
 	CPU=mips
 	#else
 	CPU=
 	#endif
-	#endif
+	#endif 
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	rm -f $dummy.c
+	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -914,9 +819,6 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -943,7 +845,7 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit 0 ;;		
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
@@ -974,11 +876,9 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -996,26 +896,6 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1037,19 +917,22 @@ EOF
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1073,15 +956,9 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1098,6 +975,9 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1169,9 +1049,6 @@ EOF
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1179,25 +1056,20 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
+	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
+		echo i386-${UNAME_MACHINE}-nto-qnx
+	else
+		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1220,6 +1092,11 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1238,21 +1115,11 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
 	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
 esac
 
@@ -1374,7 +1241,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2004-11-30'
+timestamp='2002-03-04'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -118,8 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -145,7 +144,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -229,45 +228,31 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
-	| msp430 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -296,55 +281,38 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| msp430-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -364,9 +332,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -381,12 +346,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -446,27 +405,12 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -489,10 +433,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -671,6 +611,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -762,10 +706,6 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -788,55 +728,49 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-		;;
+	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-		;;
+	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -867,16 +801,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -884,9 +808,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -945,7 +866,7 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
+        sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
@@ -953,6 +874,10 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
@@ -965,14 +890,6 @@ case $basic_machine in
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -986,10 +903,6 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1011,8 +924,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -1033,11 +946,11 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-	xps | xps100)
+        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	ymp)
@@ -1067,9 +980,6 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1086,16 +996,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1110,6 +1020,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1165,20 +1079,18 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1190,10 +1102,8 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1202,9 +1112,6 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1217,9 +1124,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1241,9 +1145,6 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1254,7 +1155,7 @@ case $os in
 		os=-rtmk-nova
 		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1266,9 +1167,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1296,17 +1194,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1339,14 +1228,11 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1388,9 +1274,6 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
-		os=-mmixware
-		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1442,19 +1325,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1523,16 +1406,10 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)

configure.in

@@ -1,37 +1,34 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
+# 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.
+# 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: configure.in,v 1.102.2.7 2005/02/03 10:16:25 alex Exp $
+# $Id: configure.in,v 1.58.2.11 2002/11/29 10:53:44 alex Exp $
 #
 
-# -- Initialisation --
+# -- Initialisierung --
 
+AC_INIT
 AC_PREREQ(2.50)
-AC_INIT(ngircd, 0.8.3)
-AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(1.6)
+AC_CONFIG_SRCDIR(src/config.h.in)
+AM_INIT_AUTOMAKE(ngircd,0.5.x-CVS)
 AM_CONFIG_HEADER(src/config.h)
 
-# -- Templates for config.h --
+# -- Templates fuer 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([USE_SYSLOG], [Define if syslog should be used for logging])
 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])
@@ -41,7 +38,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 
 AC_PROG_CC
 
-# -- Helper programs --
+# -- Hilfsprogramme --
 
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -51,33 +48,17 @@ AC_PROG_RANLIB
 
 # -- Compiler Features --
 
+AC_LANG_C
+
 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 --
+# -- Header --
 
 AC_HEADER_STDC
+
 AC_HEADER_TIME
+
 AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
@@ -85,9 +66,9 @@ AC_CHECK_HEADERS([ \
 	strings.h sys/socket.h sys/time.h unistd.h \
 	],,AC_MSG_ERROR([required C header missing!]))
 
-AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h])
+AC_CHECK_HEADERS(arpa/inet.h malloc.h stdint.h sys/select.h varargs.h)
 
-# -- Datatypes --
+# -- Datentypen --
 
 AC_MSG_CHECKING(whether socklen_t exists)
 AC_TRY_COMPILE([
@@ -103,6 +84,7 @@ AC_TRY_COMPILE([
 ])
 
 AC_TYPE_SIGNAL
+
 AC_TYPE_SIZE_T
 
 # -- Libraries --
@@ -111,115 +93,38 @@ AC_CHECK_LIB(UTIL,memmove)
 AC_CHECK_LIB(socket,bind)
 AC_CHECK_LIB(nsl,gethostent)
 
-# -- Functions --
+# -- Funktionen --
+
+AC_FUNC_MALLOC
 
 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!]))
+	bind gethostbyaddr gethostbyname gethostname inet_ntoa memmove \
+	memset select 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(inet_aton sigaction snprintf vsnprintf)
 
-AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
-	AC_MSG_ERROR([required function select() is missing!])
-)
-
-# -- Configuration options --
+# -- Konfigurationsoptionen --
 
 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!])
+AC_ARG_ENABLE(syslog,
+	[  --disable-syslog        disable syslog (autodetected by default)],
+	[	if test "$enableval" = "yes"; then
+			AC_CHECK_HEADER(syslog.h, x_syslog_on=yes,
+				AC_MSG_ERROR([Can't enable syslog: syslog.h not found!])
 			)
 		fi
 	],
-	[
-		AC_CHECK_LIB(be, syslog)
-		AC_CHECK_FUNCS(syslog, x_syslog_on=yes)
-	]
+	[	AC_CHECK_HEADER(syslog.h, 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
-	]
-)
-
-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)
+	AC_DEFINE(USE_SYSLOG, 1)
+	AC_CHECK_LIB(be,syslog)
 fi
 
 x_ircplus_on=yes
@@ -231,7 +136,6 @@ 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 IRC traffic sniffer (enables debug mode)],
 	if test "$enableval" = "yes"; then
@@ -246,10 +150,8 @@ AC_ARG_ENABLE(debug,
 )
 if test "$x_debug_on" = "yes"; then
 	AC_DEFINE(DEBUG, 1)
-	test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
 fi
 
-x_strict_rfc_on=no
 AC_ARG_ENABLE(strict-rfc,
 	[  --enable-strict-rfc     strict RFC conformance -- may break clients!],
 	if test "$enableval" = "yes"; then
@@ -258,44 +160,45 @@ AC_ARG_ENABLE(strict-rfc,
 	fi
 )
 
-# -- Definitions --
+
+# -- Definitionen --
 
 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"
+if test `uname` = "A/UX"; then
+	# unter A/UX sollte _POSIX_SOURCE definiert sein.
+	AC_MSG_RESULT([detected A/UX, defining _POSIX_SOURCE])
+	CFLAGS="$CFLAGS -D_POSIX_SOURCE"
+fi
 
-# -- Generate files --
+# -- Variablen --
+
+if test "$GCC" = "yes"; then
+	CFLAGS="-Wall $CFLAGS"
+fi
+
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+
+# -- Ausgabe der Dateien --
 
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
+	doc/en/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
+# -- Ergebnis --
 
-# -- Result --
-
-echo
-echo "ngIRCd has been configured with the following options:"
 echo
 
 # Someone please show me a better way :)  [borrowed by OpenSSH]
@@ -303,63 +206,26 @@ 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 "                host: ${host}"
+echo "            compiler: ${CC}"
+echo "      compiler flags: ${CFLAGS}"
+echo "  preprocessor flags: ${CPPFLAGS}"
+echo "        linker flags: ${LDFLAGS}"
+echo "           libraries: ${LIBS}"
 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 "     'ngircd' binary: $S"
+echo "  configuration file: $C"
+echo "        manual pages: $M"
+echo
 
+echo $ECHO_N "      active options: $ECHO_C"
+test "$x_syslog_on" = "yes"	&& echo $ECHO_N "Syslog $ECHO_C"
+test "$x_debug_on" = "yes"	&& echo $ECHO_N "Debug $ECHO_C"
+test "$x_sniffer_on" = "yes"	&& echo $ECHO_N "Sniffer $ECHO_C"
+test "$x_strict_rfc_on" = "yes"	&& echo $ECHO_N "Strict-RFC $ECHO_C"
+test "$x_ircplus_on" = "yes"	&& echo $ECHO_N "IRC+ $ECHO_C"
 echo; echo
 
 # -eof-

contrib/Debian/Makefile.am

@@ -1,28 +0,0 @@
-#
-# 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

@@ -1,155 +0,0 @@
-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

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

contrib/Debian/control

@@ -1,47 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,12 +0,0 @@
-#
-# 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

@@ -1,72 +0,0 @@
-#!/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

@@ -1,14 +0,0 @@
-#!/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

@@ -1,156 +0,0 @@
-#!/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

@@ -1,20 +0,0 @@
-#
-# 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

@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+# 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
@@ -9,12 +9,10 @@
 # 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 $
+# $Id: Makefile.am,v 1.1.2.1 2002/10/03 16:13:38 alex Exp $
 #
 
-SUBDIRS = Debian MacOSX
-
-EXTRA_DIST = README ngircd.spec systrace.policy
+EXTRA_DIST = ngircd.spec
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in

contrib/README

@@ -1,27 +0,0 @@
-
-                     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

@@ -1,9 +1,9 @@
 %define name    ngircd
-%define version 0.8.3
+%define version 0.5.x-CVS
 %define release 1
 %define prefix  %{_prefix}
 
-Summary:      A lightweight daemon for the Internet Relay Chat (IRC)
+Summary:      Next Generation Internet Relay Chat Daemon
 Name:         %{name}
 Version:      %{version}
 Release:      %{release}
@@ -15,18 +15,17 @@ 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),
+ngIRCd is a free open source daemon for 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.
+Why should you use ngIRCd? Because ...
 
-ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
-mixed networks.
+   * ... there are no problems with servers on changing or non-static IP
+         addresses.
+   * ... there is a small and lean configuration file.
+   * ... there is a free, modern and open source C source code.
+   * ... it is still under active development. 
 
 %prep
 %setup

contrib/systrace.policy

@@ -1,77 +0,0 @@
-#
-# 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,56 +1,64 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                                  -- CVS.txt --
 
 
-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.
+Die Sourcen des ngIRCd werden mit dem "Concurrent Versions System" (CVS)
+verwaltet. Somit koennen ohne Probleme mehrere Leute gleichzeitig die Sourcen
+bearbeitet.
 
 
-I. Anonymous read-only Access
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-To access the source tree anonymously in read-only mode, follow these steps:
+I. Anonymer "Nur-Lesen"-Zugang
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Anonymer Zugriff auf die CVS-Repository von ngIRCd ist im "nur-lesen"-Modus
+moeglich. Dazu sind folgende Schritte noetig:
 
-Login to the CVS server:
+Beim CVS-Server anmelden
 
  $ 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:
+Als Benutzername wird "anonymous" mit einem leeren Passwort verwendet.
+Nun ein "Check-Out" der Quellcodes durchfuehren:
 
  $ 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.
+Dadurch wird im aktuellen Verzeichnis der neue Ordner "ngircd" mit allen
+Quell-Dateien des ngIRCd erzeugt.
 
-This is the "working folder", all CVS commands will be executed from within
-this folder in the future.
+Dieses ist der "Arbeitsordner", alle CVS-Befehle werden in Zukunft aus
+diesem Ordner bzw. einem Unterordner davon ausgefuehrt.
 
-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.
+Wichtig: wenn ngIRCd "frisch" aus dem CVS compiliert werden soll, so
+existiert das configure-Script noch nicht. Dieses muss zunaechst mit dem
+Script "autogen.sh" erzeugt werden. Letzteres setzt ein installiertes GNU
+automake und GNU autoconf voraus!
 
-Updating the CVS tree:
+CVS-Tree aktualisieren:
 
- $ cvs update -d -P [<filename>]
+ $ cvs update
 
-You can update a single file or the complete source tree.
+Dieser Befehl aktualisiert alle Dateien im aktuellen Verzeichnis sowie allen
+Unterverzeichnissen.
+
+ $ cvs update <filename>
+
+So kann eine einzelne Datei aktualisiert werden (auch dann, wenn sie lokal
+z.B. geloescht wurde -- praktisch, um eigene "Experimente" rueckgaengig zu
+machen ;-))
 
 
-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>.
+III. Schreibzugriff
+~~~~~~~~~~~~~~~~~~~
+Wer Schreibzugriff auf die CVS-Repository wuenscht, der moege sich bitte
+mit Alex Barton, <alex@barton.de> in Verbindung setzen.
 
 
 -- 
-$Id: CVS.txt,v 1.7 2003/03/26 22:34:33 alex Exp $
+$Id: CVS.txt,v 1.5 2002/02/15 15:15:22 alex Exp $

doc/FAQ.txt

@@ -1,67 +1,61 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                     -- FAQ: Frequently Asked Questions --
 
 
-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.
+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.
 
-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.
+Q: Gibt es eine Homepage mit Informationen und Downloads?
+A: Ja. Die URL ist <http://arthur.ath.cx/~alex/ngircd/>.
 
 
-II. Compilation
+II. Compilieren
 ~~~~~~~~~~~~~~~
-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: 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: 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 "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 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.)
+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").
 
 
 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: Gibt es eine Liste der bekannten Bugs bzw. Feature-Wuensche?
+A: Ja. Es existiert ein Bug-Tracking-System fuer den ngIRCd (Bugzilla):
+   URL: <http://arthur.ath.cx/bugzilla/ngircd/>. Dort koennen Bugs ge-
+   meldet und Feature-Wunsche kundgetan werden. Bekannte Bugs koennen in
+   der Datenbank gesucht und aufgelistet werden.
+   Einen Account zum Suchen und Melden von Bugs bzw. Feature-Wuenschen
+   kannst du dir dort selber anlegen.
 
-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 :-)
+Q: Was mache ich, wenn ich einen Bug gefunden habe?
+A: Am besten traegst du ihn in das Bug-Tracking-System des ngIRCd ein:
+   URL: <http://arthur.ath.cx/bugzilla/ngircd/>
 
 
 -- 
-$Id: FAQ.txt,v 1.7 2003/11/07 21:32:15 alex Exp $
+$Id: FAQ.txt,v 1.2 2002/02/19 20:05:02 alex Exp $

doc/Makefile.am

@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+# 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
@@ -9,31 +9,21 @@
 # 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.17 2003/04/22 23:50:18 alex Exp $
+# $Id: Makefile.am,v 1.10 2002/09/16 10:35:06 alex Exp $
 #
 
-EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt Platforms.txt \
-	README-AUX.txt README-BeOS.txt RFC.txt sample-ngircd.conf
+SUBDIRS = en
+
+EXTRA_DIST = CVS.txt FAQ.txt Protocol.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)
+	  fi
 
 # -eof-

doc/Platforms.txt

@@ -1,63 +0,0 @@
-
-                     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

@@ -1,118 +1,109 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                               -- Protocol.txt --
 
 
-I. Compatibility
-~~~~~~~~~~~~~~~~
+I. Kompatibilitaet
+~~~~~~~~~~~~~~~~~~
 
-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.
+Der ngIRCd haelt sich an das IRC-Protokoll Version 2.10, wie es in den RFCs
+1459 und 2810-2813 beschrieben ist. Diese (und ggf. weitere fuer den ngIRCd
+relevante) RFCs sind in RFC.txt aufgefuehrt.
 
-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.
+Leider verhaelt sich aber schon der "Originalserver" nicht immer genau so,
+wie es in den RFCs beschrieben ist. Da der ngIRCd aber ein Ersatz fuer
+eben diesen Server sein soll, werden diese Abweichungen in der Regel vom
+ngIRCd emuliert um die Kompatibilitaet zu wahren.
 
-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".
+Sollte dieses Verhalten nicht erwuenscht sein, so kann mit der configure-
+Option "--enable-strict-rfc" der ngIRCd so compiliert werden, dass er sich
+strikt an die entsprechenden RFCs haelt.
+
+ACHTUNG: an einem so compilierten Server koennen sich andere Server und
+Clients, die sich nicht genau an das Protokoll halten, u.U. nicht mehr
+anmelden oder alle Funktionen nutzen! In der Regel ist diese Option daher
+nicht erwuenscht.
 
 
-II. The IRC+ Protocol
-~~~~~~~~~~~~~~~~~~~~~
+II. Das IRC+-Protokoll
+~~~~~~~~~~~~~~~~~~~~~~
 
-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.
+Der ngIRCd unterstuetzt als Erweiterung zum IRC-Protokoll wie es in den RFCs
+2810-2813 beschrieben ist, das IRC+-Protokoll. Dieses Protokoll ist dabei
+kompatibel zum IRC-Protokoll und wird nur verwendet, wenn der ngIRCd fest-
+stellt, dass ein connectierter Server ebenfalls dieses erweiterte Protokoll
+unterstuetzt.
 
-The "PASS" command is used to detect the protocol and peer versions see
-RFC 2813 (section 4.1.1) and below.
+Die Protokoll- und Server-Erkennung wird mit dem "PASS"-Befehl durchgefuehrt
+(vgl. RFC 2813, Sektion 4.1.1):
 
 
-II.1 Register new server link
+II.1 neuen Server-Link registrieren
 
-     Command: PASS
-  Parameters: <password> <version> <flags> [<options>]
-     Used by: servers only (with these parameters)
+     Befehl: PASS
+  Parameter: <password> <version> <flags> [<options>]
+       Fuer: mit dieser Syntax nur Server
 
-<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.
+<password> enthaelt das Passwort fur den neu aufzubauenden Server-Link,
+so wie es in der Konfigurationsdatei definiert wurde.
 
-<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.).
+<version> setzt sich aus zwei Teilen zusammen und ist mindestens 4, maximal
+14 Zeichen lang: die ersten vier Bytes enthalten die Versionsnummer des
+unterstuetzten IRC-Protokolls, wobei die ersten zwei Bytes die Major-, die
+letzten beiden die Minor-Revision angeben. Der String "0210" steht also
+fuer Protokollversion 2.10.
+Die folgenden (optionalen!) 10 Bytes enthalten eine von der jeweiligen
+Implementation abhaengige Versionsnummer. Server, die das IRC+-Protokoll
+unterstuetzen, liefern hier "-IRC+".
 
-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.
+<flags> setzt sich ebenfalls aus zwei Bestandteilen zusammen und ist
+maximal 100 Bytes lang. Getrennt werden die beiden Teile mit dem Zeichen
+"|". Der erste Teil enthaelt den Namen der Implementation, der ngIRCd
+liefert hier z.B. "ngIRCd", der Originalserver "IRC". Anhand dieser "ID"
+kann zwischen Serverimplementationen unterschieden werden. Der zweite Teil
+(nach dem "|") ist implementationsabhaengig und wird nur ausgewertet,
+wenn die Gegenseite das IRC+-Protokoll unterstuetzt. In diesem Fall wird
+folgende Syntax erwartet: "<serverversion>[:<serverflags>]".
 
-Example for <version>: "0210-IRC+".
+<serverversion> ist hier eine ASCII-Klartext-Darstellung der Versionsnummer,
+<serverflags> zeigt die vom Server unterstuetzten Erweiterungen an (und
+kann die leere Menge sein).
 
-<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>]".
+Mit dem optionalen Parameter <options> werden Server-Optionen uebermittelt,
+wie sie in RFC 2813, Sektion 4.1.1 definiert sind.
 
-<serverversion> is an ASCII representation of the clear-text server version
-number, <serverflags> indicates the supported IRC+ protocol extensions (and
-may be empty!).
+Folgende <serverflags> sind zur Zeit definiert:
 
-The following <serverflags> are defined at the moment:
+- o: IRC-Operatoren duerfen auch dann Channel- und Channel-User-Modes
+     aendern, wenn sie kein Channel-Operator im betroffenen Channel sind.
 
-- 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.
+- C: der Server unterstuetzt den CHANINFO-Befehl.     
 
 
-II.2 Exchange channel-modes, topics, and persistent channels
+II.2 Channel-Modes, persistente Channel und Topic austauschen
 
-     Command: CHANINFO
-  Parameters: <channel> +<modes> <key> <maxusers> [<topic>]
-     Used by: servers only
+     Befehl: CHANINFO
+  Parameter: <channel> +<mode> [<topic>]
+       Fuer: Server
 
-CHANINFO is used by servers to inform each other about a channel: its
-modes, channel key, user limits and its topic. <topic> is optional.
+Mit CHANINFO Informiert ein Server den anderen ueber einen Channel: dessen
+Modes und dessen Topic. <topic> ist 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.
+Existiert auf dem Server, der das CHANINFO empfaengt, der Channel bereits,
+so uebernimmt er die Werte jeweils nur dann, wenn er selber noch keine
+Modes bzw. kein Topic definiert hat. Ansonsten wird der jeweilige Parameter
+ignoriert.
 
-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".
+Existiert der Channel noch nicht, so wird er mit den entsprechenden Angaben
+erzeugt.
 
 
 -- 
-$Id: Protocol.txt,v 1.12 2004/04/25 15:44:10 alex Exp $
+$Id: Protocol.txt,v 1.5 2002/09/04 00:06:19 alex Exp $

doc/README-AUX.txt

@@ -1,67 +1,71 @@
 
-                    ngIRCd - Next Generation IRC Server
+                     ngIRCd - Next Generation IRC Server
 
-                     (c)2001-2003 by Alexander Barton,
-                   alex@barton.de, http://www.barton.de/
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
+
+                             -- README-AUX.txt --
 
 
-                           -- README-AUX.txt --
+Seit Version 0.2.2-pre gehoert Apple A/UX zu den offiziell unterstuetzten
+Platformen. Er ist im vollen Funktionsumfang nutzbar.
+
+Folgende Software wird jedoch benoetigt:
+
+  - GNU C Compiler (gcc)
+    Bezugsquellen:
+    http://www.rezepte-im-web.de/appleux/gcc281.tar.gz
+    ftp://arthur.ath.cx/pub/AUX/Software/Development/gcc-2.8.1-auxbin.tar.gz
+
+  - GNU make
+    Bezugsquellen:
+    http://www.rezepte-im-web.de/appleux/make-3.79.tar.gz
+    ftp://arthur.ath.cx/pub/AUX/Software/Development/make-3.79.tar.gz
+
+  - GNU sed
+    Bezugsquellen:
+    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
+
+  - install (z.B. aus den GNU fileutils)
+    Ein install, welches entweder so "broken" ist, dass configure das eigene
+    Shell-Script waehlt, oder eines, das funktioniert. Leider ist mindestens
+    ein Binary im Umlauf, das Probleme macht.
+    Bezugsquelle:
+    ftp://arthur.ath.cx/pub/UNIX/AUX/Software/Tools/fileutils-4.0.tar.gz
+
+  - libUTIL.a
+    Bezugsquellen:
+    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
+
+Nachdem diese Pakete entsprechend installiert sind, reicht ein ganz normales
+"./configure" und "make" aus, um den ngIRCd unter A/UX zu compilieren.
 
 
-Since version 0.2.2-pre Apple's A/UX belongs to the officially supported 
-platforms. It is not restricted in any way.
+Noch ein paar Hinweise, wenn es doch (noch) nicht klappt:
 
-Since version 0.5.0 ngIRCd's source compiles with the native A/UX c 
-compiler. GNU C isn't a must-have anymore.
+  - auf dem System muss entweder ein install vorhanden sein, welches so
+    "broken" ist, dass configure das eigene Shell-Skript waehlt, oder eben
+    eines, welches funktioniert. Leider ist mindestens ein Binary im Um-
+    lauf, welches Probleme verursacht. Das Binary aus folgenden GNU
+    fileutils funktioniert hier aber z.B.:
+    ftp://arthur.ath.cx/pub/UNIX/AUX/Software/Tools/fileutils-4.0.tar.gz
 
-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().
+  - das sich im Umlauf befindende vorcompilierte Binary der alten Bash sollte
+    unbedingt ausserhalb von /bin (z.B. unter /usr/local/bin) installiert
+    werden. Ansonsten waehlt es das configure-Script als Shell aus, leider
+    funktioniert das aber nicht.
+    Das config.status-Script sollte mit der ksh als Interpreter erstellt
+    worden sein (siehe erste Zeile davon!).
 
 
-After installation of these packages just do a "./configure" and "make" to
-compile ngIRCd on A/UX.
+Hier die Zeiten von Alex System (Macintosh SE/30, 32 MB, A/UX 3.0.1):
+configure: 7:33, make: 12:02
 
 
-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 $
+$Id: README-AUX.txt,v 1.3 2002/04/29 14:19:48 alex Exp $

doc/README-BeOS.txt

@@ -1,21 +1,15 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der 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
@@ -50,4 +44,4 @@ 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 $
+$Id: README-BeOS.txt,v 1.3 2002/05/19 13:10:26 alex Exp $

doc/RFC.txt

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

doc/SSL.txt

@@ -1,58 +0,0 @@
-
-                     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/en/INSTALL

@@ -0,0 +1,126 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001,2002 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
+
+                                -- INSTALL --
+
+                         
+
+I. Standard-Installation
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+ngIRCd is developed for UNIX-like systems, which means, that the installation
+on a modern UNIX-like system should be no problem. The only thing is, that
+the system should be supported by GNU automake and GNU autoconf ("configure").
+
+The normal installation is like that:
+
+   1) tar xzf ngircd-<Version>.tar.gz
+   2) cd ngircd-<Version>
+   3) ./autogen.sh	[only necessary when using CVS]
+   4) ./configure
+   5) make
+   6) make install
+
+3): "autogen.sh"
+
+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-archieves, but when using the CVS system.
+
+The next is therefore only interesting for developpers.
+
+autogen.sh produces the makefile.in's, which are necessary for the configure
+script it self, and some more files for make. For this step, there must be
+GNU automake and GNU autoconf (in recent versions).
+
+(again: "end users" do not need this step!)
+
+to 4): "./configure"
+
+The configure-script is used to detect local system dependancies.
+
+In the perfect case, configure should recognize all needed libraries, header
+and so on. If this shouldn't work, "./configure --help" shows more options.
+
+to 5): "make"
+
+The make command uses the Makefiles produced by configure and compiles the
+ngIRCd daemon.
+
+to 6): "make install"
+
+Use "make install" to install the server and a sample configuration file on
+the local system. For this step, root privileges are necessary. If there is
+already an older configuration file present, it won't be overwritten.
+
+This are the files that are installed:
+
+- /usr/local/sbin/ngircd: exectable server
+- /usr/local/etc/ngircd.conf: sample configuration, if not there
+
+
+II. Useful make-targets
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The Makefile produced by the configure-script contain always these useful
+targets:
+
+ - clean: delete every product from the compiler/linker
+   next step: -> make
+
+ - distclean: plus erase all generated Makefiles
+   next step: -> ./configure
+
+ - maintainer-clean: erease 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 code.
+
+The file is seperated in three blocks: [Global], [Operator], [Server]. In
+the [Gobal] part, there is the main configuration, like the server-name
+and the ports, on which the server should be listening. In the [Operator]
+section, the server-operators are defined and [Server] is the section,
+where the server-links are configured.
+
+The meaning of the variables in the configuration file is explained in the 
+"doc/sample-ngircd.conf", which is also the sample configuration file in
+/usr/local/etc after running "make install" (if you don't already have one).
+
+
+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.
+
+--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.2 2002/05/20 12:02:58 alex Exp $

doc/en/Makefile.am

@@ -0,0 +1,20 @@
+#
+# 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: Makefile.am,v 1.1 2002/05/09 10:17:05 alex Exp $
+#
+
+EXTRA_DIST = INSTALL README
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+# -eof-

doc/en/README

@@ -0,0 +1,101 @@
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001,2002 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 --
+                           
+                      Ilja Osthoff, <ilja@glide.ath.cx>
+
+
+I. Introduction
+~~~~~~~~~~~~~~~
+
+ngIRCd is an Open-Source server for the Internet Realy Chat (IRC), which
+is developped 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.
+
+
+
+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, ERROR, INVITE, ISON, JOIN, KICK, KILL,
+LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, NOTICE, OPER, PART,
+PASS, PING, PONG, PRIVMSG, QUIT, RESTART, SERVER, SQUIT, TOPIC, USERHOST,
+USER, VERSION, WHO, WHOIS.
+
+
+III. Features (or: why use ngIRCd?)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- no problems with servers which have dynamic ip-adresses
+- simple, easy understandable configuration file,
+- freely published C-Sourcecode,
+- 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), and Windows with Cygwin.
+
+
+IV. Documentation
+~~~~~~~~~~~~~~~~~
+
+English documentation:
+
+- doc/en/README: the file that you are reading :-)
+- doc/en/INSTALL: hints for the installation of the ngIRCd
+
+German documentation:
+
+- README: readme text in german
+- INSTALL: german installation instructions
+- NEWS: what do you think? :-) 
+- Changelog: the complete history of the ngIRCd
+- doc/FAQ.txt: frequently asked questions and answers
+- doc/CVS.txt: hints for the CVS-system
+- doc/RFC.txt: information about the RFC's
+- doc/sample-ngircd.conf: sample configuration file
+- doc/README-AUX.txt: installation hints for A/UX
+- doc/README-BeOS.txt: the same for BeOS
+
+
+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 newest developper-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 kown bugs, too.
+
+If you have critics, patches or something else, please feel yourself free
+to post a mail to: <alex@barton.de> or <alex@arthur.ath.cx>
+
+
+-- 
+$Id: README,v 1.6 2002/09/16 11:03:05 alex Exp $

doc/sample-ngircd.conf

@@ -1,160 +1,144 @@
-# $Id: sample-ngircd.conf,v 1.25.2.1 2004/05/07 11:24:17 alex Exp $
+# $Id: sample-ngircd.conf,v 1.11 2002/09/16 10:33:09 alex Exp $
 
 #
-# This is a sample configuration file for the ngIRCd, which must be adepted
-# to the local preferences and needs.
+# Das ist eine Beispiel-Konfiguration fuer den ngIRCd, die an die
+# jeweiligen Beduerfnisse angepasst werden kann/muss.
 #
-# Comments are started with "#" or ";".
+# Kommentare werden mit "#" oder ";" eingeleitet.
 #
-# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
-# server interpreted the configuration file as expected!
+# Autor: Alexander Barton, <alex@barton.de>
+# Erweiterungen von Ilja Osthoff, <ilja@glide.ath.cx>
 #
 
 [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!
+	#
+	# Im [Global]-Abschnitt der Konfigurationsdatei wird der Server
+	# "an sich" konfiguriert. Notwendig ist nur die Variable "Name",
+	# Info ist in der Regel ebengalls anzupassen. Fuer alle uebrigen
+	# Variablen koennen oft die Defaults benutzt werden, d.h. hier
+	# muss die Variable nicht angegeben werden.
+	#
+
+	# Servername im IRC-Netz
 	Name = irc.the.net
-	
-	# Info text of the server. This will be shown by WHOIS and
-	# LINKS requests for example.
+
+	# Info-Text des Servers. Dieser wird z.B. bei WHOIS- oder LINKS-
+	# Abfragen entsprechend mit ausgegeben.
 	Info = Server Info Text
-
-	# 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
+	# Informationen ueber den Server und Administrator fuer den
+	# ADMIN-Befehl:
+	;AdminInfo1 = Beschreibung
+	;AdminInfo2 = Standort
 	;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:
+	# Ports, auf denen Verbindungen angenommen werden sollen. Es koennen
+	# mehrere Ports mit "," getrennt angegeben werden. (Default: 6667)
+	;Ports = 6667, 6668, 6669
+
+	# Textdatei mit der "Message of the Day" (MOTD). Diese wird aus-
+	# gegeben, wenn sich ein User mit dem Server verbindet.
 	;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!
+	# User-ID, unter der der Daemon laufen soll (dazu muss der Server
+	# jedoch mit root-Rechten gestartet werden).
+	# ACHTUNG: Die Konfigurations- und MOTD-Datei muessen fuer diesen
+	# Benutzer lesbar sein, ansonsten schlaegt ein RESTART fehl!
 	;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!
+	# Group-ID, zu der der Daemon wechseln soll (hierzu muss der Server
+	# jedoch mit root-Rechten gestartet werden)
 	;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.
+	# Nach <PingTimeout> Sekunden verschickt der Server bei Inaktivitaet
+	# von einem Client diesem ein PING.
 	;PingTimeout = 120
 
-	# If a client fails to answer a PING with a PONG within <PongTimeout>
-	# seconds, it will be disconnected by the server.
+	# Antwortet ein Client, der ein PING bekam, nicht innerhalb von
+	# <PongTimeout> Sekunden mit einem PONG, so wird er disconnectiert.
 	;PongTimeout = 20
 
-	# The server tries every <ConnectRetry> seconds to establish a link
-	# to not yet (or no longer) connected servers.
+	# Der Server versucht alle <ConnectRetry> Sekunden, noch nicht bzw.
+	# nicht mehr connectierte Server-Links aufzubauen.
 	;ConnectRetry = 60
-
-	# Should IRC Operators be allowed to use the MODE command even if
-	# they are not(!) channel-operators?
+	
+	# Sollen IRC-Operatoren immer den MODE-Befehl in Channel benutzen
+	# koennen, auch wenn sie kein(!) Channel-Operator sind?
 	;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]
-	# [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)
+
+	#
+	# Mit einem [Operator]-Block wird der Name und das Passwort eines
+	# IRC-Operators konfiguriert. Es darf mehrere [Operator]-Bloecke
+	# geben (fuer jeden Operator einen).
+	#
+
+	# ID des IRC-Operators (muss nicht mit dem Nick identisch sein).
 	;Name = TheOper
 
-	# Password of the IRC operator
+	# Passwort des IRC-Operators
 	;Password = ThePwd
 
 [Server]
-	# 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
+	# In [Server]-Bloecken werden Server konfiguriert, zu denen sich
+	# dieser ngIRCd verbinden soll bzw. von denen Verbindungen angekommen
+	# werden duerfen.
+	# Es koennen mehrere Server konfiguriert werden, d.h. [Server]-
+	# Bloecke koennen mehrfach vorkommen.
+	# Wenn man fuer einen Server einen Port angegeben hat, dann versucht
+	# sich der ngIRCd mit der Gegenseite zu verbinden. Hat man keinen
+	# Port konfiguriert, dann wartet der ngIRCd darauf, dass sich die
+	# Gegenseite mit ihm verbindet.
+	#
+	# Server-Gruppen:
+	# Der ngIRCd unterstuetzt "Server-Gruppen": das bedeutet, man kann
+	# jedem Server, mit dem man sich verbinden will, einer Gruppe zu-
+	# ordnen. Wenn der ngIRCd sich dann mit einem Server aus der Gruppe
+	# verbinden will und keine Antwort erhaelt, dann wird der naechste
+	# Server aus der Gruppe versucht.
+	# Achtung: Gruppen werden nur beachtet, wenn man einen Port fur
+	# die Gegenseite angegeben hat!
+	#
+
+	# Hostname des Servers
 	;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.
+	# IRC-Name des Servers
+	;Name = irc2.the.net
+
+	# Port, zu dem dieser Server eine Verbindung herstellen soll. Wird
+	# kein Port angegeben, so wird auf eine Verbindung der Gegenseite
+	# gewartet.
 	;Port = 6666
 
-	# Own password for the connection. This password has to be configured
-	# as "PeerPassword" on the other server.
-	;MyPassword = MySecret
+	# Passwort fuer diese Verbindung
+	;Password = ThePwd1
 
-	# Foreign password for this connection. This password has to be
-	# configured as "MyPassword" on the other server.
-	;PeerPassword = PeerSecret
-	
-	# Group of this server (optional)
+	# Gruppe, zu der dieser Server gehoert (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
+
+	#
+	# Mit [Channel]-Bloecken werden "persistente Channels" definiert,
+	# die nach dem Start des Servers automatisch erzeugt werden und auch
+	# dann erhalten bleiben, wenn keine User mehr im Channel sind. Es
+	# koennen mehrere solcher Bloecke hier konfiguriert werden.
+	# Gekennzeichnet werden solche Channels mit dem Mode "P", der ganz
+	# normal gesetzt und geloescht werden kann.
+	#
+
+	# Name des Channels
 	;Name = #TheName
 
-	# Topic for this channel
-	;Topic = a great topic
-	
-	# Initial channel modes
+	# Topic, das gesetzt werden soll
+	;Topic = Ein tolles Topic
+
+	# Channel-Modes
 	;Modes = tn
 
 # -eof-

man/ngircd.8

@@ -1,7 +1,7 @@
 .\"
-.\" $Id: ngircd.8,v 1.9 2004/04/05 10:59:10 alex Exp $
+.\" $Id: ngircd.8,v 1.4 2002/09/16 11:11:21 alex Exp $
 .\"
-.TH ngircd 8 "March 2003" ngircd "ngIRCd Manual"
+.TH ngircd 8 "September 2002" ngircd "ngIRCd Manual"
 .SH NAME
 ngircd \- the next generation IRC daemon
 .SH SYNOPSIS
@@ -9,63 +9,32 @@ ngircd \- the next generation IRC daemon
 .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.
+.B ngircd
+is a portable IRC daemon written from scratch. It is easy to configure,
+supports server links (even with original ircds) and runs on hosts with
+changing IP addresses (such as dial-in networks). Currently supported
+platforms (tested versions) are: 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), and Windows with Cygwin.
 .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
+.IP --configtest
+read, validate and display configuration; then exit.
+.IP "-f file, --config file"
+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.
+.IP "-n, --nodaemon"
+don't fork and don't detatch from controlling terminal.
+.IP "-p, --passive"
+disable automatic connections to other servers.
+.IP --version
+output version information and exit.
+.IP --help
+display 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

man/ngircd.conf.5

@@ -1,220 +1,14 @@
 .\"
-.\" $Id: ngircd.conf.5,v 1.12.2.1 2004/05/07 11:24:18 alex Exp $
+.\" $Id: ngircd.conf.5,v 1.6 2002/09/16 11:11:21 alex Exp $
 .\"
-.TH ngircd.conf 5 "Mai 2003" ngircd "ngIRCd Manual"
+.TH ngircd.conf 5 "September 2002" ngircd "ngIRCd Manual"
 .SH NAME
-ngircd.conf \- configuration file of ngIRCd
+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.
+(coming soon, please have a look at the sample configuration
+file "doc/sample-ngircd.conf" -- Thank you!)
 .SH AUTHOR
 Alexander Barton,
 .UR mailto:alex@barton.de
@@ -227,5 +21,6 @@ http://arthur.ath.cx/~alex/ngircd/
 .UE
 .SH "SEE ALSO"
 .BR ngircd (8)
+.BR ircd (8)
 .\"
 .\" -eof-

src/Makefile.am

@@ -2,16 +2,17 @@
 # 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.
+# 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.5 2003/01/13 12:20:16 alex Exp $
+# $Id: Makefile.am,v 1.4 2002/09/09 10:00:15 alex Exp $
 #
 
-SUBDIRS = portab tool ngircd testsuite
+SUBDIRS = portab ngircd testsuite
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in config.h config.h.in stamp-h.in

src/ngircd/Makefile.am

@@ -1,41 +1,40 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+# 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.
+# 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.42 2003/12/04 14:05:16 alex Exp $
+# $Id: Makefile.am,v 1.27 2002/09/07 18:06:29 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = ../portab/ansi2knr
 
-INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool
+INCLUDES = -I$(srcdir)/../portab
 
 LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN
 
 sbin_PROGRAMS = ngircd
 
-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
+ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c hash.c irc.c \
+	irc-channel.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 resolve.c tool.c
 
-ngircd_LDFLAGS = -L../portab -L../tool
+ngircd_LDFLAGS = -L../portab
 
-ngircd_LDADD = -lngportab -lngtool
+ngircd_LDADD = -lngportab
 
-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 \
+noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.h hash.h irc.h \
+	irc-channel.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 resolve.h tool.h \
 	messages.h defines.h
 
 clean-local:
-	rm -f check-version check-help lint.out cvs-version.*
+	rm -f check-version check-help lint.out
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in
@@ -61,23 +60,6 @@ lint:
 	 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,13 +2,16 @@
  * 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.
+ * 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.
  *
- * Channel management
+ * $Id: channel.c,v 1.32.2.1 2002/11/04 19:18:39 alex Exp $
+ *
+ * channel.c: Management der Channels
  */
 
 
@@ -17,15 +20,12 @@
 
 #include "portab.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 "conn.h"
 #include "client.h"
 
 #include "exp.h"
@@ -88,14 +88,6 @@ Channel_InitPredefined( VOID )
 			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 );
@@ -293,48 +285,6 @@ Channel_MemberCount( CHANNEL *Chan )
 } /* 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 )
 {
@@ -351,22 +301,6 @@ Channel_Modes( CHANNEL *Chan )
 } /* Channel_Modes */
 
 
-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 )
 {
@@ -469,7 +403,7 @@ Channel_IsValidName( CHAR *Name )
 	if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE;
 
 	ptr = Name;
-	strcpy( badchars, " ,:\007" );
+	strcpy( badchars, " ,:\x07" );
 	while( *ptr )
 	{
 		if( strchr( badchars, *ptr )) return FALSE;
@@ -495,7 +429,7 @@ Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
 	if( ! strchr( Chan->modes, x[0] ))
 	{
 		/* Client hat den Mode noch nicht -> setzen */
-		strlcat( Chan->modes, x, sizeof( Chan->modes ));
+		strcat( Chan->modes, x );
 		return TRUE;
 	}
 	else return FALSE;
@@ -548,7 +482,7 @@ Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 	if( ! strchr( cl2chan->modes, x[0] ))
 	{
 		/* Client hat den Mode noch nicht -> setzen */
-		strlcat( cl2chan->modes, x, sizeof( cl2chan->modes ));
+		strcat( cl2chan->modes, x );
 		return TRUE;
 	}
 	else return FALSE;
@@ -630,7 +564,8 @@ Channel_SetTopic( CHANNEL *Chan, CHAR *Topic )
 	assert( Chan != NULL );
 	assert( Topic != NULL );
 	
-	strlcpy( Chan->topic, Topic, sizeof( Chan->topic ));
+	strncpy( Chan->topic, Topic, CHANNEL_TOPIC_LEN - 1 );
+	Chan->topic[CHANNEL_TOPIC_LEN - 1] = '\0';
 } /* Channel_SetTopic */
 
 
@@ -640,37 +575,18 @@ Channel_SetModes( CHANNEL *Chan, CHAR *Modes )
 	assert( Chan != NULL );
 	assert( Modes != NULL );
 
-	strlcpy( Chan->modes, Modes, sizeof( Chan->modes ));
+	strncpy( Chan->modes, Modes, CHANNEL_MODE_LEN - 1 );
+	Chan->topic[CHANNEL_MODE_LEN - 1] = '\0';
 } /* 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 */
+	/* Okay, Ziel ist ein Channel */
 	is_member = has_voice = is_op = FALSE;
 	if( Channel_IsMemberOf( Chan, From ))
 	{
@@ -679,21 +595,14 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
 		if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = TRUE;
 	}
 
-	/* Check weather client is allowed to write to channel */
+	/* pruefen, ob Client in Channel schreiben darf */
 	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 */
+	/* Text senden */
 	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 */
@@ -708,20 +617,18 @@ Channel_Create( CHAR *Name )
 
 	assert( Name != NULL );
 	
-	c = (CHANNEL *)malloc( sizeof( CHANNEL ));
+	c = malloc( sizeof( CHANNEL ));
 	if( ! c )
 	{
 		Log( LOG_EMERG, "Can't allocate memory! [New_Chan]" );
 		return NULL;
 	}
 	c->next = NULL;
-	strlcpy( c->name, Name, sizeof( c->name ));
+	strncpy( c->name, Name, CHANNEL_NAME_LEN - 1 );
 	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;
@@ -760,7 +667,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
 	assert( Client != NULL );
 
 	/* neue CL2CHAN-Struktur anlegen */
-	cl2chan = (CL2CHAN *)malloc( sizeof( CL2CHAN ));
+	cl2chan = malloc( sizeof( CL2CHAN ));
 	if( ! cl2chan )
 	{
 		Log( LOG_EMERG, "Can't allocate memory! [Add_Client]" );

src/ngircd/channel.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: channel.h,v 1.26 2002/12/16 23:05:24 alex Exp $
+ * $Id: channel.h,v 1.21.2.1 2002/11/04 19:18:39 alex Exp $
  *
- * Channel management (header)
+ * channel.h: Management der Channels (Header)
  */
 
 
@@ -25,12 +26,10 @@
 typedef struct _CHANNEL
 {
 	struct _CHANNEL *next;
-	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") */
+	CHAR name[CHANNEL_NAME_LEN];	/* Name des Channel */
+	UINT32 hash;			/* Hash ueber (kleingeschrieben) Namen */
+	CHAR modes[CHANNEL_MODE_LEN];	/* Channel-Modes */
+	CHAR topic[CHANNEL_TOPIC_LEN];	/* Topic des Channels */
 } CHANNEL;
 
 typedef struct _CLIENT2CHAN
@@ -49,60 +48,54 @@ typedef POINTER CL2CHAN;
 #endif
 
 
-GLOBAL VOID Channel_Init PARAMS(( VOID ));
-GLOBAL VOID Channel_InitPredefined PARAMS((  VOID ));
-GLOBAL VOID Channel_Exit PARAMS(( VOID ));
+GLOBAL VOID Channel_Init PARAMS((VOID ));
+GLOBAL VOID Channel_InitPredefined PARAMS(( VOID ));
+GLOBAL VOID Channel_Exit PARAMS((VOID ));
 
-GLOBAL BOOLEAN Channel_Join PARAMS(( CLIENT *Client, CHAR *Name ));
-GLOBAL BOOLEAN Channel_Part PARAMS(( 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_Quit PARAMS(( CLIENT *Client, CHAR *Reason ));
+GLOBAL VOID Channel_Quit PARAMS((CLIENT *Client, CHAR *Reason ));
 
-GLOBAL VOID Channel_Kick PARAMS((  CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));
+GLOBAL VOID Channel_Kick PARAMS(( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));
 
-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 LONG Channel_Count PARAMS((VOID ));
+GLOBAL LONG Channel_MemberCount PARAMS((CHANNEL *Chan ));
 
-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 CHAR *Channel_Name PARAMS((CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Modes PARAMS((CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Topic PARAMS((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 VOID Channel_SetTopic PARAMS((CHANNEL *Chan, CHAR *Topic ));
+GLOBAL VOID Channel_SetModes PARAMS((CHANNEL *Chan, CHAR *Modes ));
 
-GLOBAL CHANNEL *Channel_Search PARAMS(( CHAR *Name ));
+GLOBAL CHANNEL *Channel_Search PARAMS((CHAR *Name ));
 
-GLOBAL CHANNEL *Channel_First PARAMS(( VOID ));
-GLOBAL CHANNEL *Channel_Next PARAMS(( CHANNEL *Chan ));
+GLOBAL CHANNEL *Channel_First PARAMS((VOID ));
+GLOBAL CHANNEL *Channel_Next PARAMS((CHANNEL *Chan ));
 
-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 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 CLIENT *Channel_GetClient PARAMS(( CL2CHAN *Cl2Chan ));
-GLOBAL CHANNEL *Channel_GetChannel PARAMS(( CL2CHAN *Cl2Chan ));
+GLOBAL CLIENT *Channel_GetClient PARAMS((CL2CHAN *Cl2Chan ));
+GLOBAL CHANNEL *Channel_GetChannel PARAMS((CL2CHAN *Cl2Chan ));
 
-GLOBAL BOOLEAN Channel_IsValidName PARAMS(( CHAR *Name ));
+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_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_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_IsMemberOf PARAMS((CHANNEL *Chan, CLIENT *Client ));
 
-GLOBAL BOOLEAN Channel_Write PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text ));
+GLOBAL BOOLEAN Channel_Write PARAMS((CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text ));
 
-GLOBAL CHANNEL *Channel_Create PARAMS(( CHAR *Name ));
+GLOBAL CHANNEL *Channel_Create PARAMS((CHAR *Name ));
 
 
 #endif

src/ngircd/client.c

@@ -2,13 +2,23 @@
  * 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.
+ * 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.
  *
- * Client management.
+ * $Id: client.c,v 1.60.2.2 2002/11/04 19:18:39 alex Exp $
+ *
+ * client.c: Management aller Clients
+ *
+ * Der Begriff "Client" ist in diesem Fall evtl. etwas verwirrend: Clients sind
+ * alle Verbindungen, die im gesamten(!) IRC-Netzwerk bekannt sind. Das sind IRC-
+ * Clients (User), andere Server und IRC-Services.
+ * Ueber welchen IRC-Server die Verbindung nun tatsaechlich in das Netzwerk her-
+ * gestellt wurde, muss der jeweiligen Struktur entnommen werden. Ist es dieser
+ * Server gewesen, so existiert eine entsprechende CONNECTION-Struktur.
  */
 
 
@@ -17,15 +27,12 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: client.c,v 1.76 2004/03/11 22:16:31 alex Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <netdb.h>
 
 #include "conn.h"
@@ -58,14 +65,6 @@ LOCAL LONG MyCount PARAMS(( CLIENT_TYPE Type ));
 
 LOCAL CLIENT *New_Client_Struct PARAMS(( VOID ));
 LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client ));
-LOCAL VOID Adjust_Counters PARAMS(( CLIENT *Client ));
-
-#ifndef Client_DestroyNow
-GLOBAL VOID Client_DestroyNow PARAMS((CLIENT *Client ));
-#endif
-
-
-LONG Max_Users = 0, My_Max_Users = 0;
 
 
 GLOBAL VOID
@@ -77,7 +76,7 @@ Client_Init( VOID )
 	if( ! This_Server )
 	{
 		Log( LOG_EMERG, "Can't allocate client structure for server! Going down." );
-		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
 		exit( 1 );
 	}
 
@@ -91,7 +90,7 @@ Client_Init( VOID )
 
 	gethostname( This_Server->host, CLIENT_HOST_LEN );
 	h = gethostbyname( This_Server->host );
-	if( h ) strlcpy( This_Server->host, h->h_name, sizeof( This_Server->host ));
+	if( h ) strcpy( This_Server->host, h->h_name );
 
 	Client_SetID( This_Server, Conf_ServerName );
 	Client_SetInfo( This_Server, Conf_ServerInfo );
@@ -106,7 +105,7 @@ Client_Exit( VOID )
 	CLIENT *c, *next;
 	INT cnt;
 
-	if( NGIRCd_SignalRestart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, FALSE );
+	if( NGIRCd_Restart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, FALSE );
 	else Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
 	
 	cnt = 0;
@@ -180,15 +179,12 @@ Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, INT Type, CHAR *
 	if( Type == CLIENT_SERVER ) Generate_MyToken( client );
 
 	/* ist der User away? */
-	if( strchr( client->modes, 'a' )) strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
+	if( strchr( client->modes, 'a' )) strcpy( client->away, DEFAULT_AWAY_MSG );
 
 	/* Verketten */
 	client->next = (POINTER *)My_Clients;
 	My_Clients = client;
 
-	/* Adjust counters */
-	Adjust_Counters( client );
-
 	return client;
 } /* Client_New */
 
@@ -208,7 +204,7 @@ Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
 	if( ! txt ) txt = "Reason unknown.";
 
 	/* Netz-Split-Nachricht vorbereiten (noch nicht optimal) */
-	if( Client->type == CLIENT_SERVER ) snprintf( msg, sizeof( msg ), "%s: lost server %s", This_Server->id, Client->id );
+	if( Client->type == CLIENT_SERVER ) sprintf( msg, "%s: lost server %s", This_Server->id, Client->id );
 
 	last = NULL;
 	c = My_Clients;
@@ -268,7 +264,7 @@ Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
 				}
 
 				/* andere Server informieren */
-				if( ! NGIRCd_SignalQuit )
+				if( ! NGIRCd_Quit )
 				{
 					if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :%s", c->id, FwdMsg );
 					else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :", c->id );
@@ -297,35 +293,6 @@ Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
 } /* Client_Destroy */
 
 
-GLOBAL VOID
-Client_DestroyNow( CLIENT *Client )
-{
-	/* Destroy client structure immediately. This function is only
-	 * intended for the connection layer to remove client structures
-	 * of connections that can't be established! */
-
-	CLIENT *last, *c;
-
-	assert( Client != NULL );
-
-	last = NULL;
-	c = My_Clients;
-	while( c )
-	{
-		if( c == Client )
-		{
-			/* Wir haben den Client gefunden: entfernen */
-			if( last ) last->next = c->next;
-			else My_Clients = (CLIENT *)c->next;
-			free( c );
-			break;
-		}
-		last = c;
-		c = (CLIENT *)c->next;
-	}
-} /* Client_DestroyNow */
-
-
 GLOBAL VOID
 Client_SetHostname( CLIENT *Client, CHAR *Hostname )
 {
@@ -334,7 +301,8 @@ Client_SetHostname( CLIENT *Client, CHAR *Hostname )
 	assert( Client != NULL );
 	assert( Hostname != NULL );
 	
-	strlcpy( Client->host, Hostname, sizeof( Client->host ));
+	strncpy( Client->host, Hostname, CLIENT_HOST_LEN - 1 );
+	Client->host[CLIENT_HOST_LEN - 1] = '\0';
 } /* Client_SetHostname */
 
 
@@ -346,7 +314,8 @@ Client_SetID( CLIENT *Client, CHAR *ID )
 	assert( Client != NULL );
 	assert( ID != NULL );
 	
-	strlcpy( Client->id, ID, sizeof( Client->id ));
+	strncpy( Client->id, ID, CLIENT_ID_LEN - 1 );
+	Client->id[CLIENT_ID_LEN - 1] = '\0';
 
 	/* Hash */
 	Client->hash = Hash( Client->id );
@@ -361,12 +330,13 @@ Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
 	assert( Client != NULL );
 	assert( User != NULL );
 	
-	if( Idented ) strlcpy( Client->user, User, sizeof( Client->user ));
+	if( Idented ) strncpy( Client->user, User, CLIENT_USER_LEN - 1 );
 	else
 	{
 		Client->user[0] = '~';
-		strlcpy( Client->user + 1, User, sizeof( Client->user ) - 1 );
+		strncpy( Client->user + 1, User, CLIENT_USER_LEN - 2 );
 	}
+	Client->user[CLIENT_USER_LEN - 1] = '\0';
 } /* Client_SetUser */
 
 
@@ -378,7 +348,8 @@ Client_SetInfo( CLIENT *Client, CHAR *Info )
 	assert( Client != NULL );
 	assert( Info != NULL );
 	
-	strlcpy( Client->info, Info, sizeof( Client->info ));
+	strncpy( Client->info, Info, CLIENT_INFO_LEN - 1 );
+	Client->info[CLIENT_INFO_LEN - 1] = '\0';
 } /* Client_SetInfo */
 
 
@@ -390,7 +361,8 @@ Client_SetModes( CLIENT *Client, CHAR *Modes )
 	assert( Client != NULL );
 	assert( Modes != NULL );
 
-	strlcpy( Client->modes, Modes, sizeof( Client->modes ));
+	strncpy( Client->modes, Modes, CLIENT_MODE_LEN - 1 );
+	Client->modes[CLIENT_MODE_LEN - 1] = '\0';
 } /* Client_SetModes */
 
 
@@ -402,7 +374,8 @@ Client_SetFlags( CLIENT *Client, CHAR *Flags )
 	assert( Client != NULL );
 	assert( Flags != NULL );
 
-	strlcpy( Client->flags, Flags, sizeof( Client->flags ));
+	strncpy( Client->flags, Flags, CLIENT_FLAGS_LEN - 1 );
+	Client->modes[CLIENT_FLAGS_LEN - 1] = '\0';
 } /* Client_SetFlags */
 
 
@@ -414,20 +387,32 @@ Client_SetPassword( CLIENT *Client, CHAR *Pwd )
 	assert( Client != NULL );
 	assert( Pwd != NULL );
 	
-	strlcpy( Client->pwd, Pwd, sizeof( Client->pwd ));
+	strncpy( Client->pwd, Pwd, CLIENT_PASS_LEN - 1 );
+	Client->pwd[CLIENT_PASS_LEN - 1] = '\0';
 } /* Client_SetPassword */
 
 
 GLOBAL VOID
 Client_SetAway( CLIENT *Client, CHAR *Txt )
 {
-	/* Set AWAY reason of client */
+	/* Von einem Client gelieferte AWAY-Nachricht */
 
 	assert( Client != NULL );
-	assert( Txt != NULL );
 
-	strlcpy( Client->away, Txt, sizeof( Client->away ));
-	Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
+	if( Txt )
+	{
+		/* Client AWAY setzen */
+		strncpy( Client->away, Txt, CLIENT_AWAY_LEN - 1 );
+		Client->away[CLIENT_AWAY_LEN - 1] = '\0';
+		Client_ModeAdd( Client, 'a' );
+		Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
+	}
+	else
+	{
+		/* AWAY loeschen */
+		Client_ModeDel( Client, 'a' );
+		Log( LOG_DEBUG, "User \"%s\" is no longer away.", Client_Mask( Client ));
+	}
 } /* Client_SetAway */
 
 
@@ -437,7 +422,6 @@ Client_SetType( CLIENT *Client, INT Type )
 	assert( Client != NULL );
 	Client->type = Type;
 	if( Type == CLIENT_SERVER ) Generate_MyToken( Client );
-	Adjust_Counters( Client );
 } /* Client_SetType */
 
 
@@ -489,7 +473,7 @@ Client_ModeAdd( CLIENT *Client, CHAR Mode )
 	if( ! strchr( Client->modes, x[0] ))
 	{
 		/* Client hat den Mode noch nicht -> setzen */
-		strlcat( Client->modes, x, sizeof( Client->modes ));
+		strcat( Client->modes, x );
 		return TRUE;
 	}
 	else return FALSE;
@@ -555,7 +539,8 @@ Client_Search( CHAR *Nick )
 	assert( Nick != NULL );
 
 	/* Nick kopieren und ggf. Host-Mask abschneiden */
-	strlcpy( search_id, Nick, sizeof( search_id ));
+	strncpy( search_id, Nick, CLIENT_ID_LEN - 1 );
+	search_id[CLIENT_ID_LEN - 1] = '\0';
 	ptr = strchr( search_id, '!' );
 	if( ptr ) *ptr = '\0';
 
@@ -823,9 +808,8 @@ Client_CheckID( CLIENT *Client, CHAR *ID )
 		if( strcasecmp( c->id, ID ) == 0 )
 		{
 			/* die Server-ID gibt es bereits */
-			snprintf( str, sizeof( str ), "ID \"%s\" already registered", ID );
-			if( Client->conn_id != c->conn_id ) Log( LOG_ERR, "%s (on connection %d)!", str, c->conn_id );
-			else Log( LOG_ERR, "%s (via network)!", str );
+			sprintf( str, "ID \"%s\" already registered!", ID );
+			Log( LOG_ERR, "%s (on connection %d)", str, Client->conn_id );
 			Conn_Close( Client->conn_id, str, str, TRUE );
 			return FALSE;
 		}
@@ -942,20 +926,6 @@ Client_UnknownCount( VOID )
 } /* Client_UnknownCount */
 
 
-GLOBAL LONG
-Client_MaxUserCount( VOID )
-{
-	return Max_Users;
-} /* Client_MaxUserCount */
-
-
-GLOBAL LONG
-Client_MyMaxUserCount( VOID )
-{
-	return My_Max_Users;
-} /* Client_MyMaxUserCount */
-
-
 GLOBAL BOOLEAN
 Client_IsValidNick( CHAR *Nick )
 {
@@ -1024,7 +994,7 @@ New_Client_Struct( VOID )
 	
 	CLIENT *c;
 	
-	c = (CLIENT *)malloc( sizeof( CLIENT ));
+	c = malloc( sizeof( CLIENT ));
 	if( ! c )
 	{
 		Log( LOG_EMERG, "Can't allocate memory! [New_Client_Struct]" );
@@ -1078,24 +1048,4 @@ Generate_MyToken( CLIENT *Client )
 } /* Generate_MyToken */
 
 
-LOCAL VOID
-Adjust_Counters( CLIENT *Client )
-{
-	LONG count;
-
-	assert( Client != NULL );
-
-	if( Client->type != CLIENT_USER ) return;
-	
-	if( Client->conn_id != NONE )
-	{
-		/* Local connection */
-		count = Client_MyUserCount( );
-		if( count > My_Max_Users ) My_Max_Users = count;
-	}
-	count = Client_UserCount( );
-	if( count > Max_Users ) Max_Users = count;
-} /* Adjust_Counters */
-
-
 /* -eof- */

src/ngircd/client.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: client.h,v 1.34 2003/01/15 14:28:25 alex Exp $
+ * $Id: client.h,v 1.29.2.1 2002/11/04 19:18:39 alex Exp $
  *
- * Client management (header)
+ * client.h: Konfiguration des ngircd (Header)
  */
 
 
@@ -18,17 +19,18 @@
 #define __client_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)
@@ -37,22 +39,22 @@
 
 typedef struct _CLIENT
 {
-	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 */
+	CHAR id[CLIENT_ID_LEN];		/* Nick (User) bzw. ID (Server) */
+	UINT32 hash;			/* Hash ueber die (kleingeschriebene) ID */
+	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 away[CLIENT_AWAY_LEN];	/* AWAY-Text, wenn Mode 'a' gesetzt */
+	CHAR flags[CLIENT_FLAGS_LEN];	/* Flags des Client (aktuell nur bei Servern) */
 } CLIENT;
 
 #else
@@ -62,81 +64,76 @@ typedef POINTER CLIENT;
 #endif
 
 
-GLOBAL VOID Client_Init PARAMS(( VOID ));
-GLOBAL VOID Client_Exit PARAMS(( VOID ));
+GLOBAL VOID Client_Init PARAMS((VOID ));
+GLOBAL VOID Client_Exit PARAMS((VOID ));
 
-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 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 PARAMS(( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit ));
-#ifdef CONN_MODULE
-GLOBAL VOID Client_DestroyNow PARAMS(( CLIENT *Client ));
-#endif
+GLOBAL VOID Client_Destroy PARAMS((CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit ));
 
-GLOBAL CLIENT *Client_ThisServer PARAMS(( VOID ));
+GLOBAL CLIENT *Client_ThisServer PARAMS((VOID ));
 
-GLOBAL CLIENT *Client_GetFromConn PARAMS(( CONN_ID Idx ));
-GLOBAL CLIENT *Client_GetFromToken PARAMS(( 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 PARAMS(( CHAR *ID ));
-GLOBAL CLIENT *Client_First PARAMS(( VOID ));
-GLOBAL CLIENT *Client_Next PARAMS(( 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 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 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 PARAMS(( CLIENT *Client, CHAR Mode ));
+GLOBAL BOOLEAN Client_HasMode PARAMS((CLIENT *Client, CHAR Mode ));
 
-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 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 PARAMS(( CLIENT *Client, CHAR Mode ));
-GLOBAL BOOLEAN Client_ModeDel PARAMS(( 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 PARAMS(( CLIENT *Client, CHAR *Nick ));
-GLOBAL BOOLEAN Client_CheckID PARAMS(( CLIENT *Client, CHAR *ID ));
+GLOBAL BOOLEAN Client_CheckNick PARAMS((CLIENT *Client, CHAR *Nick ));
+GLOBAL BOOLEAN Client_CheckID PARAMS((CLIENT *Client, CHAR *ID ));
 
-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 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 BOOLEAN Client_IsValidNick PARAMS(( CHAR *Nick ));
+GLOBAL BOOLEAN Client_IsValidNick PARAMS((CHAR *Nick ));
 
 
 #endif

src/ngircd/conf.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: conf.h,v 1.28.2.1 2004/05/07 11:24:18 alex Exp $
+ * $Id: conf.h,v 1.19 2002/09/16 09:13:40 alex Exp $
  *
- * Configuration management (header)
+ * conf.h: Konfiguration des ngircd (Header)
  */
 
 
@@ -24,114 +25,80 @@
 
 typedef struct _Conf_Oper
 {
-	CHAR name[CLIENT_PASS_LEN];	/* Name (ID) of IRC operator */
-	CHAR pwd[CLIENT_PASS_LEN];	/* Password */
+	CHAR name[CLIENT_PASS_LEN];	/* Name (ID) des IRC-OPs */
+	CHAR pwd[CLIENT_PASS_LEN];	/* Passwort */
 } CONF_OPER;
 
 typedef struct _Conf_Server
 {
 	CHAR host[HOST_LEN];		/* Hostname */
-	CHAR ip[16];			/* IP address (Resolver) */
+	CHAR ip[16];			/* IP-Adresse (von 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 */
+	CHAR pwd[CLIENT_PASS_LEN];	/* Passwort */
+	INT port;			/* Server-Port */
+	INT group;			/* Gruppe des Servers */
+	time_t lasttry;			/* Letzter Connect-Versuch */
+	RES_STAT *res_stat;		/* Status des Resolver */
 } 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 */
+	CHAR name[CHANNEL_NAME_LEN];	/* Name des Channel */
+	CHAR modes[CHANNEL_MODE_LEN];	/* Channel-Modes */
+	CHAR topic[CHANNEL_TOPIC_LEN];	/* Topic des Channels */
 } CONF_CHANNEL;
 
 
-#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 */
+/* Name ("Nick") des Servers */
 GLOBAL CHAR Conf_ServerName[CLIENT_ID_LEN];
 
-/* Server info text */
+/* Server-Info-Text */
 GLOBAL CHAR Conf_ServerInfo[CLIENT_INFO_LEN];
 
-/* Global server passwort */
+/* Server-Passwort */
 GLOBAL CHAR Conf_ServerPwd[CLIENT_PASS_LEN];
 
-/* Administrative information */
+/* Admin-Info-Texte */
 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 */
+/* Datei mit MOTD-Text */
 GLOBAL CHAR Conf_MotdFile[FNAME_LEN];
 
-/* Phrase with MOTD text */
-GLOBAL CHAR Conf_MotdPhrase[LINE_LEN];
-
-/* Ports the server should listen on */
+/* Ports, auf denen der Server Verbindungen entgegen nimmt */
 GLOBAL UINT Conf_ListenPorts[MAX_LISTEN_PORTS];
 GLOBAL INT Conf_ListenPorts_Count;
 
-/* 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 */
+/* User- und Group-ID, zu denen der Daemon wechseln soll */
 GLOBAL UINT Conf_UID;
 GLOBAL UINT Conf_GID;
 
-/* A directory to chroot() in */
-GLOBAL CHAR Conf_Chroot[FNAME_LEN];
-
-/* Timeouts for PING and PONG */
+/* Timeouts fuer PING und PONG */
 GLOBAL INT Conf_PingTimeout;
 GLOBAL INT Conf_PongTimeout;
 
-/* Seconds between connect attempts to other servers */
+/* Sekunden zwischen Verbindungsversuchen zu anderen Servern */
 GLOBAL INT Conf_ConnectRetry;
 
-/* Operators */
+/* Operatoren */
 GLOBAL CONF_OPER Conf_Oper[MAX_OPERATORS];
 GLOBAL INT Conf_Oper_Count;
 
-/* Servers */
+/* Server */
 GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS];
+GLOBAL INT Conf_Server_Count;
 
-/* Pre-defined channels */
+/* Vorkonfigurierte Channels */
 GLOBAL CONF_CHANNEL Conf_Channel[MAX_DEFCHANNELS];
 GLOBAL INT Conf_Channel_Count;
 
-/* Are IRC operators allowed to always use MODE? */
+/* Koennen IRC OPs immer Modes setzen? */
 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 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

@@ -1,277 +0,0 @@
-/*
- * 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

@@ -1,61 +0,0 @@
-/*
- * 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

@@ -1,210 +0,0 @@
-/*
- * 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

@@ -1,38 +0,0 @@
-/*
- * 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,15 +2,16 @@
  * 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.
+ * 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: conn.h,v 1.32 2003/12/26 15:55:07 alex Exp $
+ * $Id: conn.h,v 1.17 2002/08/26 00:03:15 alex Exp $
  *
- * Connection management (header)
+ * conn.h: Verwaltung aller Netz-Verbindungen ("connections") (Header)
  */
 
 
@@ -18,75 +19,15 @@
 #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
+#include <time.h>
 
 
 typedef INT CONN_ID;
 
 
-#ifdef CONN_MODULE
-
-#include "defines.h"
-#include "resolve.h"
-
-#ifdef ZLIB
-#include <zlib.h>
-typedef struct _ZipData
-{
-	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 PARAMS((VOID ));
 GLOBAL VOID Conn_Exit PARAMS(( VOID ));
 
-GLOBAL INT Conn_InitListeners PARAMS(( VOID ));
-GLOBAL VOID Conn_ExitListeners PARAMS(( VOID ));
-
 GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port ));
 
 GLOBAL VOID Conn_Handler PARAMS(( VOID ));
@@ -96,7 +37,12 @@ GLOBAL BOOLEAN Conn_WriteStr PARAMS(( CONN_ID Idx, CHAR *Format, ... ));
 
 GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));
 
-GLOBAL VOID Conn_SyncServerStruct PARAMS(( VOID ));
+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 VOID Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds ));
+
 
 GLOBAL INT Conn_MaxFD;
 

src/ngircd/defines.h

@@ -1,16 +1,17 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * 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.
+ * 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: defines.h,v 1.45.2.1 2004/05/07 11:24:18 alex Exp $
+ * $Id: defines.h,v 1.33.2.1 2002/11/23 16:20:25 alex Exp $
  *
- * Global defines of ngIRCd.
+ * defines.h: (globale) Konstanten
  */
 
 #ifndef __defines_h__
@@ -19,6 +20,8 @@
 
 #define NONE -1
 
+#define TIME_RES 2			/* Zeit-Aufloesung des Servers in Sekunden */
+
 #define FNAME_LEN 256			/* max. Laenge eines Dateinamen */
 
 #define LINE_LEN 256			/* max. Laenge einer Konfigurationszeile */
@@ -33,9 +36,7 @@
 
 #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 MAX_CONNECTIONS 100		/* max. Anzahl von Verbindungen an diesem Server */
 
 #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 */
@@ -54,50 +55,41 @@
 
 #define COMMAND_LEN 513			/* max. Laenge eines Befehls, vgl. RFC 2812, 3.2 */
 
-#define READBUFFER_LEN 2048		/* Laenge des Lesepuffers je Verbindung (Bytes) */
+#define READBUFFER_LEN 2 * COMMAND_LEN	/* Laenge des Lesepuffers je Verbindung (Bytes) */
 #define WRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers je Verbindung (Bytes) */
 
-#ifdef ZLIB
-#define ZREADBUFFER_LEN 1024		/* Laenge des Lesepuffers je Verbindung (Bytes) */
-#define ZWRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers fuer Kompression (Bytes) */
-#endif
-
 #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 */
+# define IRCPLUSFLAGS "C"		/* 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 "aios"		/* unterstuetzte User-Modes */
-#define CHANMODES "biklImnoPtv"		/* unterstuetzte Channel-Modes */
+#define CHANMODES "biImnoPtv"		/* 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 ""
-
+#ifdef PROTOTYPES
+# define CONFIG_FILE SYSCONFDIR"/ngircd.conf"
+# define MOTD_FILE SYSCONFDIR"/ngircd.motd"
+#else
+# define CONFIG_FILE "ngircd.conf"
+# define MOTD_FILE "ngircd.motd"
+#endif
 #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/hash.c

@@ -2,20 +2,21 @@
  * 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.
+ * 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.
  *
- * Hash calculation
+ * $Id: hash.c,v 1.5 2002/05/27 12:54:07 alex Exp $
+ *
+ * hash.c: Hash-Werte berechnen
  */
 
 
 #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>
@@ -38,7 +39,9 @@ Hash( CHAR *String )
 
 	CHAR buffer[LINE_LEN];
 
-	strlcpy( buffer, String, sizeof( buffer ));
+	strncpy( buffer, String, LINE_LEN - 1 );
+	buffer[LINE_LEN - 1] = '\0';
+	
 	return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
 } /* Hash */
 
@@ -100,7 +103,7 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval
 
 	/* handle the last 11 bytes */
 	c += length;
-	switch( (INT)len )	/* all the case statements fall through */
+	switch(len)		/* all the case statements fall through */
 	{
 		case 11: c+=((UINT32)k[10]<<24);
 		case 10: c+=((UINT32)k[9]<<16);

src/ngircd/hash.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: hash.h,v 1.4 2002/12/12 12:23:43 alex Exp $
+ * $Id: hash.h,v 1.3 2002/05/27 12:54:07 alex Exp $
  *
- * Hash calculation (header)
+ * hash.h: Hash-Werte berechnen (Header)
  */
 
 

src/ngircd/irc-channel.c

@@ -2,24 +2,23 @@
  * 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.
+ * 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.
  *
- * IRC channel commands
+ * $Id: irc-channel.c,v 1.15 2002/09/16 09:16:17 alex Exp $
+ *
+ * irc-channel.c: IRC-Channel-Befehle
  */
 
 
 #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"
@@ -31,10 +30,8 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.27 2004/04/09 20:46:48 alex Ex
 #include "match.h"
 #include "messages.h"
 #include "parse.h"
-#include "irc-info.h"
+#include "irc.h"
 #include "irc-write.h"
-#include "resolve.h"
-#include "conf.h"
 
 #include "exp.h"
 #include "irc-channel.h"
@@ -43,7 +40,7 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.27 2004/04/09 20:46:48 alex Ex
 GLOBAL BOOLEAN
 IRC_JOIN( CLIENT *Client, REQUEST *Req )
 {
-	CHAR *channame, *key, *flags, *topic, modes[8];
+	CHAR *channame, *flags, *topic, modes[8];
 	BOOLEAN is_new_chan, is_invited, is_banned;
 	CLIENT *target;
 	CHANNEL *chan;
@@ -51,24 +48,22 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	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 );
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
-	/* Who is the sender? */
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 1 )) 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 );
 
-	/* 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;
+		chan = flags = NULL;
 
 		/* wird der Channel neu angelegt? */
 		if( Channel_Search( channame )) is_new_chan = FALSE;
@@ -86,19 +81,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 			}
 		}
 
-		/* Local client? */
+		/* Lokaler 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 )
 			{
@@ -120,55 +105,23 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 					/* Client ist gebanned (und nicht invited): */
 					IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
 
-					/* Try next name, if any */
+					/* naechsten Namen ermitteln */
 					channame = strtok( NULL, "," );
 					continue;
 				}
 
 				/* Ist der Channel "invite-only"? */
-				if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
+				if(( strchr( Channel_Modes( chan ), 'i' ) != NULL ) && ( 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 */
+					/* naechsten Namen ermitteln */
 					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 ))
@@ -191,7 +144,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		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 );
+		strcpy( &modes[1], Channel_UserModes( chan, target ));
 		if( modes[1] ) modes[0] = 0x7;
 		else modes[0] = '\0';
 
@@ -236,6 +189,8 @@ IRC_PART( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -272,6 +227,8 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -323,6 +280,8 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -338,7 +297,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 	{
 		/* 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 ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 
 		if( target != Client_ThisServer( ))
 		{
@@ -374,27 +333,23 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 {
-	CHAR modes_add[COMMAND_LEN], l[16], *ptr;
 	CLIENT *from;
 	CHANNEL *chan;
-	INT arg_topic;
+	CHAR *ptr;
 
 	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 );
+	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
-	/* Compatibility kludge */
-	if( Req->argc == 5 ) arg_topic = 4;
-	else if( Req->argc == 3 ) arg_topic = 2;
-	else arg_topic = -1;
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	/* Search origin */
+	/* From-Server suchen */
 	from = Client_Search( Req->prefix );
 	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
-	/* Search or create channel */
+	/* Channel suchen bzw. erzeugen */
 	chan = Channel_Search( Req->argv[0] );
 	if( ! chan ) chan = Channel_Create( Req->argv[0] );
 	if( ! chan ) return CONNECTED;
@@ -404,61 +359,27 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 		ptr = Channel_Modes( chan );
 		if( ! *ptr )
 		{
-			/* OK, this channel doesn't have modes jet, set the received ones: */
+			/* OK, es sind noch keine Modes gesetzt */
 			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 );
+			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] );
 		}
 	}
-	else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" );
+	else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" );
 
-	if( arg_topic > 0 )
+	if( Req->argc == 3 )
 	{
-		/* We got a topic */
+		/* Es wurde auch ein Topic mit uebermittelt */
 		ptr = Channel_Topic( chan );
-		if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
+		if( ! *ptr )
 		{
-			/* 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 ));
+			/* OK, es ist bisher kein Topic gesetzt */
+			Channel_SetTopic( chan, Req->argv[2] );
+			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[2] );
 		}
 	}
 
-	/* 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] );
-
+	/* an andere Server forwarden */
+	IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
 	return CONNECTED;
 } /* IRC_CHANINFO */
 

src/ngircd/irc-channel.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-channel.h,v 1.6 2002/12/12 12:23:43 alex Exp $
+ * $Id: irc-channel.h,v 1.5 2002/09/03 23:56:55 alex Exp $
  *
- * IRC channel commands (header)
+ * irc-channel.h: IRC-Channel-Befehle (Header)
  */
 
 

src/ngircd/irc-info.c

@@ -1,912 +0,0 @@
-/*
- * 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

@@ -1,44 +0,0 @@
-/*
- * 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

@@ -2,40 +2,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.
+ * 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.
  *
- * Login and logout
+ * $Id: irc-login.c,v 1.21.2.1 2002/09/22 21:37:06 alex Exp $
+ *
+ * irc-login.c: Anmeldung und Abmeldung im IRC
  */
 
 
 #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 "conn.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"
@@ -67,7 +65,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 	}
 	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;
+		CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr;
 		INT protohigh, protolow;
 
 		/* noch nicht registrierte Server-Verbindung */
@@ -96,10 +94,6 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 		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, '|' );
@@ -117,16 +111,12 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 				flags++;
 			}
 			else flags = "";
-			Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
+			Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", Client_Conn( Client ), 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 );
+			serverver = flags = "";
+			Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
 		}
 
 		Client_SetType( Client, CLIENT_GOTPASSSERVER );
@@ -225,7 +215,6 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 			
 			/* neuen Client-Nick speichern */
 			Client_SetID( target, Req->argv[0] );
-			IRC_SetPenalty( target, 2 );
 		}
 
 		return CONNECTED;
@@ -286,10 +275,6 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_USER( CLIENT *Client, REQUEST *Req )
 {
-#ifdef IDENTAUTH
-	CHAR *ptr;
-#endif
-
 	assert( Client != NULL );
 	assert( Req != NULL );
 
@@ -299,21 +284,11 @@ IRC_USER( CLIENT *Client, REQUEST *Req )
 	if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS )
 #endif
 	{
-		/* Wrong number of parameters? */
+		/* Falsche Anzahl Parameter? */
 		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, "-" );
+		Client_SetInfo( Client, Req->argv[3] );
 
 		Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client ));
 		if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client );
@@ -379,6 +354,8 @@ IRC_PING( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
 #ifdef STRICT_RFC
@@ -389,7 +366,7 @@ IRC_PING( CLIENT *Client, REQUEST *Req )
 	{
 		/* 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 ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 		if( target != Client_ThisServer( ))
 		{
 			/* ok, forwarden */
@@ -413,6 +390,8 @@ IRC_PONG( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* 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 );
@@ -421,7 +400,7 @@ IRC_PONG( CLIENT *Client, REQUEST *Req )
 	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 ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 		if( target != Client_ThisServer( ))
 		{
 			/* ok, forwarden */
@@ -445,16 +424,12 @@ IRC_PONG( CLIENT *Client, REQUEST *Req )
 LOCAL BOOLEAN
 Hello_User( CLIENT *Client )
 {
-#ifdef CVSDATE
-	CHAR ver[12], vertxt[30];
-#endif
-
 	assert( Client != NULL );
 
-	/* Check password ... */
+	/* Passwort ueberpruefen */
 	if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 )
 	{
-		/* Bad password! */
+		/* Falsches Passwort */
 		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;
@@ -462,41 +437,19 @@ Hello_User( CLIENT *Client )
 
 	Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client ));
 
-	/* Inform other servers */
+	/* Andere Server informieren */
 	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_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
 	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;
+	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE;
 
 	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 */
 
@@ -504,18 +457,19 @@ Hello_User( CLIENT *Client )
 LOCAL VOID
 Kill_Nick( CHAR *Nick, CHAR *Reason )
 {
-	REQUEST r;
+	CLIENT *c;
 
 	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 );
+
+	/* andere Server benachrichtigen */
+	IRC_WriteStrServers( NULL, "KILL %s :%s", Nick, Reason );
+
+	/* Ggf. einen eigenen Client toeten */
+	c = Client_Search( Nick );
+	if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Reason, TRUE );
 } /* Kill_Nick */
 
 

src/ngircd/irc-login.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-login.h,v 1.5 2002/12/12 12:23:43 alex Exp $
+ * $Id: irc-login.h,v 1.4 2002/05/27 13:09:27 alex Exp $
  *
- * Login and logout (header)
+ * irc-login.h: Anmeldung und Abmeldung im IRC (Header)
  */
 
 

src/ngircd/irc-mode.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-mode.h,v 1.5 2002/12/12 12:23:43 alex Exp $
+ * $Id: irc-mode.h,v 1.4 2002/05/27 13:09:27 alex Exp $
  *
- * IRC commands for mode changes (header)
+ * irc-mode.h: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...) (Header)
  */
 
 

src/ngircd/irc-op.c

@@ -1,21 +1,22 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * 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.
+ * 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.
  *
- * Channel operator commands
+ * $Id: irc-op.c,v 1.9 2002/09/08 17:06:54 alex Exp $
+ *
+ * irc-op.c: Befehle zur Channel-Verwaltung
  */
 
 
 #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>
@@ -43,6 +44,9 @@ IRC_KICK( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	/* Valider Client? */
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -69,14 +73,17 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Wrong number of parameters? */
+	/* Valider Client? */
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+	/* Falsche Anzahl Parameter? */
 	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 */
+	/* User suchen */
 	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] );
 
@@ -84,38 +91,36 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
 
 	if( chan )
 	{
-		/* Channel exists. Is the user a valid member of the channel? */
+		/* Der Channel existiert bereits; ist der User Mitglied? */
 		if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] );
 
-		/* Is the channel "invite-only"? */
+		/* Ist der Channel "invite-only"? */
 		if( strchr( Channel_Modes( chan ), 'i' ))
 		{
-			/* Yes. The user must be channel operator! */
+			/* Ja. Der User muss Channel-Operator sein! */
 			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? */
+		/* Ist der Ziel-User bereits Mitglied? */
 		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;
-		}
 	}
 
+	/* Wenn der User gebanned ist, so muss das Invite auch gespeichert werden */
+	if( Lists_CheckBanned( target, chan )) remember = TRUE;
+
 	Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
+	if( remember )
+	{
+		if( ! Lists_AddInvited( from, Client_Mask( target ), chan, TRUE )) return CONNECTED;
+	}
 	
-	/* Inform target client */
+	/* an Ziel-Client forwarden ... */
 	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 */
+		/* lokaler Ziel-Client, Status-Code melden */
 		if( ! IRC_WriteStrClientPrefix( from, target, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED;
 	}
 	

src/ngircd/irc-op.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-op.h,v 1.3 2002/12/12 12:23:43 alex Exp $
+ * $Id: irc-op.h,v 1.2 2002/09/08 00:52:55 alex Exp $
  *
- * Channel operator commands (header)
+ * irc-op.h: Befehle zur Channel-Verwaltung (Header)
  */
 
 

src/ngircd/irc-oper.c

@@ -2,29 +2,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.
+ * 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.
  *
- * IRC operator commands
+ * $Id: irc-oper.c,v 1.8 2002/09/03 23:54:59 alex Exp $
+ *
+ * irc-oper.c: IRC-Operator-Befehle
  */
 
 
 #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 "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "irc-write.h"
@@ -44,6 +44,8 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -83,60 +85,37 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
 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( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+	/* Falsche Anzahl Parameter? */
 	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;
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+
+	Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\", going down!", Client_Mask( Client ));
+	NGIRCd_Quit = 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 ));
+	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
-	/* Bad number of parameters? */
+	/* Falsche Anzahl Parameter? */
 	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;
+	if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+
+	Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\", going down!", Client_Mask( Client ));
+	NGIRCd_Restart = TRUE;
 	return CONNECTED;
 } /* IRC_RESTART */
 
@@ -144,64 +123,22 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_CONNECT(CLIENT *Client, REQUEST *Req )
 {
-	/* Connect configured or new server */
+	/* Vorlaeufige Version zu Debug-Zwecken: es wird einfach
+	 * der "passive mode" aufgehoben, mehr passiert nicht ... */
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Not a local IRC operator? */
+	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 	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] );
-	}
+	Log( LOG_NOTICE|LOG_snotice, "Got CONNECT command from \"%s\".", Client_Mask( Client ));
+	NGIRCd_Passive = FALSE;
 	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

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-oper.h,v 1.10 2002/12/31 16:11:06 alex Exp $
+ * $Id: irc-oper.h,v 1.6 2002/09/03 23:54:59 alex Exp $
  *
- * IRC operator commands (header)
+ * irc-oper.h: IRC-Operator-Befehle (Header)
  */
 
 
@@ -20,10 +21,8 @@
 
 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

src/ngircd/irc-server.c

@@ -2,36 +2,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.
+ * 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.
  *
- * IRC commands for server links
+ * $Id: irc-server.c,v 1.17.2.3 2002/11/29 10:58:49 alex Exp $
+ *
+ * irc-server.c: IRC-Befehle fuer 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 "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "irc-write.h"
-#include "lists.h"
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
@@ -44,13 +41,12 @@ static char UNUSED id[] = "$Id: irc-server.c,v 1.36.2.1 2004/05/15 23:52:17 alex
 GLOBAL BOOLEAN
 IRC_SERVER( CLIENT *Client, REQUEST *Req )
 {
-	CHAR str[LINE_LEN], *ptr, *modes, *topic;
+	CHAR str[LINE_LEN], *ptr;
 	CLIENT *from, *c, *cl;
 	CL2CHAN *cl2chan;
 	INT max_hops, i;
 	CHANNEL *chan;
 	BOOLEAN ok;
-	CONN_ID con;
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -67,18 +63,18 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		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 )
+		for( i = 0; i < Conf_Server_Count; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
+		if( i >= Conf_Server_Count )
 		{
 			/* 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 )
+		if( strcmp( Client_Password( Client ), Conf_Server[i].pwd ) != 0 )
 		{
 			/* Falsches Passwort */
-			Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
+			Log( LOG_ERR, "Connection %d: Bad password for server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
 			Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
 			return DISCONNECTED;
 		}
@@ -90,19 +86,18 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		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;
+			if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd, 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 );
+				Conn_Close( Client_Conn( Client ), "Unexpected server behavior!", NULL, FALSE );
 				return DISCONNECTED;
 			}
 			Client_SetIntroducer( Client, Client );
@@ -115,23 +110,9 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 			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 );
+		Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client ));
 
 		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;
@@ -182,56 +163,33 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		while( chan )
 		{
 #ifdef IRCPLUS
-			/* Send CHANINFO if the peer supports it */
+			/* Wenn unterstuetzt, CHANINFO senden */
 			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;
-					}
-				}
+				/* CHANINFO senden */
+				if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), Channel_Modes( chan ), Channel_Topic( chan ))) return DISCONNECTED;
 			}
 #endif
 
 			/* alle Member suchen */
 			cl2chan = Channel_FirstMember( chan );
-			snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan ));
+			sprintf( 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( str[strlen( str ) - 1] != ':' ) strcat( str, "," );
+				if( strchr( Channel_UserModes( chan, cl ), 'v' )) strcat( str, "+" );
+				if( strchr( Channel_UserModes( chan, cl ), 'o' )) strcat( str, "@" );
+				strcat( str, Client_ID( cl ));
 
 				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 ));
+					sprintf( str, "NJOIN %s :", Channel_Name( chan ));
 				}
 				
 				cl2chan = Channel_NextMember( chan, cl2chan );
@@ -244,18 +202,6 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 				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 );
 		}
@@ -296,7 +242,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		}
 
 		/* Log-Meldung zusammenbauen und ausgeben */
-		if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) snprintf( str, sizeof( str ), "connected to %s, ", Client_ID( from ));
+		if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) sprintf( 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": "" );
 
@@ -312,7 +258,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
-	CHAR nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8];
+	CHAR str[COMMAND_LEN], *channame, *ptr, modes[8];
 	BOOLEAN is_op, is_voiced;
 	CHANNEL *chan;
 	CLIENT *c;
@@ -320,14 +266,16 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTEREDSERVER_MSG, Client_ID( Client ));
+
 	/* 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, "" );
+	strncpy( str, Req->argv[1], COMMAND_LEN - 1 );
+	str[COMMAND_LEN - 1] = '\0';
 
 	channame = Req->argv[0];
-	ptr = strtok( nick_in, "," );
+	ptr = strtok( str, "," );
 	while( ptr )
 	{
 		is_op = is_voiced = FALSE;
@@ -354,17 +302,12 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 			IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame );
 
 			/* Channel-User-Modes setzen */
-			strlcpy( modes, Channel_UserModes( chan, c ), sizeof( modes ));
+			strcpy( modes, Channel_UserModes( chan, c ));
 			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 );
 		
@@ -373,7 +316,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 	}
 
 	/* an andere Server weiterleiten */
-	if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out );
+	IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], Req->argv[1] );
 
 	return CONNECTED;
 } /* IRC_NJOIN */
@@ -388,6 +331,9 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	/* SQUIT ist nur fuer Server erlaubt */
+	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -404,9 +350,9 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 	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 ));
+		sprintf( msg, "%s (SQUIT from %s).", Req->argv[1], Client_ID( Client ));
 	}
-	else snprintf( msg, sizeof( msg ), "Got SQUIT from %s.", Client_ID( Client ));
+	else sprintf( msg, "Got SQUIT from %s.", Client_ID( Client ));
 
 	if( Client_Conn( target ) > NONE )
 	{

src/ngircd/irc-server.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-server.h,v 1.4 2002/12/12 12:23:43 alex Exp $
+ * $Id: irc-server.h,v 1.3 2002/05/27 13:09:27 alex Exp $
  *
- * IRC commands for server links (header)
+ * irc-server.h: IRC-Befehle fuer Server-Links (Header)
  */
 
 

src/ngircd/irc-write.c

@@ -2,27 +2,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.
+ * 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.
  *
- * Sending IRC commands over the network
+ * $Id: irc-write.c,v 1.7.2.3 2002/10/04 13:12:46 alex Exp $
+ *
+ * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
  */
 
 
 #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 "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "defines.h"
@@ -31,10 +32,6 @@ static char UNUSED id[] = "$Id: irc-write.c,v 1.15 2003/11/05 23:24:48 alex Exp
 #include "irc-write.h"
 
 
-#define SEND_TO_USER 1
-#define SEND_TO_SERVER 2
-
-
 LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
 
 
@@ -149,11 +146,11 @@ CHAR *Format;
 va_dcl
 #endif
 {
-	BOOLEAN ok = CONNECTED;
+	BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
 	CHAR buffer[1000];
 	CL2CHAN *cl2chan;
-	CONN_ID conn;
 	CLIENT *c;
+	INT s, i;
 	va_list ap;
 
 	assert( Client != NULL );
@@ -169,7 +166,7 @@ va_dcl
 	vsnprintf( buffer, 1000, Format, ap );
 	va_end( ap );
 
-	Conn_ClearFlags( );
+	for( i = 0; i < MAX_CONNECTIONS; i++ ) sock[i] = FALSE;
 
 	/* An alle Clients, die in den selben Channels sind.
 	 * Dabei aber nur einmal je Remote-Server */
@@ -187,26 +184,26 @@ va_dcl
 		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 );
+			s = Client_Conn( c );
+			assert( s >= 0 );
+			assert( s < MAX_CONNECTIONS );
+			sock[s] = TRUE;
+			if( Client_Type( c ) == CLIENT_SERVER ) is_server[s] = TRUE;
+			else is_server[s] = FALSE;
 		}
 		cl2chan = Channel_NextMember( Chan, cl2chan );
 	}
 
-	/* Senden: alle Verbindungen durchgehen ... */
-	conn = Conn_First( );
-	while( conn != NONE )
+	/* Senden ... */
+	for( i = 0; i < MAX_CONNECTIONS; i++ )
 	{
-		/* 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 );
+		if( sock[i] )
+		{
+			if( is_server[i] ) ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
+			else ok = Conn_WriteStr( i, ":%s %s", Client_Mask( Prefix ), buffer );
+			if( ! ok ) break;
+		}
 	}
-
 	return ok;
 } /* IRC_WriteStrChannelPrefix */
 
@@ -324,13 +321,13 @@ CHAR *Format;
 va_dcl
 #endif
 {
-	BOOLEAN ok = CONNECTED;
+	BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
 	CL2CHAN *chan_cl2chan, *cl2chan;
 	CHAR buffer[1000];
 	CHANNEL *chan;
-	CONN_ID conn;
 	va_list ap;
 	CLIENT *c;
+	INT i, s;
 
 	assert( Client != NULL );
 	assert( Prefix != NULL );
@@ -345,7 +342,7 @@ va_dcl
 	va_end( ap );
 
 	/* initialisieren */
-	Conn_ClearFlags( );
+	for( i = 0; i < MAX_CONNECTIONS; i++ ) sock[i] = FALSE;
 
 	/* An alle Clients, die in einem Channel mit dem "Ausloeser" sind,
 	 * den Text schicken. An Remote-Server aber jeweils nur einmal. */
@@ -368,9 +365,12 @@ va_dcl
 			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 );
+				s = Client_Conn( c );
+				assert( s >= 0 );
+				assert( s < MAX_CONNECTIONS );
+				sock[s] = TRUE;
+				if( Client_Type( c ) == CLIENT_SERVER ) is_server[s] = TRUE;
+				else is_server[s] = FALSE;
 			}
 			cl2chan = Channel_NextMember( chan, cl2chan );
 		}
@@ -379,37 +379,20 @@ va_dcl
 		chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan );
 	}
 
-	/* Senden: alle Verbindungen durchgehen ... */
-	conn = Conn_First( );
-	while( conn != NONE )
+	/* Senden ... */
+	for( i = 0; i < MAX_CONNECTIONS; i++ )
 	{
-		/* 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 );
+		if( sock[i] )
+		{
+			if( is_server[i] ) ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
+			else ok = Conn_WriteStr( i, ":%s %s", Client_Mask( Prefix ), buffer );
+			if( ! ok ) break;
+		}
 	}
 	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 )
 {

src/ngircd/irc-write.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc-write.h,v 1.6 2003/11/05 23:24:48 alex Exp $
+ * $Id: irc-write.h,v 1.4 2002/09/03 23:56:06 alex Exp $
  *
- * Sending IRC commands over the network (header)
+ * irc-write.h: IRC-Texte und Befehle ueber Netzwerk versenden (Header)
  */
 
 
@@ -18,19 +19,17 @@
 #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_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 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 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 ));
+GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix PARAMS((CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ));
 
 
 #endif

src/ngircd/irc.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: irc.h,v 1.38 2003/01/15 13:49:20 alex Exp $
+ * $Id: irc.h,v 1.32 2002/09/16 09:14:45 alex Exp $
  *
- * IRC commands (header)
+ * irc.h: IRC-Befehle (Header)
  */
 
 
@@ -18,12 +19,28 @@
 #define __irc_h__
 
 
-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 ));
+GLOBAL BOOLEAN IRC_MOTD PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LUSERS PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LINKS PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_VERSION PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_ADMIN PARAMS((CLIENT *Client, REQUEST *Req ));
+
+GLOBAL BOOLEAN IRC_PRIVMSG PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NOTICE PARAMS((CLIENT *Client, REQUEST *Req ));
+
+GLOBAL BOOLEAN IRC_NAMES PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_ISON PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHOIS PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_USERHOST PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHO PARAMS((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_Send_NAMES PARAMS((CLIENT *Client, CHANNEL *Chan ));
+GLOBAL BOOLEAN IRC_Send_LUSERS PARAMS((CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Show_MOTD PARAMS((CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Send_WHO PARAMS((CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ));
 
 
 #endif

src/ngircd/lists.c

@@ -1,21 +1,22 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * 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.
+ * 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.
  *
- * Management of IRC lists: ban, invite, ...
+ * $Id: lists.c,v 1.8.2.2 2002/10/04 13:12:46 alex Exp $
+ *
+ * lists.c: Verwaltung der "IRC-Listen": 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>
 
@@ -30,7 +31,6 @@ static char UNUSED id[] = "$Id: lists.c,v 1.15.2.1 2005/01/26 13:27:01 alex Exp
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "exp.h"
 #include "lists.h"
@@ -102,24 +102,19 @@ Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan )
 
 
 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 )
+Lists_AddInvited( CLIENT *From, CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
 {
 	C2C *c2c;
 
 	assert( Mask != NULL );
 	assert( Chan != NULL );
 
-	if( Already_Registered( My_Invites, Mask, Chan )) return TRUE;
+	if( Already_Registered( My_Invites, Mask, Chan ))
+	{
+		/* Eintrag ist bereits vorhanden */
+		IRC_WriteStrClient( From, RPL_INVITELIST_MSG, Client_ID( From ), Channel_Name( Chan ), Mask );
+		return FALSE;
+	}
 	
 	c2c = New_C2C( Mask, Chan, OnlyOnce );
 	if( ! c2c )
@@ -186,40 +181,6 @@ Lists_ShowInvites( CLIENT *Client, CHANNEL *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 )
 {
@@ -228,24 +189,19 @@ Lists_CheckBanned( CLIENT *Client, CHANNEL *Chan )
 
 
 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 )
+Lists_AddBanned( CLIENT *From, CHAR *Mask, CHANNEL *Chan )
 {
 	C2C *c2c;
 
 	assert( Mask != NULL );
 	assert( Chan != NULL );
 
-	if( Already_Registered( My_Bans, Mask, Chan )) return TRUE;
+	if( Already_Registered( My_Bans, Mask, Chan ))
+	{
+		/* Eintrag ist bereits vorhanden */
+		IRC_WriteStrClient( From, RPL_BANLIST_MSG, Client_ID( From ), Channel_Name( Chan ), Mask );
+		return FALSE;
+	}
 
 	c2c = New_C2C( Mask, Chan, FALSE );
 	if( ! c2c )
@@ -360,10 +316,9 @@ Lists_DeleteChannel( CHANNEL *Chan )
 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! */
+	/* Hier wird aus einem "beliebigen" Pattern eine gueltige IRC-Mask erzeugt.
+	 * Diese ist aber nur bis zum naechsten Aufruf von Lists_MakeMask() gueltig,
+	 * da ein einziger globaler Puffer verwendet wird. ->Umkopieren!*/
 
 	STATIC CHAR TheMask[MASK_LEN];
 	CHAR *excl, *at;
@@ -377,32 +332,37 @@ Lists_MakeMask( CHAR *Pattern )
 
 	if(( ! at ) && ( ! excl ))
 	{
-		/* Neither "!" nor "@" found: use string as nick name */
-		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 );
-		strlcat( TheMask, "!*@*", sizeof( TheMask ));
+		/* weder ! noch @<40>vorhanden: als Nick annehmen */
+		strncpy( TheMask, Pattern, MASK_LEN - 5 );
+		TheMask[MASK_LEN - 5] = '\0';
+		strcat( TheMask, "!*@*" );
 		return TheMask;
 	}
 
 	if(( ! at ) && ( excl ))
 	{
-		/* Domain part is missing */
-		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 3 );
-		strlcat( TheMask, "@*", sizeof( TheMask ));
+		/* Domain fehlt */
+		strncpy( TheMask, Pattern, MASK_LEN - 3 );
+		TheMask[MASK_LEN - 3] = '\0';
+		strcat( TheMask, "@*" );
 		return TheMask;
 	}
 
 	if(( at ) && ( ! excl ))
 	{
-		/* User name is missing */
+		/* User fehlt */
 		*at = '\0'; at++;
-		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 );
-		strlcat( TheMask, "!*@", sizeof( TheMask ));
-		strlcat( TheMask, at, sizeof( TheMask ));
+		strncpy( TheMask, Pattern, MASK_LEN - 4 );
+		TheMask[MASK_LEN - 4] = '\0';
+		strcat( TheMask, "!*@" );
+		strncat( TheMask, at, strlen( TheMask ) - MASK_LEN - 1 );
+		TheMask[MASK_LEN - 1] = '\0';
 		return TheMask;
 	}
 
-	/* All parts (nick, user and domain name) are given */
-	strlcpy( TheMask, Pattern, sizeof( TheMask ));
+	/* alle Teile vorhanden */
+	strncpy( TheMask, Pattern, MASK_LEN - 1 );
+	TheMask[MASK_LEN - 1] = '\0';
 	return TheMask;
 } /* Lists_MakeMask */
 
@@ -416,14 +376,14 @@ New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
 	assert( Chan != NULL );
 
 	/* Speicher fuer Eintrag anfordern */
-	c2c = (C2C *)malloc( sizeof( 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 ));
+	strncpy( c2c->mask, Mask, MASK_LEN );
 	c2c->channel = Chan;
 	c2c->onlyonce = OnlyOnce;
 

src/ngircd/lists.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: lists.h,v 1.11 2004/04/25 15:40:19 alex Exp $
+ * $Id: lists.h,v 1.8 2002/09/08 17:05:25 alex Exp $
  *
- * Management of IRC lists: ban, invite, ... (header)
+ * lists.h: Verwaltung der "IRC-Listen": Ban, Invite, ... (Header)
  */
 
 
@@ -22,18 +23,14 @@ 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 BOOLEAN Lists_AddInvited PARAMS(( CLIENT *From, 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 BOOLEAN Lists_AddBanned PARAMS(( CLIENT *From, 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 ));
 

src/ngircd/log.c

@@ -2,20 +2,21 @@
  * 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.
+ * 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.
  *
- * Logging functions
+ * $Id: log.c,v 1.37.2.3 2002/11/04 19:18:39 alex Exp $
+ *
+ * log.c: Logging-Funktionen
  */
 
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.44.2.4 2005/02/03 09:27:09 alex Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -25,7 +26,7 @@ static char UNUSED id[] = "$Id: log.c,v 1.44.2.4 2005/02/03 09:27:09 alex Exp $"
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef SYSLOG
+#ifdef USE_SYSLOG
 #include <syslog.h>
 #endif
 
@@ -50,9 +51,9 @@ LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
 GLOBAL VOID
 Log_Init( VOID )
 {
-#ifdef SYSLOG
+#ifdef USE_SYSLOG
 	/* Syslog initialisieren */
-	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+	openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 
 	/* Hello World! */
@@ -85,8 +86,6 @@ Log_Init( VOID )
 	}
 #endif
 	if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
-
-	Error_File[0] = '\0';
 } /* Log_Init */
 
 
@@ -97,7 +96,7 @@ Log_InitErrorfile( VOID )
 	 * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
 	/* Dateiname zusammen bauen */
-	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( ));
+	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (LONG)getpid( ));
 
 	/* stderr umlenken */
 	fflush( stderr );
@@ -121,16 +120,13 @@ 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( NGIRCd_Restart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE );
+	else Log( LOG_NOTICE, "%s done.", PACKAGE );
 
-	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 ));
-	}
+	/* Error-File (stderr) loeschen */
+	if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
 
-#ifdef SYSLOG
+#ifdef USE_SYSLOG
 	/* syslog abmelden */
 	closelog( );
 #endif
@@ -182,10 +178,10 @@ va_dcl
 	if( NGIRCd_NoDaemon )
 	{
 		/* auf Konsole ausgeben */
-		fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+		fprintf( stdout, "[%d] %s\n", Level, msg );
 		fflush( stdout );
 	}
-#ifdef SYSLOG
+#ifdef USE_SYSLOG
 	else
 	{
 		/* Syslog */
@@ -211,18 +207,16 @@ va_dcl
 GLOBAL VOID
 Log_Init_Resolver( VOID )
 {
-#ifdef SYSLOG
-	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#ifdef USE_SYSLOG
+	openlog( PACKAGE, 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 )
 {
-	Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
-#ifdef SYSLOG
+#ifdef USE_SYSLOG
 	closelog( );
 #endif
 } /* Log_Exit_Resolver */
@@ -241,11 +235,17 @@ va_dcl
 {
 	/* Eintrag des Resolver in Logfile(s) schreiben */
 
+#ifndef USE_SYSLOG
+	return;
+#else
+
 	CHAR msg[MAX_LOG_MSG_LEN];
 	va_list ap;
 
 	assert( Format != NULL );
 
+	if( NGIRCd_NoDaemon ) return;
+
 #ifdef DEBUG
 	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -261,15 +261,9 @@ va_dcl
 	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 );
+	/* ... und ausgeben */
+	syslog( Level, msg );
+
 #endif
 } /* Log_Resolver */
 
@@ -286,7 +280,7 @@ Wall_ServerNotice( CHAR *Msg )
 	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 );
+		if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s", Client_ThisServer( ), Msg );
 		c = Client_Next( c );
 	}
 } /* Wall_ServerNotice */

src/ngircd/log.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: log.h,v 1.14 2003/12/26 15:55:07 alex Exp $
+ * $Id: log.h,v 1.12 2002/05/27 13:09:27 alex Exp $
  *
- * Logging functions (header)
+ * log.h: Logging-Funktionen (Header)
  */
 
 
@@ -18,7 +19,7 @@
 #define __log_h__
 
 
-#ifdef SYSLOG
+#ifdef USE_SYSLOG
 #	include <syslog.h>
 #else
 #	define LOG_EMERG 0

src/ngircd/match.c

@@ -2,20 +2,21 @@
  * 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.
+ * 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.
  *
- * Wildcard pattern matching
+ * $Id: match.c,v 1.1 2002/06/26 15:42:58 alex Exp $
+ *
+ * match.c: 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>

src/ngircd/match.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: match.h,v 1.2 2002/12/12 12:23:43 alex Exp $
+ * $Id: match.h,v 1.1 2002/06/26 15:42:58 alex Exp $
  *
- * Wildcard pattern matching (header)
+ * match.h: Wildcard Pattern Matching (Header)
  */
 
 

src/ngircd/messages.h

@@ -1,16 +1,17 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+ * 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.
+ * 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: messages.h,v 1.66 2004/02/28 02:18:16 alex Exp $
+ * $Id: messages.h,v 1.46.2.4 2002/11/22 22:55:05 alex Exp $
  *
- * IRC numerics (Header)
+ * irc.h: IRC-Befehle (Header)
  */
 
 
@@ -22,14 +23,6 @@
 #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_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"
@@ -40,9 +33,6 @@
 #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_AWAY_MSG			"301 %s %s :%s"
 #define RPL_USERHOST_MSG		"302 %s :"
@@ -52,7 +42,6 @@
 #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"
@@ -73,20 +62,15 @@
 #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 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"
@@ -101,15 +85,12 @@
 #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_PASSWDMISMATCH_MSG		"464 %s: Invalid password"
 #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"
 
@@ -117,10 +98,6 @@
 #define ERR_UMODEUNKNOWNFLAG2_MSG	"501 %s :Unknown mode \"%c%c\""
 #define ERR_USERSDONTMATCH_MSG		"502 %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,21 +1,22 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * 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.
+ * 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.
  *
- * Main program -- main()
+ * $Id: ngircd.c,v 1.54.2.4 2002/11/24 15:25:25 alex Exp $
+ *
+ * ngircd.c: Hier beginnt alles ;-)
  */
 
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.83.2.3 2005/01/26 22:02:36 alex Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -24,29 +25,24 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.83.2.3 2005/01/26 22:02:36 alex Exp
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
-#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <time.h>
 #include <pwd.h>
 #include <grp.h>
 
-#include "defines.h"
 #include "resolve.h"
 #include "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "conf.h"
-#include "cvs-version.h"
+#include "defines.h"
 #include "lists.h"
 #include "log.h"
 #include "parse.h"
 #include "irc.h"
 
-#ifdef RENDEZVOUS
-#include "rendezvous.h"
-#endif
-
 #include "exp.h"
 #include "ngircd.h"
 
@@ -54,6 +50,8 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.83.2.3 2005/01/26 22:02:36 alex Exp
 LOCAL VOID Initialize_Signal_Handler PARAMS(( VOID ));
 LOCAL VOID Signal_Handler PARAMS(( INT Signal ));
 
+LOCAL VOID Initialize_Listen_Ports PARAMS(( VOID ));
+
 LOCAL VOID Show_Version PARAMS(( VOID ));
 LOCAL VOID Show_Help PARAMS(( VOID ));
 
@@ -69,16 +67,17 @@ main( int argc, const char *argv[] )
 
 	umask( 0077 );
 
-	NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = FALSE;
-	NGIRCd_NoDaemon = NGIRCd_Passive = FALSE;
+	NGIRCd_Restart = FALSE;
+	NGIRCd_Quit = FALSE;
+	NGIRCd_NoDaemon = FALSE;
+	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 ));
+	strcpy( NGIRCd_ConfFile, CONFIG_FILE );
 
 	/* Kommandozeile parsen */
 	for( i = 1; i < argc; i++ )
@@ -92,10 +91,11 @@ main( int argc, const char *argv[] )
 			{
 				if( i + 1 < argc )
 				{
-					/* Ok, there's an parameter left */
-					strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile ));
+					/* Ok, danach kommt noch ein Parameter */
+					strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 );
+					NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
 
-					/* next parameter */
+					/* zum uebernaechsten Parameter */
 					i++; ok = TRUE;
 				}
 			}
@@ -158,10 +158,11 @@ main( int argc, const char *argv[] )
 				{
 					if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
 					{
-						/* Ok, next character is a blank */
-						strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile ));
+						/* Ok, danach kommt ein Leerzeichen */
+						strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 );
+						NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
 
-						/* go to the following parameter */
+						/* zum uebernaechsten Parameter */
 						i++; n = (LONG)strlen( argv[i] );
 						ok = TRUE;
 					}
@@ -183,16 +184,11 @@ main( int argc, const char *argv[] )
 					ok = TRUE;
 				}
 #endif
-				if( argv[i][n] == 't' )
-				{
-					configtest = TRUE;
-					ok = TRUE;
-				}
 
 				if( ! ok )
 				{
-					printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
-					printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
+					printf( "%s: invalid option \"-%c\"!\n", PACKAGE, argv[i][n] );
+					printf( "Try \"%s --help\" for more information.\n", PACKAGE );
 					exit( 1 );
 				}
 			}
@@ -200,8 +196,8 @@ main( int argc, const char *argv[] )
 		}
 		if( ! ok )
 		{
-			printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] );
-			printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
+			printf( "%s: invalid option \"%s\"!\n", PACKAGE, argv[i] );
+			printf( "Try \"%s --help\" for more information.\n", PACKAGE );
 			exit( 1 );
 		}
 	}
@@ -226,40 +222,8 @@ main( int argc, const char *argv[] )
 		exit( Conf_Test( ));
 	}
 	
-	while( ! NGIRCd_SignalQuit )
+	while( ! NGIRCd_Quit )
 	{
-		/* 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)
@@ -276,7 +240,7 @@ main( int argc, const char *argv[] )
 			if( pid < 0 )
 			{
 				/* Fehler */
-				printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE_NAME, strerror( errno ));
+				printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE, strerror( errno ));
 				exit( 1 );
 			}
 
@@ -284,27 +248,44 @@ main( int argc, const char *argv[] )
 			(VOID)setsid( );
 			chdir( "/" );
 		}
+	
+		/* Globale Variablen initialisieren */
+		NGIRCd_Start = time( NULL );
+		(VOID)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
+		NGIRCd_Restart = FALSE;
+		NGIRCd_Quit = FALSE;
 
-		/* Initialize modules, part II: these functions are eventually
-		 * called with already dropped privileges ... */
+		/* Module initialisieren */
+		Log_Init( );
 		Resolve_Init( );
+		Conf_Init( );
 		Lists_Init( );
 		Channel_Init( );
 		Client_Init( );
-#ifdef RENDEZVOUS
-		Rendezvous_Init( );
-#endif
 		Conn_Init( );
 
-		/* Show user, group, and PID of the running daemon */
+		/* Wenn als root ausgefuehrt und eine andere UID
+		 * konfiguriert ist, jetzt zu dieser wechseln */
+		if( getuid( ) == 0 )
+		{
+			if( Conf_GID != 0 )
+			{
+				/* Neue Group-ID setzen */
+				if( setgid( Conf_GID ) != 0 ) Log( LOG_ERR, "Can't change Group-ID to %u: %s", Conf_GID, strerror( errno ));
+			}
+			if( Conf_UID != 0 )
+			{
+				/* Neue User-ID setzen */
+				if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno ));
+			}
+		}
+		
+		/* User, Gruppe und Prozess-ID des Daemon ausgeben */
 		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( );
+		/* stderr in "Error-File" umlenken */
+		Log_InitErrorfile( );
 
 		/* Signal-Handler initialisieren */
 		Initialize_Signal_Handler( );
@@ -313,39 +294,25 @@ main( int argc, const char *argv[] )
 		 * 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
+		sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE, VERSION, IRCPLUSFLAGS );
 		if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
 #else
-		sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION );
+		sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, 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 );
 
 		/* Vordefinierte Channels anlegen */
 		Channel_InitPredefined( );
 
 		/* Listen-Ports initialisieren */
-		if( Conn_InitListeners( ) < 1 )
-		{
-			Log( LOG_ALERT, "Server isn't listening on a single port!" );
-			Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
-			exit( 1 );
-		}
-		
+		Initialize_Listen_Ports( );
+
 		/* Hauptschleife */
 		Conn_Handler( );
 
 		/* Alles abmelden */
 		Conn_Exit( );
-#ifdef RENDEZVOUS
-		Rendezvous_Exit( );
-#endif
 		Client_Exit( );
 		Channel_Exit( );
 		Lists_Exit( );
@@ -360,12 +327,8 @@ GLOBAL CHAR *
 NGIRCd_Version( VOID )
 {
 	STATIC CHAR version[126];
-	
-#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
+
+	sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
 	return version;
 } /* NGIRCd_Version */
 
@@ -373,30 +336,14 @@ NGIRCd_Version( VOID )
 GLOBAL CHAR *
 NGIRCd_VersionAddition( VOID )
 {
-	STATIC CHAR txt[200];
+	STATIC CHAR txt[64];
 
 	strcpy( txt, "" );
 
-#ifdef SYSLOG
+#ifdef USE_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" );
@@ -414,54 +361,17 @@ NGIRCd_VersionAddition( VOID )
 	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 ));
+	if( txt[0] ) strcat( txt, "-" );
+	strcat( txt, TARGET_CPU );
+	strcat( txt, "/" );
+	strcat( txt, TARGET_VENDOR );
+	strcat( txt, "/" );
+	strcat( txt, TARGET_OS );
 
 	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 )
 {
@@ -522,30 +432,56 @@ Signal_Handler( INT Signal )
 		case SIGINT:
 		case SIGQUIT:
 			/* wir soll(t)en uns wohl beenden ... */
-			NGIRCd_SignalQuit = TRUE;
+			if( Signal == SIGTERM ) Log( LOG_WARNING, "Got TERM signal, terminating now ..." );
+			else if( Signal == SIGINT ) Log( LOG_WARNING, "Got INT signal, terminating now ..." );
+			else if( Signal == SIGQUIT ) Log( LOG_WARNING, "Got QUIT signal, terminating now ..." );
+			NGIRCd_Quit = TRUE;
 			break;
 		case SIGHUP:
-			/* Konfiguration neu einlesen: */
-			NGIRCd_SignalRehash = TRUE;
+			/* neu starten */
+			Log( LOG_WARNING, "Got HUP signal, restarting now ..." );
+			NGIRCd_Restart = 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_DEBUG, "Got signal %d! Ignored.", Signal );
-#endif
+			Log( LOG_NOTICE, "Got signal %d! Ignored.", Signal );
 	}
 } /* 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 %u!", Conf_ListenPorts[i] );
+	}
+
+	if( created < 1 )
+	{
+		Log( LOG_ALERT, "Server isn't listening on a single port!" );
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+		exit( 1 );
+	}
+} /* Initialize_Listen_Ports */
+
+
 LOCAL VOID
 Show_Version( VOID )
 {
 	puts( NGIRCd_Version( ));
-	puts( "Copyright (c)2001-2005 by Alexander Barton (<alex@barton.de>)." );
+	puts( "Copyright (c)2001,2002 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." );
@@ -559,12 +495,12 @@ Show_Help( VOID )
 	puts( "  -d, --debug        log extra debug messages" );
 #endif
 	puts( "  -f, --config <f>   use file <f> as configuration file" );
-        puts( "  -n, --nodaemon     don't fork and don't detach from controlling terminal" );
+        puts( "  -n, --nodaemon     don't fork and don't detatch 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" );
 #endif
-	puts( "  -t, --configtest   read, validate and display configuration; then exit" );
+	puts( "      --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,15 +2,16 @@
  * 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.
+ * 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: ngircd.h,v 1.19 2002/12/26 16:48:14 alex Exp $
+ * $Id: ngircd.h,v 1.14 2002/09/02 19:01:11 alex Exp $
  *
- * Prototypes of the "main module".
+ * ngircd.h: Prototypen aus dem "Haupt-Modul"
  */
 
 
@@ -37,22 +38,18 @@ GLOBAL BOOLEAN NGIRCd_NoDaemon;		/* nicht im Hintergrund laufen */
 
 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 BOOLEAN NGIRCd_Quit;		/* TRUE: ngIRCd beenden */
+GLOBAL BOOLEAN NGIRCd_Restart;		/* TRUE: neu starten */
 
 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_ProtoID[1024];	/* Protokoll- und Server-Identifikation */
 
 GLOBAL CHAR *NGIRCd_Version PARAMS((VOID ));
 GLOBAL CHAR *NGIRCd_VersionAddition PARAMS((VOID ));
 
-GLOBAL VOID NGIRCd_Rehash PARAMS(( VOID ));
-
 
 #endif
 

src/ngircd/parse.c

@@ -2,30 +2,30 @@
  * 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.
+ * 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.
  *
- * IRC command parser and validator
+ * $Id: parse.c,v 1.41.2.4 2002/11/29 10:59:51 alex Exp $
+ *
+ * parse.c: Parsen der Client-Anfragen
  */
 
 
 #include "portab.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 "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "log.h"
@@ -38,7 +38,6 @@ static char UNUSED id[] = "$Id: parse.c,v 1.60 2004/01/17 03:17:49 alex Exp $";
 #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"
@@ -49,57 +48,6 @@ static char UNUSED id[] = "$Id: parse.c,v 1.60 2004/01/17 03:17:49 alex Exp $";
 #include "exp.h"
 
 
-COMMAND My_Commands[] =
-{
-	{ "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 */
-};
-
-
 LOCAL VOID Init_Request PARAMS(( REQUEST *Req ));
 
 LOCAL BOOLEAN Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
@@ -109,13 +57,6 @@ 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 )
-{
-	return My_Commands;
-} /* Parse_GetCommandStruct */
-
-
 GLOBAL BOOLEAN
 Parse_Request( CONN_ID Idx, CHAR *Request )
 {
@@ -167,7 +108,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request )
 		*ptr = '\0';
 #ifndef STRICT_RFC
 		/* multiple Leerzeichen als Trenner vor
-		 * Parametern ignorieren */
+		*Parametertrennern ignorieren */
 		while( *(ptr + 1) == ' ' ) ptr++;
 #endif
 	}
@@ -319,8 +260,6 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
 
 	CLIENT *client, *target, *prefix;
 	CHAR str[LINE_LEN];
-	BOOLEAN result;
-	COMMAND *cmd;
 	INT i;
 
 	assert( Idx >= 0 );
@@ -330,87 +269,94 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
 	client = Client_GetFromConn( Idx );
 	assert( client != NULL );
 
-	/* Statuscode? */
-	if(( Client_Type( client ) == CLIENT_SERVER ) && ( strlen( Req->command ) == 3 ) && ( atoi( Req->command ) > 100 ))
+	/* Statuscode, der geforwarded werden muss? */
+	if(( strlen( Req->command ) == 3 ) && ( atoi( Req->command ) > 100 ))
 	{
-		/* Command is a status code from an other server */
+		/* Befehl ist ein Statuscode */
 
-		/* Determine target */
-		if( Req->argc > 0 ) target = Client_Search( Req->argv[0] );
+		/* Zielserver ermitteln */
+		if(( Client_Type( client ) == CLIENT_SERVER ) && ( Req->argc > 0 )) target = Client_Search( Req->argv[0] );
 		else target = NULL;
 		if( ! target )
 		{
-			/* 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;
 		}
 
-		/* Determine source */
+		/* Quell-Client ermitteln */
 		if( ! Req->prefix[0] )
 		{
-			/* Oops, no prefix!? */
-			Log( LOG_WARNING, "Got status code %s from \"%s\" without prefix!?", Req->command, Client_ID( client ));
+			Log( LOG_WARNING, "Got status code without prefix!?" );
 			return TRUE;
 		}
 		else prefix = Client_Search( Req->prefix );
 		if( ! prefix )
 		{
-			/* Oops, unknown prefix!? */
-			Log( LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix );
+			Log( LOG_WARNING, "Got status code from unknown source: \"%s\"", Req->prefix );
 			return TRUE;
 		}
 
-		/* Forward status code */
-		strlcpy( str, Req->command, sizeof( str ));
+		/* Statuscode weiterleiten */
+		strcpy( str, Req->command );
 		for( i = 0; i < Req->argc; i++ )
 		{
-			if( i < Req->argc - 1 ) strlcat( str, " ", sizeof( str ));
-			else strlcat( str, " :", sizeof( str ));
-			strlcat( str, Req->argv[i], sizeof( str ));
+			if( i < Req->argc - 1 ) strcat( str, " " );
+			else strcat( str, " :" );
+			strcat( str, Req->argv[i] );
 		}
 		return IRC_WriteStrClientPrefix( target, prefix, "%s", str );
 	}
 
-	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 ));
-		}
-	}
+	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 );
+	else if( strcasecmp( Req->command, "VERSION" ) == 0 ) return IRC_VERSION( client, Req );
+	else if( strcasecmp( Req->command, "KILL" ) == 0 ) return IRC_KILL( client, Req );
+	else if( strcasecmp( Req->command, "AWAY" ) == 0 ) return IRC_AWAY( client, Req );
+	else if( strcasecmp( Req->command, "TOPIC" ) == 0 ) return IRC_TOPIC( client, Req );
+	else if( strcasecmp( Req->command, "WHO" ) == 0 ) return IRC_WHO( client, Req );
+	else if( strcasecmp( Req->command, "LIST" ) == 0 ) return IRC_LIST( client, Req );
+	else if( strcasecmp( Req->command, "INVITE" ) == 0 ) return IRC_INVITE( client, Req );
+	else if( strcasecmp( Req->command, "KICK" ) == 0 ) return IRC_KICK( client, Req );
+	else if( strcasecmp( Req->command, "CONNECT" ) == 0 ) return IRC_CONNECT( client, Req );
+	else if( strcasecmp( Req->command, "ADMIN" ) == 0 ) return IRC_ADMIN( client, Req );
+#ifdef IRCPLUS
+	else if( strcasecmp( Req->command, "CHANINFO" ) == 0 ) return IRC_CHANINFO( client, Req );
+#endif
 	
 	/* 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" );
-	if( Client_Type( client ) != CLIENT_SERVER ) return IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command );
-	else return TRUE;
+
+	return TRUE;
 } /* Handle_Request */
 
 

src/ngircd/parse.h

@@ -2,15 +2,16 @@
  * 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.
+ * 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: parse.h,v 1.10 2003/01/03 22:03:51 alex Exp $
+ * $Id: parse.h,v 1.7 2002/05/27 13:09:27 alex Exp $
  *
- * IRC command parser and validator (header)
+ * parse.h: Parsen der Client-Anfragen (Header)
  */
 
 
@@ -27,20 +28,8 @@ typedef struct _REQUEST			/* vgl. RFC 2812, 2.3 */
 } REQUEST;
 
 
-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 PARAMS((CONN_ID Idx, CHAR *Request ));
 
-GLOBAL COMMAND *Parse_GetCommandStruct PARAMS(( VOID ));
-
 
 #endif
 

src/ngircd/rendezvous.c

@@ -1,229 +0,0 @@
-/*
- * 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

@@ -1,39 +0,0 @@
-/*
- * 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

@@ -1,21 +1,22 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * 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.
+ * 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.
  *
- * Asynchronous resolver
+ * $Id: resolve.c,v 1.3 2002/06/09 13:19:08 alex Exp $
+ *
+ * resolve.c: asyncroner 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>
@@ -27,12 +28,6 @@ static char UNUSED id[] = "$Id: resolve.c,v 1.8.2.1 2004/05/15 23:52:17 alex Exp
 #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"
@@ -41,12 +36,7 @@ static char UNUSED id[] = "$Id: resolve.c,v 1.8.2.1 2004/05/15 23:52:17 alex Exp
 #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
@@ -57,35 +47,31 @@ LOCAL CHAR *Get_Error PARAMS(( INT H_Error ));
 GLOBAL VOID
 Resolve_Init( VOID )
 {
-	/* Initialize module */
+	/* Modul initialisieren */
 
 	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. */
+	/* IP (asyncron!) aufloesen. Bei Fehler, z.B. wenn der
+	 * Child-Prozess nicht erzeugt werden kann, wird NULL geliefert.
+	 * Der Host kann dann nicht aufgeloest werden. */
 
 	RES_STAT *s;
 	INT pid;
 
-	/* Allocate memory */
-	s = (RES_STAT *)malloc( sizeof( RES_STAT ));
+	/* Speicher anfordern */
+	s = malloc( sizeof( RES_STAT ));
 	if( ! s )
 	{
 		Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" );
 		return NULL;
 	}
 
-	/* Initialize pipe for result */
+	/* Pipe fuer Antwort initialisieren */
 	if( pipe( s->pipe ) != 0 )
 	{
 		free( s );
@@ -93,34 +79,28 @@ Resolve_Addr( struct sockaddr_in *Addr )
 		return NULL;
 	}
 
-	/* For sub-process */
+	/* Sub-Prozess erzeugen */
 	pid = fork( );
 	if( pid > 0 )
 	{
-		/* Main process */
+		/* Haupt-Prozess */
 		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 */
+		/* Sub-Prozess */
 		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! */
+		/* Fehler */
 		free( s );
 		Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
 		return NULL;
@@ -131,21 +111,22 @@ Resolve_Addr( struct sockaddr_in *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. */
+	/* Hostnamen (asyncron!) aufloesen. Bei Fehler, z.B. wenn der
+	 * Child-Prozess nicht erzeugt werden kann, wird NULL geliefert.
+	 * Der Host kann dann nicht aufgeloest werden. */
 
 	RES_STAT *s;
 	INT pid;
 
-	/* Allocate memory */
-	s = (RES_STAT *)malloc( sizeof( RES_STAT ));
+	/* Speicher anfordern */
+	s = malloc( sizeof( RES_STAT ));
 	if( ! s )
 	{
 		Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Name]" );
 		return NULL;
 	}
 
-	/* Initialize the pipe for the result */
+	/* Pipe fuer Antwort initialisieren */
 	if( pipe( s->pipe ) != 0 )
 	{
 		free( s );
@@ -153,22 +134,20 @@ Resolve_Name( CHAR *Host )
 		return NULL;
 	}
 
-	/* Fork sub-process */
+	/* Sub-Prozess erzeugen */
 	pid = fork( );
 	if( pid > 0 )
 	{
-		/* Main process */
+		/* Haupt-Prozess */
 		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 */
+		/* Sub-Prozess */
 		Log_Init_Resolver( );
 		Do_ResolveName( Host, s->pipe[1] );
 		Log_Exit_Resolver( );
@@ -176,7 +155,7 @@ Resolve_Name( CHAR *Host )
 	}
 	else
 	{
-		/* Error! */
+		/* Fehler */
 		free( s );
 		Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
 		return NULL;
@@ -184,28 +163,19 @@ Resolve_Name( CHAR *Host )
 } /* 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. */
+	/* Resolver Sub-Prozess: IP aufloesen und Ergebnis in Pipe schreiben. */
 
 	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 ));
+
+	/* Namen aufloesen */
 	h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET );
-	if( h ) strlcpy( hostname, h->h_name, sizeof( hostname ));
+	if( h ) strcpy( hostname, h->h_name );
 	else
 	{
 #ifdef h_errno
@@ -213,59 +183,38 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
 #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 ));
+		strcpy( hostname, inet_ntoa( Addr->sin_addr ));
 	}
-	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 )
+	/* Antwort an Parent schreiben */
+	if( write( w_fd, hostname, strlen( hostname ) + 1 ) != ( strlen( hostname ) + 1 ))
 	{
 		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
+	Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname );
 } /* Do_ResolveAddr */
 
 
 LOCAL VOID
 Do_ResolveName( CHAR *Host, INT w_fd )
 {
-	/* Resolver sub-process: resolve name and write result into pipe
-	 * to parent. */
+	/* Resolver Sub-Prozess: Name aufloesen und Ergebnis in Pipe schreiben. */
 
 	CHAR ip[16];
 	struct hostent *h;
 	struct in_addr *addr;
-	INT len;
 
 	Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host );
 
-	/* Resolve hostname */
+	/* Namen aufloesen */
 	h = gethostbyname( Host );
 	if( h )
 	{
 		addr = (struct in_addr *)h->h_addr;
-		strlcpy( ip, inet_ntoa( *addr ), sizeof( ip ));
+		strcpy( ip, inet_ntoa( *addr ));
 	}
 	else
 	{
@@ -276,16 +225,16 @@ Do_ResolveName( CHAR *Host, INT w_fd )
 #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 )
+	/* Antwort an Parent schreiben */
+	if( write( w_fd, ip, strlen( ip ) + 1 ) != ( strlen( ip ) + 1 ))
 	{
 		Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno ));
 		close( w_fd );
+		return;
 	}
+
+	if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip );
 } /* Do_ResolveName */
 
 
@@ -294,7 +243,7 @@ Do_ResolveName( CHAR *Host, INT w_fd )
 LOCAL CHAR *
 Get_Error( INT H_Error )
 {
-	/* Get error message for H_Error */
+	/* Fehlerbeschreibung fuer H_Error liefern */
 
 	switch( H_Error )
 	{

src/ngircd/resolve.h

@@ -1,16 +1,17 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * 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.
+ * 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: resolve.h,v 1.6.2.1 2004/05/15 23:52:17 alex Exp $
+ * $Id: resolve.h,v 1.2 2002/09/16 09:22:41 alex Exp $
  *
- * Asynchronous resolver (header)
+ * resolve.h: asyncroner Resolver (Header)
  */
 
 
@@ -18,20 +19,17 @@
 #define __resolve_h__
 
 
+#include <sys/types.h>
+#include <netinet/in.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;
 
 
@@ -40,12 +38,7 @@ 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 ));
 
 

src/ngircd/tool.c

@@ -2,20 +2,21 @@
  * 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.
+ * 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.
  *
- * Tool functions
+ * $Id: tool.c,v 1.9 2002/05/27 13:09:27 alex Exp $
+ *
+ * tool.c: Hilfsfunktionen, ggf. Platformabhaengig
  */
 
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.1 2003/01/13 12:20:16 alex Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <ctype.h>

src/ngircd/tool.h

@@ -0,0 +1,30 @@
+/*
+ * 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.8 2002/05/27 13:09:27 alex Exp $
+ *
+ * log.h: Hilfsfunktionen (Header)
+ */
+
+
+#ifndef __tool_h__
+#define __tool_h__
+
+
+GLOBAL VOID ngt_TrimStr PARAMS((CHAR *String ));
+
+GLOBAL CHAR *ngt_LowerStr PARAMS((CHAR *String ));
+
+
+#endif
+
+
+/* -eof- */

src/portab/Makefile.am

@@ -9,23 +9,19 @@
 # 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.7 2003/01/03 22:04:14 alex Exp $
+# $Id: Makefile.am,v 1.4 2002/05/22 09:09:43 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = ansi2knr
 
 noinst_LIBRARIES = libngportab.a
 
-libngportab_a_SOURCES = strlcpy.c vsnprintf.c
+libngportab_a_SOURCES = 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:

src/portab/portab.h

@@ -1,16 +1,17 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * 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.
+ * 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: portab.h,v 1.17 2004/03/15 19:26:39 alex Exp $
+ * $Id: portab.h,v 1.7.2.1 2002/11/04 19:18:39 alex Exp $
  *
- * Portability functions and declarations (header for libngbportab).
+ * portab.h: "Portabilitaets-Definitionen"
  */
 
 
@@ -20,20 +21,9 @@
 
 #include "config.h"
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
 
+/* Compiler Features */
 
-/* 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
@@ -44,7 +34,7 @@
 #endif
 
 
-/* keywords */
+/* Keywords */
 
 #define EXTERN extern
 #define STATIC static
@@ -53,7 +43,7 @@
 #define REGISTER register
 
 
-/* datatypes */
+/* Datatentypen */
 
 #ifndef PROTOTYPES
 # ifndef signed
@@ -108,7 +98,18 @@ typedef UINT8 BOOLEAN;
 #endif
 
 
-/* target constants  */
+/* configure-Optionen */
+
+#ifndef HAVE_socklen_t
+#define socklen_t int			/* u.a. fuer Mac OS X */
+#endif
+
+#if OS_UNIX_AUX
+#define _POSIX_SOURCE			/* muss unter A/UX definiert sein */
+#endif
+
+
+/* Konstanten */
 
 #ifndef TARGET_OS
 #define TARGET_OS "unknown"
@@ -123,38 +124,6 @@ typedef UINT8 BOOLEAN;
 #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
 
 

src/portab/portabtest.c

@@ -2,65 +2,43 @@
  * 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.
+ * 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.
  *
- * test program for portab.h and friends ;-)
+ * $Id: portabtest.c,v 1.8 2002/09/09 10:05:10 alex Exp $
+ *
+ * portabtest.c: Testprogramm fuer portab.h
  */
 
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: portabtest.c,v 1.11 2003/01/04 10:40:01 alex Exp $";
-
 #include "imp.h"
-#include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "exp.h"
 
 
-LOCAL VOID Panic PARAMS (( CHAR *Reason, INT Code ));
-
-
 GLOBAL int
 main( VOID )
 {
-	/* validate datatypes */
-	if( FALSE != 0 ) Panic( "FALSE", 1 );
-	if( TRUE != 1 ) Panic( "TRUE", 1 );
-	if( sizeof( INT8 ) != 1 ) Panic( "INT8", 1 );
-	if( sizeof( UINT8 ) != 1 ) Panic( "UINT8", 1 );
-	if( sizeof( INT16 ) != 2 ) Panic( "INT16", 1 );
-	if( sizeof( UINT16 ) != 2 ) Panic( "UINT16", 1 );
-	if( sizeof( INT32 ) != 4 ) Panic( "INT32", 1 );
-	if( sizeof( UINT32 ) != 4 ) Panic( "UINT32", 1 );
-
-#ifdef PROTOTYPES
-	/* check functions */
-	if( ! snprintf ) Panic( "snprintf", 2 );
-	if( ! vsnprintf ) Panic( "vsnprintf", 2 );
-	if( ! strlcpy ) Panic( "strlcpy", 2 );
-	if( ! strlcat ) Panic( "strlcat", 2 );
-#endif
+	/* Datentypen pruefen */
+	if( FALSE != 0 ) return 1;
+	if( TRUE != 1 ) return 1;
+	if( sizeof( INT8 ) != 1 ) return 1;
+	if( sizeof( UINT8 ) != 1 ) return 1;
+	if( sizeof( INT16 ) != 2 ) return 1;
+	if( sizeof( UINT16 ) != 2 ) return 1;
+	if( sizeof( INT32 ) != 4 ) return 1;
+	if( sizeof( UINT32 ) != 4 ) return 1;
 	
-	/* ok, no error */
+	/* kein Fehler */
 	return 0;
 } /* portab_check_types */
 
 
-LOCAL VOID
-Panic( CHAR *Reason, INT Code )
-{
-	/* Oops, something failed!? */
-	fprintf( stderr, "Oops, test for %s failed!?", Reason );
-	exit( Code );
-} /* Panic */
-
-
 /* -eof- */

src/portab/strlcpy.c

@@ -1,76 +0,0 @@
-/*
- * 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.
- *
- * strlcpy() and strlcat() replacement functions.
- * See <http://www.openbsd.org/papers/strlcpy-paper.ps> for details.
- *
- * Code partially borrowed from compat.c of rsync, written by Andrew
- * Tridgell (1998) and Martin Pool (2002):
- * <http://samba.anu.edu.au/rsync/doxygen/head/lib_2compat_8c.html>
- */
-
-
-#include "portab.h"
-
-static char UNUSED id[] = "$Id: strlcpy.c,v 1.2.4.1 2005/01/18 09:09:05 alex Exp $";
-
-#include "imp.h"
-#include <string.h>
-#include <sys/types.h>
-
-#include "exp.h"
-
-
-#ifndef HAVE_STRLCAT
-
-GLOBAL size_t
-strlcat( CHAR *dst, CONST CHAR *src, size_t size )
-{
-	/* Like strncat() but does not 0 fill the buffer and
-	 * always null terminates. */
-
-	size_t len1 = strlen( dst );
-	size_t len2 = strlen( src );
-	size_t ret = len1 + len2;
-	
-	if( len1 + len2 >= size ) len2 = size - ( len1 + 1 );
-	if( len2 > 0 )
-	{
-		memcpy( dst + len1, src, len2 );
-		dst[len1 + len2] = 0;
-	}
-	return ret;
-} /* strlcat */
-
-#endif
-
-
-#ifndef HAVE_STRLCPY
-
-GLOBAL size_t
-strlcpy( CHAR *dst, CONST CHAR *src, size_t size )
-{
-	/* Like strncpy but does not 0 fill the buffer and
-	 * always null terminates. */
-
-	size_t len = strlen( src );
-	size_t ret = len;
-
-	if( size <= 0 ) return 0;
-	if( len >= size ) len = size - 1;
-	memcpy( dst, src, len );
-	dst[len] = 0;
-	return ret;
-} /* strlcpy */
-
-#endif
-
-
-/* -eof- */

src/portab/vsnprintf.c

@@ -2,20 +2,20 @@
  * 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.
+ * 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.
  *
- * snprintf() and vsnprintf() replacement functions
+ * $Id: vsnprintf.c,v 1.3 2002/05/27 13:01:04 alex Exp $
+ *
+ * vsnprintf.c: u.a. Ersatz fuer vsnprintf()
  */
 
 
 #include "portab.h"
-
-static char UNUSED id[] = "$Id: vsnprintf.c,v 1.5 2003/04/21 10:53:38 alex Exp $";
-
 #include "imp.h"
 
 #include "exp.h"
@@ -98,7 +98,6 @@ static char UNUSED id[] = "$Id: vsnprintf.c,v 1.5 2003/04/21 10:53:38 alex Exp $
 /* only include stdio.h if we are not re-defining snprintf or vsnprintf */
 #include <stdio.h>
 /* make the compiler happy with an empty file */
-void dummy_snprintf PARAMS(( void ));
 void dummy_snprintf PARAMS(( void )) { }
 #else