3.2.8.1

.CHANGES.NEW

@@ -7,7 +7,7 @@
  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
 
                                Configuration Program
-                                for Unreal3.2
+                                for Unreal3.2.8.1
                                     
 This program will help you to compile your IRC server, and ask you
 questions regarding the compile-time settings of it during the process. 

.RELEASE.NOTES

@@ -1,50 +1,95 @@
+Unreal3.2.8.1 Release Notes
+============================
 
-Unreal3.2 Release Notes
-========================
+==[ ABOUT 3.2.8.1 RELEASE ]==
+This Unreal3.2.8.1 release fixes a (serious) security issue regarding
+allow::options::noident. The original release notes for 3.2.8 are below.
 
 ==[ GENERAL INFORMATION ]==
-* If you are upgrading, make sure you run make clean and ./Config before doing make
-* The official UnrealIRCd documentation is doc/unreal32docs.html
-  online version at: http://www.vulnscan.org/UnrealIrcd/unreal32docs.html
-  FAQ: http://www.vulnscan.org/UnrealIrcd/faq/
+- If you are upgrading on *NIX, make sure you run 'make clean' and './Config'
+  first, before doing 'make'
+- The official UnrealIRCd documentation is doc/unreal32docs.html
+  online version at: http://www.vulnscan.org/UnrealIRCd/unreal32docs.html
+  FAQ: http://www.vulnscan.org/UnrealIRCd/faq/
   Read them before asking for help.
-* Report bugs at http://bugs.unrealircd.org/
+- Report bugs at http://bugs.unrealircd.org/
+- When upgrading a network, we assume you are upgrading from the previous
+  version (3.2.7). Upgrading from 3.2.6 or 3.2.5 should also be no problem.
+  However, if you have a network running with servers that are several versions behind
+  (eg: 3.2.1) then you might experience small (desynch) problems.
+  Please also minimize the time you have multiple versions running, a few days or
+  one week is generally not a problem, but having mixed versions on a network for several
+  weeks or months is not recommended.
+- The purpose of the sections below (NEW, CHANGED, MINOR, etc) is to be a SUMMARY of
+  the changes in this release. There have been 70+ changes, and trying to mention them
+  all would be useless, see the Changelog for the full list of changes.
 
-== [ NEW ]==
-- Added german docs (doc/unreal32docs.de.html)
-- In a spamfilter reason field '_' gets converted to a space (' '),
-  now also added '__' which gets converted to underscore itself ('_').
-
-==[ MAJOR BUGS FIXED ]==
-- '/spamfiltere remove' was often removing the wrong entry (RC2 bug)
-- The TRE regex library was sometimes matching too much if [range].+
-  was used multiple times.
-- Fixed a remote include issue and added timeouts in case a connection/transfer fails
-
-==[ MINOR BUGS FIXED ]==
-- Sometimes hosts were not resolved on Windows due to a resolver bug
-- spamfilter and sqline: memory leak on /rehash (a few kb)
-- spamfilter: protect against insane long reason/regex fields in configfile
-- set::modes-on-join now accepts extended channelmodes
-- Opteron: various crashbugs fixed, should work ok now.
-- Win32 GUI "rehash all" option did not reload motd/rules.
-- Same for ./unreal rehash on *NIX
-- Usermode 'r' (registered) was unset if you changed the case of your
-  nick (eg: 'blah'->'Blah'), this affected at least ircservices.
-- vhost::swhois wasn't shown if you did a remote /whois.
-- Made './curlinstall' work with new c-ares-1.0.0.
-- Fixed compile problem on some machines related to TRE / libintl.
-- /who +m was incorrectly hiding +H users even for opers.
-- Fixed /rehash bug if an .so or remote include didn't load properly
+==[ NEW ]==
+- set::level-on-join: this defines which privileges a user receives when creating a
+  channel, default is 'chanop', the only other available setting is 'none' (opless).
+- Away notification through WATCH: This allows clients to receive a notification
+  when someone goes away or comes back, along with a reason, a bit like IM's.
+  There's probably no current client supporting this but it would be a nice feature
+  in notify lists. Client developers: see Changes file for full protocol details.
+  This feature can be disabled by setting set::watch-away-notification to 'no'.
+- Spamfilter: Slow spamfilter detection: For each spamfilter, Unreal will check,
+  each time it executes, how long it takes to execute. When a certain threshold is
+  reached the IRCd will warn or even remove the spamfilter. This could prevent a
+  spamfilter from completely stalling the IRCd. Warning is configured through
+  set::spamfilter::slowdetect-warn (default: 250ms) and automatic deletion is
+  configured by set::spamfilter::slowdetect-fatal (default: 500ms).
+  You can set both settings to 0 (zero) to disable slow spamfilter detection.
+  This feature is currently not available on Windows.
+- SSL: set::ssl::server-cipher-list can be used to limit the allowed ciphers
+- SSL: To specify when an SSL session key should be renegotiated you can use
+  set::ssl::renegotiate-bytes <bytes> and set::ssl::renegotiate-timeout <seconds>.
+- UHNAMES support: This sends the full nick!ident@host in NAMES which can be
+  used by clients for their IAL. mIRC, Klient, etc support this.
+- There have also been some behavior changes, which can be considered NEW, see
+  next section (CHANGED).
 
 ==[ CHANGED ]==
-- spamfilter.conf: fixed fyle sig, added sigs for: soex, Nkie, LOI, Gaggle,
-  changed a lot of sigs from block to gline.
-- Windows: now using new Inno Setup which made the installer 300k smaller
-- Docs, help.conf and other text updates.
+- IPv6: On IPv6 servers you no longer have to use ::ffff:1.2.3.4 IP's for IPv4 in the
+  config file, you can use the simple 1.2.3.4 form, as they are converted automatically.
+- When someone is banned and /PARTs, the part reason (comment) is no longer shown
+- ChanMode +S/+c: now strips/blocks 'reverse' as well
+- Smart banning is now disabled by default because it was too annoying, this means that
+  f.e. if there's a ban on *!*@*.com then you can still add a ban on *!*@*.aol.com
+- except ban { } now also protects against ZLINEs and ban ip { }
+- Modules: user modes and channel modes without parameters (eg: +X) no longer have
+  to be PERManent, this means they can be upgraded/reloaded/unloaded on-the-fly.
 
-==[ COMMING UP ]==
-- You can expect module support on windows in a nearby release.
+==[ MAJOR BUGS FIXED ]==
+- Zip links issue (Overflowed unzipbuf)
+- Crash issue with 3rd party modules that introduce new channel modes w/parameters
+- Mac OS X: Various issues which prevented the IRCd from booting up
+- Remote includes (constant) crash with new curl/c-ares versions
+- A few rare crash issues, including a crash when linking to another server
+- In case of clock adjustments, the IRCd will no longer freeze when the time is
+  adjusted backwards, nor will it incorrectly throttle clients when adjusted forward.
+  However, because clock adjustments (time shifts) of more than xx seconds are 
+  so dangerous (and will still cause a number of issues), big warnings are now
+  printed when they happen.
+  Morale: synchronize your system clock, or use the built-in timesync feature.
+
+==[ MINOR BUGS FIXED ]==
+- CGI:IRC: Several IPv6 issues, both on IPv6 IRCd's and CGI:IRC gateways
+- IP masks in oper::from::userhost sometimes didn't match when they should
+- (G)ZLINE's on IPv6 users were sometimes rejected
+- CHROOTDIR works again
+- OperOverride fixes
+- Throttling is now more accurate
+- And more... see Changelog
+
+==[ KNOWN ISSUES ]==
+- Regexes: Be careful with backreferences (\1, etc), certain regexes can slow the IRCd
+  down considerably and even bring it to a near-halt. In the spamfilter user target it's
+  usually safe though. Slow spamfilter detection can help prevent the slowdown/freeze,
+  but might not work in worst-case scenario's.
+- Regexes: Possessive quantifiers such as, for example, "++" (not to be confused with "+")
+  are not safe to use, they can easily freeze the IRCd.
+- Suse 10.3 in 64 bit mode (amd64, x64) is known to crash UnrealIRCd on-boot, this is
+  likely to be a Suse 10.3 bug as over 3 people reported it with that exact OS / arch.
 
 ==[ ADDITIONAL INFO ]==
-* See Changelog
+* See Changelog for more details

Config

@@ -21,6 +21,27 @@
 
 RUN_CONFIGURE () {
 ARG=""
+# Do this even if we're not in advanced mode
+if [ "$SHOWLISTMODES" = "1" ] ; then
+	ARG="$ARG--with-showlistmodes "
+fi
+if [ "$ADVANCED" = "1" ] ; then
+if [ "$TOPICNICKISNUH" = "1" ] ; then
+	ARG="$ARG--with-topicisnuhost "
+fi
+if [ "$SHUNNOTICES" = "1" ] ; then
+	ARG="$ARG--with-shunnotices "
+fi
+if [ "$NOOPEROVERRIDE" = "1" ] ; then
+	ARG="$ARG--with-no-operoverride "
+fi
+if [ "$DISABLEUSERMOD" = "1" ] ; then
+	ARG="$ARG--with-disableusermod "
+fi
+if [ "$OPEROVERRIDEVERIFY" = "1" ] ; then
+	ARG="$ARG--with-operoverride-verify "
+fi
+fi
 if [ "$NOSPOOF" = "1" ] ; then
 ARG="$ARG--enable-nospoof "
 fi
@@ -63,7 +84,8 @@ ARG="$ARG--enable-dynamic-linking "
 ARG="$ARG $EXTRAPARA "
 CONF="./configure $ARG"
 echo $CONF
-$CONF
+$CONF || exit 1
+cd "$UNREALCWD"
 if [  "$CRYPTOIRCD" = "1" ] ; then
 if [ ! -f server.req.pem ]; then
 export OPENSSLPATH
@@ -76,8 +98,187 @@ fi
 fi
 }
 
+RUN_ADVANCED () {
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$SHOWLISTMODES" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to show the modes a channel has set in the /list output?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    SHOWLISTMODES="1"
+	    ;;
+	[Nn]*)
+	    SHOWLISTMODES=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$TOPICNICKISNUH" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want the /topic command to show the nick!user@host of the person"
+    echo "who set the topic, rather than just the nickname?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    TOPICNICKISNUH="1"
+	    ;;
+	[Nn]*)
+	    TOPICNICKISNUH=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$SHUNNOTICES" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Should Unreal notify a user when they are no longer shunned?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    SHUNNOTICES="1"
+	    ;;
+	[Nn]*)
+	    SHUNNOTICES=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$NOOPEROVERRIDE" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to disable oper override?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    NOOPEROVERRIDE="1"
+	    ;;
+	[Nn]*)
+	    NOOPEROVERRIDE=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$DISABLEUSERMOD" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to disable /sethost, /setident, /chgname,"
+    echo "/chghost, and /chgident?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    DISABLEUSERMOD="1"
+	    ;;
+	[Nn]*)
+	    DISABLEUSERMOD=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$OPEROVERRIDEVERIFY" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to require opers to /invite themselves into a +s or +p channel?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    OPEROVERRIDEVERIFY="1"
+	    ;;
+	[Nn]*)
+	    OPEROVERRIDEVERIFY=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+}
 c=""
 n=""
+UNREALCWD="`pwd`"
 NOSPOOF=""
 DPATH="`pwd`"
 SPATH="`pwd`/src/ircd"
@@ -96,7 +297,13 @@ MAXCONNECTIONS="1024"
 INET6=""
 REMOTEINC=""
 CURLDIR=""
-PREFIXAQ=""
+PREFIXAQ="1"
+SHOWLISTMODES="1"
+TOPICNICKISNUH=""
+SHUNNOTICES=""
+NOOPEROVERRIDE=""
+DISABLEUSERMOD=""
+OPEROVERRIDEVERIFY=""
 EXTRAPARA=""
 if [ "`eval echo -n 'a'`" = "-n a" ] ; then
         c="\c"
@@ -108,37 +315,53 @@ fi
 #parse arguments
 NOCACHE=""
 NOINTRO=""
-if [ "$1" = "--help" ] ; then
-	echo "Config utility for UnrealIRCd"
-	echo "-----------------------------"
-	echo "Syntax: ./Config [options]"
-	echo "-nocache     Ignore settings saved in config.settings"
-	echo "-nointro     Skip intro (release notes, etc)"
-	echo "-quick       Skip questions, go straight to configure"
-	echo "-C           Clean ./configure cache"
-	exit 0
-fi
-if [ "$1" = "-nocache" -o "$2" = "-nocache" ] ; then
-    NOCACHE="1"
-fi
-if [ "$1" = "-nointro" -o "$2" = "-nointro" ] ; then
-    NOINTRO="1"
-fi
+CLEAN=""
+ADVANCED=""
+while [ $# -ge 1 ] ; do
+	if [ $1 = "--help" ] ; then
+		echo "Config utility for UnrealIRCd"
+		echo "-----------------------------"
+		echo "Syntax: ./Config [options]"
+		echo "-nocache     Ignore settings saved in config.settings"
+		echo "-nointro     Skip intro (release notes, etc)"
+		echo "-quick       Skip questions, go straight to configure"
+		echo "-advanced    Include additional advanced questions"
+		echo "-clean       Clean ./configure cache"
+		exit 0
+	elif [ $1 = "-nocache" ] ; then
+		NOCACHE="1"
+	elif [ $1 = "-nointro" ] ; then
+		NOINTRO="1"
+	elif [ $1 = "-quick" -o $1 = "-q" ] ; then
+		echo "running quick config"
+		if [ -f "config.settings" ] ; then
+			. ./config.settings
+		fi
+		RUN_CONFIGURE
+		cd "$UNREALCWD"
+		exit 0
+	elif [ $1 = "-clean" -o $1 = "-C" ] ; then
+		CLEAN="1"
+	elif [ $1 = "-advanced" ] ; then
+		PREADVANCED="1"
+	fi
+	shift 1
+done
 
 if [ -f "config.settings" -a -z "$NOCACHE" ] ; then
-    . config.settings
+    . ./config.settings
 fi
 
-if [ "$1" = "-C" -o "$2" = "-C" ] ; then
+if [ "$PREADVANCED" = "1" ] ; then
+	ADVANCED="1"
+elif [ "$ADVANCED" = "1" ]; then
+	ADVANCED=""
+fi
+
+if [ -n "$CLEAN" ] ; then
 	rm -f config.cache
 fi
 
-if [ "$1" = "-quick" -o "$1" = "-q" -o "$2" = "-quick" ] ; then
-	echo "running quick config"
-	RUN_CONFIGURE
-	exit 0
-fi
-
 clear
 
     if [ -f ".CHANGES.NEW" -a -z "$NOINTRO" ] ; then
@@ -307,14 +530,14 @@ while [ -z "$TEST" ] ; do
 done
 
 if [ "$CRYPTOIRCD" = "1" ] ; then
-TEST=""
+TEST="$SSLDIR"
 echo ""
 echo "If you know the path to OpenSSL on your system, enter it here. If not"
 echo "leave this blank"
 echo $n "[$TEST] -> $c"
     read cc
 if [ -z "$cc" ] ; then
-    SSLDIR=""
+    SSLDIR="$TEST"
 else 
     SSLDIR=`eval echo $cc` # modified
 fi
@@ -379,14 +602,14 @@ while [ -z "$TEST" ] ; do
 done
 
 if [ "$ZIPLINKS" = "1" ] ; then
-TEST=""
+TEST="$ZIPLINKSDIR"
 echo ""
 echo "If you know the path to zlib on your system, enter it here. If not"
 echo "leave this blank"
 echo $n "[$TEST] -> $c"
     read cc
 if [ -z "$cc" ] ; then
-    ZIPLINKSDIR=""
+    ZIPLINKSDIR="$TEST"
 else 
     ZIPLINKSDIR=`eval echo $cc` # modified
 fi
@@ -450,8 +673,8 @@ while [ -z "$TEST" ] ; do
     echo ""
     echo "Do you want to enable prefixes for chanadmin and chanowner?"
     echo "This will give +a the & prefix and ~ for +q (just like +o is @)"
-    echo "Supported by the major clients (mIRC, xchat, epic, eggdrop, Klient, PJIRC, etc.)"
-    echo "with the notable exceptions of irssi, KVIrc and CGI:IRC."
+    echo "Supported by the major clients (mIRC, xchat, epic, eggdrop, Klient,"
+    echo "PJIRC, irssi, CGI:IRC, etc.)"
     echo "This feature should be enabled/disabled network-wide."
     echo $n "[$TEST] -> $c"
 	read cc
@@ -592,7 +815,9 @@ while [ -z "$TEST" ] ; do
 	    ;;
     esac
 done
-
+if [ -n "$ADVANCED" ] ; then
+	RUN_ADVANCED
+fi
 echo ""
 echo "Would you like any more parameters to configure?"
 echo "Write them here:"
@@ -621,9 +846,17 @@ ZIPLINKS="$ZIPLINKS"
 ZIPLINKSDIR="$ZIPLINKSDIR"
 REMOTEINC="$REMOTEINC"
 CURLDIR="$CURLDIR"
+SHOWLISTMODES="$SHOWLISTMODES"
+TOPICNICKISNUH="$TOPICNICKISNUH"
+SHUNNOTICES="$SHUNNOTICES"
+NOOPEROVERRIDE="$NOOPEROVERRIDE"
+DISABLEUSERMOD="$DISABLEUSERMOD"
+OPEROVERRIDEVERIFY="$OPEROVERRIDEVERIFY"
 EXTRAPARA="$EXTRAPARA"
+ADVANCED="$ADVANCED"
 __EOF__
 RUN_CONFIGURE
+cd "$UNREALCWD"
 cat << __EOF__
 
  _______________________________________________________________________

Donation

@@ -5,11 +5,11 @@ you like Unreal, and you'd like to see it continue to exist, please consider mak
 a donation. We're not asking for anything huge, whatever you can afford is fine.
 
 PayPal Donation Link:
-<https://www.paypal.com/xclick/business=donation%40unrealircd.com&
+<https://www.paypal.com/xclick/business=donation%40unrealircd.org&
 item_name=UnrealIRCd+Donation&no_shipping=1&cn=Comments&tax=0&currency_code=USD>
 
 Or simply send a payment through PayPal to:
-donation@unrealircd.com
+donation@unrealircd.org
 
 If you don't want to use PayPal, or you want to donate something other than money
 (old computer hardware, etc.), contact Stskeeps (stskeeps@unrealircd.com) and send

Makefile.in

@@ -34,11 +34,11 @@ FROMDOS=/home/cmunk/bin/4dos
 #
 
 #XCFLAGS=-O -g -export-dynamic
-IRCDLIBS=@IRCDLIBS@ @TRELIBS@
+IRCDLIBS=@IRCDLIBS@ @TRELIBS@ @CARESLIBS@
 CRYPTOLIB=@CRYPTOLIB@
 OPENSSLINCLUDES=
 
-XCFLAGS=-I@TREINCDIR@ @CFLAGS@
+XCFLAGS=-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@
 #
 # use the following on MIPS:
 #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)
@@ -131,7 +131,8 @@ MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
 		'RM=${RM}' 'CP=${CP}' 'TOUCH=${TOUCH}' \
 		'SHELL=${SHELL}' 'STRTOUL=${STRTOUL}' \
 		'CRYPTOLIB=${CRYPTOLIB}' \
-		'CRYPTOINCLUDES=${CRYPTOINCLUDES}' 'URL=${URL}'
+		'CRYPTOINCLUDES=${CRYPTOINCLUDES}' \
+		'URL=${URL}'
 
 custommodule:
 	cd src; ${MAKE} ${MAKEARGS} MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodule
@@ -208,15 +209,19 @@ install: all
 	$(INSTALL) -m 0700 networks/makenet $(IRCDDIR)/networks
 	$(INSTALL) -m 0600 networks/networks.ndx $(IRCDDIR)/networks
 	$(INSTALL) -m 0700 -d $(IRCDDIR)/doc
-	$(INSTALL) -m 0600 doc/Authors doc/example.conf doc/example.settings doc/coding-guidelines doc/tao.of.irc doc/unreal32docs.html $(IRCDDIR)/doc
+	$(INSTALL) -m 0600 doc/Authors doc/example.conf doc/coding-guidelines doc/tao.of.irc doc/unreal32docs.html $(IRCDDIR)/doc
 	$(INSTALL) -m 0700 -d $(IRCDDIR)/aliases
 	$(INSTALL) -m 0600 aliases/*.conf $(IRCDDIR)/aliases
 	$(TOUCH) $(IRCDDIR)/unrealircd.conf
 	chmod 0600 $(IRCDDIR)/unrealircd.conf
+	$(INSTALL) -m 0600 spamfilter.conf dccallow.conf $(IRCDDIR)
 	$(INSTALL) -m 0600 badwords.*.conf help.conf LICENSE Donation $(IRCDDIR)
 	$(INSTALL) -m 0700 unreal $(IRCDDIR)
 	$(INSTALL) -m 0700 -d $(IRCDDIR)/modules
 	$(INSTALL) -m 0700 src/modules/*.so $(IRCDDIR)/modules
+	-@if [ ! -f "$(IRCDDIR)/curl-ca-bundle.crt" ] ; then \
+		$(INSTALL) -m 0700 curl-ca-bundle.crt $(IRCDDIR) ; \
+	fi
 
 pem:	src/ssl.cnf
 	@echo "Generating certificate request .. "

Unreal.nfo

@@ -1,29 +1,30 @@
 ===============================================
-=               UnrealIRCd v3.2               =
+=            UnrealIRCd v3.2.8.1              =
 ===============================================
- Was brought to you by:
+ This release was brought to you by:
 
-  The core team:
-  ==============
-  * Stskeeps  <stskeeps@tspre.org>
-  * codemastr <codemastr@unrealircd.com>
-  * Syzop     <syzop@unrealircd.org>
-  * Luke      <luke@unrealircd.com>
+  Coders:
+  =======
+  * Syzop
 
-  Contributors
-  ============
-  * McSkaf    <mcskaf@unrealircd.org>
-  * Zogg      <zogg@unrealircd.org>
-  * NiQuiL    <niquil@unrealircd.org>
-  * assyrian  <assyrian@unrealircd.org>
-  * nighthawk <nighthawk@unrealircd.com>
-  * DrBin     <drbin@unrealircd.com>
-  * llthangel <llthangel@unrealircd.org>
-  * Griever   <griever@unrealircd.com>
-  
-  Documentation:
-  ==============
-  * CKnight^ <cknight@unrealircd.com>
+  Contributors:
+  =============
+  * aquanight
+  * WolfSage
+  * Stealth
+  * tabrisnet
+  * Bock
+  * fbi
+
+  RC Testers:
+  ===========
+  * Bock, Apocalypse, StrawberryKittens, wax, Elemental, and many more
+
+  Previous coders:
+  ================
+  * Stskeeps
+  * codemastr
+  * Many more..
 
  Precenses on the Internet:
   * http://www.unrealircd.com
@@ -31,16 +32,16 @@
  CVS
  ====
  To get anonymous access: (read only)
- "cvs -d :pserver:anonymous@cvs.ircsystems.net:/home/cmunk/ircsystems/cvsroot login"
+ "cvs -d :pserver:anonymous@cvs.unrealircd.com:/cvs login"
 
  press enter when asked for password
  Then, choose the appropiate branch you want:
 
  latest 3.2 release ("stable"):
- "cvs -d :pserver:anonymous@cvs.ircsystems.net:/home/cmunk/ircsystems/cvsroot checkout -r stable -d Unreal-stable unreal"
+ "cvs -z3 -d :pserver:anonymous@cvs.unrealircd.com:/cvs checkout -r stable -d Unreal-stable unreal"
 
  latest 3.2 fixes / development ("unreal3_2_fixes"):
- "cvs -d :pserver:anonymous@cvs.ircsystems.net:/home/cmunk/ircsystems/cvsroot checkout -r unreal3_2_fixes -d Unreal-stable unreal"
+ "cvs -z3 -d :pserver:anonymous@cvs.unrealircd.com:/cvs checkout -r unreal3_2_fixes -d Unreal-stable unreal"
 
  To get support
  ================
@@ -49,7 +50,7 @@
  * check the FAQ (www.vulnscan.org/UnrealIrcd/faq/)
 
  Means of support:
- * IRC: /server irc.ircsystems.net 6667 - /join #unreal-support
+ * IRC: /server irc.unrealircd.com 6667 - /join #unreal-support
    [Note: Follow the bots instructions in order to get voice.
           Please be patient after asking questions, we may do other stuff
           or we're away. Don't repeat questions, we heard you first time,
@@ -57,9 +58,6 @@
           base so we are volunteeringly helping you, but we are humans
           like you, and we got to have peace at times as well.]
  * Forum: http://forums.unrealircd.com/
- * Mailing list: unreal-users@lists.sourceforge.net
-   (http://lists.sourceforge.net/lists/listinfo/unreal-users also
-    has links to the archive).
 
  UnrealIRCd Bugtracker (Where to report bugs or make suggestions)
  ==================================================================
@@ -67,4 +65,4 @@
 
  Want to discuss, chat, etc?
  =============================
- * IRC: /server irc.ircsystems.net 6667 - /join #UnrealIRCd
+ * IRC: /server irc.unrealircd.com 6667 - /join #UnrealIRCd

aliases/aliases.conf

@@ -2,12 +2,12 @@
 
 alias identify {
 	format "^#" {
-		nick chanserv;
+		target chanserv;
 		type services;
 		parameters "IDENTIFY %1-";
 	};
 	format "^[^#]" {
-		nick nickserv;
+		target nickserv;
 		type services;
 		parameters "IDENTIFY %1-";
 	};
@@ -16,12 +16,12 @@ alias identify {
 
 alias services {
 	format "^#" {
-		nick chanserv;
+		target chanserv;
 		type services;
 		parameters "%1-";
 	};
 	format "^[^#]" {
-		nick nickserv;
+		target nickserv;
 		type services;
 		parameters "%1-";
 	};
@@ -30,12 +30,12 @@ alias services {
 
 alias register {
 	format "^#" {
-		nick chanserv;
+		target chanserv;
 		type services;
 		parameters "REGISTER %1-";
 	};
 	format "^[^#]" {
-		nick nickserv;
+		target nickserv;
 		type services;
 		parameters "REGISTER %1-";
 	};

aliases/anope.conf

@@ -1,19 +1,18 @@
 /* Anope Aliases */
 
 alias nickserv { type services; };
-alias ns { nick nickserv; type services; };
+alias ns { target nickserv; type services; };
 alias chanserv { type services; };
-alias cs { nick chanserv; type services; };
-alias memoserv { type services; };
-alias ms { nick memoserv; type services; };
+alias cs { target chanserv; type services; };
+alias memoserv { type services; spamfilter yes; };
+alias ms { target memoserv; type services; spamfilter yes; };
 alias operserv { type services; };
-alias os { nick operserv; type services; };
+alias os { target operserv; type services; };
 alias helpserv { type services; };
-alias hs { nick helpserv; type services; };
 alias botserv { type services; };
-alias bs { nick botserv; type services; };
+alias bs { target botserv; type services; };
 alias hostserv { type services; };
-alias hs { nick hostserv; type services; };
+alias hs { target hostserv; type services; };
 
 include "aliases/aliases.conf";
 

aliases/auspice.conf

@@ -1,16 +1,33 @@
 /* Auspice Aliases */
 
-alias nickserv { type services; };
-alias ns { nick nickserv; type services; };
+/* Uncomment this, if you have enabled "MassServ, W and X" in auspice */
+# alias massserv { type services; };
+# alias ma { target massserv; type services; };
+# alias W { type services; };
+# alias X { type services; };
+
+/* Uncomment this, if you have enabled "WebServ" in auspice */
+# alias webserv { type services; };
+# alias ws { target webserv; type services; };
+
+alias agent { type services; };
+alias adminserv { type services; };
+alias as { target adminserv; type services; };
+alias botserv { type services; };
+alias bs { target botserv; type services; };
 alias chanserv { type services; };
-alias cs { nick chanserv; type services; };
-alias memoserv { type services; };
-alias ms { nick memoserv; type services; };
+alias cs { target chanserv; type services; };
 alias helpserv { type services; };
-alias hs { nick helpserv; type services; };
+alias hs { target helpserv; type services; };
+alias hostserv { type services; };
+alias ho { target hostserv; type services; };
+alias memoserv { type services; spamfilter yes; };
+alias ms { target memoserv; type services; spamfilter yes; };
+alias nickserv { type services; };
+alias ns { target nickserv; type services; };
 alias operserv { type services; };
-alias os { nick operserv; type services; };
+alias os { target operserv; type services; };
 alias rootserv { type services; };
-alias rs { nick rootserv; type services; };
+alias rs { target rootserv; type services; };
 
 include "aliases/aliases.conf";

aliases/cygnus.conf

@@ -1,12 +1,12 @@
 /* Cygnus Aliases */
 
 alias nickserv { type services; };
-alias ns { nick nickserv; type services; };
+alias ns { target nickserv; type services; };
 alias chanserv { type services; };
-alias cs { nick chanserv; type services; };
-alias memoserv { type services; };
-alias ms { nick memoserv; type services; };
+alias cs { target chanserv; type services; };
+alias memoserv { type services; spamfilter yes; };
+alias ms { target memoserv; type services; spamfilter yes; };
 alias rootserv { type services; };
-alias rs { nick rootserv; type services; };
+alias rs { target rootserv; type services; };
 
 include "aliases/aliases.conf";

aliases/epona.conf

@@ -1,16 +1,16 @@
 /* Epona Aliases */
 
 alias nickserv { type services; };
-alias ns { nick nickserv; type services; };
+alias ns { target nickserv; type services; };
 alias chanserv { type services; };
-alias cs { nick chanserv; type services; };
-alias memoserv { type services; };
-alias ms { nick memoserv; type services; };
+alias cs { target chanserv; type services; };
+alias memoserv { type services; spamfilter yes; };
+alias ms { target memoserv; type services; spamfilter yes; };
 alias operserv { type services; };
-alias os { nick operserv; type services; };
+alias os { target operserv; type services; };
 alias helpserv { type services; };
-alias hs { nick helpserv; type services; };
+alias hs { target helpserv; type services; };
 alias botserv { type services; };
-alias bs { nick botserv; type services; };
+alias bs { target botserv; type services; };
 
 include "aliases/aliases.conf";

aliases/generic.conf

@@ -1,14 +1,14 @@
 /* Generic Aliases */
 
 alias nickserv { type services; };
-alias ns { nick nickserv; type services; };
+alias ns { target nickserv; type services; };
 alias chanserv { type services; };
-alias cs { nick chanserv; type services; };
-alias memoserv { type services; };
-alias ms { nick memoserv; type services; };
+alias cs { target chanserv; type services; };
+alias memoserv { type services; spamfilter yes; };
+alias ms { target memoserv; type services; spamfilter yes; };
 alias operserv { type services; };
-alias os { nick operserv; type services; };
+alias os { target operserv; type services; };
 alias helpserv { type services; };
-alias hs { nick helpserv; type services; };
+alias hs { target helpserv; type services; };
 
 include "aliases/aliases.conf";

aliases/genericstats.conf

@@ -1,4 +1,4 @@
 /* Generic StatServ Aliases */
 
 alias statserv { type stats; };
-alias ss { nick statserv; type stats; };
+alias ss { target statserv; type stats; };

aliases/ircservices.conf

@@ -1,17 +1,17 @@
 /* IRCServices Aliases */
 
 alias nickserv { type services; };
-alias ns { nick nickserv; type services; };
+alias ns { target nickserv; type services; };
 alias chanserv { type services; };
-alias cs { nick chanserv; type services; };
-alias memoserv { type services; };
-alias ms { nick memoserv; type services; };
+alias cs { target chanserv; type services; };
+alias memoserv { type services; spamfilter yes; };
+alias ms { target memoserv; type services; spamfilter yes; };
 alias operserv { type services; };
-alias os { nick operserv; type services; };
+alias os { target operserv; type services; };
 alias helpserv { type services; };
-alias hs { nick helpserv; type services; };
+alias hs { target helpserv; type services; };
 alias irciihelp { type services; };
 alias statserv { type services; };
-alias ss { nick statserv; type services; };
+alias ss { target statserv; type services; };
 
 include "aliases/aliases.conf";

aliases/operstats.conf

@@ -1,6 +1,6 @@
 /* OperStats Aliases */
 
 alias operserv { type stats; };
-alias os { nick operserv; type stats; };
+alias os { target operserv; type stats; };
 alias statserv { type stats; };
-alias ss { nick statserv; type stats; };
+alias ss { target statserv; type stats; };

autoconf/aclocal.m4

@@ -52,14 +52,29 @@ AC_DEFUN(CHECK_LIBCURL,
 	[AC_HELP_STRING([--enable-libcurl=DIR],[enable libcurl (remote include) support])],
 	[
 		CURLCFLAG=`$enableval/bin/curl-config --cflags`
-		CFLAGS="$CFLAGS $CURLCFLAG -DUSE_LIBCURL"
 		CURLLIBS=`$enableval/bin/curl-config --libs`
 
-		dnl curl-7.11.0 and up will include the ares info, older versions do not
-		if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
-			CURLLIBS="$CURLLIBS -lares"
+		dnl Ok this is ugly, basically we need to strip the version of c-ares that curl uses
+		dnl because we want to use our own version (which is hopefully fully binary
+		dnl compatible with the curl one as well).
+		dnl Therefore we need to strip the cares libs in a weird way...
+		dnl If anyone can come up with something better and still portable (no awk!?)
+		dnl then let us know.
+		if test "x`echo $CURLLIBS |grep ares`" != x ; then
+			dnl Attempt one: Linux sed
+			XCURLLIBS="`echo "$CURLLIBS"|sed -r 's/(@<:@^ @:>@+ @<:@^ @:>@+ )(@<:@^ @:>@+ @<:@^ @:>@+ )(.+)/\1\3/g' 2>/dev/null`"
+			if test x"$XCURLLIBS" = x; then
+				dnl Attempt two: FreeBSD (and others?) sed
+				XCURLLIBS="`echo "$CURLLIBS"|sed -E 's/(@<:@^ @:>@+ @<:@^ @:>@+ )(@<:@^ @:>@+ @<:@^ @:>@+ )(.+)/\1\3/g' 2>/dev/null`"
+				if test x"$XCURLLIBS" = x; then
+					AC_MSG_ERROR([sed appears to be broken. It is needed for a remote includes compile hack.])
+				fi
+			fi
+			CURLLIBS="$XCURLLIBS"
 		fi
+		
 		IRCDLIBS="$IRCDLIBS $CURLLIBS"
+		CFLAGS="$CFLAGS $CURLCFLAG -DUSE_LIBCURL"
 		URL="url.o"
 		AC_SUBST(URL)
 	])
@@ -94,7 +109,16 @@ AC_MSG_CHECKING(for openssl)
     done
     if test x_$found_ssl != x_yes; then
 	AC_MSG_RESULT(not found)
-	AC_WARN(disabling ssl support)
+	echo ""
+	echo "Apparently you do not have both the openssl binary and openssl development libraries installed."
+	echo "You have two options:"
+	echo "a) Install the needed binaries and libraries"
+	echo "   and run ./Config"
+	echo "OR"
+	echo "b) If you don't need SSL..."
+	echo "   Run ./Config and say 'no' when asked about SSL"
+	echo ""
+	exit 1
     else
         CRYPTOLIB="-lssl -lcrypto";
 	if test ! "$ssldir" = "/usr" ; then
@@ -127,7 +151,16 @@ AC_MSG_CHECKING(for zlib)
     done
     if test x_$found_zlib != x_yes; then
 	AC_MSG_RESULT(not found)
-	AC_WARN(disabling ziplink support)
+	echo ""
+	echo "Apparently you do not have the zlib development library installed."
+	echo "You have two options:"
+	echo "a) Install the zlib development library"
+	echo "   and run ./Config"
+	echo "OR"
+	echo "b) If you don't need compressed links..."
+	echo "   Run ./Config and say 'no' when asked about ziplinks support"
+	echo ""
+	exit 1
     else
         IRCDLIBS="$IRCDLIBS -lz";
 	if test "$zlibdir" != "/usr" ; then

autoconf/configure.in

@@ -20,6 +20,20 @@ CFLAGS="-pipe $CFLAGS"
 fi
 fi
 
+dnl (the gcc flag detection trick is taken from xemacs/Vin Shelton)
+
+dnl UnrealIRCd might not be strict-aliasing safe at this time
+case "`$CC -v --help 2>&1`" in
+	*-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
+esac
+
+dnl Pointer signedness warnings are really a pain and 99.9% of the time
+dnl they are of absolutely no use whatsoever. IMO the person who decided
+dnl to enable this without -Wall should be shot on sight.
+case "`$CC -v --help 2>&1`" in
+	*-Wpointer-sign* ) CFLAGS="$CFLAGS -Wno-pointer-sign" ;;
+esac
+
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(CP,cp)
 AC_PATH_PROG(TOUCH,touch)
@@ -40,13 +54,13 @@ AC_SUBST(IRCDLIBS)
 AC_SUBST(MKPASSWDLIBS)
 
 dnl module checking based on Hyb7's module checking code
-AC_DEFUN(AC_ENABLE_DYN,
+AC_DEFUN([AC_ENABLE_DYN],
 [
-AC_CHECK_FUNC(dlopen,, AC_CHECK_LIB(dl, dlopen,IRCDLIBS="$IRCDLIBS -ldl",
+AC_CHECK_FUNC(dlopen,, [AC_CHECK_LIB(dl, dlopen,IRCDLIBS="$IRCDLIBS -ldl",
 [
 AC_MSG_WARN(Dynamic linking is not enabled because dlopen was not found) 
 AC_DEFINE(STATIC_LINKING)
-]))
+])])
 
 hold_cflags=$CFLAGS
 CFLAGS="$CFLAGS -export-dynamic"
@@ -63,6 +77,9 @@ if test "$ac_cv_prog_gcc" = "yes"; then
 		Darwin*[)]
 		ac_cv_pic="-bundle -flat_namespace -undefined suppress"
 		;;
+		HP-UX*[)]
+		ac_cv_pic="-fPIC"
+		;;
 	esac
 else
 case `uname -s` in
@@ -93,7 +110,7 @@ fi
 MODULEFLAGS=$ac_cv_pic
 AC_DEFINE(DYNAMIC_LINKING)
 ])
-AC_DEFUN(AC_ENABLE_INET6,[
+AC_DEFUN([AC_ENABLE_INET6],[
 AC_CACHE_CHECK(if your system has IPv6 support, ac_cv_ip6, [
 save_libs="$LIBS"
 LIBS="$LIBS $SOCKLIB"
@@ -111,9 +128,26 @@ if test "$ac_cv_ip6" = "no"; then
 AC_MSG_WARN(Your system does not support IPv6 so it will not be enabled)
 else
 AC_DEFINE(INET6)
+	dnl in6addr_any detection code taken from ratbox
+	AC_MSG_CHECKING([for struct in6addr_any])
+	AC_COMPILE_IFELSE(
+		[AC_LANG_PROGRAM(
+			[[#define IN_AUTOCONF
+			#include <sys/types.h>
+			#include <sys/socket.h>
+			#include <netinet/in.h>]],
+			[[struct in6_addr a = in6addr_any;]]
+		)],
+		[AC_MSG_RESULT(yes)],
+		[
+			AC_MSG_RESULT(no)
+			AC_DEFINE(NO_IN6ADDR_ANY)
+		]
+	)
 fi
 LIBS="$save_libs"
 ])
+
 AC_CHECK_HEADER(sys/param.h,AC_DEFINE(PARAMH))
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(STDLIBH))
 AC_CHECK_HEADER(stddef.h,AC_DEFINE(STDDEFH))
@@ -224,12 +258,27 @@ dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_SETPGRP
 AC_FUNC_SETVBUF_REVERSED
+AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(snprintf,AC_DEFINE(HAVE_SNPRINTF))
 AC_CHECK_FUNCS(vsnprintf,AC_DEFINE(HAVE_VSNPRINTF))
 AC_CHECK_FUNCS(strlcpy, AC_DEFINE(HAVE_STRLCPY))
 AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT))
 AC_CHECK_FUNCS(strlncat, AC_DEFINE(HAVE_STRLNCAT))
-
+AC_CHECK_FUNCS(inet_pton, AC_DEFINE(HAVE_INET_PTON))
+AC_CHECK_FUNCS(inet_ntop, AC_DEFINE(HAVE_INET_NTOP))
+dnl Check if it supports C99 style variable length arrays
+AC_CACHE_CHECK(if C99 variable length arrays are supported, ac_cv_varlen_arrays, [
+AC_TRY_COMPILE(,[
+int main() {
+int i = 5;
+int a[i];
+a[0] = 1;
+return 0;
+}], ac_cv_varlen_arrays=yes, ac_cv_varlen_arrays=no)
+])
+if test "$ac_cv_varlen_arrays" = "yes" ; then
+	AC_DEFINE(HAVE_C99_VARLEN_ARRAY)
+fi
 AC_CACHE_CHECK(if we can set the core size to unlimited, ac_cv_force_core,[
 AC_TRY_RUN([
 #include <sys/time.h>
@@ -319,11 +368,10 @@ AC_DEFINE_UNQUOTED(MAXSENDQLENGTH,$withval),AC_DEFINE(MAXSENDQLENGTH,3000000))
 AC_ARG_WITH(bufferpool, [AC_HELP_STRING([--with-bufferpool=size],[Specify the size of the buffer pool])],
 AC_DEFINE_UNQUOTED(BUFFERPOOL,[($withval * MAXSENDQLENGTH)]),AC_DEFINE(BUFFERPOOL,[(18 * MAXSENDQLENGTH)]))
 AC_ARG_WITH(hostname, [AC_HELP_STRING([--with-hostname=host],[Specify the local hostname of the server])], AC_DEFINE_UNQUOTED(DOMAINNAME,"$withval"),AC_DEFINE_UNQUOTED(DOMAINNAME,"`hostname`"))
-AC_DEFINE_UNQUOTED(MYOSNAME,"`uname -a`")
 AC_ARG_WITH(permissions, [AC_HELP_STRING([--with-permissions=permissions],[Specify the default permissions for
 configuration files])], AC_DEFINE_UNQUOTED(DEFAULT_PERMISSIONS,$withval), AC_DEFINE(DEFAULT_PERMISSIONS, 0600)) 
 AC_ARG_WITH(dpath, [AC_HELP_STRING([--with-dpath=path],[Specify the path where configuration files are stored])],
-AC_DEFINE_UNQUOTED(DPATH, "$withval") IRCDDIR="$withval"; mkdir $withval/tmp, AC_DEFINE_UNQUOTED(DPATH,"`pwd`") IRCDDIR="`pwd`" mkdir `pwd`/tmp)
+AC_DEFINE_UNQUOTED(DPATH, "$withval") IRCDDIR="$withval", AC_DEFINE_UNQUOTED(DPATH,"`pwd`") IRCDDIR="`pwd`")
 AC_ARG_WITH(fd-setsize, [AC_HELP_STRING([--with-fd-setsize=size],[Specify the max file descriptors to use])],
 ac_fd=$withval, ac_fd=1024)
 AC_DEFINE_UNQUOTED(MAXCONNECTIONS, $ac_fd)
@@ -332,11 +380,23 @@ AC_DEFINE_UNQUOTED(SPATH,"$withval") BINDIR="$withval",AC_DEFINE_UNQUOTED(SPATH,
 AC_ARG_ENABLE(nospoof, [AC_HELP_STRING([--enable-nospoof],[Enable spoofing protection])], AC_DEFINE(NOSPOOF))
 AC_ARG_ENABLE(prefixaq, [AC_HELP_STRING([--enable-prefixaq],[Enable chanadmin and chanowner prefixes])], AC_DEFINE(PREFIX_AQ))
 AC_ARG_ENABLE(hub, [AC_HELP_STRING([--enable-hub],[Compile as a hub server])], AC_DEFINE(HUB))
+AC_ARG_WITH(showlistmodes, [AC_HELP_STRING([--with-showlistmodes], [Specify whether modes are shown in /list])],
+	AC_DEFINE(LIST_SHOW_MODES))
+AC_ARG_WITH(topicisnuhost, [AC_HELP_STRING([--with-topicisnuhost], [Display nick!user@host as the topic setter])],
+	AC_DEFINE(TOPIC_NICK_IS_NUHOST))
+AC_ARG_WITH(shunnotices, [AC_HELP_STRING([--with-shunnotices], [Notify a user when he/she is no longer shunned])],
+	AC_DEFINE(SHUN_NOTICES))
+AC_ARG_WITH(no-operoverride, [AC_HELP_STRING([--with-no-operoverride], [Disable OperOverride])],
+	AC_DEFINE(NO_OPEROVERRIDE))
+AC_ARG_WITH(disableusermod, [AC_HELP_STRING([--with-disableusermod], [Disable /set* and /chg*])],
+	AC_DEFINE(DISABLE_USERMOD))
+AC_ARG_WITH(operoverride-verify, [AC_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])],
+	AC_DEFINE(OPEROVERRIDE_VERIFY))
 CHECK_SSL
 CHECK_ZLIB
 CHECK_LIBCURL
-AC_ARG_ENABLE(dynamic-linking, [AC_HELP_STRING([--enable-dynamic-linking],[Make the IRCd dynamically link shared objects rather than statically])], AC_ENABLE_DYN, AC_DEFINE(STATIC_LINKING))
-AC_ARG_ENABLE(inet6, [AC_HELP_STRING([--enable-inet6],[Make the IRCd support IPv6])], AC_ENABLE_INET6)
+AC_ARG_ENABLE(dynamic-linking, [AC_HELP_STRING([--enable-dynamic-linking],[Make the IRCd dynamically link shared objects rather than statically])], [AC_ENABLE_DYN], [AC_DEFINE(STATIC_LINKING)])
+AC_ARG_ENABLE(inet6, [AC_HELP_STRING([--enable-inet6],[Make the IRCd support IPv6])], [AC_ENABLE_INET6])
 AC_SUBST(IRCDDIR)
 AC_SUBST(BINDIR)
 AC_MSG_CHECKING(if FD_SETSIZE is large enough to allow $ac_fd file descriptors)
@@ -364,8 +424,8 @@ IRCDLIBS="$IRCDLIBS -lresolv "
 ;;
 esac
 
-dnl REMEMBER TO CHANGE WITH A NEW RELEASE!
-tre_version="0.6.6"
+dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!
+tre_version="0.7.5"
 AC_MSG_RESULT(extracting TRE regex library)
 cur_dir=`pwd`
 cd extras
@@ -381,11 +441,11 @@ else
 fi
 AC_MSG_RESULT(configuring TRE regex library)
 cd tre-$tre_version
-./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp
+./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp || exit 1
 AC_MSG_RESULT(compiling TRE regex library)
-$ac_cv_prog_MAKER
+$ac_cv_prog_MAKER || exit 1
 AC_MSG_RESULT(installing TRE regex library)
-$ac_cv_prog_MAKER install
+$ac_cv_prog_MAKER install || exit 1
 TREINCDIR="$cur_dir/extras/regexp/include"
 AC_SUBST(TREINCDIR)
 if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
@@ -395,6 +455,61 @@ else
 fi
 AC_SUBST(TRELIBS)
 cd $cur_dir
+
+
+dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
+cares_version="1.6.0"
+AC_MSG_RESULT(extracting c-ares resolver library)
+cur_dir=`pwd`
+cd extras
+dnl remove old c-ares directory to force a recompile...
+rm -rf c-ares-$cares_version
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz c-ares.tar.gz
+else
+	cp c-ares.tar.gz c-ares.tar.gz.bak
+	gunzip -f c-ares.tar.gz
+	cp c-ares.tar.gz.bak c-ares.tar.gz
+	tar xf c-ares.tar
+fi
+AC_MSG_RESULT(configuring c-ares library)
+cd c-ares-$cares_version
+./configure --prefix=$cur_dir/extras/c-ares || exit 1
+AC_MSG_RESULT(compiling c-ares resolver library)
+$ac_cv_prog_MAKER || exit 1
+AC_MSG_RESULT(installing c-ares resolver library)
+$ac_cv_prog_MAKER install || exit 1
+CARESINCDIR="$cur_dir/extras/c-ares/include"
+AC_SUBST(CARESINCDIR)
+CARESLIBDIR="-L../extras/c-ares/lib"
+AC_SUBST(CARESLIBDIR)
+
+dnl Set default library parameters for when pkg-config is not available
+CARESLIBSALT="-lcares"
+case `uname -s` in
+*FreeBSD*)
+CARESLIBSALT="-lcares"
+;;
+*Linux*)
+CARESLIBSALT="-lcares -lrt"
+;;
+esac
+
+dnl Use pkg-config for c-ares libraries, and if not available use defaults
+dnl from above. Also, if pkg-config returns an empty result (ex: on fbsd
+dnl or older versions it might be missing --static) then also use defaults.
+if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
+	CARESLIBS="$CARESLIBSALT"
+else
+	CARESLIBS="`$ac_cv_path_PKGCONFIG --static --libs libcares.pc`"
+	if test "x$CARESLIBS" = "x" ; then
+		CARESLIBS="$CARESLIBSALT"
+	fi
+fi
+AC_SUBST(CARESLIBS)
+cd $cur_dir
+
+
 AC_OUTPUT(Makefile src/modules/Makefile unreal ircdcron/ircdchk)
 chmod 0700 unreal
 chmod 0700 ircdcron/ircdchk

dccallow.conf

@@ -0,0 +1,42 @@
+/* Example of a possible semi-secure /DCCALLOW configuration written by Syzop.
+ * $Id$
+ *
+ * Actually nothing is *100% secure*... there could still be
+ * bugs in the software itself (think: a winamp bug that can
+ * be exploited via an mp3, or: a wmplayer bug that can be
+ * exploited via a specially crafted .wmv, etc..).
+ * If you are really that paranoid you could just remove
+ * all 'allow dcc'-blocks and prompt the user for EVERY file ;).
+ * 
+ * Still, I think this file is a good tradeoff between userfriendlyness
+ * and security. Note that when you try to only DENY specific
+ * file type (exe, com, etc) you are *guaranteed* to miss ones
+ * (like: did you know .r17 gets treated as a rar archive?
+ *  and that an exe can be disguished as .cmd which is executable
+ *  on nt/w2k/xp?)
+ */
+
+/* first.. deny everything, then allow known-good stuff... */
+deny dcc { filename "*"; reason "Possible executable content"; soft yes; };
+/* common image formats */
+allow dcc { filename "*.jpg"; soft yes; };
+allow dcc { filename "*.jpeg"; soft yes; };
+allow dcc { filename "*.gif"; soft yes; };
+allow dcc { filename "*.png"; soft yes; };
+allow dcc { filename "*.bmp"; soft yes; };
+/* audio / video (but not scripted/playlists!) */
+allow dcc { filename "*.mp1"; soft yes; };
+allow dcc { filename "*.mp2"; soft yes; };
+allow dcc { filename "*.mp3"; soft yes; };
+allow dcc { filename "*.mpg"; soft yes; };
+allow dcc { filename "*.mpeg"; soft yes; };
+allow dcc { filename "*.m1v"; soft yes; };
+allow dcc { filename "*.m2v"; soft yes; };
+allow dcc { filename "*.vob"; soft yes; };
+allow dcc { filename "*.wav"; soft yes; };
+/* text / misc */
+allow dcc { filename "*.txt"; soft yes; };
+allow dcc { filename "*.log"; soft yes; };
+allow dcc { filename "*.pdf"; soft yes; };
+allow dcc { filename "*.c"; soft yes; };
+allow dcc { filename "*.cpp"; soft yes; };

doc/Authors

@@ -123,7 +123,8 @@ Carsten Munk <stskeeps@unrealircd.com> / May 1999, date
 Dominick Meglio <codemastr@unrealircd.com> / June 1999, date
 David Flynn / March 2000, June 2000
 McSkaf / June 2001, September 2001
-Finny Merrill <griever@unrealircd.com> / November 2001, date
+Finny Merrill <griever@unrealircd.com> / November 2001, December 2002
+Bram Matthys <syzop@unrealircd.com> / January 2002, date
 
 Thanks go to those persons not mentioned here who have added their advice,
 opinions, and code to IRC.
@@ -143,4 +144,4 @@ Eric P. Scott <eps@toaster.sfsu.edu>
 Dan Goodwin <fornax@wpi.wpi.edu>
 Noah Friedman <friedman@ai.mit.edu>
 
-[ $Id$ ]
+[ $Id$ ]

doc/Unreal31_to_32.html

@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>UnrealIRCd - 3.2 - Offical Documentation</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<p> <font size="-1">I M P O R T A N T R E A D I N G</font></p>
-<p><font size="-1">(YES, YOU WILL NEED TO READ ALL OF THIS)</font></p>
-<p><font size="-1">* Unreal3.2 is a lot different than Unreal3.1.1. Forget 
-  all you have learned about setting up Unreal3.1.1 - this is a lot different. 
-  We have got a new configuration format that integrates all the former config 
-  files,ircd.conf, vhost.conf, chrestrict.conf, unrealircd.conf, into to one newunrealircd.conf 
-  (what the ircd.conf is called now). See doc/ for more information on the configuration 
-  format</font></p>
-<p><font size="-1">* THIS IS A BETA VERSION, REPORT BUGS ON http://bugs.unrealircd.org</font></p>
-<p><font size="-1">* We have introduced a new cloaking algorithm (+x), which makes 
-  it incompatible with Unreal3.1.1 - these can however still link, but the hostname 
-  will look different. This is made of three big numbers, configured in the config 
-  file - and these MUST be the same on all servers on the network. Keep these 
-  numbers secret, and the cloaking algorithm is uncrackable (within 55 years, 
-  that is). The +x algorithm was changed slightly to fix a method of cracking 
-  that was found. #define COMPAT_BETA4_KEYS to use the beta4 system for compatibility 
-  with older betas.</font></p>
-<p><font size="-1">* If you use Linux and have problems where the IRCd complains 
-  that MAXCONNECTIONS is larger than FD_SETSIZE, you need to get your root to 
-  edit /usr/include/bits/types.h - #define __FD_SETSIZE 1024 to be somenumber 
-  that is equal or higher than MAXCONNECTIONS. This is a problem with Linux that 
-  it is hard coded and non override able in some distributions. We recommend you 
-  use FreeBSD or the variants of this if you need to run high load IRC servers.</font></p>
-<p><font size="-1">* We use autoconf to help with compilation, and this should 
-  make us able to a lot more platform (we have even ported to BeOS).</font></p>
-<p><font size="-1">* We require a pthreads library for the SOCKS scan now - and 
-  this is now done in the background (no more waiting!).</font></p>
-<p><font size="-1">* The IRCd is now modularized, and you load modules with the 
-  loadmodule command. You will most likely want to add these lines:<br>
-  loadmodule &quot;src/modules/commands.so&quot;;<br>
-  loadmodule &quot;src/modules/scan.so&quot;;<br>
-  loadmodule &quot;src/modules/scan_socks.so&quot;;<br>
-  loadmodule &quot;src/modules/scan_http.so&quot;;</font></p>
-<p><font size="-1"> If you would like to code a module, doc/ will contain a module 
-  guide,and we got an example module in src/modules/m_dummy.c.</font></p>
-<p><font size="-1">* We have some IPv6 support, and there are some minor bugs 
-  in it.</font></p>
-<p><font size="-1">* The documentation is NOT yet 100% complete</font></p>
-<p><font size="-1">* We have added snomask (similar to ircu), basically this allowed 
-  us to remove several modes. Modes +cfFkje are gone, but don't worry, you can 
-  still use them. They are now added like this:</font></p>
-<p><font size="-1"> /mode yournick +s +cF</font></p>
-<p><font size="-1"> You set the flags in the second parameter of the mode command 
-  for a mode change +s, setting -s with no parameters removes all your snomask. 
-  You can remove a specific snomask by doing:</font></p>
-<p><font size="-1"> /mode yournick -s -c</font></p>
-<p><font size="-1">The current snomasks are:</font></p>
-<p><font size="-1"> c - local connects<br>
-  F - far connects<br>
-  f - flood notices<br>
-  k - kill notices<br>
-  e - 'eyes' notices<br>
-  j - 'junk' notices<br>
-  v - vhost notices<br>
-  G - gline/shun notices<br>
-  n - nick change notices<br>
-  q - deny nick (Q:line) rejection notices</font></p>
-<p><font size="-1"> It shouldn't be too hard to figure out, just play around with 
-  it a bit :)</font></p>
-<p><font size="-1">* /who needs testing it was recorded and may contain bugs</font></p>
-<p><font size="-1">* We have added alias {} which allows you to dynamically create 
-  commands such as /nickserv Read example.conf for more information on how to 
-  create your own. To use standard ones include one of the following files</font></p>
-<p><font size="-1"> aliases/ircservices.conf (IRCServices, Daylight)<br>
-  aliases/epona.conf (Epona)<br>
-  aliases/auspice.conf (Auspice)<br>
-  aliases/generic.conf (Magick, Sirius, Wrecked)<br>
-  aliases/operstats.conf (OperStats)<br>
-  aliases/genericstats.conf (GeoStats, NeoStats)</font></p>
-<p><font size="-1">* You can now use an IP in the oper::from and vhost::from fields 
-  even if the host resolves</font></p>
-<p><font size="-1">* Added an http proxy scanner (scan_http.so)</font></p>
-<p><font size="-1">* Added oper::snomask to specify default oper snomask modes</font></p>
-<p><font size="-1">* /helpop text has been moved to a config directive, help {}. 
-  To keep the standard help text you need to include help.conf so add include 
-  &quot;help.conf&quot;; to your config file.</font></p>
-<p><font size="-1">* To be able to use G:lines you must now have the can_gkline 
-  flag (or t if old style flags)</font></p>
-<p><font size="-1">* Usermode +T (Tech Admin) has been removed, since it is 100% 
-  useless</font></p>
-<p><font size="-1">* Added a make install to copy files to the installation location</font></p>
-<p><font size="-1">* Removed ./ircd, ./killircd, crypt/mkpasswd, ./rehash and 
-  merged them into a new ./unreal [start|stop|rehash|mkpasswd] for mkpasswd the 
-  format is</font></p>
-<p><font size="-1"> ./unreal mkpasswd [method] [password]</font></p>
-<p><font size="-1">* Added a new system for crypting passwords. You now do for 
-  example password &quot;my password&quot; { crypt; }; This allows you to have 
-  some crypted passwords and others not. If you have SSL enabled you may also 
-  use the md5 and sha1 methods.</font></p>
-<p><font size="-1">* The old blackhole is now set::scan::endpoint and specifies 
-  an IP and port to tell proxies to connect to.</font></p>
-<p><font size="-1">* You can now specify a cipher list for SSL links (read doc/conf.doc 
-  for more info)</font></p>
-<p><font size="-1">* +I is now in invisibility.so so it is easily disabled</font></p>
-<p><font size="-1">* set::socks has been replaced by set::scan (read doc/conf.doc 
-  for more info)</font></p>
-<p><font size="-1">* If you experience problems with the scanners, perhaps check 
-  out BOPM (http://www.blitzed.org/bopm)</font></p>
-<p><font size="-1">* log {} syslog support added (read doc/unreal32docs.html for 
-  more info)</font></p>
-<p><font size="-1">* Added ripemd-160 password encryption support</font></p>
-<p><font size="-1">* Enabled sha1 and md5 password encryption on Win32 regardless 
-  of whether SSL is used.</font></p>
-<p><font size="-1">* Added WinNT/2k/XP service support (experimental) To use this 
-  you use the unreal.exe utility: unreal install -installs the service<br>
-  unreal uninstall -uninstalls the service <br>
-  unreal start -starts the service <br>
-  unreal stop -stops the service<br>
-  unreal restart -restarts the service<br>
-  unreal rehash -rehashes the config file</font></p>
-<p><font size="-1"> Config errors and crashes are now logged to service.log when 
-  in service mode.</font></p>
-<p><font size="-1">* Implemented a new win32 debugger to make fixing bugs much 
-  easier.</font></p>
-<p><font size="-1">* Added a win32 installer to simplify installing under Windows.</font></p>
-<p><font size="-1">* AKILL/RAKILL is deprecated. Server command still works but 
-  will be removed eventually (aliases to TKL G). For normal opers it notices that 
-  the commands are deprecated.</font></p>
-<p><font size="-1">Made the config parser smarter when it comes to time values 
-  and size values. Entries are no longer limited to 1d2h1m. You can now enter 
-  &quot;1day 2 hours 1 minute&quot; for example. See doc/conf.doc for more information.</font></p>
-<p><font size="-1">* The oper override code has been rewritten to be less intrusive. 
-  You can now no longer automatically join a channel for which you must override 
-  a mode. You must /invite yourself to the channel. The idea behind this is it 
-  prevents the accidental &quot;rejoin on kick&quot; ban override and joining 
-  a +s channel without realizing it is +s and therefore you shouldn't know it 
-  exists.</font></p>
-<p><font size="-1">* If you use the SSL features of Unreal, you should use OpenSSL 
-  0.9.6e or later. This is important as the older versions may make the program 
-  exploitable. See http://www.openssl.org for more information</font></p>
-<p><font size="-1">* We have made a lot of changes to deal with SSL, and if you 
-  find any flaws or problems, please contact the coder team. We however think 
-  that the changes will make SSL more transparent and make it work more efficiently.</font></p>
-<p><font size="-1">* Added technical documentation in doc/technical. This directory 
-  will contain information about the protocol used by Unreal.</font></p>
-<p><font size="-1">* Added EGD support for SSL. EGD allows entropy to be gathered 
-  on systems that do not have a random device (/dev/random or /dev/urandom) or 
-  have an unreliable random device. Unreal has been tested using EGADS (http://www.securesoftware.com/egads.php) 
-  [With EGD support enabled], PRNGD (http://www.aet.tu-cottbus.de/personen/jaenicke/postfix_tls/prngd.html), 
-  and EGD (http://egd.sourceforge.net). Other EGD compatible programs should work 
-  as well.</font></p>
-<p><font size="-1">* We have created a new complete set of docs! doc/unreal32docs.html 
-  is now a complete<br>
-  set of docs! It is still not finished, however it contains atleast what was 
-  already<br>
-  avail. in the other doc files. <br>
-  It can also be view online @ http://www.unrealircd.com/unreal32docs.html</font></p>
-<p><font size="-1">* We have removed ./Setup - Please read the new docs for information 
-  on configuring &amp;<br>
-  setting up Unreal3.2</font></p>
-<p><font size="-1">* Removed makeconf - Read the docs to make a config file</font></p>
-<p><font size="-1">* Added set::ssl::options with the following options:<br>
-    fail-if-no-clientcert   - If SSL client connects and doesn't provide a client<br>
-                              certificate, abort connection immediately<br>
-    verify-certificate      - Check the certificate's validity using X509 methods, check if<br>
-                              we trust CA's, etc. <br>
-                              It however does slip self signed certificates through UNLESS<br>
-    no-self-signed          - Don't allow self-signed certificates through (requires<br>
-                              verify-certificate)</font></p>
-
-<p><font size="-1">* Added the ability specify which CA's are trusted using set::ssl::trusted-ca-file</font></p>
-
-<p><font size="-1">* A new configuration system has been added. The system is a bit more strict (meaning it
-  will complain more often) but it will never crash due to configuration errors, just
-  display a message saying errors exist.</font></p>
-
-<p><font size="-1">* SVSLUSERS was added to all U:lines to change local and global max user counts (this is
-  NOT meant so you can make the max count higher than it really should be.)</font></p>
-
-<p><font size="-1">* A new oper flag, can_override/v has been added. This is an attempt to stop oper abuse.
-  All opers can no longer use oper-override, this oflag MUST be in place for oper-override
-  to be allowed. Can_override is NOT assumed to be present no matter what your flags,
-  meaning you could be +N but still not be allowed to use oper-override.</font></p>
-
-<p><font size="-1">* UNKLINE and UNZLINE have been removed in favor of a system like G:lines, to remove you
-  now /kline -user@host or /zline -user@host</font></p>
-<p><font size="-1">* MAKE SURE YOU RERUN ./Config AND RUN make clean BEFORE USING 
-  THIS VERSION!!!</font></p>
-<p> </p>
-<p> </p>
-<p><font size="+2"><strong>Notes on compatibility</strong><a name="notesoncompatibility" id="notesoncompatibility"></a></font><br>
-</p>
-<p>Unreal 3.2 is ONLY compatible with Unreal3.1.4 and Unreal3.2 servers. DO NOT 
-  ATTEMPT to link to servers that it is NOT compatible with.</p>
-<p>
-</body>
-</html>

doc/coding-guidelines

@@ -39,3 +39,48 @@ Some minor rules about patches & modifications to UnrealIRCd
 8. We do NOT rip people off. If we use other people's code, it MUST be
    properly credited.
 
+9. We generally use tabsize 4 and 8. In any case, use tabs and NOT spaces.
+   Some code is old and horrible and has a mix of tabs and spaces used for
+   spacing, that's something we do not want to have ;)
+
+10. Be careful about overflows. As you know a line from a user can never be longer
+    than 511 (510?) characters, sometimes you can use this knowledge to your
+    advantage. Whenever it's not safe or when you don't know what input size you
+    can expect, use strlcpy instead of strcpy. Do not ever use strncpy, this is
+    older, slower, and does not add proper zero termination.
+    For the same reason, use snprintf if really needed. Note though, that using
+    ircsprintf with a bigger buffer (eg: 1024 bytes) is MUCH faster, so preferably
+    use that instead of snprintf. The same can be true for strcpy vs strlcpy in
+    some circumstances as well.
+
+11. Speed.  When optimizing or writing code, keep in mind that readability and
+    stability comes first, and after that comes speed. So we'd rather prefer some
+    readable code (even if difficult) over some odd highly optimized routine which
+    nobody understands, is difficult to extend, and might have several bugs.
+    As mentioned earlier: use ircsprintf, not sprintf (this is because ircsprintf
+    is optimized for simple strings like the ones we use).
+    Prefer ircsprintf with a bigger buffer over the use of snprintf, since
+    ircsprintf is much faster.
+
+12. Initialize your structs and use the proper memory calls.
+    In UnrealIRCd we use MyMalloc, MyMallocEx and MyFree (so not malloc/free).
+    MyMalloc usually maps to malloc, and MyMallocEx is a malloc plus filling
+    the memory area (eg: the struct) with zero's (a la calloc).
+    Use of MyMallocEx is suggested. In general you should not be using MyMalloc.
+    "But MyMalloc is faster!" you might say. This is true, but using MyMallocEx
+    has very little speed impact and enourmous benefits: people tend to forget
+    to set certain fields in the struct to NULL, or much more common: when
+    someone later on (eg: 1 year later) adds a field to a struct, there could
+    be several places he/she needs to update to make sure x->something is NULL
+    after allocating a new struct. Bad idea.
+    Little speed impact, huge stability benefits, easy decision ;).
+
+13. Comment your code! This should speak for itself...
+    Put comments wherever you think they are needed, to aid any further coders
+    with reading your code.. and, in fact, it will aid yourself as well if you
+    would look back at your code 2 years later.
+    If there's some obscure pitfall, do mention it! Don't just "hope" a next
+    author will see it like you did.
+
+14. Use enums whenever possible, rather than #define constants. Besides making
+    things more clean, it also aids debugging.

doc/compiling_win32.txt

@@ -1,43 +1,109 @@
 ==[ IMPORTANT MESSAGE ABOUT DISABLING NOSPOOF ]==
 Disabling NOSPOOF at windows (w9x, nt, w2k, xp) is NOT recommended since this
-will allow users to use "spoofed hosts" (like the IP of someone you trust).
+WILL allow users to use "spoofed hosts" (like the IP of someone you trust).
 
-If you got problems with NOSPOOF fix your client (bot?) instead (you should
-PONG back to the initial PING at connect).
+If you have problems with NOSPOOF, fix your client (bot?) instead (you should PONG
+back to the initial PING at connect).
 
-==[ HOW TO COMPILE UNREALIRCD WITHOUT SSL AT WINDOWS ]==
-First of all you need Microsoft Visual C++, compiling with cygwin
-is not supported.
+==[ GENERAL GUIDELINES ]==
+First of all you need Microsoft Visual C++ (see below), compiling with
+cygwin is not supported (nor is there any good reason to do so).
 
-== "old" VC++ 6.0 ==
-1. You need the Platform SDK (PSDK)
-   Grab it at: http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ ->
-   core sdk -> install this sdk.
-   Note that this can take some time to download because it's >200Mb
-   (450mb installed) [!].
-2. To compile:
-   start -> programs -> platform sdk blabla -> open build env. -> (choose os) ->
-   set blabla build env (debug). This will launch a DOS window.
-3. Go to your UnrealIrcd dir (like: cd \dev\unreal3.2) and then compile with:
-   nmake -f makefile.win32
-   This will generate a wircd.exe and unreal.exe
-4. Copy the src\win32\tre.dll to your UnrealIrcd main dir.
-5. Done!
+Compatible compilers:
+cygwin     NOT supported. Will not work. Should be no reason to use this anyway.
+msvc 6.x   Microsoft Visual Studio 6 does not work, this compiler is too old.
+msvc 7.x   Microsoft Visual Studio 7.x (.NET) will work just fine
+msvc 8.x   Microsoft Visual Studio 8.x (.NET 2005), including the free kit,
+           should work fine (since Unreal3.2.5).
 
-== VC++ 7.x (.NET) ==
+If you don't have the paid version of Microsoft Visual Studio 7.x, then you can
+use the FREE development kit and PSDK as explained below:
+1. Download the MS Visual Studio Development kit at:
+   http://msdn.microsoft.com/visualc/vctoolkit2003/
+2. Install the Platform Software Development Kit (PSDK) from:
+   http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
+3. NOTE: Whenever you need to compile something we say 'Start the Visual Studio
+   .NET Command Prompt' below, but you - a person using the free version - will
+   actually have to start the Platform SDK Prompt instead (check out the
+   Start Menu).
+
+== Simple compile (no SSL/ZIP/Remote includes) ==
 1. Start the Visual Studio .NET Command Prompt
-2. Go to your UnrealIrcd dir (like: cd \dev\unreal3.2) and then compile with:
+2. Go to your UnrealIRCd dir (like: cd \dev\unreal3.2) and then compile with:
    nmake -f makefile.win32
    This will generate a wircd.exe and unreal.exe
-3. Copy the src\win32\tre.dll to your UnrealIrcd main dir.
+3. Copy the src\win32\tre.dll to your UnrealIRCd main dir.
 4. Done!
 
-==[ HOW TO COMPILE UNREALIRCD WITH SSL AT WINDOWS ]==
-Ouch, that's much work ;).
-You need to compile openssl yourself.
-Then have a look at makefile.win32 for instruction on how
-to enable / specify path / etc...
-DO NOT ask us for help with compiling openssl!
+== Compiling modules ==
+1. Put your module (the .c file) in src\modules (eg: c:\dev\unreal3.2\src\modules).
+2. Start the Visual Studio .NET Command Prompt
+3. Go to your UnrealIRCd dir (like: cd \dev\unreal3.2).
+4. Compile the module with:
+   nmake -f makefile.win32 custommodule MODULEFILE=<name>
+   <name> is the name of the module WITHOUT the .c suffix, so if your
+   module has the filename 'm_crappymod.c', then you use:
+   nmake -f makefile.win32 custommodule MODULEFILE=m_crappymod
+5. Done. A .dll file should have been created.
 
-==[ AND ZIP LINKS SUPPORT? ]==
-See makefile.win32 for instructions.
+If you compiled with VC7 and used the official source (not a CVS version,
+but for example 3.2.1 source) then the module should work on all these
+versions (binary compatible) and you could for example put them on
+your website so users can download them.
+Such a module will work on both SSL and non-SSL, there should be no need
+for separate versions... unless, of course, you use SSL-specific code in your
+mod.
+DO NOT download a CVS version & compile your mod and then start
+distributing the .dll for use at another (non-CVS) version!!
+Every time we change a struct (and in some other cases) it makes the
+binary/module binary incompatible which practically means that your module
+might seem to work fine at first (or not..) but will CRASH or cause memory
+corruption and other subtle errors.
+
+== COMPILING WITH ZIP LINKS / SSL / REMOTE INCLUDES SUPPORT ==
+First of all, DO NOT use any precompiled libs from the official
+zlib/openssl/curl sites. We require certain compile parameters.
+Versions downloaded from such sites will often CRASH.
+
+The easiest is to download the UnrealIRCd development package
+which contains zlib, openssl and curl precompiled for you.
+See: www.vulnscan.org/unrealwin32dev/
+
+Just extract it somewhere (eg: to c:\dev).
+Then, use compile flags to enable the features + specify where to look.
+Here are examples if you used c:\dev:
+ZIP: nmake -f makefile.win32 USE_ZIPLINKS=1 ZLIB_INC_DIR="c:\dev\zlib" ZLIB_LIB_DIR="c:\dev\zlib\dll32"
+SSL: nmake -f makefile.win32 USE_SSL=1 OPENSSL_INC_DIR="c:\dev\openssl\include" OPENSSL_LIB_DIR="c:\dev\openssl\lib" 
+CURL: nmake -f makefile.win32 USE_REMOTEINC=1 LIBCURL_INC_DIR="c:\dev\curl\include" LIBCURL_LIB_DIR="c:\dev\curl\lib"
+
+Obviously you can (and probably will) combine all these options, like
+to build a zip+ssl+curl version (all in 1 line):
+nmake -f makefile.win32 USE_ZIPLINKS=1 ZLIB_INC_DIR="c:\dev\zlib" ZLIB_LIB_DIR="c:\dev\zlib\dll32"
+USE_SSL=1 OPENSSL_INC_DIR="c:\dev\openssl\include" OPENSSL_LIB_DIR="c:\dev\openssl\lib" USE_REMOTEINC=1
+LIBCURL_INC_DIR="c:\dev\curl\include" LIBCURL_LIB_DIR="c:\dev\curl\lib"
+
+== SYMBOL FILES ==
+If you get something like this:
+
+  Creating library L_COMMANDS.lib and object L_COMMANDS.exp
+M_OPER.obj : error LNK2019: unresolved external symbol _sendto_snomask_global re
+ferenced in function _m_oper
+
+(note: the exact name of the symbol will vary)
+
+Then you will have to rebuild the wircd.def symbol file. You do this by
+downloading http://www.vulnscan.org/tmp/dlltool.exe and putting the file somewhere
+in your path (eg: c:\winnt\system32).
+Then, to compile you do this:
+nmake -f makefile.win32 [your other options here]
+nmake -f makefile.win32 SYMBOLFILE
+nmake -f makefile.win32 [your other options here]
+
+So basically you just run 'nmake -f makefile.win32 SYMBOLFILE' and then restart
+compiling again.
+
+== COMPILING ZLIB/SSL/CURL YOURSELF ==
+This is off-topic and not explained here.
+Again, use the stuff from the win32 development pack unless you have a good
+reason to do otherwise (in which case we might not support your self-compiled version
+because we work with specific versions / compile options).

doc/example.conf

@@ -14,9 +14,11 @@
  * closing } line. The IRCd will ignore commented lines.
  *
  * PLEASE READ doc/unreal32docs.html! The online version is also available at:
- * www.vulnscan.org/UnrealIrcd/unreal32docs.html
+ * www.vulnscan.org/UnrealIRCd/unreal32docs.html
  * It contains a lot information about the configfile: gives information about
  * every block, variable, etc..
+ * If you try to edit this file without reading the documentation properly
+ * then you are pretty much guaranteed to fail!
  */
 
 /* Type of comments */
@@ -26,10 +28,17 @@
 #those lines are ignored by the ircd.
 
 /*
- * At *NIX UnrealIrcd supports modules.
- * Loading the commands module is required:
+ * UnrealIRCd supports modules, loading some of them is required.
+ * You need at least the commands module and a cloaking module.
  */
-loadmodule "src/modules/commands.so";
+
+/* FOR *NIX, uncomment the following 2lines: */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* FOR Windows, uncomment the following 2 lines: */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
 
 /*
  * You can also include other configuration files.
@@ -65,7 +74,8 @@ me
 
 /*
  * NEW: admin {} 
- * OLD: A:Line Admin gives information on the server admin. you
+ * OLD: A:Line
+ * Admin gives information on the server admin. you
  * may put as many lines under admin { as you wish. 
  * Syntax is as follows:
  * admin {
@@ -180,39 +190,10 @@ allow           channel {
  * };
  */
 
-/* OLD OPER FLAG  | NEW FLAG NAME
-	O		global
-	o		local
-	a		services-admin
-	A		admin
-	r		can_rehash
-	D		can_die
-	R		can_restart
-	h		helpop
-	w		can_wallops
-	g		can_globops
-	c		can_localroute
-	L		can_globalroute
-	k		can_localkill
-	K		can_globalkill
-	b		can_kline
-	Z		can_gzline
-	t		can_gkline
-	B		can_unkline
-	n		can_localnotice
-	G		can_globalnotice
-	N		netadmin
-	C		coadmin
-	z		can_zline
-	W		get_umodew
-	H		get_host
-	v		can_override
-*/
 
-/*
-Note: netadmin gives you OaAN
-admin and services-admin give you o as well
-*/
+/* For a list of oper flags, see doc/unreal32docs.html#operblock
+ * [HIGHLY recommended to read]
+ */
 
 oper bobsmith {
 	class           clients;
@@ -223,9 +204,13 @@ oper bobsmith {
 	flags
 	{
 		netadmin;
+		can_zline;
+		can_gzline;
+		can_gkline;
 		global;
 	};
 };
+
 /*
  * NEW: listen {}
  * OLD: P:Line
@@ -277,6 +262,14 @@ listen         *:6697
 listen         *:8067;
 listen         *:6667;
 
+/* NOTE: If you are on an IRCd shell with multiple IP's you are
+ *       likely to get 'Address already in use' errors in your log
+ *       and the ircd won't start. This means you MUST bind
+ *       to a specific IP instead of '*', so for example:
+ *       listen 1.2.3.4:6667;
+ *       Obviously, replace the IP with the IP that was assigned to you.
+ */
+
 /*
  * NEW: link {}
  * OLD: C/N:Lines
@@ -297,9 +290,9 @@ listen         *:6667;
  *	options {
  *		(options here*);
  *	};
- *      /* If we use SSL, we can choose what cipher to use in SSL mode
- *       * Retrieve a list by "openssl ciphers", seperate ciphers with :'s
- *      */
+ *      // If we use SSL, we can choose what cipher to use in SSL mode
+ *      // Retrieve a list by "openssl ciphers", separate ciphers with :'s
+ *      
  *      ciphers "DES-CBC3-MD5";
  * 
  * };
@@ -327,9 +320,7 @@ link            hub.mynet.com
 	password-receive "LiNk";
 	class           servers;
 		options {
-			/* Note: You should not use autoconnect when linking
-			 * services
-			 */
+			/* Note: You should not use autoconnect when linking services */
 			autoconnect;
 			ssl;
 			zip;
@@ -374,8 +365,6 @@ drpass {
  * 
  * FLAGS: errors, kills, tkl, connects, server-connects, kline, oper
  * 
- * NOTICE: Right now, SEGV messages are *always* sent to ircd.log. codemastr is
- * working on a way to redirect the messages to this log file. *
  * Syntax: 
  * log "log file" 
  * {
@@ -399,6 +388,10 @@ log "ircd.log" {
 		server-connects;
 		kills;
 		errors;
+		sadmin-commands;
+		chg-commands;
+		oper-override;
+		spamfilter;
 	};
 };
 
@@ -410,7 +403,7 @@ log "ircd.log" {
  *
  * Syntax:
  * alias "name" {
- *	nick "points to";
+ *	target "points to";
  *	type aliastype;
  * };
  *
@@ -419,14 +412,14 @@ log "ircd.log" {
 
 // This points the command /nickserv to the user NickServ who is connected to the set::services-server server
 /*alias NickServ {
-	nick "NickServ";
+	target "NickServ";
 	type services;
 };*/
 
 // If you want the command to point to the same nick as the command, you can leave the nick entry out
 //alias ChanServ { type services; };
 
-// Points the /statserv command to the user StatServ on the set::stats-name server
+// Points the /statserv command to the user StatServ on the set::stats-server server
 //alias StatServ { type stats; };
 
 // Points the /superbot command to the user SuperBot
@@ -448,7 +441,7 @@ alias StatServ { type stats; };
  * Syntax:
  * alias "name" {
  *	format "format string" {
- *		nick "points to";
+ *		target "points to";
  *              type aliastype;
  *		parameters "parameters to send";
  *	};
@@ -461,12 +454,12 @@ alias StatServ { type stats; };
 /*
 alias "identify" {
 	format "^#" {
-		nick "chanserv";
+		target "chanserv";
 		type services;
 		parameters "IDENTIFY %1-";
 	};
 	format "^[^#]" {
-		nick "nickserv";
+		target "nickserv";
 		type services;
 		parameters "IDENTIFY %1-";
 	};
@@ -481,18 +474,19 @@ alias "identify" {
 
 /* The alias::format::parameters is similar to scripting languages. %N (where N is a number) represents a
  * parameter sent to the command (in this case /identify). If you specify %N- it means all parameters from
- * N until the last parameter in the string.
+ * N until the last parameter in the string. You may also specify %n which is replaced by
+ * the user's nickname.
 */
 
 /* Standard aliases */
 alias "services" {
 	format "^#" {
-		nick "chanserv";
+		target "chanserv";
 		type services;
 		parameters "%1-";
 	};
 	format "^[^#]" {
-		nick "nickserv";
+		target "nickserv";
 		type services;
 		parameters "%1-";
 	};
@@ -501,18 +495,30 @@ alias "services" {
 
 alias "identify" {
 	format "^#" {
-		nick "chanserv";
+		target "chanserv";
 		type services;
 		parameters "IDENTIFY %1-";
 	};
 	format "^[^#]" {
-		nick "nickserv";
+		target "nickserv";
 		type services;
 		parameters "IDENTIFY %1-";
 	};
 	type command;
 };
 
+/* This is an example of a real command alias */
+/* This maps /GLINEBOT to /GLINE <parameter> 2d etc... */
+alias "glinebot" {
+	format ".+" {
+		command "gline";
+		type real;
+		parameters "%1 2d Bots are not allowed on this server, please read the faq at http://www.example.com/faq/123";
+	};
+	type command;
+};
+
+
 
 /*
  * NEW: tld {}
@@ -533,6 +539,11 @@ tld {
 	rules "ircd.rules.fr";
 };
 
+/* note: you can just delete the example block above,
+ * in which case the defaults motd/rules files (ircd.motd, ircd.rules)
+ * will be used for everyone.
+ */
+
 /*
  * NEW: ban nick {}
  * OLD: Q:Line
@@ -696,14 +707,18 @@ set {
 	help-channel 		"#ROXnet";
 	hiddenhost-prefix	"rox";
 	/* prefix-quit 		"no"; */
-	/* Your cloak keys should be 3 random numbers between 10000 and 2147483646
-	 * and should be the same at all servers on the network.
+	/* Cloak keys should be the same at all servers on the network.
 	 * They are used for generating masked hosts and should be kept secret.
+	 * The keys should be 3 random strings of 5-100 characters
+	 * (10-20 chars is just fine) and must consist of lowcase (a-z),
+	 * upcase (A-Z) and digits (0-9) [see first key example].
+	 * HINT: On *NIX, you can run './unreal gencloak' in your shell to let
+	 *       Unreal generate 3 random strings for you.
 	 */
 	cloak-keys {
-		9666;
-		3333;
-		3330;
+		"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+		"and another one";
+		"and another one";
 	};
 	/* on-oper host */
 	hosts {
@@ -724,11 +739,6 @@ set {
 	modes-on-connect "+ixw";
 	modes-on-oper	 "+xwgs";
 	oper-auto-join "#opers";
-	dns {
-		nameserver 127.0.0.1;
-		timeout 2s;
-		retries 2;
-	};
 	options {
 		hide-ulines;
 		/* You can enable ident checking here if you want */
@@ -755,7 +765,7 @@ set {
 	 */
 	oper-only-stats "okfGsMRUEelLCXzdD";
 
-	/* Throttling: this example sets a limit of 3 connections per 60s (per host). */
+	/* Throttling: this example sets a limit of 3 connection attempts per 60s (per host). */
 	throttle {
 		connections 3;
 		period 60s;
@@ -777,8 +787,8 @@ set {
 
 /*
  * Problems or need more help?
- * 1) www.vulnscan.org/UnrealIrcd/unreal32docs.html
- * 2) www.vulnscan.org/UnrealIrcd/faq/ <- contains 80% of your questions!
+ * 1) www.vulnscan.org/UnrealIRCd/unreal32docs.html
+ * 2) www.vulnscan.org/UnrealIRCd/faq/ <- contains 80% of your questions!
  * 3) If you still have problems you can go irc.ircsystems.net #unreal-support,
  *    note that we require you to READ THE DOCUMENTATION and FAQ first!
  */

doc/example.de.conf

@@ -0,0 +1,787 @@
+/*
+ * example.conf von Daniel Hawton AKA Osiris (osiris@unrealircd.org).
+ * $Id$
+ * 
+ * Arbeitet mit Unreal3.2 und darüber
+ * 
+ * Dies hier ist die neue example.conf. Sie ähnelt irgendwie ein wenig C++ und sie
+ * soll sie jedenfalls einmal erläutert werden. Es ist ein wenig schwer, erstmals
+ * damit umzugehen, aber mit ein Wenig Übung und sorgfältigem Lesen sollte das zu 
+ * verstehen sein.
+ *
+ * Diese Datei ist einfach in das Hauptverzeichnis des UnrealIRCD zu kopieren und in
+ * 'unrealircd.conf' umzubenennen.
+ * 
+ * ZU BEACHTEN: Sämtliche Zeilen außer der mit einer '{' zu Beginn werden mit dem Zeichen
+ * ';' beendet, auch die Zeile mit '}'. (Beliebter Syntaxfehler!)
+ * Kommentar Zeilen werden vom IRCd ignoriert.
+ *
+ * BITTE LESE die doc/unreal32docs.html! Sie ist auch online erhältlich bei:
+ * www.vulnscan.org/UnrealIrcd/unreal32docs.html
+ * Diese Datei enthält zahlreiche ergänzende Informationen über jeden Block, Variablen usw.
+ * Übersetzung durch stylus740@smart-irc.de (bei irc.smart-irc.net)
+ */
+
+/* Kommentar Typen */
+#Kommentar Typ 1 (Shell Typ)
+// Kommentar Typ 2(C++ Stil)
+/* Kommentar Typ 3 (C Stil) */
+#Solche Zeilen vom Typ 1, 2 oder 3 werden vom ircd ignoriert.
+
+/*
+ * UnrealIRCd arbeitet mit Modulen, die geladen werden, wenn sie benötigt werden.
+ * Man benötigt mindestens das commands Modul und ein cloaking Modul.
+ */
+
+/* FÜR *NIX (Unix, Linux, Xenix etc.), sind diese 2 Zeilen auszukommentieren: */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* FÜR Windows sind diese 2 Zeilen auszukommentieren: */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
+
+/*
+ * Man kann über eine 'include' Anweisung auch weitere Konfigurationsdateien einfügen.
+ * help.conf enthält sämtliche /helpop Texte. Die badwords.*.conf filtert alle badword
+ * Einträge für den Modus +G...
+ * Die spamfilter.conf enthält einige wirksame Regeln für aktuelle Trojaner.
+ * Falls man diese Dateien mit einfügen möchte:
+ */
+include "help.conf";
+include "badwords.channel.conf";
+include "badwords.message.conf";
+include "badwords.quit.conf";
+include "spamfilter.conf";
+
+/*
+ * NEU: me {} 
+ * ALT: M:Line 
+ * me {} legt Name, Beschreibung und eindeutige Nummer ('numeric') für diesen Server fest.
+ * Syntax ist wie folgt: 
+ * me { 
+ *  name "server.name"; 
+ *  info "Server Beschreibung";
+ *  numeric (server numeric*);
+ * }; 
+ * Falls der Server mit anderen gelinkt wird, darf muss die Nummer bei 'numeric' eindeutig
+ * sein, darf also von keinem anderen Server im Netzwerk verwendet werden.
+ */
+me
+{
+	name "irc.foonet.com";
+	info "FooNet Server";
+	numeric 1;
+};
+
+/*
+ * NEU: admin {} 
+ * ALT: A:Line 
+ * Admin liefert Informationen über den Server Administrator. Man kann
+ * so viele Zeilen unter 'admin {' angeben, wie man will. 
+ * Syntax ist wie folgt:
+ * admin {
+ *   "erste Zeile"; 
+ *   "zweite Zeile"; 
+ *   [usw]
+ * };
+ */
+admin {
+	"Bob Smith";
+	"bob";
+	"widely@used.name";
+};
+
+/*
+ * NEU: class {} 
+ * ALT: Y:line (alte Form war verwirrend) 
+ * Hiermit werden Klassen und ihre Einstellungen festgelegt. Eine Klasse ist eine Gruppen-
+ * einstellung für Verbindungen. So kann man beispielsweise Server Verbindungen in einer
+ * eigenen Klasse behandeln, statt zusammen mit Clients.
+ * Syntax ist wie folgt:
+ * class (class name)
+ * {
+ *     pingfreq (wie oft in Sekunden wird ein user/server angepingt);
+ *     maxclients (wie viele Verbindungen sind in dieser Klasse möglich);
+ *     sendq (maximale send Queue einer Verbindung);
+ *     recvq (maximale Empfangs Queue einer Verbindung [Flood Kontrolle!]);
+ *  };
+ */
+
+class           clients
+{
+	pingfreq 90;
+	maxclients 500;
+	sendq 100000;
+	recvq 8000;
+};
+
+class           servers
+{
+	pingfreq 90;
+	maxclients 10;		/* Wieviele Servers können gleichzeitig gelinkt sein */
+	sendq 1000000;
+	connfreq 100;           /* Wieviele Sekunden zwischen jedem Verbindungsversuch */
+};
+
+/*
+ * NEU: allow {} 
+ * ALT: I:Line
+ * Hier wird festgelegt, welche Verbindungen erlaubt sind...
+ * Grundlegend kann man damit Clienten erlauben, zu verbinden und hat etwas Kontrolle
+ * Syntax ist wie folgt: 
+ * allow {
+ *    ip (ip Maske für allow);
+ *    hostname (host Maske);
+ *    class (Klasse, die zugewiesen wird [siehe class {}]);
+ *    password "(password)"; (optional)
+ *    maxperip (wie viele Verbindungen je IP); (optional) 
+ * };
+ */
+
+allow {
+	ip             *@*;
+	hostname       *@*;
+	class           clients;
+	maxperip 5;
+};
+
+/* Passworded allow line */
+allow {
+	ip             *@255.255.255.255;
+	hostname       *@*.passworded.ugly.people;
+	class           clients;
+	password "f00Ness";
+	maxperip 1;
+};
+
+/*
+ * NEU: allow channel {} 
+ * ALT: chrestrict 
+ * Erlaubt es Usern, einen Channel zu betreten...
+ * Ist wie eine Ausnahme von 'deny channel'. 
+ * Syntax ist wie folgt:
+ * allow channel {
+ *   channel "channel name";
+ * };
+ */
+allow           channel {
+	channel "#WarezSucks";
+};
+
+/*
+ * NEU: oper {} 
+ * ALT: O:Line 
+ * Legt einen IRC Operator fest
+ * IRC Operatoren halten den Server in Ordnung, warten ihn und halten die Verbindung 
+ * zum Netzwerk. 
+ * Syntax ist wie folgt: 
+ * oper (login) { 
+ *     class (Klasse, die zugewiesen wird, falls anders als meine, wird eine neuee Klasse
+ *                zugewiesen); 
+ *     from { 
+ *        userhost (ident@host);
+ *        userhost (ident@host);
+ *     }; 
+ *     flags
+ *     { 
+ *       (Flags hier*);
+ *     };
+ *     ODER
+ *     flags "alte Form von Flags, wie OAaRD";
+ * };
+ */
+
+
+/* Die Liste möglicher Oper Flags kann in doc/unreal32docs.html#operblock nachgelesen werden
+ * [WIRKLICH empfehlenswert, zu lesen!]
+ */
+
+oper bobsmith {
+	class           clients;
+	from {
+		userhost bob@smithco.com;
+	};
+	password "f00";
+	flags
+	{
+		netadmin;
+		can_zline;
+		can_gzline;
+		can_gkline;
+		global;
+	};
+};
+
+/*
+ * NEU: listen {}
+ * ALT: P:Line
+ * Legt den Port fest, an dem der ircd 'lauscht', um Usern/Servern zu erlauben, eine 
+ * Verbindung zum Server aufzunehmen. 
+ * Syntax ist wie folgt:
+ * listen (ip number):(port number) 
+ * { 
+ *   options {
+ *     (options here);
+ *   };
+ * };
+ * oder für ein einfaches listen:
+ * listen (ip):(port);
+ * 
+ * ACHTUNG: für ipv6 ips (3ffe:b80:2:51d::2 etc), benutze listen [ip]:port;
+ * 
+ * Das funktioniert ebenfalls.
+ */
+
+/* Options for listen:
+	OLD	| 	NEW
+	S		serversonly
+	C		clientsonly
+	J		java
+	s		ssl
+	*		standard
+*/
+
+/* ZU BEACHTEN BEI SSL PORTS: SSL Ports sind nicht standardisiert.
+ * Es wird oft gesagt, man solle den Port 994 benutzen, weil dies der
+ * offizielle SSL Port sei. Aber das erfordert root Rechte! Andererseits
+ * ist der Port 194 der offizielle Port und wann hat man je einen Ircd
+ * auf diesem Port laufen gesehen?
+ * Unsere Empfehlung ist, den Port 6697 für SSL zu benutzen, wie es auch
+ * bei vielen anderen Netzwerken gemacht wird und für z.B. StunTour benutzt wird.
+ * Man kann so viele SSL Ports öffnen, wie man will, aber wenn man (auch) den Port
+ * 6697 benutzt, hilft man mit, die Welt ein klein wenig zu standardisieren ;).
+ */
+listen         *:6697
+{
+	options
+	{
+		ssl;
+		clientsonly;
+	};
+};
+
+listen         *:8067;
+listen         *:6667;
+
+/* ACHTUNG: Wird der IRCd auf einer Shell mit verschiedenen IP's ausgeführt, kann
+ *          die Fehlermeldung 'Address already in use' ('Adresse wird schon benutzt')
+ *          in den Logfiles auftauchen und der IRCd startet nicht.
+ *          Das bedeutet, dass man eine spezifische Adresse anstelle von '*' definieren
+ *          MUSS, wie z.B.:
+ *          listen 1.2.3.4:6667;
+ *          Es sollte klar sein, dass die IP durch die zu ersetzen ist, die einem
+ *          zugewiesen ist.
+ */
+
+/*
+ * NEU: link {}
+ * ALT: C/N:Lines
+ * Hiermit wird ein okay für eine Server Verbindung festgelegt.
+ * ACHTUNG: BEIDE SERVER MÜSSEN EINE LINK {} EINSTELLUNG HABEN, UM KORREKT ZU VERBINDEN!
+ * Syntax ist wie folgt:
+ * link (server name)
+ * {
+ *	username	(username, * funktioniert auch);
+ * 	hostname	(ip Nummer/Hostmaske);
+ *	bind-ip	(Welche IP soll zum Verbinden benutzt werden, oder *);
+ *	port		(Port, zu dem verbunden werden soll);
+ *	hub (Wenn dies ein Hub ist, funktioniert * , oder Servermasken);
+ *	[oder leaf *;]
+ *	password-connect "(Passwort zu senden)";
+ *	password-receive "(Passwort, welches wir emfangen sollten)";
+ *	class		(Klasse, in die Server sollen);
+ *	options {
+ *		(options hier*);
+ *	};
+ *      // Wird SSL benutzt, kann bestimmt werden, welche Verschlüsselung im SSL 
+ *      // Modus zu benutzen ist
+ *      // Bei mehreren "openssl ciphers" sind die einzelnen Verschlüsselungen 
+ *      // durch ':' zu trennen
+ *      
+ *      ciphers "DES-CBC3-MD5";
+ * 
+ * };
+*/
+
+/*
+	options:
+	OLD	|	NEW
+	S		ssl
+	Z		zip
+	N/A		autoconnect
+	N/A		quarantine
+	N/A		nodnscache
+*/
+
+
+link            hub.mynet.com
+{
+	username	*;
+	hostname 	1.2.3.4;
+	bind-ip 	*;
+	port 		7029;
+	hub             *;
+	password-connect "LiNk";
+	password-receive "LiNk";
+	class           servers;
+		options {
+			/* Achtung: autoconnect sollte nicht benutzt werden, wenn man Services linkt */
+			autoconnect;
+			ssl;
+			zip;
+		};
+};
+/*
+ *
+ * NEU: ulines {}
+ * ALT: U:Line
+ * U-lines geben Servern mehr Möglichkeiten/Befehle, sie sollten NUR für Services/Stats
+ * gesetzt werden und NIEMALS für normale UnrealIRCd Server!
+ * Syntax ist wie folgt:
+ * ulines {
+ *	(server to uline);
+ *	(server to uline);
+ *  [etc]
+ * };
+*/
+ulines {
+	services.roxnet.org;
+	stats.roxnet.org;
+};
+
+/*
+ * NEU: drpass {}
+ * ALT: X:Line
+ * Hiermit werden die Passworte für /die und /restart festgelegt.
+ * Syntax ist wie folgt:
+ * drpass { 
+ *  restart			"(Passwort für Restart)";
+ *  die		      "(Passwort für die (die = 'sterben' = Abschaltung))";
+ * };
+ */
+drpass {
+	restart "I-love-to-restart";
+	die "die-you-stupid";
+};
+
+/*
+ * NEU: log {} ALT: N/A Festlegung von Namen und Speicherort der Logfiles. Man kann
+ * beliebig viele festlegen.
+ * 
+ * FLAGS: errors, kills, tkl, connects, server-connects, kline, oper
+ * 
+ * Syntax: 
+ * log "log file" 
+ * {
+ *    flags
+ *    {
+ *        flag;
+ *        flag; 
+ *        etc.. 
+ *    }; 
+ * };
+ */
+
+log "ircd.log" {
+	/* Lösche das Logfile und starte ein neues, wenn 2MB erreicht wurden,  
+	   nichts festlegen, wenn man immer das gleiche Log will */
+	maxsize 2097152;
+	flags {
+		oper;
+		kline;
+		connects;
+		server-connects;
+		kills;
+		errors;
+		sadmin-commands;
+		chg-commands;
+		oper-override;
+		spamfilter;
+	};
+};
+
+/*
+ * NEU: alias {}
+ * ALT: N/A
+ * Hier kann man Befels Aliasse festlegen, wie z.B. /nickserv, /chanserv usw.
+ * FLAGS: services, stats, normal
+ *
+ * Syntax:
+ * alias "name" {
+ *	target "points to";
+ *	type aliastype;
+ * };
+ *
+ * [ACHTUNG: Mann kann hier auch eine Datei mit vordefinierten Aliassen per include
+ * einfügen. Siehe auch: doc/unreal32docs.html Abschnitt 2.9]
+ */
+
+// Hiermit wird der Befehl /nickserv an den User NickServ geleitet, welcher zur Einstellung set::services-server server verbunden ist
+/*alias NickServ {
+	target "NickServ";
+	type services;
+};*/
+
+// Soll der Befehl auf denselben Nick wie das der Befehl leiten, kann man den Nick auslassen
+//alias ChanServ { type services; };
+
+// leitet den /statserv Befehl an den User StatServ aus set::stats-server server
+//alias StatServ { type stats; };
+
+// leitet den /superbot Befehl an den User SuperBot
+//alias SuperBot { type normal; };
+
+
+/* Standard Aliasse */
+alias NickServ { type services; };
+alias ChanServ { type services; };
+alias OperServ { type services; };
+alias HelpServ { type services; };
+alias StatServ { type stats; };
+
+/*
+ * NEU: alias {}
+ * ALT: N/A
+ * Hier können Befehls Aliase, wie z.B.: /identify, /services, usw festgelegt werden.
+ *
+ * Syntax:
+ * alias "name" {
+ *	format "format string" {
+ *		target "zeigt auf";
+ *              type aliastype;
+ *		parameters "zu sendende Parameter";
+ *	};
+ *	type command;
+ * };
+ */
+/* Die nachfolgenden Zeilen eigens deshalb, um zu zeigen, dass trotz gleichem Namens die vorherige Anweisung
+ * völlig unterschiedlich in der Syntax ist, obwohl eine ähnliche Funktion unterstützt wird.
+ */
+/*
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+*/
+/* Die alias::format Anweisung ist ein regulärer Ausdruck. Das erste Format passt auf den /identify Befehl,
+ * wenn das erste Zeichen ein # ist. Dann wird dies an den chanserv alias mit dem Parameters IDENTIFY
+ * %1- übergeben. Das zweite Format passt auf den /identify Befehl, wenn das erste Zeichen kein # ist. Danach
+ * wird der Befehl an den nickserv alias mit den Parameters IDENTIFY %1- geleitet.
+ */
+
+/* Die alias::format::parameters Scripting Sprachen ähnlich. %N (wobei N einen Nummer ist) repräsentiert einen
+ * Parameter, der an den Befehl (in diesem Fall /identify) zu senden ist. Wird  %N- angegeben, bedeutet dies
+ * alle Parameter vom N bis zum letzten Parameter des Strings. Man kann ebenso %n angeben, welches durch den 
+ * Nicknamen des users ersetzt wird.
+*/
+
+/* Standard Aliasse */
+alias "services" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "%1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "%1-";
+	};
+	type command;
+};
+
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+
+
+/*
+ * NEU: tld {}
+ * ALT: T:Line
+ * Hiermit werden unterschiedliche motd und rules Dateien in Abhängigkeit
+ * von der Hostmaske des Clients eingestellt.
+ * Syntax ist wie folgt: 
+ * tld {
+ *    mask (ident@host);
+ *    motd "(motd file)";
+ *    rules "(rules file)";
+ * };
+ */
+
+tld {
+	mask *@*.fr;
+	motd "ircd.motd.fr";
+	rules "ircd.rules.fr";
+};
+
+/* zu beachten: Will man nur die default motd/rules Dateien (ircd.motd, ircd.rules)
+ * für jedermann benutzen, genügt es, den obigen Beispiel Block einfach zu löschen.
+ */
+
+/*
+ * NEU: ban nick {}
+ * ALT: Q:Line
+ * Bannt einen Nicknamen, so dass dieser nicht benutzt werden kann.
+ * Syntax ist wie folgt:
+ * ban nick {
+ *	mask "(nick to ban)";
+ *	reason "(reason)";
+ * };
+*/
+ban nick {
+	mask "*C*h*a*n*S*e*r*v*";
+	reason "Reserviert für Services";
+};
+/*
+ * NEU: ban ip {}
+ * ALT: Z:Line
+ * Bannt eine IP, so dass diese nicht mehr zum Netzwerk verbinden kann.
+ * Syntax:
+ * ban ip { mask (ip Nummer/Hostmaske); reason "(Grund)"; };
+*/
+ban ip {
+	mask 195.86.232.81;
+	reason "Server nicht mehr gelinkt";
+};
+/*
+ * NEU: ban server {}
+ * ALT: Server Q:Line
+ * Nimmt einem Server die Möglichkeit, zum Neztwerk zu verbinden.
+ * Wenn der Server zu einem anderen Server des Netzwerkes linkt, wird der
+ * lokale server die Verbindung zum Netzwerk trennen.
+ * Syntax ist wie folgt:
+ * ban server {
+ *	mask "(Server Name)";
+ *	reason "(angegebener Grund)";
+ * };
+*/
+
+ban server {
+	mask eris.berkeley.edu;
+	reason "Hau ab hier.";
+};
+/*
+ * NEU: ban user {}
+ * ALT: K:Line
+ * Bewirkt, dass ein User mit einer bestimmten Maske nicht mehr zum Server verbinden kann.
+ * Syntax:
+ * ban user { mask (Hostmaske/ip Nummer); reason "(Grund)"; };
+*/
+
+ban user {
+	mask *tirc@*.saturn.bbn.com;
+        reason "Idiot";
+};
+
+/*
+ * NEU: ban realname {}
+ * ALT: n:Line
+ * Verhindert, dass ein bestimmter Realname benutzt werden kann.
+ * Syntax:
+ * ban realname {
+ *	mask "(Realname)";
+ * 	reason "(Grund)";
+ * };
+*/
+
+ban realname {
+	mask "Swat Team";
+	reason "mIRKFORCE";
+};
+
+ban realname {
+	mask "sub7server";
+	reason "sub7";
+};
+
+/*
+ * Sämtliche Banns dürfen durch zusätzliche Einträge wiederholt werden!
+ * 
+ * NEU: except ban {} 
+ * ALT: E:Line
+ * Diese Maske ist von Banns ausgenommen. 
+ * Syntax:
+ * except ban { mask (ident@host); };
+ * except ban {} kann so oft angegeben werden, wie man für verschiedene Hosts will.
+ */
+
+except ban {
+	/* don't ban stskeeps */
+	mask           *stskeeps@212.*;
+};
+
+/*
+ * NEU: deny dcc {} 
+ * ALT: dccdeny.conf
+ * Mit diesem Block können dcc send's geblockt werden... Gut, um Viren aufzuhalten. 
+ * Syntax: 
+ * deny dcc 
+ * { 
+ *   filename "zu sperrende Datei(ie, *exe)";
+ *   reason "Grund";
+ * };
+ */
+deny dcc {
+	filename "*sub7*";
+	reason "Möglicherweise Sub7 Virus";
+};
+
+/*
+ * NEU: deny channel {}
+ * ALT: N/A (NEW)
+ * Verhindert, dass angegebene Channels benutzt werden können.
+ * Syntax:
+ * deny channel {
+ * 	channel "(channel)";
+ * 	reason "Grund";
+ * };
+*/
+deny channel {
+	channel "*warez*";
+	reason "Warez sind illegal";
+};
+
+/*
+ * NEU: vhost {}
+ * ALT: Vhost.conf file
+ * Setzt eine Fake IP für Nicht-Opers, oder opers, die zu bequem für /sethost sind.... :P
+ * Syntax:  
+ *   vhost { 
+ *       vhost (vhost.com); 
+ *       from {
+ *            userhost (ident@host um die Nutzung zu gestatten);
+ *       };
+ *       login (Loginname);
+ *       password (Passwort);
+ *   };
+ *        um den vhost zu nutzen, mache /vhost (login) (password) im IRC
+ */
+vhost {
+	vhost           i.hate.microsefrs.com;
+	from {
+		userhost       *@*.image.dk;
+	};
+	login           stskeeps;
+	password        moocowsrulemyworld;
+};
+
+/* Man kann hier weitere Config Dateien einfügen */
+/* include "klines.conf"; */
+
+/* Network configuration */
+set {
+	network-name 		"ROXnet";
+	default-server 		"irc.roxnet.org";
+	services-server 		"services.roxnet.org";
+	stats-server 		"stats.roxnet.org";
+	help-channel 		"#ROXnet";
+	hiddenhost-prefix		"rox";
+	/* prefix-quit 		"no"; */
+	/* Cloak keys müssen angegeben sein und sie müssen die selben auf allen Servern
+       * im Netzwerk sein. Sie werden zur Generierung der maskierten Hosts verwendet
+	 * und sie sollten geheim gehalten werden.
+	 * Die Keys sollten 3 zufällige Strings von 5-100 Zeichen Länge sein (10-20 Zeichen
+	 * (sind ganz ok) und müssen aus Kleinbuchstaben(a-z), Großbuchstaben (A-Z) und
+       * Ziffern (0-9) bestehen [wie im ersten Key Beispiel].
+       * TIPP: Auf *NIX, kann man in der Shell './unreal gencloak' aufrufen und durch
+  	 *       Unreal 3 Zufalls Stings erzeugen und anzeigen lassen.
+	 */
+	cloak-keys {
+		"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+		"und noch einer";
+		"und noch einer";
+	};
+	/* on-oper Host */
+	hosts {
+		local			"locop.roxnet.org";
+		global		"ircop.roxnet.org";
+		coadmin		"coadmin.roxnet.org";
+		admin			"admin.roxnet.org";
+		servicesadmin 	"csops.roxnet.org";
+		netadmin 		"netadmin.roxnet.org";
+		host-on-oper-up 	"no";
+	};
+};
+
+/* Server spezifische Configuration */
+
+set {
+	kline-address "setze.diese.email";
+	modes-on-connect "+ixw";
+	modes-on-oper	 "+xwgs";
+	oper-auto-join "#opers";
+	options {
+		hide-ulines;
+		/* Man kann hier ident checking aktivieren, wenn man will */
+		/* identd-check; */
+		show-connect-info;
+	};
+
+	maxchannelsperuser 10;
+	/* Die Mindestzeit, die ein User verbunden sein muss, bevor er eine QUIT Meldung
+	 * senden darf (Das wird offentlich helfen, Spam zu verhindern) */
+	anti-spam-quit-message-time 10s;
+	/* Macht die Meldung statisch, die in allen Quit Meldungen angezeigt wird.
+           Somit sind keine individuellen Quts auf dem lokalen Server mehr erlaubt */
+	/* static-quit "Client quit";	*/
+
+	/* Man kann auch sämtliche Part Meldungen blocken, indem man dies auskommentiert
+       * und 'yes' sagt oder einen anderen Text angibt (z.B. "Bye bye!")
+	/* static-part yes; */
+
+	/* Hiermit kann man bestimmte stats auf ausschliesslich Opers beschränken. Für
+       * alle Stats kann man * benutzen. Wenn man es weglässt, können alle User alle
+       * Stats abfragen. Eine vollständige Liste erhält man mit dem Befehl '/stats'.
+	 * Manche Admins entfernen 'kGs' und erlauben so normalen Usern die Anzeige von
+	 * klines, glines and shuns.
+	 */
+	oper-only-stats "okfGsMRUEelLCXzdD";
+
+	/* Throttling: Dieses Beispiel setzte ein Limit von 3 Verbindungen je 60s (pro Host). */
+	throttle {
+		connections 3;
+		period 60s;
+	};
+
+	/* Anti Flood Schutz */
+	anti-flood {
+		nick-flood 3:60;	/* 3 Nickänderungen pro 60 Sekunden (Default) */
+	};
+
+	/* Spam Filter */
+	spamfilter {
+		ban-time 1d; /* Default Dauer eines *line Banns durch Spamfilter */
+		ban-reason "Spam/Belästigung"; /* default Grund */
+		virus-help-channel "#help"; /* Channel, der für die 'viruschan' action benutzt wird*/
+		/* except "#help"; Channel, der von Filtern ausgenommen wird */
+	};
+};
+
+/*
+ * Probleme? Weitere Hilfe nötig?
+ * 1) www.vulnscan.org/UnrealIrcd/unreal32docs.html
+ * 2) www.vulnscan.org/UnrealIrcd/faq/ <- enthält 80% deiner Fragen - Wetten Dass?
+ * 3) Hat man dann noch Probleme, kann man den Chat bei irc.ircsystems.net 
+ *    #unreal-support aufsuchen. Dabei ist zu beachten, dass wir voraussetzen,
+ *    dass zuvor DIE DOKU GELESEN WURDE (genauso, wie die FAQ!)!
+ */

doc/example.fr.conf

@@ -0,0 +1,801 @@
+/*
+ * example.conf par Daniel Hawton AKA Osiris (osiris@unrealircd.org).
+ * $Id$
+ * Traduction française par babass (babass@unrealircd.org). 
+ * 
+ * Fonctionne pour Unreal3.2 et supérieur
+ * 
+ * Okay les mecs.  Voici la nouvelle version de l'example.conf. Cela ressemble plus à du C++.
+ * Peu importe, il est temps de se lancer.  Il est difficile de l'attaquer pour la première fois, mais
+ * avec un peu d'expérience et en lisant vous comprendrez.
+ *
+ * Copiez juste ce fichier dans votre répertoire unrealircd principal et appellez le 'unrealircd.conf'.
+ * 
+ * NOTE:  Toutes les lignes, excepté la ligne d'ouverture { , les lignes finissant par un ;, 
+ * et celle de fermeture } incluses.
+ * L'IRCd ignorera les lignes commentées.
+ *
+ * LISEZ S'IL VOUS PLAIT doc/unreal32docs.fr.html! La version en ligne est aussi disponible à :
+ * www.vulnscan.org/UnrealIRCd/unreal32docs.fr.html
+ * Elle contient beaucoup d'informations à propos du fichier de configuration : fournis des informations 
+ * à propos de chaque blocs, variable, etc..
+ * Si vous essayez de modifier ce fichier sans avoir bien lu la documentation,
+ * vous êtes presque sûr de vous tromper.
+ */
+
+/* Type de commentaires */
+#Commentaire type 1 (type Shell)
+// Commentaire type 2 (style C++)
+/* Commentaire type 3 (style C) */
+#Ces lignes sont ignorées par l'ircd.
+
+/*
+ * UnrealIRCd supportes des modules, en charger certains est requis.
+ * Vous aurez besoin au moins du module commands et du module cloaking.
+ */
+
+/* POUR *NIX, décommentez les 2 lignes suivantes : */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* POUR Windows, décommentez les 2 lignes suivantes : */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
+
+/*
+ * Vous pouvez également inclure d'autres fichiers de configuration.
+ * help.conf contient tous le texte de /helpop. Les fichiers badwords.*.conf
+ * contiennent tous les badwords pour le mode +G...
+ * spamfilter.conf contient quelques bonnes règles pour les trojans courrants.
+ * Vous voudrez probablement les inclure:
+ */
+include "help.conf";
+include "badwords.channel.conf";
+include "badwords.message.conf";
+include "badwords.quit.conf";
+include "spamfilter.conf";
+
+/*
+ * ACTUEL : me {} 
+ * ANCIEN : M:Line 
+ * me {} definit le nom, la description et le numeric du serveur unreal
+ * pour ce serveur. La syntaxe est la suivante : 
+ * me { 
+ *  name "nom.du.serveur"; 
+ *  info "Description du Serveur";
+ *  numeric (numeric* serveur);
+ * }; 
+ * En cas de link, ce numeric ne peut être utilisé pour aucun autre serveur du réseau.
+ */
+me
+{
+	name "irc.foonet.com";
+	info "FooNet Server";
+	numeric 1;
+};
+
+/*
+ * ACTUEL : admin {} 
+ * ANCIEN : A:Line 
+ * Admin donne des informations sur les server admins.
+ * Vous pouvez mettre autant de lignes que vous voulez après admin {. 
+ * La syntaxe est la suivante :
+ * admin {
+ *   "première ligne"; 
+ *   "deuxième ligne"; 
+ *   [etc]
+ * };
+ */
+admin {
+	"Bob Smith";
+	"bob";
+	"widely@used.name";
+};
+
+/*
+ * ACTUEL : class {} 
+ * ANCIEN : Y:line (l'ancien était déroutant) 
+ * Défini les réglages pour les classes. Une classe est un groupe de réglages pour 
+ * des connexions. Par exemple, les connexions serveurs, au lieu de passer par une classe
+ * client, vous utilisez directement une classe serveur. La syntaxe est la suivante :
+ * class (nom de la classe)
+ * {
+ *     pingfreq (fréquence des pings utilisateurs/serveurs en secondes);
+ *     maxclients (combien de connexions pour cette classe);
+ *     sendq (file d'attente maximum pour l'envoie depuis une connexion);
+ *     recvq (file d'attente maximum pour la réception depuis une connexion [contrôle du flood]);
+ *  };
+ */
+
+class           clients
+{
+	pingfreq 90;
+	maxclients 500;
+	sendq 100000;
+	recvq 8000;
+};
+
+class           servers
+{
+	pingfreq 90;
+	maxclients 10;		/* Nombre maximum de serveurs pouvant être reliés en même temps */
+	sendq 1000000;
+	connfreq 100; /* Combien de secondes entre chaque tentatives de connexions */
+};
+
+/*
+ * ACTUEL : allow {} 
+ * ANCIEN : I:Line
+ * Défini les autorisations de connexions...
+ * Principalement pour les clients, cela leur permet de se connecter, vous pouvez donc avoir un certain
+ * contrôle et/ou mettre un mot de passe. 
+ * La syntaxe est la suivante : 
+ * allow {
+ *    ip (ip mask à autoriser);
+ *    hostname (host mask);
+ *    class (classe à laquelle les renvoyer [voir class {}]);
+ *    password "(mot de passe)"; (optionnel)
+ *    maxperip (nombre de connexions par ip); (optionnel) 
+ * };
+ */
+
+allow {
+	ip             *@*;
+	hostname       *@*;
+	class           clients;
+	maxperip 5;
+};
+
+/* connexion autorisée avec mot de passe */
+allow {
+	ip             *@255.255.255.255;
+	hostname       *@*.passworded.ugly.people;
+	class           clients;
+	password "f00Ness";
+	maxperip 1;
+};
+
+/*
+ * ACTUEL : allow channel {} 
+ * ANCIEN : chrestrict 
+ * Autorise un utilisateur à joindre un salon...
+ * comme une exception au deny channel. 
+ * Syntaxe :
+ * allow channel {
+ *   channel "nom du salon";
+ * };
+ */
+allow           channel {
+	channel "#WarezSucks";
+};
+
+/*
+ * ACTUEL : oper {} 
+ * ANCIEN : O:Line 
+ * Défini un IRC Operateur
+ * Les IRC operateurs sont là pour préserver la qualité du serveur mais aussi d'en assurer
+ * la maintenance et sa connexion au réseau. 
+ * La syntaxe est la suivante : 
+ * oper (login) { 
+ *     class (classe à laquelle les associer, si différent de moi, déplacez les vers une
+ *                nouvelle classe); 
+ *     from { 
+ *        userhost (ident@host);
+ *        userhost (ident@host);
+ *     }; 
+ *     flags
+ *     { 
+ *       (flags ici*);
+ *     };
+ *     OU
+ *     flags "ancien type de flags, comme OAaRD";
+ * };
+ */
+
+
+/* Pour avoir la liste des flags oper, voir doc/unreal32docs.fr.html#operblock
+ * [lecture HAUTEMENT recommendée]
+ */
+
+oper bobsmith {
+	class           clients;
+	from {
+		userhost bob@smithco.com;
+	};
+	password "f00";
+	flags
+	{
+		netadmin;
+		can_zline;
+		can_gzline;
+		can_gkline;
+		global;
+	};
+};
+
+/*
+ * ACTUEL : listen {}
+ * ANCIEN : P:Line
+ * Défini un port à rattacher à l'ircd, pour autoriser
+ * des utilisateurs/serveurs à se connecter au serveur. 
+ * La syntaxe est la suivante :
+ * listen (ip):(port) 
+ * { 
+ *   options {
+ *     (options ici);
+ *   };
+ * };
+ * ou pour une écoute
+ * indifférente : listen (ip):(port);
+ * 
+ * NOTICE : pour les ips ipv6 (3ffe:b80:2:51d::2 etc), utilisez listen [ip]:port;
+ * 
+ * Cela fonctionne également.
+ */
+
+/* Options de listen:
+      ANCIEN	| 	ACTUEL
+	S		serversonly
+	C		clientsonly
+	J		java
+	s		ssl
+	*		standard
+*/
+
+/* NOTE SUR LES PORTS SSL: les ports SSL sont plutôt non standardisés,
+ * A côté des nombreux ports high-SSL, certaines personnes disent que vous devez 
+ * l'utiliser sur le port 994 car c'est le port SSL officiel.. mais cela
+ * requière d'être root! D'un autre coté, le port 194 est le port irc officiel et
+ * avez vous déjà vu un ircd fonctionner sur celui-ci ?
+ * Donc, notre suggestion est d'utiliser le port 6697 pour le SSL, ceci est utilisé par
+ * assez bien de réseaux et est reconnu par exemple par StunTour.
+ * Vous êtes libre d'ouvrir autant de ports SSL que vous le désirez mais
+ * en utilisant (au moins) 6697 vous aidez le monde à standardiser un peu a bit ;).
+ */
+listen         *:6697
+{
+	options
+	{
+		ssl;
+		clientsonly;
+	};
+};
+
+listen         *:8067;
+listen         *:6667;
+
+/* NOTE: Si vous êtes sur un shell shell avec de multiples IP's vous êtes 
+ *       susceptibles d'avoir l'erreur 'Address already in use' (adresse déjà utilisée) 
+ *       dans vos logs et l'ircd refusera de démarer.
+ *       Cela signifie que vous devrez utiliser une IP spécifique au lieu de '*',
+ *       Donc par exemple :
+ *       listen 1.2.3.4:6667;
+ *       Evidemment, remplacez l'IP par celle qui vous a été assignée.
+ */
+
+/*
+ * ACTUEL : link {}
+ * ANCIEN : C/N:Lines
+ * Défini un accord pour la connexion d'un serveur.
+ * NOTE : CHACUN DES SERVEURS NECESSITE UN PARAMETRE LINK {} POUR SE CONNECTER CORRECTEMENT !
+ * La syntaxe est la suivante :
+ * link (nom du serveur)
+ * {
+ *	username	(username, * fonctionne aussi);
+ * 	hostname	(ip/hostmask);
+ *	bind-ip		(Quelle IP à laquelle se relier lors de la connexion, ou *);
+ *	port		(port auquel se connecter, si il y en a un);
+ *	hub (Si c'est un a hub, * fonctionne, ou les servermasks qu'il doit porter);
+ *	[ou leaf *;]
+ *	password-connect "(mot de passe à envoyer)";
+ *	password-receive "(mot de passe que l'on doit recevoir)";
+ *	class		(classe à affecter aux serveurs);
+ *	options {
+ *		(options ici*);
+ *	};
+ *      // Si vous utilisez le SSL, vous pouvez choisir quel cryptage (cipher) utiliser dans le mode SSL
+ *      // Retrouvez une liste "crytages openssl", séparez les cryptages par des :
+ *      
+ *      ciphers "DES-CBC3-MD5";
+ * 
+ * };
+*/
+
+/*
+	options:
+	ANCIEN	|	ACTUEL
+	S		ssl
+	Z		zip
+	N/A		autoconnect
+	N/A		quarantine
+	N/A		nodnscache
+*/
+
+
+link            hub.mynet.com
+{
+	username	*;
+	hostname 	1.2.3.4;
+	bind-ip 	*;
+	port 		7029;
+	hub             *;
+	password-connect "LiNk";
+	password-receive "LiNk";
+	class           servers;
+		options {
+			/* Note : Vous ne devriez pas utiliser autoconnect lorsque vous linkez des services */
+			autoconnect;
+			ssl;
+			zip;
+		};
+};
+/*
+ *
+ * ACTUEL : ulines {}
+ * ANCIEN : U:Line
+ * Les U-lines donnent aux serveurs plus de pouvoir/commandes, ceci doit UNIQUEMENT être appliqué
+ * aux serveurs de services/stats et JAMAIS pour des servuers UnrealIRCd normaux !
+ * La syntaxe est la suivante :
+ * ulines {
+ *	(serveur auquel appliquer la uline);
+ *	(serveur auquel appliquer la uline);
+ *  [etc]
+ * };
+*/
+ulines {
+	services.roxnet.org;
+	stats.roxnet.org;
+};
+
+/*
+ * ACTUEL : drpass {}
+ * ANCIEN : X:Line
+ * Défini les mots de passe pour les commandes /die et /restart.
+ * La syntaxe est la suivante :
+ * drpass { 
+ *  restart		"(mot de passe pour relancer)";
+ *  die		        "(mot de passe pour arrêter)";
+ * };
+ */
+drpass {
+	restart "I-love-to-restart";
+	die "die-you-stupid";
+};
+
+/*
+ * ACTUEL : log {} 
+ * ANCIEN : N/A 
+ * Dit à l'ircd où et quoi loguer. Vous pouvez en avoir
+ * autant que vous le souhaitez.
+ * 
+ * FLAGS : errors, kills, tkl, connects, server-connects, kline, oper
+ * 
+ * Syntaxe : 
+ * log "fichier de log" 
+ * {
+ *    flags
+ *    {
+ *        flag;
+ *        flag; 
+ *        etc.. 
+ *    }; 
+ * };
+ */
+
+log "ircd.log" {
+	/* Efface le fichier de log et commence un nouveau lorsqu'il dépasse 2MB, 
+	   retirez ceci pour toujour utiliser le même fichier de log */
+	maxsize 2097152;
+	flags {
+		oper;
+		kline;
+		connects;
+		server-connects;
+		kills;
+		errors;
+		sadmin-commands;
+		chg-commands;
+		oper-override;
+		spamfilter;
+	};
+};
+
+/*
+ * ACTUEL : alias {}
+ * ANCIEN : N/A
+ * Ceci vous permet de définir des alias pour les commandes telles que /nickserv, /chanserv etc
+ * FLAGS: services, stats, normal
+ *
+ * Syntaxe :
+ * alias "nom" {
+ *	target "pointe vers";
+ *	type typedalias;
+ * };
+ *
+ * [NOTE : Vous pouvez également inclure un fichier d'alias prédéfinis ici, voir 
+ * doc/unreal32docs.fr.html section 2.9]
+ */
+
+// Ceci fait pointer la commande /nickserv vers l'utilisateur NickServ qui est connecté au serveur set::services-server
+/*alias NickServ {
+	target "NickServ";
+	type services;
+};*/
+
+// Si vous voulez que la commande pointe vers le même nom que la commande, vous pouvez ignorez l'entré du nom
+//alias ChanServ { type services; };
+
+// Faire pointer la commande /statserv vers l'utilisateur StatServ sur le serveur set::stats-name
+//alias StatServ { type stats; };
+
+// Faire pointer la commande /superbot vers l'utilisateur SuperBot
+//alias SuperBot { type normal; };
+
+
+/* Alias Standards */
+alias NickServ { type services; };
+alias ChanServ { type services; };
+alias OperServ { type services; };
+alias HelpServ { type services; };
+alias StatServ { type stats; };
+
+/*
+ * ACTUEL : alias {}
+ * ANCIEN : N/A
+ * Ceci vous permet de définir des alias pour les commandes telles que /identify, /services, etc
+ *
+ * Syntaxe :
+ * alias "nom" {
+ *	format "format string" {
+ *		target "pointer vers";
+ *              type typedalias;
+ *		parameters "paramètres à envoyer";
+ *	};
+ *	type command;
+ * };
+ */
+/* Ceci est expliqué séparément car même si elle a le même nom que la directive précédente, elle est très
+ * différente dans sa syntaxe, bien que elle a une fonction similaire et dépend des alias standards pour 
+ * fonctionner.
+ */
+/*
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+*/
+/* La direcitive alias::format est une expression régulière. Le premier format correspond à la commande  
+ * /identify command lorsque le premier caractère est un #. Cela renvois donc à l'alias chanserv avec 
+ * les paramètres IDENTIFY %1-. Le second format correspond à la commanden /identify lorsque le premier
+ * caractère n'est pas un #. Cela envoies alors la commande à l'alias nickserv avec les paramètres
+ * IDENTIFY %1-.
+ */
+
+/* L'alias::format::parameters est similaire aux languages de programmation. %N (où N est un nombre)
+ * représente un paramètre envoyé à la commande (dans ce cas /identify). Si vous spécifiez %N- cela
+ * signifie que tous les paramètres depuis N jusqu'au dernier paramètre dans la chaîne de caractères.
+ * Vous pouvez également spécifier %n qui est remplacé par le pseudo de l'utilisateur.
+*/
+
+/* Alias Standards */
+alias "services" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "%1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "%1-";
+	};
+	type command;
+};
+
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+
+/* Ceci est un exemple de véritable alias de commande*/
+/* Ceci renvoye /GLINEBOT à /GLINE <parameter> 2d etc... */
+alias "glinebot" {
+         format ".+" {
+                 command "gline";
+                 type real;
+                 parameters "%1 2d Les bots ne sont pas permis sur ce serveur, lisez s'il-vous-plait la faq sur http://www.example.com/faq/123";
+         };
+         type command;
+ };
+ 
+
+/*
+ * ACTUEL : tld {}
+ * ANCIEN : T:Line
+ * Ceci applique une motd et des fichiers de règles différents
+ * en fonction de l'hostmask des clients.
+ * La syntaxe est la suivante : 
+ * tld {
+ *    mask (ident@host);
+ *    motd "(motd file)";
+ *    rules "(rules file)";
+ * };
+ */
+
+tld {
+	mask *@*.fr;
+	motd "ircd.motd.fr";
+	rules "ircd.rules.fr";
+};
+
+/* note : vous pouvez juste effacer le bloc d'exemple ci-dessus,
+ * en quel cas les fichiers motd/règles par défaut (ircd.motd, ircd.rules)
+ * seront utilisés pour tout le monde.
+ */
+
+/*
+ * ACTUEL : ban nick {}
+ * ANCIEN : Q:Line
+ * Banni un pseudo, il ne peut donc être utilisé.
+ * La syntaxe est la suivante :
+ * ban nick {
+ *	mask "(pseudo à bannir)";
+ *	reason "(raison)";
+ * };
+*/
+ban nick {
+	mask "*C*h*a*n*S*e*r*v*";
+	reason "Reservé aux Services";
+};
+/*
+ * ACTUEL : ban ip {}
+ * ANCIEN : Z:Line
+ * Empêche une ip de se connecter au réseau.
+ * Syntaxe :
+ * ban ip { mask (ip/hostmask); reason "(raison)"; };
+*/
+ban ip {
+	mask 195.86.232.81;
+	reason "Serveur délinké";
+};
+/*
+ * ACTUEL : ban server {}
+ * ANCIEN : Server Q:Line
+ * Empêche un serveur de se connecter au réseau.
+ * Si le serveur est linké à un serveur distant, le serveur local
+ * sera déconnecté du réseau.
+ * La syntaxe est la suivante :
+ * ban server {
+ *	mask "(nom du serveur)";
+ *	reason "(raison à donner)";
+ * };
+*/
+
+ban server {
+	mask eris.berkeley.edu;
+	reason "Va-t-en d'ici.";
+};
+/*
+ * ACTUEL : ban user {}
+ * ANCIEN : K:Line
+ * Fait qu'un utilisateur avec un certain masque ne peut se connecter
+ * à votre serveur.
+ * Syntaxe :
+ * ban user { mask (hostmask/ip); reason "(raison)"; };
+*/
+
+ban user {
+	mask *tirc@*.saturn.bbn.com;
+        reason "Idiot";
+};
+
+/*
+ * ACTUEL : ban realname {}
+ * ANCIEN : n:Line
+ * Ceci empêche un certain realname d'être utilisé.
+ * Syntaxe :
+ * ban realname {
+ *	mask "(realname)";
+ * 	reason "(raison)";
+ * };
+*/
+
+ban realname {
+	mask "Swat Team";
+	reason "mIRKFORCE";
+};
+
+ban realname {
+	mask "sub7server";
+	reason "sub7";
+};
+
+/*
+ * NOTE POUR TOUS LES BANS, ils peuvent être répetés pour ajouter des entrées !
+ * 
+ * ACTUEL : except ban {} 
+ * ANCIEN : E:Line
+ * Fait que vous ne pouvez être banni. 
+ * Syntaxe :
+ * except ban { mask (ident@host); };
+ * Répétez l'except ban {} autant de fois
+ * que vous voulez pour différents hosts.
+ */
+
+except ban {
+	/* ne banni pas stskeeps */
+	mask           *stskeeps@212.*;
+};
+
+/*
+ * ACTUEL : deny dcc {} 
+ * ANCIEN : dccdeny.conf
+ * Utilisez ceci pour bloquer l'envoie de dcc... stope
+ * mieux les virus. 
+ * Syntaxe : 
+ * deny dcc 
+ * { 
+ *   filename "fichier à bloquer (ex : *exe)";
+ *   reason "raison";
+ * };
+ */
+deny dcc {
+	filename "*sub7*";
+	reason "Possible Sub7 Virus";
+};
+
+/*
+ * ACTUEL : deny channel {}
+ * ANCIEN : N/A (NEW)
+ * Ceci empêche des salons d'être joins.
+ * Syntax:
+ * deny channel {
+ * 	channel "(salon)";
+ * 	reason "raison";
+ * };
+*/
+deny channel {
+	channel "*warez*";
+	reason "Warez is illegal";
+};
+
+/*
+ * ACTUEL : vhost {}
+ * ANCIEN : Vhost.conf file
+ * Applique une ip factice aux non-opers, ou aux
+ * opers trop flemmards pour utiliser /sethost :P
+ * Syntaxe :  
+ *   vhost { 
+ *       vhost (vhost.com); 
+ *       from {
+ *            userhost (ident@host à autoriser à utiliser);
+ *       };
+ *       login (login);
+ *       password (mot de passe);
+ *   };
+ *        ensuite pour utiliser ce vhost, tapez /vhost (login) (mot de passe) sur l'IRC
+ */
+vhost {
+	vhost           i.hate.microsefrs.com;
+	from {
+		userhost       *@*.image.dk;
+	};
+	login           stskeeps;
+	password        moocowsrulemyworld;
+};
+
+/* Vous pouvez utiliser d'autres fichiers de configuration */
+/* include "klines.conf"; */
+
+/* Configuration du réseau */
+set {
+	network-name 		"ROXnet";
+	default-server 		"irc.roxnet.org";
+	services-server 	"services.roxnet.org";
+	stats-server 		"stats.roxnet.org";
+	help-channel 		"#ROXnet";
+	hiddenhost-prefix	"rox";
+	/* prefix-quit 		"no"; */
+	/* Les Cloak keys doivent être les mêmes sur tous les serveurs du réseau.
+	 * Ils sont utilisés pour générer des hosts masqués et doivent être gardés secrets.
+	 * Les clés doivent être 3 chaînes de 5-100 caractères melangés.
+	 * (10-20 caractères est parfait) et elles doivent être constituées de minuscules (a-z),
+	 * majuscules (A-Z) et chiffres (0-9) [voir le premier exemple de clé].
+	 */
+	cloak-keys {
+		"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+		"et une autre";
+		"et un autre";
+	};
+	/* host à l'identification oper */
+	hosts {
+		local		"locop.roxnet.org";
+		global		"ircop.roxnet.org";
+		coadmin		"coadmin.roxnet.org";
+		admin		"admin.roxnet.org";
+		servicesadmin 	"csops.roxnet.org";
+		netadmin 	"netadmin.roxnet.org";
+		host-on-oper-up "no";
+	};
+};
+
+/* Configuration spécifique d'un serveur */
+
+set {
+	kline-address "mettre.cet.email";
+	modes-on-connect "+ixw";
+	modes-on-oper	 "+xwgs";
+	oper-auto-join "#opers";
+	options {
+		hide-ulines;
+		/* Vous pouvez enclencher la vérification des idents si vous voulez */
+		/* identd-check; */
+		show-connect-info;
+	};
+
+	maxchannelsperuser 10;
+	/* Durée maximum pendant laquelle un utilisateur doit rester connecté avant de pouvoir utiliser
+	 * un message de QUIT.
+	 * Ceci devrait aider à stoper le spam */
+	anti-spam-quit-message-time 10s;
+	/* Applique le message de static-quit à tous les quits - cela signifie qu'aucun
+           message de quit personalisé ne sera autorisé sur le serveur local */
+	/* static-quit "Client quit";	*/
+
+	/* Vous pouvez également bloquer toutes les raisons de part en décommentant ceci et en disant
+	 * 'yes', ou spécifiez un autre texte (ex: "Bye bye!") pour qu'il soit toujours utilisé.. */
+	/* static-part yes; */
+
+	/* Vous permet de restreindre certaines stats aux opers, utilisez * pour toutes les stats,
+	 * enlevez le pour autoriser les utilisateurs à voir toutes les stats. Tapez '/stats' pour
+	 * une liste complète.
+	 * Certains admins pourront vouloir bloquer 'kGs' pour que les utilisateurs normaux ne puissent
+	 * lister les klines, glines et shuns.
+	 */
+	oper-only-stats "okfGsMRUEelLCXzdD";
+
+	/* Throttling: cet exemple applique une limite de 3 tentatives de connection en 60s (par host). */
+	throttle {
+		connections 3;
+		period 60s;
+	};
+
+	/* Protection Anti flood */
+	anti-flood {
+		nick-flood 3:60;	/* 3 changements de pseudo en 60 secondes (la valeur par défaut) */
+	};
+
+	/* Filtre anti-spam */
+	spamfilter {
+		ban-time 1d; /* durée par défaut d'un ban *line appliqué par le spamfilter */
+		ban-reason "Spam/Advertising"; /* raison par défaut */
+		virus-help-channel "#help"; /* salon à utiliser pour l'action 'viruschan' */
+		/* excepté "#help"; salon à exempter de filtrage */
+	};
+};
+
+/*
+ * Problèmes ou besoin de plus d'aide ?
+ * 1) www.vulnscan.org/UnrealIRCd/unreal32docs.fr.html
+ * 2) www.vulnscan.org/UnrealIRCd/faq/ <- contient 80% de vos questions !
+ * 3) Si vous avez encore des problèmes vous pouvez aller sur irc.ircsystems.net #unreal-support,
+ *    notez que vous devez avoir LU LA DOCUMENTATION ET LA FAQ d'abord !
+ */

doc/example.hu.conf

@@ -0,0 +1,824 @@
+/*
+ * example.conf Daniel Hawton avagy Osiris jóvoltából (osiris@unrealircd.org).
+ * A magyar fordítást AngryWolf <angrywolf@flashmail.com> készítette.
+ * $Id$
+ * 
+ * Felhasználható Unreal3.2 és későbbi verziókhoz
+ * 
+ * Oké, emberek! Ez az új példa konfiguráció. A kinézete nagyon hasonló
+ * a C++-hoz, olyasformán. Mindenesetre itt az ideje végigmennünk rajta. Eleinte
+ * nehéz nekilendülni, de kis gyakorlással és olvasgatással meg fogjuk érteni.
+ *
+ * Csak másoljuk be ezt a fájlt a fő unrealircd könyvtárunkba, és nevezzük
+ * 'unrealircd.conf'-nak.
+ * 
+ * MEGJEGYZÉS:  Minden sor, kivéve a nyitó { sort, ;-vel végződik, beleértve
+ * a záró } sort is. Az IRCd figyelmen kívül hagyja a megjegyzéssorokat.
+ *
+ * KÉRLEK, OLVASD EL A doc/unreal32docs.html-T! Az online verzió is elérhető
+ * a www.vulnscan.org/UnrealIRCd/unreal32docs.html címen.
+ * Rengeteg információt tartalmaz a konfigurációs fájlról: tájékoztatást ad
+ * minden blokkról, változóról stb.
+ * Ha megpróbálod szerkeszteni ezt a fájlt anélkül, hogy megfelelően elolvastad
+ * volna a dokumentációt, jó eséllyel kanyarodsz a biztos kudarc felé!
+ */
+
+/* Megjegyzések típusai */
+#1. Megjegyzéstípus (Shell típusú)
+// 2. Megjegyzéstípus (C++ stílusú)
+/* 3. Megjegyzéstípus (C stílusú) */
+#ezeket a sorokat az ircd figyelmen kívül hagyja.
+
+/*
+ * Az UnrealIRCd támogat modulokat, néhányuk betöltése kötelező is.
+ * Legalább a parancsokat biztosító és egy álcázó modulra lesz szükségünk.
+ */
+
+/* *NIX-BAN vegyük ki a megjegyzésből a következő két sort: */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* Windows-BAN vegyük ki a megjegyzésből a következő két sort: */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
+
+/*
+ * Azt is megtehetjük, hogy befűzünk más konfigurációs fájlokat.
+ * A help.conf tartalmazza az összes /helpop szöveget. A badwords.*.conf
+ * fájlok tartalmazzák az összes csúnyaszó bejegyzést a +G módhoz...
+ * A spamfilter.conf néhány jó szabályt a jelenlegi trójai vírusokra.
+ * Valószínűleg be akarjuk tölteni őket:
+ */
+include "help.conf";
+include "badwords.channel.conf";
+include "badwords.message.conf";
+include "badwords.quit.conf";
+include "spamfilter.conf";
+
+/*
+ * ÚJ:   me {} 
+ * RÉGI: M:Line 
+ * A me {} határozza meg ennek a szervernek a nevét, a leírását és az unrealbeli
+ * szerverazonosító-számát. A szintaktikája a következő: 
+ * me { 
+ *  name "szerver.név"; 
+ *  info "A szerver leírása";
+ *  numeric (szerverazonosító*);
+ * }; 
+ * Ha linkelünk, ezt az azonosítószámot nem használhatja semmilyen más szerver
+ * a hálózaton.
+ */
+me
+{
+	name "irc.valaminet.com";
+	info "ValamiNet Szerver";
+	numeric 1;
+};
+
+/*
+ * ÚJ:   admin {} 
+ * RÉGI: A:Line
+ * Ez a blokk információt ad a szerver adminisztrátorairól. Annyi sort tehetünk
+ * az admin { alá, amennyit kívánunk. 
+ * A szintaktikája a következő:
+ * admin {
+ *   "első sor"; 
+ *   "második sor"; 
+ *   [stb]
+ * };
+ */
+admin {
+	"Bob Smith";
+	"bob";
+	"szeleskorben@hasznalt.nev";
+};
+
+/*
+ * ÚJ:   class {} 
+ * RÉGI: Y:line (a régi zavarbaejtő volt) 
+ * Ezek az osztályokat állítják be. Az osztályok a kapcsolatok egy csoportjának
+ * beállításai. Például a szerver kapcsolatokat, ahelyett, hogy egy kliens
+ * osztályába kerülnének, beleirányítjuk a szerverek osztályába. Szintaktika:
+ * class (osztálynév)
+ * {
+ *     pingfreq (hány másodpercenként pingeljünk egy felhasználót/szervert);
+ *     maxclients (mennyi kapcsolat lehet ebben az osztályban);
+ *     sendq (egy kapcsolat küldési sorának maximális mérete);
+ *     recvq (egy kapcsolat fogadási sorának maximális mérete [árvízvédelem]);
+ *  };
+ */
+
+class           clients
+{
+	pingfreq 90;
+	maxclients 500;
+	sendq 100000;
+	recvq 8000;
+};
+
+class           servers
+{
+	pingfreq 90;
+	maxclients 10;	/* Legfeljebb ennyi szervert linkelhetünk egyszerre */
+	sendq 1000000;
+	connfreq 100; /* Ennyi másodpercet várjon, mielőtt újra kapcsolódik */
+};
+
+/*
+ * ÚJ:   allow {} 
+ * RÉGI: I:Line
+ * Ez a kapcsolatok engedélyezését határozza meg...
+ * Alapvetően kliensekre használjuk; megengedi nekik, hogy kapcsolódjanak, így
+ * némileg van lehetőség a szabályozásra, valamint jelszót is beállíthatunk. 
+ * A szintaktika a következő: 
+ * allow {
+ *    ip (ip maszk az engedélyezéshez);
+ *    hostname (gazdanév maszk);
+ *    class (osztály, ahová küldjük őket [lásd: class {}]);
+ *    password "(jelszó)"; (nem kötelező)
+ *    maxperip (mennyi kapcsolatot engedjünk ip címenként); (nem kötelező) 
+ * };
+ */
+
+allow {
+	ip             *@*;
+	hostname       *@*;
+	class           clients;
+	maxperip 5;
+};
+
+/* Jelszavas allow blokk */
+allow {
+	ip             *@255.255.255.255;
+	hostname       *@*.jelszavas.csunya.emberkek;
+	class           clients;
+	password "V4lami";
+	maxperip 1;
+};
+
+/*
+ * ÚJ:   allow channel {} 
+ * RÉGI: chrestrict 
+ * Megengedi egy felhasználónak, hogy belépjen egy csatornára...
+ * mint egy csatornáról letiltás alóli kivétel. 
+ * Szintaktika:
+ * allow channel {
+ *   channel "csatornanév";
+ * };
+ */
+allow           channel {
+	channel "#AWarezSzívás";
+};
+
+/*
+ * ÚJ:   oper {} 
+ * RÉGI: O:Line 
+ * Definiál egy IRC operátort
+ * Az IRC operátorok feladata, hogy épségben tartsák a szervert; rendszerint
+ * ügyelnek a karbantartottságára és arra, hogy kapcsolatban maradjon
+ * a hálózattal. A szintaktika a következő: 
+ * oper (bejelentkezőnév) { 
+ *     class (osztály, ahová berakjuk őket; ha eddig más osztályban voltak,
+ *                átteszi őket ebbe az új osztályba); 
+ *     from { 
+ *        userhost (azonosító@gazdanév);
+ *        userhost (azonosító@gazdanév);
+ *     }; 
+ *     flags
+ *     { 
+ *       (flagek ide*);
+ *     };
+ *     VAGY
+ *     flags "régi típusú flagek, mint pl. OAaRD";
+ * };
+ */
+
+
+/* Az oper flagek listáját lásd a doc/unreal32docs.hu.html#operblock szekcióban
+ * [ERŐSEN ajánlott elolvasni]
+ */
+
+oper bobsmith {
+	class           clients;
+	from {
+		userhost bob@smithco.com;
+	};
+	password "f00";
+	flags
+	{
+		netadmin;
+		can_zline;
+		can_gzline;
+		can_gkline;
+		global;
+	};
+};
+
+/*
+ * ÚJ:   listen {}
+ * RÉGI: P:Line
+ * Meghatároz egy olyan portot, amelyet az ircd megnyit, és engedélyt ad
+ * a felhasználóknak/szervereknek, hogy kapcsolódjanak a szerverre.
+ * A szintaktika a  következő:
+ * listen (ip cím):(portszám) 
+ * { 
+ *   options {
+ *     (opciók ide);
+ *   };
+ * };
+ * vagy egy síma portnyitáshoz:
+ * listen (ip):(port);
+ * 
+ * MEGJEGYZÉS: ipv6-os ip-kre (3ffe:b80:2:51d::2 stb.) használjuk a
+ * listen [ip]:port;
+ * szintaktikát. Az is működik.
+ */
+
+/* Opciók a listenhez:
+	RÉGI	| 	ÚJ
+	S		serversonly
+	C		clientsonly
+	J		java
+	s		ssl
+	*		standard
+*/
+
+/* MEGJEGYZÉS SSL PORTOKRA: az SSL portok eléggé szabványosítatlanok, emellett
+ * sok a magas SSL port. Néhányan azt mondják, a 994-en célszerű futtatni,
+ * mert az a hivatalos SSL port... de a rendszergazdát igényel! Ezenkívül,
+ * a 194 a hivatalos irc port, de láttunk valaha egy ircd-t azon futni?
+ * Így mi a javaslatunk az, hogy használjuk a 6697-et SSL-hez, ezt használja
+ * jónéhány hálózat, és ezt ismeri fel például a StunTour is.
+ * Szabadon megnyithatunk annyi SSL portot, amennyit akarunk, de ha a 6697-et
+ * (is) használjuk, kicsit segítjük a világot szabványosodni ;).
+ */
+listen         *:6697
+{
+	options
+	{
+		ssl;
+		clientsonly;
+	};
+};
+
+listen         *:8067;
+listen         *:6667;
+
+/* MEGJEGYZÉS: Ha egy több IP címes IRCd shellen vagyunk, előfordulhat, hogy
+ *       "Address already in use" ("A cím már használatban van") hibaüzeneteket
+ *       találunk a naplóban, és az ircd nem indul el. Ez azt jelenti, hogy
+ *       az ircd-nek egy meghatározott IP címre KELL bindelnie a "*" helyett
+ *       vagyis például így:
+ *       listen 1.2.3.4:6667;
+ *       Természetesen cseréljük ki az IP címet arra az IP-re, amelyet nekünk
+ *       osztottak ki.
+ */
+
+/*
+ * ÚJ:   link {}
+ * RÉGI: C/N:Line-ok
+ * Ez a blokk "igen"-t mond egy szerver kapcsolódására.
+ * MEGJEGYZÉS: MINDKÉRT SZERVEREN KELL EGY LINK {} BEÁLLÍTÁS A HELYES
+ *             KAPCSOLÓDÁSHOZ!
+ * A szintaktika a következő:
+ * link (szervernév)
+ * {
+ *	username	(felhasználónév, * is működik);
+ * 	hostname	(ip cím/gazdanév maszk);
+ *	bind-ip		(amilyen IP címre bindeljen kapcsolódáskor, vagy *);
+ *	port		(port, ahová kapcsolódjon, ha van);
+ *	hub (Ha ez egy hub; * működik, vagy szervermaszkokat is beírhatunk);
+ *	[vagy leaf *;]
+ *	password-connect "(elküldendő jelszó)";
+ *	password-receive "(fogadandó jelszó)";
+ *	class		(osztály, ahová betesszük a szervereket);
+ *	options {
+ *		(opciók ide*);
+ *	};
+ *      // Ha SSL-t használunk, kiválaszthatjuk, milyen rejtjelező algoritmusok
+ *      // legyenek használatban SSL módban. Listát kapunk az "openssl ciphers"
+ *      // paranccsal. Az egyes algoritmusokat :-tal válasszuk el.
+ *
+ *      ciphers "DES-CBC3-MD5";
+ * 
+ * };
+*/
+
+/*
+	opciók:
+	RÉGI	|	ÚJ
+	S		ssl
+	Z		zip
+	N/A		autoconnect
+	N/A		quarantine
+	N/A		nodnscache
+*/
+
+
+link            hub.sajatnet.com
+{
+	username	*;
+	hostname 	1.2.3.4;
+	bind-ip 	*;
+	port 		7029;
+	hub             *;
+	password-connect "LiNk";
+	password-receive "LiNk";
+	class           servers;
+		options {
+			/* Megjegyzés: szolgáltatások linkelésekor célszerű nem
+			 * használni az autoconnect opciót.
+			 */
+			autoconnect;
+			ssl;
+			zip;
+		};
+};
+/*
+ *
+ * ÚJ:   ulines {}
+ * RÉGI: U:Line
+ * Az U-line-ok több hatalmat/parancsot adnak a szervereknek. CSAK
+ * szolgáltatásokat és statisztikákat nyújtó szerverekre érdemes beállítani,
+ * és SOHA rendes UnrealIRCd szerverekre!
+ * A szintaktika a következő:
+ * ulines {
+ *	(uline-ra teendő szerver);
+ *	(uline-ra teendő szerver);
+ *  [stb.]
+ * };
+*/
+ulines {
+	services.roxnet.org;
+	stats.roxnet.org;
+};
+
+/*
+ * ÚJ:   drpass {}
+ * RÉGI: X:Line
+ * Meghatározza a jelszavakat a /die és /restart parancsokhoz.
+ * A szintaktika a következő:
+ * drpass { 
+ *  restart		"(újraindítás jelszava)";
+ *  die		        "(leállítás jelszava)";
+ * };
+ */
+drpass {
+	restart "Imádok-újraindítani";
+	die "Halj-te-buta";
+};
+
+/*
+ * ÚJ:   log {}
+ * RÉGI: N/A
+ * Megmondja az ircd-nek, hová és mit naplózzon. Annyi naplófájlunk lehet,
+ * amennyit szeretnénk.
+ * 
+ * FLAGEK: errors, kills, tkl, connects, server-connects, kline, oper
+ * 
+ * Szintaktika: 
+ * log "naplófájl" 
+ * {
+ *    flags
+ *    {
+ *        (flag);
+ *        (flag); 
+ *        [stb.] 
+ *    }; 
+ * };
+ */
+
+log "ircd.log" {
+	/* Törölje a naplófájlt, és kezdjen egy újat, ha eléri a 2 MB-ot;
+	 * hagyjuk ki ezt a beállításból, ha mindig ugyanazt a naplót
+	 * szeretnénk használni
+	 */
+	maxsize 2097152;
+	flags {
+		oper;
+		kline;
+		connects;
+		server-connects;
+		kills;
+		errors;
+		sadmin-commands;
+		chg-commands;
+		oper-override;
+		spamfilter;
+	};
+};
+
+/*
+ * ÚJ:   alias {}
+ * RÉGI: N/A
+ * Ezzel olyan álparancsokat készíthetünk, mint a /nickserv, /chanserv stb.
+ * FLAGEK: services (szolgáltatás), stats (statisztika), normal (közönséges
+ *         felhasználó)
+ *
+ * Szintaxis:
+ * alias "név" {
+ *	target "ahová mutasson";
+ *	type álparancstípus;
+ * };
+ *
+ * [MEGJEGYZÉS: Beilleszthetünk ide egy előre beállított álparancsfájlt is,
+ *              lásd: doc/unreal32docs.html, 2.9-es szekció]
+ */
+
+// Ez a /nickserv parancsot a NickServ felhasználóra irányítja, aki a set::services-server szerverre kapcsolódott.
+/*alias NickServ {
+	target "NickServ";
+	type services;
+};*/
+
+// Ha a parancsot ugyanarra a nicknévre szeretnénk irányítani, ami a parancs neve, kihagyhatjuk a nick bejegyzést.
+//alias ChanServ { type services; };
+
+// A /statserv parancsot a set::stats-server szerveren lévő StatServ felhasználóra irányítja
+//alias StatServ { type stats; };
+
+// A /superbot parancsot a SuperBot felhasználóra irányítja.
+//alias SuperBot { type normal; };
+
+
+/* Szabványos álparancsok */
+alias NickServ { type services; };
+alias ChanServ { type services; };
+alias OperServ { type services; };
+alias HelpServ { type services; };
+alias StatServ { type stats; };
+
+/*
+ * ÚJ:   alias {}
+ * RÉGI: N/A
+ * Ezzel olyan álparancsokat készíthetünk, mint az /identify, /services stb.
+ *
+ * Szintaktika:
+ * alias "név" {
+ *	format "formátumsztring" {
+ *		target "ahova mutasson";
+ *              type álparancstípus;
+ *		parameters "küldendő paraméterek";
+ *	};
+ *	type command;
+ * };
+ */
+/* Ezt azért mutatjuk külön, mert még ha ugyanaz is a neve, mint az előző direktívának, a szintaktikája nagyon
+ * más, habár hasonló feladatot lát el, és a szabványosok álparancsokra van szüksége, hogy működjön.
+ */
+/*
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+*/
+/* Az alias::format direktíva egy reguláris kifejezés. Az első formátum akkor illeszkedik az /identify parancsra,
+ * ha az első karakter egy #. Azután elküldi ezt a chanserv álparancshoz az IDENTIFY %1- paraméterekkel.
+ * A második formátum akkor illeszkedik az /identify parancsra, ha az első karakter nem egy #. Azután
+ * elküldi a parancsot a nickserv álparancshoz az IDENTIFY %1- paraméterekkel.
+ */
+
+/* Az alias::format::parameters hasonló a scriptnyelvekhez. Az %N (ahol N egy szám) a parancshoz küldött egyik
+ * paramétert ábrázolja (ebben az esetben az /identify-ét). Ha azt írjuk, hogy %N-, a sztring N-edik
+ * paraméterétől az utolsóig minden paramétert fog jelenteni. Megadhatunk egy %n-et is, amely ki lesz cserélve
+ * a felhasználó nicknevével.
+*/
+
+/* Szabványos álparancsok */
+alias "services" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "%1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "%1-";
+	};
+	type command;
+};
+
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+
+/* Példa egy valódi álparancsra */
+/* A /GLINEBOT parancsot leképezi arra, hogy /GLINE <paraméter> 2d stb... */
+alias "glinebot" {
+	format ".+" {
+		command "gline";
+		type real;
+		parameters "%1 2d Botok tilosak ezen a szerveren, kérlek, olvasd el a faq-ot a http://www.example.com/faq/123 címen";
+	};
+	type command;
+};
+
+
+
+/*
+ * ÚJ:   tld {}
+ * RÉGI: T:Line
+ * Beállít más motd és rules fájlt
+ * a kliens hostmaszkjára.
+ * A szintaktikája a következő: 
+ * tld {
+ *    mask (azonosító@gazda);
+ *    motd "(motd fájl)";
+ *    rules "(rules fájl)";
+ * };
+ */
+
+tld {
+	mask *@*.fr;
+	motd "ircd.motd.fr";
+	rules "ircd.rules.fr";
+};
+
+/* megjegyzés: a fenti példa blokkot akár le is törölhetjük; ebben az esetben
+ * mindenkire az alapértelmezett motd/rules fájlok (ircd.motd, ircd.rules)
+ * lesznek használatban.
+ */
+
+/*
+ * ÚJ:   ban nick {}
+ * RÉGI: Q:Line
+ * Kitilt egy nicknevet, így az nem használható.
+ * A szintaktikája a következő:
+ * ban nick {
+ *	mask "(kitiltandó nick)";
+ *	reason "(indoklás)";
+ * };
+*/
+ban nick {
+	mask "*C*h*a*n*S*e*r*v*";
+	reason "Fenntartva a szolgáltatásoknak";
+};
+/*
+ * ÚJ:   ban ip {}
+ * RÉGI: Z:Line
+ * Megtiltja egy ip-nek, hogy a hálózatra kapcsolódjon.
+ * Szintaktika:
+ * ban ip { mask (ip cím/gazdanévmaszk); reason "(indoklás)"; };
+*/
+ban ip {
+	mask 195.86.232.81;
+	reason "Lecsatolt szerver";
+};
+/*
+ * ÚJ:   ban server {}
+ * RÉGI: Q:Line szerverekre
+ * Megtiltja egy szervernek, hogy a hálózatra kapcsolódjon.
+ * Ha egy szerver távoli szerverre linkel, a helyi szerver
+ * szétkapcsolja a hálózatról.
+ * A szintaktikája a következő:
+ * ban server {
+ *	mask "(szervernév)";
+ *	reason "(indoklás)";
+ * };
+*/
+
+ban server {
+	mask eris.berkeley.edu;
+	reason "Mars ki innen!";
+};
+/*
+ * ÚJ:   ban user {}
+ * RÉGI: K:Line
+ * Elintézi, hogy egy felhasználó egy bizonyos maszkról ne tudjon kapcsolódni
+ * a szerverünkre.
+ * Szintaktika:
+ * ban user { mask (gazdanévmaszk/ip cím); reason "(indok)"; };
+*/
+
+ban user {
+	mask *tirc@*.saturn.bbn.com;
+        reason "Idióta";
+};
+
+/*
+ * ÚJ:   ban realname {}
+ * RÉGI: n:Line
+ * Letiltja egy bizonyos valós név használatát.
+ * Szintaktikája:
+ * ban realname {
+ *	mask "(valós név)";
+ * 	reason "(indok)";
+ * };
+*/
+
+ban realname {
+	mask "Swat Team";
+	reason "mIRKFORCE";
+};
+
+ban realname {
+	mask "sub7server";
+	reason "sub7";
+};
+
+/*
+ * MEGJEGYZÉS MINDEN BANRA: ezek ismételhetőek további bejegyzésekhez!
+ * 
+ * ÚJ:   except ban {} 
+ * RÉGI: E:Line
+ * Elintézi, hogy ne lehessen minket kibannolni. 
+ * Szintaktika:
+ * except ban { mask (azonosító@gazda); };
+ * További gazdákhoz annyiszor ismételjük az except ban {}-t,
+ * amennyiszer szükséges.
+ */
+
+except ban {
+	/* ne tiltsuk ki stskeeps-t */
+	mask           *stskeeps@212.*;
+};
+
+/*
+ * ÚJ:   deny dcc {} 
+ * RÉGI: dccdeny.conf
+ * Használjuk dcc küldések blokkolására... Jobban
+ * megállítja a vírusokat. 
+ * Szintaktika: 
+ * deny dcc 
+ * { 
+ *   filename "blokkolandó fájl (pl. *exe)";
+ *   reason "indok";
+ * };
+ */
+deny dcc {
+	filename "*sub7*";
+	reason "Valószínűleg Sub7 Virus";
+};
+
+/*
+ * ÚJ:   deny channel {}
+ * RÉGI: N/A (ÚJ)
+ * Letiltja bizonyos csatornákon a belépést.
+ * Szintaktika:
+ * deny channel {
+ * 	channel "(csatorna)";
+ * 	reason "indok";
+ * };
+*/
+deny channel {
+	channel "*warez*";
+	reason "A warez törvényellenes";
+};
+
+/*
+ * ÚJ:   vhost {}
+ * RÉGI: Vhost.conf fájl
+ * Beállít egy hamis ip címet közönséges felhasználókon, vagy
+ * olyan operátorokon, akik lusták a /sethost-ot használni :P
+ * Szintaktika:  
+ *   vhost { 
+ *       vhost (vhost.com); 
+ *       from {
+ *            userhost (azonosító@gazda, aki használhatja);
+ *       };
+ *       login (bejelentkezőnév);
+ *       password (jelszó);
+ *   };
+ *        azután e vhost használatához adjuk ki
+ *        a /vhost (bejelentkezőnév) (jelszó) parancsot IRC-n
+ */
+vhost {
+	vhost           i.hate.microsefrs.com;
+	from {
+		userhost       *@*.image.dk;
+	};
+	login           stskeeps;
+	password        moocowsrulemyworld;
+};
+
+/* Befűzhetünk más konfigurációs fájlokat */
+/* include "klines.conf"; */
+
+/* Hálózati beállítások */
+set {
+	network-name 		"ROXnet";
+	default-server 		"irc.roxnet.org";
+	services-server 	"services.roxnet.org";
+	stats-server 		"stats.roxnet.org";
+	help-channel 		"#ROXnet";
+	hiddenhost-prefix	"rox";
+	/* prefix-quit 		"no"; */
+	/* Az álcázó kulcsoknak a hálózat minden szerverén azonosnak kell
+	 * lenniük. Az álcázott gazdanevek előállításában van szerepük, ezért
+	 * legyenek titokban tartva! Mind 3 kulcs legyen egy-egy véletlenszerű
+	 * sztring 5-100 karakterből (10-20 karakter kitűnő), valamint
+	 * tartalmazniuk kell kisbetűket (a-z), nagybetűket (A-Z) és számokat
+	 * (0-9) [ahogy az első kulcsos példában látható].
+	 * TIPP: *NIX alatt az './unreal gencloak' parancsot futtatva
+         *       a parancsértelmezőnkben, az Unreal 3 véletlen sztringet
+         *       generál nekünk.
+	 */
+	cloak-keys {
+		"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+		"írjunk hozzá még egyet";
+		"írjunk hozzá még egyet";
+	};
+	/* gazdanevek opereléskor */
+	hosts {
+		local		"locop.roxnet.org";
+		global		"ircop.roxnet.org";
+		coadmin		"coadmin.roxnet.org";
+		admin		"admin.roxnet.org";
+		servicesadmin 	"csops.roxnet.org";
+		netadmin 	"netadmin.roxnet.org";
+		host-on-oper-up "no";
+	};
+};
+
+/* Szerverszintű beállítások */
+
+set {
+	kline-address "állítsuk.be.ezt.az.emailt";
+	modes-on-connect "+ixw";
+	modes-on-oper	 "+xwgs";
+	oper-auto-join "#operek";
+	options {
+		hide-ulines;
+		/* Itt engedélyezhetjük az ident ellenőrzést, ha szeretnénk */
+		/* identd-check; */
+		show-connect-info;
+	};
+
+	maxchannelsperuser 10;
+	/* Legkevesebb ennyi ideig kell a felhasználónak kapcsolatban lennie,
+	 * mielőtt engedélyt kap a QUIT üzenetek használatára. Remélhetőleg
+	 * ez leállítja a spamot. */
+	anti-spam-quit-message-time 10s;
+	/* A static-quit a neki megadott üzenetet megjeleníti minden
+	 * kilépésben - avagy egyéni kilépési szövegek nem engedélyezettek
+	 * a helyi szerveren */
+	/* static-quit "Kliens kilépés";	*/
+
+	/* Hasonlóan blokkolható minden lelépési indok, úgy, hogy kivesszük
+	 * a megjegyzésből ezt, és "yes"-t írunk vagy megadunk valamilyen
+	 * más szöveget (pl. "Bye bye!"), hogy mindig az legyen a lelépés
+	 * indoklószövege. */
+	/* static-part yes; */
+
+	/* Ezzel megmondhatjuk, mely statisztikákat szeretnénk csak operátorok
+	 * számára engedélyezni. Használjunk *-ot, ha az összeset kívánjuk,
+	 * és hagyjuk el a direktívát, ha a felhasználók mindet láthatják. Írjuk
+	 * be a "/stats" parancsot a teljes listáért.
+	 * Lehet, hogy néhány adminisztrátor törölni fogja a "kGs"-t, hogy
+	 a közönséges felhasználók láthassák a kline-okat, gline-okat és
+	 * shunokat.
+	 */
+	oper-only-stats "okfGsMRUEelLCXzdD";
+
+	/* Elfojtás: ez a példa 60 másodpercenként legfeljebb 3 kapcsolódási
+	 * kísérletet engedélyező korlátozást állít be (gazdánként). */
+	throttle {
+		connections 3;
+		period 60s;
+	};
+
+	/* Árasztásellenes védelem */
+	anti-flood {
+		nick-flood 3:60;	/* 3 nicknévváltás 60 másodpercenként
+		            		   (az alapértelmezés) */
+	};
+
+	/* Spamszűrő */
+	spamfilter {
+		ban-time 1d; /* a spamszűrő által beállított *line-ok
+		                alapértelmezett kitiltási ideje */
+		ban-reason "Spam/Reklámozás"; /* alapértelmezett indok */
+		virus-help-channel "#help"; /* a "viruschan" tevékenységhez
+		                               használt csatorna */
+		/* except "#help"; kivesszük a szűrés alól ezt a csatornát */
+	};
+};
+
+/*
+ * Problémák akadtak, vagy szükség van további segítségre?
+ * 1) www.vulnscan.org/UnrealIRCd/unreal32docs.html
+ * 2) www.vulnscan.org/UnrealIRCd/faq/ <- a kérdéseid 80%-át tartalmazza!
+ * 3) Ha még mindig gondod van, felmehetsz az irc.ircsystems.net #unreal-support
+ *    csatornájára. Fontos: kérjük, hogy előbb OLVASD EL A DOKUMENTÁCIÓT és
+ *    a GYIK-ot!
+ */

doc/example.nl.conf

@@ -0,0 +1,816 @@
+/*
+ * example.conf door Daniel Hawton AKA Osiris (osiris@unrealircd.org).
+ * $Id$
+ * Vertaald door Mark
+ * 
+ * Werkt voor Unreal3.2 en hoger
+ * 
+ * Dit is de nieuwe example.conf. Het lijkt veel op C++.
+ * Het begin is wellicht moeilijk, maar met wat ervaring en lezen
+ * zul je het wel begrijpen.
+ *
+ * Kopieer dit bestand naar je hoofd UnrealIRCd dir en noem het 'unrealircd.conf'.
+ * 
+ * OPMERKING: Alle regels, behalve de openings { regel, eindingen met een ;, dus
+ * ook de sluitende } regel. Commentaar regels worden door de IRCd niet verwerkt.
+ *
+ * LEES doc/unreal32docs.html! De online versie is tevens te bereiken op:
+ * www.vulnscan.org/UnrealIRCd/unreal32docs.html
+ * Er staat heel veel informatie in over het configbestand: informatie over
+ * elk block, variabele, etc..
+ * Wanneer je dit bestand aanpast zonder de documentatie grondig te lezen,
+ * zul je gegarandeerd falen!
+ */
+
+/* Type van commentaar */
+#Commentaar type 1 (Shell type)
+// Commentaar type 2(C++ style)
+/* Commentaar type 3 (C Style) */
+#Deze regels worden niet verwerkt door de IRCd.
+
+/*
+ * UnrealIRCd ondersteunt modules, het laden van sommige is benodigd.
+ * Je hebt tenminste een commands module en een cloacking module nodig.
+ */
+
+/* VOOR *NIX, haal de commentaartekens weg bij de volgende 2 regels: */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* VOOR Windows, haal de commentaartekens weg bij de volgende 2 regels: */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
+
+/*
+ * Je kan tevens andere configuratiebestanden toevoegen.
+ * help.conf bevat alle /helpop tekst. De badwords.*.conf
+ * bestanden bevatten alle badword instellingen voor mode +G..
+ * spamfilter.conf bevat enkele goede regels voor huidige trojans.
+ * Je wilt deze waarschijnlijk laden:
+ */
+ 
+include "help.conf";
+include "badwords.channel.conf";
+include "badwords.message.conf";
+include "badwords.quit.conf";
+include "spamfilter.conf";
+
+/*
+ * NIEUW: me {} 
+ * OUD: M:Line 
+ * me {} definieert de naam, beschrijving en unreal numeriek voor deze server.
+ * De syntax is als volgt:
+ * me { 
+ *  name "server.naam"; 
+ *  info "Server Beschrijving";
+ *  numeric (server numeric*);
+ * }; 
+ * Waneer je servers linkt, mag de numeric niet door een andere server in gebruik zijn.
+ */
+me
+{
+	name "irc.foonet.com";
+	info "FooNet Server";
+	numeric 1;
+};
+
+/*
+ * NIEUW: admin {} 
+ * OUD: A:Line
+ * Admin geeft informatie over de server admin. Je mag hier
+ * zo veel regels opgeven als je wilt.
+ * De syntax is als volgt:
+ * admin {
+ *   "eerste regel"; 
+ *   "tweede regel"; 
+ *   [etc]
+ * };
+ */
+admin {
+	"Bob Smith";
+	"bob";
+	"widely@used.name";
+};
+
+/*
+ * NIEUW: class {} 
+ * OUD: Y:line (de oude was verwarrend) 
+ * Hiermee stel je de classes in. Een class is een groepsinstelling voor
+ * connections. Server connecties stuur je naar een andere class dan
+ * gebruikers.
+ * De syntax is als volgt:
+ * class (class naam)
+ * {
+ *     pingfreq (hoe vaak er gepingt moet worden naar een gebruiker/server in seconden);
+ *     maxclients (hoeveel connecties er maximaal in deze class mogen zijn);
+ *     sendq (maximale send queue voor 1 connectie);
+ *     recvq (maximale receive queue voor 1 connectie [flood control]);
+ *  };
+ */
+
+class           clients
+{
+	pingfreq 90;
+	maxclients 500;
+	sendq 100000;
+	recvq 8000;
+};
+
+class           servers
+{
+	pingfreq 90;
+	maxclients 10;		/* Hoeveel servers we maximaal tegelijk gelinkt kunnen hebben */
+	sendq 1000000;
+	connfreq 100; /* Hoeveel seconden tussen een poging to verbinden */
+};
+
+/*
+ * NIEUW: allow {} 
+ * OUD: I:Line
+ * Hiermee stel je het toestaan van connecties in.
+ * Gebruikers kunnen verbinden, en jij hebt wat controle en kan eventueel
+ * een wachtwoord instellen.
+ * De syntax is als volgt: 
+ * allow {
+ *    ip (ip mask dat toegestaan moet worden);
+ *    hostname (host mask);
+ *    class (class waarnaar ze gestuurd moeten worden [see class {}]);
+ *    password "(wachtwoord)"; (optioneel)
+ *    maxperip (hoeveel connecties per IP); (optioneel) 
+ * };
+ */
+
+allow {
+	ip             *@*;
+	hostname       *@*;
+	class           clients;
+	maxperip 5;
+};
+
+/* Allow met wachtwoord */
+allow {
+	ip             *@255.255.255.255;
+	hostname       *@*.passworded.ugly.people;
+	class           clients;
+	password "f00Ness";
+	maxperip 1;
+};
+
+/*
+ * NIEUW: allow channel {} 
+ * OUD: chrestrict 
+ * Geeft de mogelijkheid een kanaal te joinen,
+ * als uitzondering voor een deny channel {}
+ * De syntax is als volgt:
+ * allow channel {
+ *   channel "kanaal naam";
+ * };
+ */
+allow           channel {
+	channel "#WarezSucks";
+};
+
+/*
+ * NIEUW: oper {} 
+ * OUD: O:Line 
+ * Stelt een IRC Operator in
+ * IRC Operators zorgen voor orde op de server en zorgen er
+ * tevens voor dat de server verbonden blijft met het netwerk.
+ * De syntax is als volgt: 
+ * oper (login) { 
+ *     class (class waarin ze geplaatst moeten worden.); 
+ *     from { 
+ *        userhost (ident@host);
+ *        userhost (ident@host);
+ *     }; 
+ *     flags
+ *     { 
+ *       (flags hier*);
+ *     };
+ *     OF
+ *     flags "oud type flags, zoals OAaRD";
+ * };
+ */
+
+
+/* Voor een lange lijst van oper flags, zie doc/unreal32docs.html#operblock
+ * [wordt ten zeerste aangeraden te lezen!]
+ */
+
+oper bobsmith {
+	class           clients;
+	from {
+		userhost bob@smithco.com;
+	};
+	password "f00";
+	flags
+	{
+		netadmin;
+		can_zline;
+		can_gzline;
+		can_gkline;
+		global;
+	};
+};
+
+/*
+ * NIEUW: listen {}
+ * OUD: P:Line
+ * Hiermee stel je een poort in voor de IRCd, zodat
+ * gebruikers/servers kunnen verbinden met je server.
+ * De syntax is als volgt:
+ * listen (ip nummer):(port nummer)
+ * { 
+ *   options {
+ *     (opties hier);
+ *   };
+ * };
+ * of een gewone:
+ * listen: listen (ip):(port);
+ * 
+ * OPMERKING: voor IPv6 IPs (3ffe:b80:2:51d::2 etc), gebruik listen [ip]:port;
+ * 
+ * Dat werkt ook.
+ */
+
+/* Opties voor listen:
+	OUD	| 	NIEUW
+	S		serversonly
+	C		clientsonly
+	J		java
+	s		ssl
+	*		standard
+*/
+
+
+/* Opmerking voor SSL poorten: SSL poorten zijn niet echt
+ * standaard. Mensen zeggen dat je SSL op poort 994 moet laten
+ * lopen, omdat dit de standaard SSL poort is.. Maar meestal worden
+ * hogere poorten gebruikt. Om poort 994 te gebruiken, moet je root
+ * zijn! Tevens is poort 194 de officiele IRC poort. Maar heb je daar
+ * ooit een IRCd op zien lopen?
+ * Wij raden je aan om poort 6697 voor SSL te gebruiken. Dit wordt op
+ * vrijwel alle netwerken gebruikt en wordt herkend door bijvoorbeeld
+ * StunTour. Je mag zoveel SSL poorten openen als je wil, maar als je
+ * (tevens) 6697 gebruikt, help je mee de wereld meer uniform te maken ;).
+ */
+ 
+listen         *:6697
+{
+	options
+	{
+		ssl;
+		clientsonly;
+	};
+};
+
+listen         *:8067;
+listen         *:6667;
+
+
+/* Opmerking: Als je een IRCd shell gebruikt met meerdere IPs, krijg
+ *            je wellicht een "Address already in use" error in je log
+ *            en de IRCd zal niet starten. Dit betekent dat je MOET binden
+ *            naar een specifiek IP in plaats van '*', bijvoorbeeld:
+ *            listen 1.2.3.4:6667l
+ *            Natuurlijk moet je het IP vervangen door het IP dat je toewezen is.
+ */
+ 
+/*
+ * NIEUW: link {}
+ * OUD: C/N:Lines
+ * Geeft een server toegang om te verbinden.
+ * OPMERKING: Beiden servers hebben een link { } nodig om goed te kunnen verbinden!
+ * De syntax is als volgt:
+ * link (server naam)
+ * {
+ *	username	(username, * werkt ook);
+ * 	hostname	(ip number/hostmask);
+ *	bind-ip		(welk IP te binden wanneer je connect, of *);
+ *	port		(poort om naar te verbinden);
+ *	hub (Als dit een hub is, werkt '*');
+ *	[of leaf *;]
+ *	password-connect "(wachtwoord te zenden)";
+ *	password-receive "(wachtwoord te ontvangen)";
+ *	class		(class waarin de server geplaatst moet worden);
+ *	options {
+ *		(opties hier*);
+ *	};
+ *      // Als we SSL gebruiken, kunnen we kiezen welke cipher we willen gebruiken in SSL mode
+ *      // Verkrijg een lijst door "openssl ciphers", onderscheid ciphers met :'s
+ *      ciphers "DES-CBC3-MD5";
+ * 
+ * };
+*/
+
+/*
+	opties:
+	OUD	|	NIEUW
+	S		ssl
+	Z		zip
+	N/A		autoconnect
+	N/A		quarantine
+	N/A		nodnscache
+*/
+
+
+link            hub.mynet.com
+{
+	username	*;
+	hostname 	1.2.3.4;
+	bind-ip 	*;
+	port 		7029;
+	hub             *;
+	password-connect "LiNk";
+	password-receive "LiNk";
+	class           servers;
+		options {
+			/* Opmerking: Gebruik geen autoconnect naar Services */
+			autoconnect;
+			ssl;
+			zip;
+		};
+};
+/*
+ *
+ * NIEUW: ulines {}
+ * OUD: U:Line
+ * U:Lines geven servers meer macht/commando's. Gebruik het alleen voor
+ * services en stats, en NOOIT voor normale UnrealIRCd servers!
+ * De syntax is als volgt:
+ * ulines {
+ *	(server to uline);
+ *	(server to uline);
+ *  [etc]
+ * };
+*/
+ulines {
+	services.roxnet.org;
+	stats.roxnet.org;
+};
+
+/*
+ * NIEUW: drpass {}
+ * OUD: X:Line
+ * Stelt de wachtwoorden voor /die en /restart in.
+ * De syntax is als volgt:
+ * drpass { 
+ *  restart		"(wachtwoord voor herstart)";
+ *  die		    "(wachtwoord voor beeindigen)";
+ * };
+ */
+drpass {
+	restart "I-love-to-restart";
+	die "die-you-stupid";
+};
+
+/*
+ * NIEUW: log {}
+ * OUD: N/A
+ * Laat de IRCd weten wat en waar te loggen. Je kan er
+ * zoveel instellen als je wilt.
+ * 
+ * FLAGS: errors, kills, tkl, connects, server-connects, kline, oper
+ * 
+ * De syntax is als volgt: 
+ *
+ * log "log file" 
+ * {
+ *    flags
+ *    {
+ *        flag;
+ *        flag; 
+ *        etc.. 
+ *    }; 
+ * };
+ */
+
+log "ircd.log" {
+  /* Verwijder het logbestand en begint een nieuwe wanneer de oude 2MB groot is. Laat dit leeg om altijd
+     hetzelfde bestand te gebruiken */
+	maxsize 2097152;
+	flags {
+		oper;
+		kline;
+		connects;
+		server-connects;
+		kills;
+		errors;
+		sadmin-commands;
+		chg-commands;
+		oper-override;
+		spamfilter;
+	};
+};
+
+/*
+ * NIEUW: alias {}
+ * OUD: N/A
+ * Hiermee stel je commando's zoals /nickserv, /chanserv etc in.
+ * FLAGS: services, stats, normal
+ *
+ * De syntax is als volgt:
+ * alias "naam" {
+ *	target "wijst naar";
+ *	type aliastype;
+ * };
+ *
+ * [Opmerking: Je kan ook een standaard alias bestand gebruiken, zie doc/unreal32docs.nl.html sectie 2.9]
+ */
+
+// Dit wijst het commando /nickserv naar de gebruiker NickServ welke verbonden is met set::services-server
+
+/*alias NickServ {
+	target "NickServ";
+	type services;
+};*/
+
+// Als je het commando naar dezelfde nick als het commando wil sturen, kun je "target" weglaten.
+//alias ChanServ { type services; };
+
+// Wijst het /statserv commando naar de gebruiker Statserv verbonden met set::stats-server
+//alias StatServ { type stats; };
+
+// Wijst het /superbot commando naar de gebruiker SuperBot
+//alias SuperBot { type normal; };
+
+/* Standaard aliases */
+alias NickServ { type services; };
+alias ChanServ { type services; };
+alias OperServ { type services; };
+alias HelpServ { type services; };
+alias StatServ { type stats; };
+
+/*
+ * NIEUW: alias {}
+ * OUD: N/A
+ * Hiermee stel je commando's zoals /identify, /services in.
+ *
+ * De syntax is als volgt:
+ * alias "naam" {
+ *	format "format string" {
+ *		target "wijst naar";
+ *    type aliastype;
+ *		parameters "parameters te verzenden";
+ *	};
+ *	type command;
+ * };
+ */
+
+/* Hier wordt apart notitie van gemaakt, hoewel het dezelfde naam heeft als het vorige block. Het verschilt veel
+ * in syntax, maar het maakt gebruik van dezelfde functies.
+ */
+
+/*
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+*/
+
+/* De alias::format is een reguliere expressie. Het eerste formaat matcht het /identify commando wanneer
+ * het eerste teken een # is. Daarna wordt het doorgezonden naar de chanserv alias met de parameters
+ * IDENTIFY %1-. Het tweede formaat matcht het /identify commando wanneer het eerste teken geen # is. Daarna
+ * wordt het commando doorgestuurd naar de nickserv alias met de parameters IDENTIFY %1-.
+ */
+
+/* Het alias::format::parameters is gelijk aan script-talen. %N (N is een nummer) staat voor de parameter die
+ * gezonden is naar het commando (in dit geval /identify). Wanneer je %N- opgeeft, betekent dat alle parameters
+ * vanaf N tot de laatste paramater in de string. Je kan ook %n gebruiken, waar %n vervangen wordt door de nick.
+*/
+
+/* Standaard aliases */
+alias "services" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "%1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "%1-";
+	};
+	type command;
+};
+
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+
+/* Dit is een voorbeeld van een echt commando alias */	
+/* Dit verwijst /GLINEBOT naar /GLINE <parameter> 2d etc... */	
+alias "glinebot" {	
+	format ".+" {	
+		command "gline";	
+		type real;	
+		parameters "%1 2d Bots are not allowed on this server, please read the faq at http://www.example.com/faq/123";	
+	};	
+	type command;	
+};
+
+/*
+ * NIEUW: tld {}
+ * OUD: T:Line
+ * Hiermee stel je verschillende MOTD en RULES bestanden in,
+ * afhangend van de gebruikers hostmask.
+ * De syntax is als volgt: 
+ * tld {
+ *    mask (ident@host);
+ *    motd "(motd bestand)";
+ *    rules "(rules bestand)";
+ * };
+ */
+
+tld {
+	mask *@*.fr;
+	motd "ircd.motd.fr";
+	rules "ircd.rules.fr";
+};
+
+/* Opmerking: je kan het bovenstaande voorbeeld verwijderen.
+ * In dat geval worden de standaard motd/rules bestanden (ircd.motd, ircd.rules).
+ * gebruikt voor iedereen.
+ */
+
+/*
+ * NIEUW: ban nick {}
+ * OUD: Q:Line
+ * Bant een nickname zodat deze niet gebruikt kan worden.
+ * De syntax is als volgt:
+ * ban nick {
+ *	mask "(nick om te bannen)";
+ *	reason "(reden)";
+ * };
+ */
+ 
+ban nick {
+	mask "*C*h*a*n*S*e*r*v*";
+	reason "Reserved for Services";
+};
+
+/*
+ * NIEUW: ban ip {}
+ * OUD: Z:Line
+ * Bant een IP van de server
+ * De syntax is als volgt:
+ * ban ip {
+ *  mask (ip number/hostmask);
+ *  reason "(reden)";
+ * };
+ */
+
+ban ip {
+	mask 195.86.232.81;
+	reason "Delinked server";
+};
+
+/*
+ * NIEUW: ban server {}
+ * OUD: Server Q:Line
+ * Zorgt ervoor dat een server niet kan verbinden met het netwerk.
+ * Als de server naar een andere server linkt, zal de lokale server
+ * de verbinding met het netwerk verbreken.
+ * De syntax is als volgt:
+ * ban server {
+ *	mask "(server naam)";
+ *	reason "(reden)";
+ * };
+ */
+
+ban server {
+	mask eris.berkeley.edu;
+	reason "Get out of here.";
+};
+/*
+ * NIEUW: ban user {}
+ * OUD: K:Line
+ * Zorgt ervoor dat een gebruiker met een bepaalde mask niet
+ * kan verbinden met je server.
+ * De syntax is als volgt:
+ * ban user {
+ *  mask (hostmask/ip number);
+ *  reason "(reden)";
+ * };
+ */
+
+ban user {
+	mask *tirc@*.saturn.bbn.com;
+        reason "Idiot";
+};
+
+/*
+ * NIEUW: ban realname {}
+ * OUD: n:Line
+ * Belet het gebruik van een bepaalde realname.
+ * De syntax is als volgt:
+ * ban realname {
+ *	mask "(real name)";
+ * 	reason "(reden)";
+ * };
+ */
+
+ban realname {
+	mask "Swat Team";
+	reason "mIRKFORCE";
+};
+
+ban realname {
+	mask "sub7server";
+	reason "sub7";
+};
+
+/*
+ * OPMERKING VOOR ALLE BANS: Ze mogen herhaald worden voor extra toevoegingen!
+ * 
+ * NIEUW: except ban {} 
+ * OUD: E:Line
+ * Zorgt ervoor dat jij niet gebanned kan worden.
+ * De syntax is als volgt:
+ * except ban { mask (ident@host); };
+ * Herhaal de except ban {} zo vaak als je wilt
+ * voor andere hosts.
+ */
+
+except ban {
+	/* don't ban stskeeps */
+	mask           *stskeeps@212.*;
+};
+
+/*
+ * NIEUW: deny dcc {} 
+ * OUD: dccdeny.conf
+ * Wordt gebruikt om DCC sends te blokkeren..
+ * Stopt virii beter.
+ * De syntax is als volgt: 
+ * deny dcc 
+ * { 
+ *   filename "bestand te blokkeren (bv, *exe)";
+ *   reason "reden";
+ * };
+ */
+deny dcc {
+	filename "*sub7*";
+	reason "Possible Sub7 Virus";
+};
+
+/*
+ * NIEUW: deny channel {}
+ * OUD: N/A (NIEUW)
+ * Belet het gebruik van een kanaal.
+ * De syntax is als volgt:
+ * deny channel {
+ * 	channel "(kanaal)";
+ * 	reason "reden";
+ * };
+*/
+deny channel {
+	channel "*warez*";
+	reason "Warez is illegal";
+};
+
+/*
+ * NIEUW: vhost {}
+ * OUD: Vhost.conf file
+ * Dit zet een nep ip voor niet-opers, of voor opers
+ * die te lui zijn /sethost te gebruiken ;)
+ * De syntax is als volgt:  
+ *   vhost { 
+ *       vhost (vhost.com); 
+ *       from {
+ *            userhost (ident@host toegestaan de vhost te gebruiken);
+ *       };
+ *       login (login name);
+ *       password (password);
+ *   };
+ * Om je vhost te gebruiken, typ /vhost (login) (password) op IRC
+ */
+vhost {
+	vhost           i.hate.microsefrs.com;
+	from {
+		userhost       *@*.image.dk;
+	};
+	login           stskeeps;
+	password        moocowsrulemyworld;
+};
+
+/* Je kan ook andere configuratiebestanden laden */
+/* include "klines.conf"; */
+
+/* Netwerk configuratie */
+set {
+	network-name 		"ROXnet";
+	default-server 		"irc.roxnet.org";
+	services-server 	"services.roxnet.org";
+	stats-server 		"stats.roxnet.org";
+	help-channel 		"#ROXnet";
+	hiddenhost-prefix	"rox";
+	/* prefix-quit 		"no"; */
+	/* Cloak keys moeten op alle servers in het netwerk hetzelfde zijn.
+	 * Ze worden gebruikt voor het maken van gemaskte hosts en moeten geheim blijven.
+	 * De keys moeten 3 willekeurige strings zijn, bestaande uit 5-100 tekens
+	 * (10-20 tekens is genoeg) en moeten bestaan uit kleine letters (a-z),
+	 * hoofdletters (A-Z) en getallen (0-9) [zie de eerste key als voorbeeld].
+     * Tip: Wanneer je met een *NIX systeem werkt, kun je './unreal gencloak' gebruiken in
+     * je shell. Dit genereert 3 willekeurige strings die je kunt gebruiken.
+	 */
+	cloak-keys {
+		"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+		"en nog eentje";
+		"en nog eentje";
+	};
+	/* on-oper host */
+	hosts {
+		local		"locop.roxnet.org";
+		global		"ircop.roxnet.org";
+		coadmin		"coadmin.roxnet.org";
+		admin		"admin.roxnet.org";
+		servicesadmin 	"csops.roxnet.org";
+		netadmin 	"netadmin.roxnet.org";
+		host-on-oper-up "no";
+	};
+};
+
+/* Server gerelateerde configuratie */
+
+set {
+	kline-address "stel.dit.adres.in";
+	modes-on-connect "+ixw";
+	modes-on-oper	 "+xwgs";
+	oper-auto-join "#opers";
+	options {
+		hide-ulines;
+		/* Je kan hier ident checking aanzetten als je wilt */
+		/* identd-check; */
+		show-connect-info;
+	};
+
+	maxchannelsperuser 10;
+	/* Hoelang een gebruiker minimaal verbonden moet zijn voordat hij toegestaan wordt het
+	 * QUIT bericht te gebruiken. Dit stopt spam hopelijk. */
+	anti-spam-quit-message-time 10s;
+	/* Stelt een tekst in die standaard wordt gebruikt voor een quit.
+	 * Houdt in dat er geen eigen quits gebruikt mogen worden op deze server. */
+	/* static-quit "Client quit";	*/
+
+  /* Je kan ook alle part-redenen blokkeren door hieronder het commentaar weg te halen
+   * en er 'yes' neer te zetten. Je kan ook een standaard tekst gebruiken (bijvoorbeeld
+   * "Bye bye!") om deze tekst altijd te gebruiken..
+   */
+	/* static-part yes; */
+
+	/* Stelt in dat stats alleen door opers gebruikt mogen worden. Gebruik * voor alle stats,
+	 * en laat het weg zodat gebruikers alle stats kunnen zien. Typ '/stats' voor een lijst
+	 * van alle stats.
+	 * Sommige admins willen 'kGs' wellicht verwijderen zodat gewone gebruikers een lijst van
+	 * klines, glines en shunts kunnen zien.
+	 */
+	
+	oper-only-stats "okfGsMRUEelLCXzdD";
+
+	/* Throttle: dit voorbeeld zet een limie van 3 conneties per 60s (per host). */
+	throttle {
+		connections 3;
+		period 60s;
+	};
+
+	/* Anti flood protectie */
+	anti-flood {
+		nick-flood 3:60;	/* 3 naamsveranderingen per 60 seconden (standaard) */
+	};
+
+	/* Spam filter */
+	spamfilter {
+		ban-time 1d; /* standaard duur van een *line gezet door spamfilter */
+		ban-reason "Spam/Advertising"; /* standaard reden */
+		virus-help-channel "#help"; /* kanaal te gebruiken voor 'viruschan' actie */
+		/* except "#help"; kanaal waar niet gefilterd wordt */
+	};
+};
+
+/*
+ * Problemen of meer hulp nodig?
+ * 1) www.vulnscan.org/UnrealIRCd/unreal32docs.html
+ * 2) www.vulnscan.org/UnrealIRCd/faq/ <- hier staat 80% van je vragen!
+ * 3) Als je nog steeds problemen hebt, kun je naar irc.ircsystems.net #unreal-support,
+      maar je moet wel eerst de documentatie en FAQ gelezen hebben!
+ */

doc/example.ru.conf

@@ -0,0 +1,792 @@
+/*
+ * example.conf by Daniel Hawton AKA Osiris (osiris@unrealircd.org).
+ * example.ru.conf by Samets Anton aka Bock (bock@bynets.org).
+ * $Id$
+ * 
+ * (Encoding): Windows-1251
+ *
+ * Работает для Unreal3.2 и выше
+ * 
+ * Итак, это русскоязычный пример example.conf. По синтаксису похож на C++.
+ * По началу будет тяжело понять, что тут написано, однако во время практики и чтения
+ * вы научитесь это делать.
+ *
+ * Просто скопируйте этот файл в главную директорию unrealircd и переименуйте в 'unrealircd.conf'.
+ * 
+ * Замечание: Все линии, кроме тех, которые начинаются с {, заканчиваются ; включая и закрывающую }. 
+ * IRCd проигнорирует закомментированные линии.
+ *
+ * ПРОЧТИТЕ doc/unreal32docs.ru.html! Версия в интернете доступна по адресу:
+ * www.vulnscan.org/UnrealIRCd/unreal32docs.ru.html
+ * Она содержит большинство информации о конфигурировании, даёт представление о каждом блоке,
+ * переменной и так далее...
+ * Если вы пытаетесь редактировать этот файл без прочтения документации, вы гарантированно
+ * потерпите неудачу!
+ */
+
+/* Типы комментариев */
+# Первый тип (Shell type)
+// Второй тип (C++ style)
+/* Третий тип (C Style) */
+# данные линии игнорируются ircd.
+
+/*
+ * UnrealIRCd поддерживает модули, загрузка некоторых необходима для запуска.
+ * Вам необходимо загрузить как минимум модули команд и скрытия хоста.
+ */
+
+/* Для *NIX систем раскомментируйте следующие 2 линии: */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* Для Windows систем раскомментируйте следующие 2 линии: */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
+
+/*
+ * Вам необходимо подключить и другие конфигурационные файлы.
+ * help.ru.conf содержит весь текст команды /helpop. Файлы badwords.*.conf
+ * содержат все включения матных слов для режима +G...
+ * spamfilter.conf содержит правила для защиты от троянских коней.
+ * Вы вероятно захотите подключить эти файлы:
+ */
+include "help.ru.conf";
+include "badwords.channel.conf";
+include "badwords.message.conf";
+include "badwords.quit.conf";
+include "spamfilter.conf";
+
+/*
+ * НОВОЕ: me {} 
+ * СТАРОЕ: M:Line 
+ * me {} определяет имя, описание и нумерик сервера unreal для данного сервера.
+ * Синтаксис: 
+ * me { 
+ *  name "Имя.сервера"; 
+ *  info "Описание сервера";
+ *  numeric (нумерик сервера*);
+ * }; 
+ * При соединении с другими серверами, нумерик должен быть уникальным в сети. Имя сервера - англоязычное.
+ */
+me
+{
+    name "irc.foonet.com";
+    info "Сервер FooNet";
+    numeric 1;
+};
+
+/*
+ * НОВОЕ: admin {} 
+ * СТАРОЕ: A:Line
+ * Данный блок предоставляет информацию об администраторе сервера.
+ * Вы можете поместить сколько угодно линий после admin {. 
+ * Синтаксис:
+ * admin {
+ *   "первая линия"; 
+ *   "вторая линия"; 
+ *   [так далее]
+ * };
+ */
+admin {
+    "Вася Пупкин!";
+    "vasya_pupkin";
+    "haker@lamer.ru";
+    "ICQ: 987654321";
+};
+
+/*
+ * НОВОЕ: class {} 
+ * СТАРОЕ: Y:line (был слишком запутан) 
+ * Определяет настройки для классов. Класс определяет групповые настройки для подключений.
+ * Например, подключение сервера, вместо включения его в класс пользователей, вы направляете в
+ * класс серверов. Используется следующий синтаксис:
+ * class (имя класса)
+ * {
+ *     pingfreq (как часто пиновать пользователя/сервер в секундах);
+ *     maxclients (сколько максимально соединений разрешено данному классу);
+ *     sendq (максимальная очередь для отправки от подключения);
+ *     recvq (максимальная очередь для получения от подключения [контроль за флудом]);
+ *  };
+ */
+
+class           clients
+{
+    pingfreq 90;
+    maxclients 500;
+    sendq 100000;
+    recvq 8000;
+};
+
+class           servers
+{
+    pingfreq 90;
+    maxclients 10;        /* Какое максимальное количество серверов может быть прилинковано к этому серверу */
+    sendq 1000000;
+    connfreq 100; /* Через сколько секунд проводить следующую попытку подключения */
+};
+
+/*
+ * НОВОЕ: allow {} 
+ * СТАРОЕ: I:Line
+ * Определяет, кому разрешено подключаться к серверу...
+ * В основном используется для клиентов, это разрешает им подключаться к серверу, а вы можете их контролировать
+ * и/или устанавивать пароль.
+ * Синтаксис: 
+ * allow {
+ *    ip (разрешённая маска ip);
+ *    hostname (маска хоста);
+ *    class (класс, в который определить[смотри class {}]);
+ *    password "(пароль)"; (необязательно)
+ *    maxperip (сколько подключений с одного ip); (необязательно) 
+ * };
+ */
+
+allow {
+    ip             *@*;
+    hostname       *@*;
+    class           clients;
+    maxperip 5;
+};
+
+/* Разрешение подключения с паролем */
+allow {
+    ip             *@255.255.255.255;
+    hostname       *@*.passworded.ugly.people;
+    class           clients;
+    password "аццкип0р0ль";
+    maxperip 1;
+};
+
+/*
+ * НОВОЕ: allow channel {} 
+ * СТАРОЕ: chrestrict 
+ * Позволяет пользователю зайти на канал...
+ * служит как исключение из запрещённых каналов. 
+ * Синтаксис:
+ * allow channel {
+ *   channel "имя канала";
+ * };
+ */
+allow           channel {
+    channel "#WarezSucks";
+};
+
+/*
+ * НОВОЕ: oper {} 
+ * СТАРОЕ: O:Line 
+ * Определяет IRC оператора
+ * IRC операторы следят за сервером, занимаются его поддержкой и подключением к сети. 
+ * Синтаксис: 
+ * oper (логин) { 
+ *     class (класс, в который определять их, если отличен от блока I, в какой класс переместить); 
+ *     from { 
+ *        userhost (идент@хост);
+ *        userhost (идент@хост);
+ *     }; 
+ *     flags
+ *     { 
+ *       (тут флаги*);
+ *     };
+ *     ИЛИ
+ *     flags "флаги старого типа, вида OAaRD";
+ * };
+ */
+
+
+/* Для списка флагов оператора прочитайте doc/unreal32docs.ru.html#operblock
+ * [ОЧЕНЬ НАСТОЯТЕЛЬНО рекомендуется к прочтения]
+ */
+
+oper vasyapupkin {
+    class           clients;
+    from {
+        userhost vasya@somewhere.by;
+    };
+    password "p0r0l'";
+    flags
+    {
+        netadmin;
+        can_zline;
+        can_gzline;
+        can_gkline;
+        global;
+    };
+};
+
+/*
+ * НОВОЕ: listen {}
+ * СТАРОЕ: P:Line
+ * Определяет, на каких портах будет работать ircd,
+ * позволяя пользователям/серверам подключаться к серверу. 
+ * Синтаксис:
+ * listen (ip):(номер порта) 
+ * { 
+ *   options {
+ *     (тут опции);
+ *   };
+ * };
+ * или просто
+ * listen: listen (ip):(порт);
+ * 
+ * ЗАМЕЧАНИЕ: для протокола ip v6 (3ffe:b80:2:51d::2), используйте [ip]:порт;
+ * 
+ * Это так же будет работать.
+ */
+
+/* Опции для listen:
+    СТАРЫЕ    |     НОВЫЕ
+    S        serversonly
+    C        clientsonly
+    J        java
+    s        ssl
+    *        standard
+*/
+
+/* ЗАМЕЧАНИЕ ДЛЯ ПОРТОВ SSL: SSL порты стандартизированы,
+ * за исключением многочисленных "высоких" портов SSL, некоторые люди могут сказать вам, 
+ * чтобы вы запустили на порту 994, потому что он официальный порт SSL... Но это же
+ * требует привилегий пользователя root! К слову, порт 194 - официальный порт irc, 
+ * но вы видели когда-нибудь ircd, запущенный на нём?
+ * Итак, наше предложение - использовать порт 6697 для SSL, он используется уже рядом сетей
+ * и используется в примере StunTour.
+ * Вы можете открыть сколько угодно портов SSL, но используя так же и 6697, вы поможете
+ * стандартизировать его;).
+ */
+listen         *:6697
+{
+    options
+    {
+        ssl;
+        clientsonly;
+    };
+};
+
+listen         *:8067;
+listen         *:6667;
+
+/* ЗАМЕЧАНИЕ: Если вы используете шелл IRCd, где несколько IP адресов, вы можете получить сообщение типа
+ *            'Address already in use', ошибки в вашем лог-файле и ircd не запустится.
+ *            Это значит, что вам необходимо указать определённый адрес IP вместо '*', к примеру:
+ *            listen 1.2.3.4:6667;
+ *            Конечно же, измените IP адрес на тот, который назначен вам.
+ */
+
+/*
+ * НОВОЕ: link {}
+ * СТАРОЕ: C/N:Lines
+ * Определяет блок для подключения серверов.
+ * ЗАМЕЧАНИЕ: ЧТОБЫ ПОДКЛЮЧИТЬСЯ БЕЗ ВОПРОСОВ, НА ОБОИХ СЕРВЕРАХ НЕОБХОДИМЫ ПРАВИЛЬНЫЕ НАСТРОЙКИ LINK {}!
+ * Синтаксис:
+ * link (имя сервера)
+ * {
+ *    username    (имя пользователя, * работает тоже);
+ *     hostname    (адрес ip/маска хоста);
+ *    bind-ip        (На каком адресе IP слушать или *);
+ *    port        (порт для соединения);
+ *    hub (если это хаб, * так же работает, или макси сервера, которые могут быть под ним);
+ *    [или leaf *;]
+ *    password-connect "(пароль для отправки)";
+ *    password-receive "(пароль, что мы должны получить)";
+ *    class        (класс, в который определить сервер);
+ *    options {
+ *        (тут указываются опции*);
+ *    };
+ *      // Если мы используем SSL, мы можем указать, какой шифр использовать в режиме SSL
+ *      // Получить список можно "openssl ciphers", шифры разделяются двоеточиями (:)
+ *      
+ *      ciphers "DES-CBC3-MD5";
+ * 
+ * };
+*/
+
+/*
+    опции:
+    СТАРЫЕ    |    НОВЫЕ
+    S        ssl
+    Z        zip
+    N/A        autoconnect
+    N/A        quarantine
+    N/A        nodnscache
+*/
+
+
+link		hub.ru.by
+{
+    username    *;
+    hostname     1.2.3.4;
+    bind-ip     *;
+    port         7029;
+    hub             *;
+    password-connect "LiNk";
+    password-receive "LiNk";
+    class           servers;
+        options {
+            /* Замечание: Вы не должны использовать автоподключение (autoconnect) при подключении сервисов */
+            autoconnect;
+            ssl;
+            zip;
+        };
+};
+/*
+ *
+ * НОВОЕ: ulines {}
+ * СТАРОЕ: U:Line
+ * U-lines обладают большей силой/властью, чем другие сервера. Это нужно устанавливать только на
+ * сервисы/сервера сбора статистики и НИКОГДА на обычные сервера UnrealIRCd!
+ * Синтаксис:
+ * ulines {
+ *    (сервер в uline);
+ *    (сервер в uline);
+ *  [и т.д.]
+ * };
+*/
+ulines {
+    services.roxnet.org;
+    stats.roxnet.org;
+};
+
+/*
+ * НОВОЕ: drpass {}
+ * СТАРОЕ: X:Line
+ * Определяет пароли для использования команд /die и /restart.
+ * Синтаксис:
+ * drpass { 
+ *  restart        "(пароль для перезапуска)";
+ *  die            "(пароль для отключения)";
+ * };
+ */
+drpass {
+    restart "Я-люблю-перезапускать-сервер";
+    die "умри-тупое!:)";
+};
+
+/*
+ * НОВОЕ: log {} 
+ * СТАРОЕ: N/A 
+ * Указыает ircd куда и что протоколировать (вести лог). Вы можете указать столько, сколько пожелаете.
+ * 
+ * ФЛАГИ: errors, kills, tkl, connects, server-connects, kline, oper
+ * 
+ * Синтаксис: 
+ * log "путь_к_лог_файлу" 
+ * {
+ *    flags
+ *    {
+ *        flag;
+ *        flag; 
+ *        etc.. 
+ *    }; 
+ * };
+ */
+
+log "ircd.log" {
+    /* Удалять логфайл и старовать новый, если размер превышает 2MB, оставьте это как есть, чтобы использовать
+	тот же самый файл */
+    maxsize 2097152;
+    flags {
+        oper;
+        kline;
+        connects;
+        server-connects;
+        kills;
+        errors;
+        sadmin-commands;
+        chg-commands;
+        oper-override;
+        spamfilter;
+    };
+};
+
+/*
+ * НОВОЕ: alias {}
+ * СТАРОЕ: N/A
+ * Позволяет установить вам псевдонимы на команды, такие как /nickserv, /chanserv и т.д.
+ * ФЛАГИ: services, stats, normal
+ *
+ * Синтаксис:
+ * alias "имя" {
+ *    target "куда направить";
+ *    type aliastype;
+ * };
+ *
+ * [ЗАМЕЧАНИЕ: Вы так же можете подключить уже определённый файл с псевдонимами,подробнее doc/unreal32docs.ru.html в секции 2.9]
+ */
+
+// Данный псевдноним /nickserv направляет команды пользователю NickServ, который подключён к серверу set::services-server
+/*alias NickServ {
+    target "NickServ";
+    type services;
+};*/
+
+// Если вы хотите, чтобы команды направлялись на тот же ник, что и команда, вы можете не указывать target
+//alias ChanServ { type services; };
+
+// Указывает, что команда /statserv будет отправлена пользователю StatServ, подключённого к серверу set::stats-server
+//alias StatServ { type stats; };
+
+// Указывает, что команда /superbot будет отправлена пользователю SuperBot
+//alias SuperBot { type normal; };
+
+
+/* Стандартные псевдонимы */
+alias NickServ { type services; };
+alias ChanServ { type services; };
+alias OperServ { type services; };
+alias HelpServ { type services; };
+alias StatServ { type stats; };
+
+/*
+ * НОВОЕ: alias {}
+ * СТАРОЕ: N/A
+ * Позволяет установить такие псевдонимы на команды как /identify, /services и т.д.
+ *
+ * Синтаксис:
+ * alias "имя" {
+ *    format "строка формата" {
+ *        target "кому";
+ *              type aliastype;
+ *        parameters "список параметров";
+ *    };
+ *    type command;
+ * };
+ */
+/* Вынесено отдельно, так как имеются отличия по сравнению с предыдущим типом псевдонимов и имеются очень большие отличия в
+ * синтаксисе, так же используется для других целей, чем стандартные псевдонимы.
+ */
+/*
+alias "identify" {
+    format "^#" {
+        target "chanserv";
+        type services;
+        parameters "IDENTIFY %1-";
+    };
+    format "^[^#]" {
+        target "nickserv";
+        type services;
+        parameters "IDENTIFY %1-";
+    };
+    type command;
+};
+*/
+/* Директива alias::format является регулярным выражением. Под первый формат подпадает команда /identify, 
+ * если первым символом является #. Она посылает команду chanserv с параметрами IDENTIFY %1-.
+ * Второй формат срабатывает, если в команде, посланной посредством /identify первый символ не #. Тогда ircd
+ * передаёт эту команду nickserv с параметрами IDENTIFY %1-.
+ */
+
+/* alias::format::parameters сходно со скриптовыми языками. %N (где N число) представляет собой параметр, посланный командой
+ * (в случае /identify). Если вы указали %N-, так вы определили все параметры, начиная от N до последнего в этой строке.
+ * Вы можете так же указать %n, что будет означать ник пользователя.
+*/
+
+/* Стандартные псевдонимы */
+alias "services" {
+    format "^#" {
+        target "chanserv";
+        type services;
+        parameters "%1-";
+    };
+    format "^[^#]" {
+        target "nickserv";
+        type services;
+        parameters "%1-";
+    };
+    type command;
+};
+
+alias "identify" {
+    format "^#" {
+        target "chanserv";
+        type services;
+        parameters "IDENTIFY %1-";
+    };
+    format "^[^#]" {
+        target "nickserv";
+        type services;
+        parameters "IDENTIFY %1-";
+    };
+    type command;
+};
+
+/* Тут идёт пример использования "действительно псевдонима" (real command alias) */
+/* Данный пример - использование /GLINEBOT как /GLINE <параметры> 2d и т.д... */
+alias "glinebot" {
+    format ".+" {
+        command "gline";
+        type real;
+        parameters "%1 2d Боты запрещены на этом сервере, прочитайте ЧаВО на http://www.example.com/faq/123";
+    };
+    type command;
+};
+
+
+
+/*
+ * НОВОЕ: tld {}
+ * СТАРОЕ: T:Line
+ * Устанавливает различные different motd и rules файлы
+ * в зависимости от маски хостов клиентов.
+ * Синтаксис: 
+ * tld {
+ *    mask (идент@хост);
+ *    motd "(файл motd)";
+ *    rules "(файл rules)";
+ * };
+ */
+
+tld {
+    mask *@*.ru;
+    motd "ircd.motd.ru";
+    rules "ircd.rules.ru";
+};
+
+/* замечание: вы можете просто удалить блок выше, указанный для примера в случае, если есть в наличии
+ * файлы motd/rules, используемые по умолчанию (ircd.motd, ircd.rules), которые будут использоваться всеми
+ */
+
+/*
+ * НОВОЕ: ban nick {}
+ * СТАРОЕ: Q:Line
+ * Банит ник, он не может быть использован.
+ * Синтаксис:
+ * ban nick {
+ *    mask "(ник для бана)";
+ *    reason "(причина)";
+ * };
+*/
+ban nick {
+    mask "*C*h*a*n*S*e*r*v*";
+    reason "Зарезервирован для сервисов";
+};
+/*
+ * НОВОЕ: ban ip {}
+ * СТАРОЕ: Z:Line
+ * Банит адрес ip при подключении в сеть.
+ * Синтаксис:
+ * ban ip { mask (адрес ip/маска хоста); reason "(причина)"; };
+*/
+ban ip {
+    mask 195.86.232.81;
+    reason "Отключённый сервер";
+};
+/*
+ * НОВОЕ: ban server {}
+ * СТАРОЕ: Серверный Q:Line
+ * Отключает сервер от попыток подключиться в сеть.
+ * Если сервер подключается к удалённому серверу в сети, локальный сервер
+ * будет отключён он сети.
+ * Синтаксис:
+ * ban server {
+ *    mask "(имя сервера)";
+ *    reason "(причина)";
+ * };
+*/
+
+ban server {
+    mask eris.berkeley.edu;
+    reason "Ламерский сервер :).";
+};
+/*
+ * НОВОЕ: ban user {}
+ * СТАРОЕ: K:Line
+ * Пользователь с указанной маской не может подключиться к вашему серверу.
+ * Синтаксис:
+ * ban user { mask (маска хоста/адрес ip); reason "(причина)"; };
+*/
+
+ban user {
+    mask *newiceman@*.irc.by;
+        reason "Идиот!";
+};
+
+/*
+ * НОВОЕ: ban realname {}
+ * СТАРОЕ: n:Line
+ * Банит по указанному пользователем реальному имени.
+ * Синтаксис:
+ * ban realname {
+ *    mask "(Реальное имя)";
+ *     reason "(причина)";
+ * };
+*/
+
+ban realname {
+    mask "Swat Team";
+    reason "mIRKFORCE";
+};
+
+ban realname {
+    mask "sub7server";
+    reason "sub7";
+};
+
+/*
+ * ЗАМЕЧАНИЕ ДЛЯ ВСЕХ БАНОВ: они могут повторятся в случае необходимости уточнений!
+ * 
+ * НОВОЕ: except ban {} 
+ * СТАРОЕ: E:Line
+ * Предотвращает бан. 
+ * Синтаксис:
+ * except ban { mask (идент@хост); };
+ * Повторите except ban {} столько раз, сколько хотите использовать различные хосты.
+ */
+
+except ban {
+    /* не банить wax */
+    mask           *wax@195.222.*;
+};
+
+/*
+ * НОВОЕ: deny dcc {} 
+ * СТАРОЕ: dccdeny.conf
+ * Используется чтобы запретить отправку dcc... служит для защиты от вирусов
+ * Синтаксис: 
+ * deny dcc 
+ * { 
+ *   filename "имя файла для блокироваки (т.е. *exe)";
+ *   reason "причина";
+ * };
+ */
+deny dcc {
+    filename "*sub7*";
+    reason "Вероятность вируса Sub7";
+};
+
+/*
+ * НОВОЕ: deny channel {}
+ * СТАРОЕ: N/A (НОВОЕ)
+ * Запрещает вход на указанные каналы.
+ * Синтаксис:
+ * deny channel {
+ *     channel "(канал)";
+ *     reason "причина";
+ * };
+*/
+deny channel {
+    channel "*warez*";
+    reason "Warez нелегален";
+};
+
+/*
+ * НОВОЕ: vhost {}
+ * СТАРОЕ: файл Vhost.conf
+ * Устанавливает фейковый ip для не-операторов или операторы слишком
+ * ленивые, чтобы сделать /sethost :P
+ * Синтаксис:  
+ *   vhost { 
+ *       vhost (vhost.com); 
+ *       from {
+ *            userhost (идент@хост, кому разрешено использовать);
+ *       };
+ *       login (логин);
+ *       password (пароль);
+ *   };
+ *        чтобы использовать vhost, наберите /vhost (логин) (пароль) в IRC
+ */
+vhost {
+    vhost           i.hate.microsefrs.com;
+    from {
+        userhost       *@*.image.dk;
+    };
+    login           stskeeps;
+    password        moocowsrulemyworld;
+};
+
+/* Вы так же можете подключить и другие конфигурационные файлы */
+/* include "klines.conf"; */
+
+/* Конфигурация Сети */
+set {
+    network-name         "ROXnet";
+    default-server         "irc.roxnet.org";
+    services-server     "services.roxnet.org";
+    stats-server         "stats.roxnet.org";
+    help-channel         "#ROXnet";
+    hiddenhost-prefix    "rox";
+    /* prefix-quit         "no"; */
+    /* Ключи скрытия хостов должны быть одинаковы на всех серверах в сети.
+     * Они использутся для генерации замаскированных хостов и должны держаться в секрете.
+     * Ключи должен быть 3-мя случайными срочками с 5-100 символами в каждой
+     * (10-20 символов должно быть достаточно) и должны содержать прописные (a-z),
+     * заглавные (A-Z) буквы и цифрты (0-9) [смотрите пример первого ключа].
+     * Подсказка: В *NIX системах вы можете запустить './unreal gencloak' в вашем шелле, чтобы получить
+     * 3 строки, сгенерированные случайным образом.
+     */
+    cloak-keys {
+        "aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+        "и ещё одна;
+        "и ещё одна";
+    };
+    /* хост on-oper */
+    hosts {
+        local        "locop.roxnet.org";
+        global        "ircop.roxnet.org";
+        coadmin        "coadmin.roxnet.org";
+        admin        "admin.roxnet.org";
+        servicesadmin     "csops.roxnet.org";
+        netadmin     "netadmin.roxnet.org";
+        host-on-oper-up "no";
+    };
+};
+
+/* Специфическая конфигурация сервера */
+
+set {
+    kline-address "set.this.email";
+    modes-on-connect "+ixw";
+    modes-on-oper     "+xwgs";
+    oper-auto-join "#opers";
+    options {
+        hide-ulines;
+        /* Если желаете, вы можете включить проверку ident  */
+        /* identd-check; */
+        show-connect-info;
+    };
+
+    maxchannelsperuser 10;
+    /* Указывает минимальное время, сколько был подключен пользователь, 
+     * прежде чем разрешать ему использовать сообщение QUIT.
+     * Должно помочь в борьбе со спамом */
+    anti-spam-quit-message-time 10s;
+    /* Устанавливает постоянное сообщение о выходе - значит, что локальный сервер не разрешит
+           различные сообщения о выходе */
+    /* static-quit "Клиент вышел";    */
+
+    /* Вы так же можете блокировать все сообщения о выходе из канала просто раскомментировав это и указать'yes'
+     * или указать какой-нибудь другой текст (например: "Пока пока!"), который всегда будет использован как причина. */
+    /* static-part yes; */
+
+    /* Позволяет сделать важные сообщения stats были использованы только операторами, используйте * для всех сообщений stats,
+     * или закомментируйте, что позволит пользователям видеть все сообщения stats. Чтобы получить весь список, введите '/stats'.
+     * Некоторые администраторы могут убрать 'kGs' для того, чтобы разрешить обычным пользователям видеть список
+     * klines, glines и shuns.
+     */
+    oper-only-stats "okfGsMRUEelLCXzdD";
+
+    /* Тротлинг: данный пример устанавливает предел в 3 попытки подключения в 60 секунд (для одного хоста). */
+    throttle {
+        connections 3;
+        period 60s;
+    };
+
+    /* Защита от флуда */
+    anti-flood {
+        nick-flood 3:60;    /* 3 изменения ника в 60 секунд (по умолчанию) */
+    };
+
+    /* Фильтр спама */
+    spamfilter {
+        ban-time 1d; /* длительность по умолчанию бана *line, установленного spamfilter */
+        ban-reason "Спам/Реклама"; /* причина по умолчанию */
+        virus-help-channel "#help"; /* канал при использовании действия 'viruschan' */
+        /* except "#help"; канал для исключения действия фильтра */
+    };
+};
+
+/*
+ * Проблемы или нуждаетесь в более подробной информации?
+ * 1) www.vulnscan.org/UnrealIRCd/unreal32docs.ru.html
+ * 2) www.vulnscan.org/UnrealIRCd/faq/ <- содержит 80% ваших вопросов!
+ * 3) Если у вас до сих пор остались проблемы, зайдите на irc.ircsystems.net #unreal-support,
+ *    но мы требуем, чтобы вы ПРЕЖДЕ ПРОЧИТАЛИ ДОКУМЕНТАЦИЮ и ЧаВО!
+ */

doc/example.settings

@@ -1,53 +0,0 @@
-/*
- * Example set {} block
-*/
-
-set {
-	/*
- 	 * This is the mail users will get shown when k-lined
-	*/
-	kline-address		 "mail.to.mail.to";
-	/*
-	 * What modes will users get when connecting to this server
-	*/
-	modes-on-connect 	 "+ix";
-	/* What channels users will autojoin */
-	auto-join		 "0";
-	/* What channels opers will autojoin on connect*/
-	oper-auto-join		 "0";
-	dns {
-		/* What IP has our DNS server got? */
-		nameserver 127.0.0.1;
-		/* How long time will we wait for each attempt? */
-		timeout	2s;
-		/* How many attempts will we do */
-		retries 2s;
-	};
-	options {
-		enable-opermotd;
-		enable-chatops;
-		hide-ulines;
-//		webtv-support;
-		identd-check;
-	};
-	
-	/*
-	 * How many channels each user can join
-	*/
-	maxchannelsperuser 10;
-	/* 
-	 * This is a new thing in Unreal3.2.
-	 * You _need_ to make three numbers up, bigger than 100000
-	 * These MUST be the SAME on EVERY server in your NETWORK
-	 * If people discover these keys, it is easier for them to crack
-	 * the +x algoritm.
-	*/
-	cloak-keys
-	{
-		0;
-		0;
-		0;
-	};
-	
-};
-

doc/example.tr.conf

@@ -0,0 +1,787 @@
+/*
+ * example.conf by Daniel Hawton AKA Osiris (osiris@unrealircd.org).
+ * $Id$
+ * Türkçe çeviri: Mustafa "Ironic" Cakmak (ironic@unrealircd.org) 
+ *
+ * Unreal3.2 ve üstü sürümler için kullanılmaktadır
+ * 
+ * Peki beyler.  Bu example.conf dosyasının yenisi. C++ türüne çok benziyor.
+ * Neyse şimdi bunun üstesinden gelme zamanı.  Başlangıçta zor gelebilir, fakat
+ * okuyarak ve biraz pratikle anlayacaksınız.
+ *
+ * Yapmanız gereken bu dosyayı ana dizine atıp, 'unrealircd.conf' olarak adlandırmak.
+ * 
+ * NOTE:  Bütün satırlar, açılış { satırı dışında, kapama } satırı dahil, sonunda ; taşır.
+ * IRCd açıklama satırlarını göz ardı edecektir.
+ *
+ * Lütfen doc/unreal32docs.tk.html dosyasını okuyunuz! Çevrimiçi sürümüne ulaşabileceğiniz adres:
+ * www.vulnscan.org/UnrealIRCd/unreal32docs.tk.html
+ * Yapılandırma dosyası hakkında bir çok bilgi içerir: Her blok,
+ * değişken vs.. hakkında bilgi verir.
+ * Eğer dökümantasyon dosyasını tam olarak okumadan bu dosyayı düzenlemeye kalkarsanız
+ * başarısız olacağınız oldukça yüksek bir oranda garanti edilir!
+ */
+
+/* Açıklama satırı çeşitleri */
+#Açıklama satırı 1 (Shell tipi)
+// Açıklama satırı 2 (C++ tipi)
+/* Açıklama satırı satırı 3 (C tipi) */
+#Bu satırlar ircd tarafından göz ardı edilecektir.
+
+/*
+ * UnrealIRCd modülleri destekler, Bunların bazılarının yüklenmesi gereklidir.
+ * En azından komutlar modülü(commands) ve gizleme modülü(cloaking)'ne ihtiyacınız vardır.
+ */
+
+/* *NIX için, sonraki 2 satırın açıklama satıracını(//) kaldırın: */
+//loadmodule "src/modules/commands.so";
+//loadmodule "src/modules/cloak.so";
+
+/* Windows için, sonraki 2 satırın açıklama satıracını(//) kaldırın: */
+//loadmodule "modules/commands.dll";
+//loadmodule "modules/cloak.dll";
+
+/*
+ * Diğer yapılandırma dosyalarınıda dahil edebilirsiniz.
+ * help.conf bütün /helpop metinlerini içerir. +G kipi için badwords.*.conf
+ * dosyaları bütün kötü kelime girdilerini içerir...
+ * spamfilter.conf güncel trojanlar için uygun kuralları içerir.
+ * Muhtemelen bunları eklemek isteyeceksiniz:
+ */
+include "help.conf";
+include "badwords.channel.conf";
+include "badwords.message.conf";
+include "badwords.quit.conf";
+include "spamfilter.conf";
+
+/*
+ * YENI: me {} 
+ * ESKI: M:Line 
+ * me {} bu sunucu için isim, tanımlama ve unreal sunucu sayısalını(numeric) belirler.
+ * Sözdizimi aşağıdaki gibidir: 
+ * me { 
+ *  name "sunucu.ismi"; 
+ *  info "Sunucu tanımlaması";
+ *  numeric (sunucu sayısalı*);
+ * }; 
+ * Eğer link varsa, bu sayısal ağ üzerinde varolan herhangi bir server tarafından kullanılmamalıdır.
+ */
+me
+{
+	name "irc.foonet.com";
+	info "FooNet Server";
+	numeric 1;
+};
+
+/*
+ * YENI: admin {} 
+ * ESKI: A:Line
+ * Admin sunucu yöneticisine dair bilgi verir. Dilediğiniz kadar
+ * satırı admin { altına yerleştirebilirsiniz. 
+ * Sözdizimi aşağıdaki gibidir:
+ * admin {
+ *   "ilk satır"; 
+ *   "ikinci satır"; 
+ *   [vs]
+ * };
+ */
+admin {
+	"Bob Smith";
+	"bob";
+	"widely@used.name";
+};
+
+/*
+ * YENI: class {} 
+ * ESKI: Y:line (eskisi karışıktı) 
+ * Bu sınıflar için ayarları belirtir. Bir sınıf bağlantılar için bir grup 
+ * ayarıdır. Örneğin, sunucu bağlantılarını, bir istemci sınıfı
+ * yerine, sunucu sınıfına yönlendirirsiniz. Sözdizimi aşağıdaki gibidir:
+ * class (class name)
+ * {
+ *     pingfreq (ne sıklıkta saniye içerisinde kullanıcı veya sunucunun ping edileceği);
+ *     maxclients (bu sınıf için kaç bağlantı);
+ *     sendq (bir bağlantıdan gönderilecek en yüksek dizi);
+ *     recvq (bir bağlantıdan alınacak en yüksek dizi [flood kontrolü]);
+ *  };
+ */
+
+class           clients
+{
+	pingfreq 90;
+	maxclients 500;
+	sendq 100000;
+	recvq 8000;
+};
+
+class           servers
+{
+	pingfreq 90;
+	maxclients 10;		/* Link edebileceğimiz en yüksek sunucu sayısı */
+	sendq 1000000;
+	connfreq 100; /* Her bağlantı girişimi arasında ne kadar saniye olacağı */
+};
+
+/*
+ * YENI: allow {} 
+ * ESKI: I:Line
+ * Bağlantı izinlerini belirtir..
+ * Temel olarak istemcilerin sunucuya bağlanabilmesi için herhangi bir kontrol
+ * ve/veya bir şifre belirtmenize olanak sağlar.
+ * Sözdizimi aşağıdaki gibidir:
+ * allow {
+ *    ip (izin verilecek ip maskesi);
+ *    hostname (host maskesi);
+ *    class (gönderilecek sınıf [class {} bloğuna göz atınız]);
+ *    password "(şifre)"; (isteğe bağlı)
+ *    maxperip (ip başına kabul edilecek bağlantı sayısı); (isteğe bağlı) 
+ * };
+ */
+
+allow {
+	ip             *@*;
+	hostname       *@*;
+	class           clients;
+	maxperip 5;
+};
+
+/* Şifrelendirilmiş allow bloğu */
+allow {
+	ip             *@255.255.255.255;
+	hostname       *@*.passworded.ugly.people;
+	class           clients;
+	password "f00Ness";
+	maxperip 1;
+};
+
+/*
+ * YENI: allow channel {} 
+ * ESKI: chrestrict 
+ * Bir kullanıcının bir kanala girmesine olanak sağlar...
+ * yasak kanal bloğundaki hariçlik gibi.
+ * Sözdizimi:
+ * allow channel {
+ *   channel "kanal ismi";
+ * };
+ */
+allow           channel {
+	channel "#WarezSucks";
+};
+
+/*
+ * YENI: oper {} 
+ * ESKI: O:Line 
+ * Bir IRC Operatörü tanımlamanızı sağlar.
+ * IRC Operatörleri sunucuya uygun bir biçimde bağlanılmasını ve
+ * makullüğü sağlarlar. 
+ * Sözdizimi aşağıdaki gibidir:
+ * oper (login) { 
+ *     class (sınıf ismini ekleyin, eğer istemciden farklıysa, yeni sınıfı ekleyin); 
+ *     from { 
+ *        userhost (ident@host);
+ *        userhost (ident@host);
+ *     }; 
+ *     flags
+ *     { 
+ *       (flaglar buraya*);
+ *     };
+ *     VEYA
+ *     flags "OAaRD gibi eski tip flaglar";
+ * };
+ */
+
+
+/* Oper flaglarının listesine doc/unreal32docs.html#operblock dan göz atabilirsiniz.
+ * [Okumanız şiddetle önerilir]
+ */
+
+oper bobsmith {
+	class           clients;
+	from {
+		userhost bob@smithco.com;
+	};
+	password "f00";
+	flags
+	{
+		netadmin;
+		can_zline;
+		can_gzline;
+		can_gkline;
+		global;
+	};
+};
+
+/*
+ * YENI: listen {}
+ * ESKI: P:Line
+ * İstemci ve sunucuların sunucuya bağlanmasını sağlamak için ircd tarafından
+ * kullanılacak bir port tanımlamanızı sağlar .
+ * Sözdizimi aşağıdaki gibidir:
+ * listen (ip adresi):(port numarası) 
+ * { 
+ *   options {
+ *     (tercihler buraya);
+ *   };
+ * };
+ * veya sade bir biçimde
+ * listen: listen (ip):(port);
+ * 
+ * UYARI: ipv6 ipleri için (3ffe:b80:2:51d::2 vb),  [ip]:port; kullanınız
+ * 
+ * Böylede çalışır.
+ */
+
+/* listen için tercihler:
+	ESKI	| 	YENI
+	S		serversonly
+	C		clientsonly
+	J		java
+	s		ssl
+	*		standard
+*/
+
+/* SSL PORTLARI İÇİN NOT: SSL portları oldukça standart dışıdır,
+ * ayrıca pek çok yüksek-SSL portları için bazı insanlar 994 te çalıştırın 
+ * der çünkü bu resmi SSL portudur..Fakat bu root erişimi gerektirir.Yanı sıra, 
+ * 194 resmi irc portu olarak bunun üzerinde çalışan ircd 
+ * hiç gördünüz mü?
+ * Böyle olunca bizim önerimiz 6697 portunu SSL için kullanmanız, bu hayli 
+ * sunucuda kullanılıyor ve örnek için StunTour tarafından kabul görmüş durumda.
+ * İstediğiniz kadar SSL port açmakta özgürsünüz, fakat 6697 yi kullanmanız
+ * dünya standartı haline gelmesine biraz daha yardım edecektir. ;).
+ */
+listen         *:6697
+{
+	options
+	{
+		ssl;
+		clientsonly;
+	};
+};
+
+listen         *:8067;
+listen         *:6667;
+
+/* NOT: Eğer bir çok IP barındıran bir IRCd Shell kullanıyorsanız logunuzda olası
+ *       'Address already in use' alırsınız ve ircd başlamaz.Bunun anlamı '*' yerine 
+ *       belirli bir IP adresi kullanmanız gerektiğidir.Yani örneğin:
+ *       listen 1.2.3.4:6667;
+ *       Açıkça, IP yi önceden koyduğunuz IP ile değiştirin.
+ */
+
+/*
+ * YENI: link {}
+ * ESKI: C/N:Lines
+ * Bir sunucu bağlantısı için bir onay tanımlamanızı sağlar.
+ * NOT: HER IKI SUNUCUDA BAĞLANTI IÇIN TAM OLARAK DÜZGÜN BİR LINK {} GEREĞİ DUYAR!
+ * Sözdizimi aşağıdaki gibidir:
+ * link (sunucu ismi)
+ * {
+ *	username	(username, * da uygundur);
+ * 	hostname	(ip adresi/hostmask);
+ *	bind-ip		(Bağlanırken hangi IP ile bağlanacağı, veya *);
+ *	port		(bağlantı portu, eğer herhangi biriyse);
+ *	hub (Bu bir hub ise, * çalışır, veya sunucu maskeleri bunu sağlar);
+ *	[veya leaf *;]
+ *	password-connect "(gönderilecek şifre)";
+ *	password-receive "(almamız gereken şifre)";
+ *	class		(sunucuların yönetileceği sınıf);
+ *	options {
+ *		(tercihler buraya*);
+ *	};
+ *      /* Eğer SSL kullanıyorsak, SSL modunda ne tür bir anahtar kullanacağımızı seçebiliriz
+ *       * "openssl ciphers" ile bir liste alınır, anahtarlar birbirinden : ile ayrılırak belirtilebilirler.
+ *      */
+ *      ciphers "DES-CBC3-MD5";
+ * 
+ * };
+*/
+
+/*
+	tercihler:
+	YENI	|	ESKI
+	S		ssl
+	Z		zip
+	N/A		autoconnect
+	N/A		quarantine
+	N/A		nodnscache
+*/
+
+
+link            hub.mynet.com
+{
+	username	*;
+	hostname 	1.2.3.4;
+	bind-ip 	*;
+	port 		7029;
+	hub             *;
+	password-connect "LiNk";
+	password-receive "LiNk";
+	class           servers;
+		options {
+			/* Note: Servisler link edilirken autoconnect kullanmamalısınız.*/
+			autoconnect;
+			ssl;
+			zip;
+		};
+};
+/*
+ *
+ * YENI: ulines {}
+ * ESKI: U:Line
+ * U-lines satırları sunuculara daha güç/komut kazandırır.Bu servis/istatistik
+ * sunucuları içindir ve ASLA normal UnrealIRCd sunucuları için değildir.
+ * Sözdizimi aşağıdaki gibidir:
+ * ulines {
+ *	(uline olacak sunucu);
+ *	(uline olacak sunucu);
+ *  [vb]
+ * };
+*/
+ulines {
+	services.roxnet.org;
+	stats.roxnet.org;
+};
+
+/*
+ * YENI: drpass {}
+ * ESKI: X:Line
+ * Bu blok /die ve /restart için şifre tanımlamanızı sağlar.
+ * Sözdizimi aşağıdaki gibidir:
+ * drpass { 
+ *  restart		"(yeniden başlatmak için şfire)";
+ *  die		        "(sona erdirmek için şifre)";
+ * };
+ */
+drpass {
+	restart "I-love-to-restart";
+	die "die-you-stupid";
+};
+
+/*
+ * YENI: log {} ESKI: N/A Ircd e logun ne ve nerede olacağını bildirir. Dilediğiniz 
+ * kadara sahip olabilirsiniz.
+ * 
+ * FLAGS: errors, kills, tkl, connects, server-connects, kline, oper
+ * 
+ * Syntax: 
+ * log "log file" 
+ * {
+ *    flags
+ *    {
+ *        flag;
+ *        flag; 
+ *        etc.. 
+ *    }; 
+ * };
+ */
+
+log "ircd.log" {
+	/* Eğer 2 MB yi geçerse log dosyasını sil ve yenisini aç, eğer her zaman aynı log 
+         dosyasını kullanmak istiyorsanız karışmayın */
+	maxsize 2097152;
+	flags {
+		oper;
+		kline;
+		connects;
+		server-connects;
+		kills;
+		errors;
+		sadmin-commands;
+		chg-commands;
+		oper-override;
+		spamfilter;
+	};
+};
+
+/*
+ * YENI: alias {}
+ * ESKI: N/A
+ * /nickserv, /chanserv gibi komutlar hazırlamanızı sağlar.
+ * FLAGS: services, stats, normal
+ *
+ * Sözdizimi:
+ * alias "isim" {
+ *	target "gidecek nokta";
+ *	type aliastype;
+ * };
+ *
+ * [NOT: Aynı zamanda önceden tanımlanmış alias dosyası dahil edebilirsiniz, doc/unreal32docs.html bölüm 2.9]
+ */
+
+// Bu nokta /NickServ komutu ile set::services-server server üzerinden bağlanmış olan NickServ e döner.
+/*alias NickServ {
+	target "NickServ";
+	type services;
+};*/
+
+// Eğer komutla noktanın aynı olmasını istiyorsanız nick girişini gözardı edebilirsiniz
+//alias ChanServ { type services; };
+
+// Bu nokta /statserv komutu ile set::stats-server server üzerinden bağlanmış olan StatServ e döner.
+//alias StatServ { type stats; };
+
+// Bu nokta /superbot komutu ile kullanıcı SuperBot a döner
+//alias SuperBot { type normal; };
+
+
+/* Standart aliases */
+alias NickServ { type services; };
+alias ChanServ { type services; };
+alias OperServ { type services; };
+alias HelpServ { type services; };
+alias StatServ { type stats; };
+
+/*
+ * ESKI: alias {}
+ * YENI: N/A
+ * Bu /identify, /services gibi komutlar hazırlamanızı sağlar.
+ *
+ * Sözdizimi:
+ * alias "isim" {
+ *	format "format satırı" {
+ *		target "gidecek nokta";
+ *              type aliastype;
+ *		parameters "gönderilecek parametreler";
+ *	};
+ *	type command;
+ * };
+ */
+/* Bu ayrı bir şekilde gösterilir.Çünkü bir önceki direktif ile aynı isme sahip olsa bile benzer bir 
+ * fonksiyon sağlaması ve standart aliaseslerin çalışmasına dayanması ile birlikte çok farklı sözdizimine sahip olması.
+ */
+/*
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+*/
+/* alias::format direktifi bir düzenli ifadedir. İlk biçim /identify komutundan sonraki ilk karakter bir # ise eşleşir.
+ * Ardından IDENTIFY %1- ile chanserv aliases e döner.
+ * İkinci biçim ise /identify komutundan sonraki ilk karakterin bir # işareti ile eşleşmeme durumunu belirtir.Ardından
+ * IDENTIFY %1- ile nickserv aliases e döner.
+ */
+
+/* alias::format::parameters betik diline benzerdir. %N (N bir numaradır) komuta gönderilecek
+ * parametreyi temsil eder.(bu durumda /identify). Eğer bir %N- belirtirseniz bu N den sonraki
+ * bütün parametleri içerir. Ayrıca kullanıcı nickname inin yerine %n kullanabilirsiniz.
+*/
+
+/* Standart aliases */
+alias "services" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "%1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "%1-";
+	};
+	type command;
+};
+
+alias "identify" {
+	format "^#" {
+		target "chanserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	format "^[^#]" {
+		target "nickserv";
+		type services;
+		parameters "IDENTIFY %1-";
+	};
+	type command;
+};
+
+/* Bu gerçek komut aliası için bir örnektir */
+/* Bu eşlem /GLINEBOT ile /GLINE <parametre> 2d vb... şeklindedir */
+alias "glinebot" {
+	format ".+" {
+		command "gline";
+		type real;
+		parameters "%1 2d Bu sunucuda botlara izin verilmemektedir, lütfen http://www.example.com/faq/123 sayfasından sss ı okuyunuz.";
+	};
+	type command;
+};
+
+
+
+/*
+ * ESKI: tld {}
+ * YENI: T:Line
+ * Bu istemcilerin hostmaskesine bağlı olarak farklı 
+ * motd ve rules dosyaları belirler.
+ * Sözdizimi aşağıdaki gibidir: 
+ * tld {
+ *    mask (ident@host);
+ *    motd "(motd dosyası)";
+ *    rules "(rules dosyası)";
+ * };
+ */
+
+tld {
+	mask *@*.fr;
+	motd "ircd.motd.fr";
+	rules "ircd.rules.fr";
+};
+
+/* not: Bütün istemciler için aynı motd/rules (ircd.motd, ircd.rules) dosyaları 
+ * görüntületmek istiyorsanız sadece yukarıdaki örnek bloğu silebilirsiniz.
+ */
+
+/*
+ * YENI: ban nick {}
+ * ESKI: Q:Line
+ * Nir nickname yasaklar, bundan doalyı kullanılamaz.
+ * Sözdizimi aşağıdaki gibidir:
+ * ban nick {
+ *	mask "(yasaklanak nick)";
+ *	reason "(neden)";
+ * };
+*/
+ban nick {
+	mask "*C*h*a*n*S*e*r*v*";
+	reason "Servisler için ayrılmıştır";
+};
+/*
+ * YENI: ban ip {}
+ * ESKI: Z:Line
+ * Ağa bağlanan bir ip yi yasaklar.
+ * Sözdizimi:
+ * ban ip { mask (ip adresi/hostmask); reason "(neden)"; };
+*/
+ban ip {
+	mask 195.86.232.81;
+	reason "Bağlı olmayan sunucu";
+};
+/*
+ * YENI: ban server {}
+ * ESKI: Server Q:Line
+ * Ağa bir sunucunun bağlanmasını devredışı kılar.
+ * eğer sunucu uzak bir sunucuya bağlanmışsa, yerel sunucunun
+ * ağdan bağlantısı kesilir.
+ * Sözdizimi aşağıdaki gibidir:
+ * ban server {
+ *	mask "(sunucu ismi)";
+ *	reason "(neden)";
+ * };
+*/
+
+ban server {
+	mask eris.berkeley.edu;
+	reason "Defol buradan.";
+};
+/*
+ * YENI: ban user {}
+ * ESKI: K:Line
+ * Kullanıcının belirtilen kesin bir mask ile sunucuya bağlanmasını engeller.
+ * Sözdizimi:
+ * ban user { mask (hostmask/ip adresi); reason "(neden)"; };
+*/
+
+ban user {
+	mask *tirc@*.saturn.bbn.com;
+        reason "Idiot";
+};
+
+/*
+ * YENI: ban realname {}
+ * ESKI: n:Line
+ * Kullanılan kesin bir realname i yasaklar.
+ * Sözdizimi:
+ * ban realname {
+ *	mask "(real name)";
+ * 	reason "(neden)";
+ * };
+*/
+
+ban realname {
+	mask "Swat Team";
+	reason "mIRKFORCE";
+};
+
+ban realname {
+	mask "sub7server";
+	reason "sub7";
+};
+
+/*
+ * BUTUN BANLAR İÇİN NOT, ilave girdiler için tekrarlanabilir!
+ * 
+ * YENI: except ban {} 
+ * ESKI: E:Line
+ * Bu yasaklanmamanızı sağlar.
+ * Sözdizimi:
+ * except ban { mask (ident@host); };
+ * Farklı hostlar için istediğiniz kadar except ban {}
+ * bloğunu tekrarlayın.
+ */
+
+except ban {
+	/* stskeeps i yasaklama*/
+	mask           *stskeeps@212.*;
+};
+
+/*
+ * YENI: deny dcc {} 
+ * ESKI: dccdeny.conf
+ * Dcc gönderimlerini bloklamak için kullanılır..Virüsler
+ * dursa iyi olur. 
+ * Sözdizimi: 
+ * deny dcc 
+ * { 
+ *   filename "bloklanacak dosya (örnek, *exe)";
+ *   reason "neden";
+ * };
+ */
+deny dcc {
+	filename "*sub7*";
+	reason "Muhtemek Sub7 Virüsü";
+};
+
+/*
+ * ESKI: deny channel {}
+ * YENI: N/A (NEW)
+ * Girilen kanalları bloklar.
+ * Sözdizimi:
+ * deny channel {
+ * 	channel "(kanal)";
+ * 	reason "neden";
+ * };
+*/
+deny channel {
+	channel "*warez*";
+	reason "Warez yasaktır";
+};
+
+/*
+ * YENI: vhost {}
+ * ESKI: Vhost.conf file
+ * Oper olmayan kullanıcılar için sahte ip hazırlar, veya
+ * tembellik yaparak /sethost kullanmayan operler içindir :P
+ * Sözdizimi:  
+ *   vhost { 
+ *       vhost (vhost.com); 
+ *       from {
+ *            userhost (kullanılacak ident@host);
+ *       };
+ *       login (login ismi);
+ *       password (şifre);
+ *   };
+ *        ardından bu vhostu kullanmak için, IRC de /vhost (login) (şifre) yapın
+ */
+vhost {
+	vhost           i.hate.microsefrs.com;
+	from {
+		userhost       *@*.image.dk;
+	};
+	login           stskeeps;
+	password        moocowsrulemyworld;
+};
+
+/* Diğer yapılandırma dosyalarını dahil edebilirsiniz */
+/* include "klines.conf"; */
+
+/* Ağ yapılandırması */
+set {
+	network-name 		"ROXnet";
+	default-server 		"irc.roxnet.org";
+	services-server 	"services.roxnet.org";
+	stats-server 		"stats.roxnet.org";
+	help-channel 		"#ROXnet";
+	hiddenhost-prefix	"rox";
+	/* prefix-quit 		"no"; */
+	/* Gizleme anahtarları ağ üzerindeki bütün sunucularda aynı olmalı.
+	 * Bu anahtarlar maskeli hostlar yaratmak ve bunları saklamak için kullanılır.
+	 * Anahtarlar 5-100 karakterlik (10-20 karakter yeterli) 3 rastgele diziden oluşmalı ve 
+	 * küçük harf (a-z), büyük harf (A-Z) ve rakamlardan (0-9) meydana gelmelidirler.. [ilk örneğe bakınız].
+	 */
+	cloak-keys {
+		"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";
+		"and another one";
+		"and another one";
+	};
+	/* on-oper host */
+	hosts {
+		local		"locop.roxnet.org";
+		global		"ircop.roxnet.org";
+		coadmin		"coadmin.roxnet.org";
+		admin		"admin.roxnet.org";
+		servicesadmin 	"csops.roxnet.org";
+		netadmin 	"netadmin.roxnet.org";
+		host-on-oper-up "no";
+	};
+};
+
+/* Sunucunun kendine özgü yapılandırması */
+
+set {
+	kline-address "bunu.email.olarak.ayarlayın";
+	modes-on-connect "+ixw";
+	modes-on-oper	 "+xwgs";
+	oper-auto-join "#opers";
+	options {
+		hide-ulines;
+		/* Eğer isterseniz identd kontrolünü buradan aktif edebilirsiniz */
+		/* identd-check; */
+		show-connect-info;
+	};
+
+	maxchannelsperuser 10;
+	/* /quit mesajının görüntülenebilmesi için, bir kullanıcının sunucuya bağlı kalması gereken süre
+	 * Umarız spamleri durdurmak için yardım eder */
+	anti-spam-quit-message-time 10s;
+	/* Bütün çıkışlarda değişmeyen bir çıkış mesajı yaratır - anlamı yerel sunucuda
+           ısmarlama çıkışlara izin verilmemesidir */
+	/* static-quit "Client quit";	*/
+
+	/* Ayrıca bu seçeneğin açıklama satırlarını kaldırıp 'yes' diyerek bütün kanaldan ayrılma mesajlarını,
+	 * bloklamış veya belirli bir diğer metini bunun için kullanabilirsiniz. (örnek: "Bye bye!") Her zaman kanaldan 
+       * ayrılma mesajı olarak kullanılır */
+	/* static-part yes; */
+
+	/* Operlerin sadece belirli istatistikleri görüntüleyebilmesini sağlar, bütün istatistikler için * kullanın,
+	 * bütün istatistikleri görebilmeleri için gözardı edin. Full liste için '/stats' yapınız.
+	 * Bazı yöneticiler normal kullanıcıların 'kGs' istatistiklerine ulaşmasını istemeyebilir.
+	 */
+	oper-only-stats "okfGsMRUEelLCXzdD";
+
+	/* Throttling: Bu örnek bir hosta 60 saniye içerisine yanlızca 3 bağlantı imkanı sağlar. */
+	throttle {
+		connections 3;
+		period 60s;
+	};
+
+	/* Anti flood koruması */
+	anti-flood {
+		nick-flood 3:60;	/* Her 60 saniyede 3 nick değişikliği (varsayılan) */
+	};
+
+	/* Spam filtresi */
+	spamfilter {
+		ban-time 1d; /* spamfilter ile bir *line yasağının varsayılan devaö süresi */
+		ban-reason "Spam/Advertising"; /* varsayılan neden */
+		virus-help-channel "#help"; /* 'viruschan' eylemi için kullanılacak kanal */
+		/* except "#help"; spam filtreden muaf tutulacak kanal */
+	};
+};
+
+/*
+ * Sorununuz veya daha fazla yardımamı ihtiyacınız var?
+ * 1) www.vulnscan.org/UnrealIRCd/unreal32docs.tr.html
+ * 2) www.vulnscan.org/UnrealIRCd/faq/ <- sorularınızın %80 ini kapsamakta!
+ * 3) Eğer probleminiz hala devam ediyorsa irc.ircsystems.net sunucusu #unreal-support kanalına girebilirsiniz
+ *    DÖKÜMANTASYON ve FAQ kısmını okumanızı gerekli gördüğümüzü belirtiyoruz!
+ */

doc/technical/005.txt

@@ -1,5 +1,6 @@
-Numeric 005 Documentation (c) 2002 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
-(As of Unreal3.2-beta11)
+Numeric 005 Documentation
+(c) 2002-2005 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
+(c) 2005-2009 syzop (Bram Matthys) [syzop@vulnscan.org]
 
 Numeric 005 allows the server to inform the client of any protocol specific features in the
 IRCd.  The numeric is sent at connection time immediately after numeric 004. Additionally
@@ -17,13 +18,23 @@ by this server"
 Currently UnrealIRCd supports several tokens that are included in numeric 005. A list of
 all tokens, their respective value and a brief description are listed below.
 
+Unreal attempts to follow the proposed ISupport standard as much as possible. Unreal only
+ignores the standard in one regard, the TARGMAX token. This token is believed to be 
+impractical and technically impossible to correctly implement due to existing limitations
+in the standard. Therefore, this token is not currently supported. 
+
+Unreal does additionally provide a few tokens which are not specified in the standard, these
+include: HCN, AWAYLEN, WATCH, SILENCE, EXTBAN, ELIST, CMDS, NAMESX, UHNAMES, and WATCHOPTS.
+Unreal also maintains a few legacy tokens such as MAXCHANNELS and WALLCHOPS to ensure
+compatibility until the ISupport standard is more widely accepted by clients.
+
 Token         Value           Default Value                Description
 ------------------------------------------------------------------------------------------------
 MAP           none            none                         Informs the client that the /map 
-                                                           command is present.
+                                                           command is present. [Obsolete]
 
 KNOCK         none            none                         Informs the client that the /knock
-                                                           command is present.
+                                                           command is present. [Obsolete]
 
 SAFELIST      none            none                         The LIST command is sent in 
                                                            multiple iterations so that the
@@ -34,10 +45,11 @@ HCN           none            none                         The server supports t
                                                            (Hybrid Connect Notice) protocol.
 
 MAXCHANNELS   number          10                           The maximum number of channels a
-                                                           user may join.
+                                                           user may join. [Deprecated]
 
 MAXBANS       number          60                           The maximum number of bans that
                                                            may be placed for a channel.
+                                                           [Obsolete]
 
 NICKLEN       number          30                           Maximum length of a user's
                                                            nickname.
@@ -55,6 +67,7 @@ AWAYLEN       number          307                          Maximum length of an
 WALLCHOPS     none            none                         Indicates that you may use
                                                            NOTICE/PRIVMSG to send to +ohv by
                                                            using PRIVMSG/NOTICE [@|%|+]#channel.
+                                                           [Deprecated]
  
 WATCH         number          128                          Indicates the presence of the
                                                            WATCH command and specifies the
@@ -74,8 +87,8 @@ PREFIX        (modes)prefixes (qaohv)~&@%+                 Indicates the modes o
                                                            that corespond to the given
                                                            nickname prefixes.
 
-CHANMODES     A,B,C,D         be,k,lfL,                    Specifies how each channel mode is
-                              psmntirRcOAQKVHGCuzN         set/unset. The A section specifies
+CHANMODES     A,B,C,D         be,kfL,lj,                   Specifies how each channel mode is
+                              psmntirRcOAQKVHGCuzNSMT      set/unset. The A section specifies
                                                            modes that add a nick/mask to a
                                                            list. The B section specifies
                                                            modes that require a parameter
@@ -95,8 +108,73 @@ CASEMAPPING   string          ascii                        Specifies what defini
                                                            characters are upper/lowercase
                                                            of eachother.
 
-EXTBAN        prefix,types    ~,cqr                        Specifies what extbans are
+EXTBAN        prefix,types    ~,cqnr                       Specifies what extbans are
                                                            supported by the server. The prefix
                                                            defines which character indicates
                                                            an extban and the types defines
                                                            which extbans the server supports.
+
+ELIST         flags           MNUCT                        Specifies the set of extended LIST
+                                                           options supported. The M flag 
+                                                           indicates mask based searching,
+                                                           the N flag indicates negative
+                                                           mask based searching. The U flag
+                                                           means support for user count
+                                                           searching. The C flag allows channel
+                                                           creation time searching, and the T
+                                                           flag allows topic set time 
+                                                           searching.
+
+CMDS          commands        MAP,KNOCK,DCCALLOW,USERIP    Specifies a series of commands that
+                                                           can be useful for the client to know
+                                                           exist as they may provide a more
+                                                           efficient means for the client to
+                                                           accomplish a specific task. This
+                                                           token replaces the MAP and KNOCK
+                                                           tokens.
+
+STATUSMSG     flags           ~&@%+                        Specifies the mode flags that may
+                                                           prefix a channel name in a PRIVMSG
+                                                           or NOTICE to limit who receives the
+                                                           message to only those with a certain
+                                                           level of access. This token will
+                                                           replace the WALLCHOPS token.
+
+EXCEPTS       none            none                         Indicates that channel ban exceptions
+                                                           (+e) are supported by the server.
+
+INVEX         none            none                         Indicates that channel invite
+                                                           exceptions (+I) are supported by
+                                                           the server.
+
+MAXLIST       mode:num,...    b:60,e:60,I:60               Specifies the maximum number of 
+                                                           entries that may be added to a 
+                                                           particular mode list (type A modes).
+                                                           This token replaces MAXBANS.
+
+CHANLIMIT     pfx:num,...     #:10                         Specifies the maximum number of 
+                                                           channels with the specified prefix
+                                                           that a user may join at one time.
+                                                           This token will replace MAXCHANNELS.
+
+CHANNELLEN    number          32                           Provides the maximum length of a
+                                                           channel name that a user can create.
+
+NAMESX        none            none                         Indicates that extended /NAMES info
+                                                           is available on this server. If the
+                                                           client sends "PROTOCTL NAMESX" then
+                                                           the server will, from then on, send
+                                                           all channel rights in a NAMES reply
+                                                           instead of only the highest right
+                                                           (eg: @+Person instead of @Person).
+
+UHNAMES       none            none                         Indicates that (other) extended
+                                                           /NAMES info is available on the
+                                                           server. If the client sends
+                                                           "PROTOCTL UHNAMES" then the server
+                                                           will, from then on, send user@host
+                                                           information in a NAMES reply
+                                                           (eg: @nick!ident@hostname).
+
+WATCHOPTS     flags           A                            WATCH options supported. 'A' means
+                                                           Away Notification is available.

doc/technical/protoctl.txt

@@ -128,3 +128,14 @@ ZIP           If both servers have this set then the link will be (zlib) compres
 
 TKLEXT        This allows 10 instead of 8 parameters in TKL's for spamfilter, see s_kline.c
               function m_tkl for more info on this (added in 3.2RC2).
+
+NICKIP        This token indicates that a (standard) base64 encoded IP address is included
+              in the NICK command. The IP is in binary network byte order formated and
+              encoded using the standard base64 algorithm. '*' is used if no IP is available.
+
+NICKCHARS     This specifies a list of language characters that are allowed in nicks.
+              USMARC codes are used, with a suffix if needed. See src/charsys.c for the full
+              list (ctrl+f, static LangList) of possible languages (2nd column).
+              The items in the list sent as NICKCHARS=.. must always be sorted.
+              If a server sends NICKCHARS= and if the remote parameters do not match the
+              charsets in use locally, then the server link is rejected.

doc/technical/serverprotocol.html

@@ -0,0 +1,465 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- $Id$ -->
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+		<title>Unreal 3.2 Protocol Documentation</title>
+	</head>
+	<body>
+		<h1 style="text-align: center;">Unreal 3.2 Protocol Documentation</h1>
+		<h3 style="text-align: center;">Last update: 29 November 2006</h3>
+		<h1>Table of Contents</h1>
+		<p><a href="#S1">1 Introduction</a></p>
+		<p><a href="#S2">2 Server Negotiation</a></p>
+		<blockquote><p><a href="#S2_1">2.1 PASS - Connection Password</a></p></blockquote>
+		<blockquote><p><a href="#S2_2">2.2 PROTOCTL - Server Protocol Negotiation</a></p></blockquote>
+		<blockquote><p><a href="#S2_3">2.3 SERVER - Server Negotiation</a></p></blockquote>
+		<blockquote><p><a href="#S2_4">2.4 EOS - End Of Synch</a></p></blockquote>
+		<blockquote><p><a href="#S2_5">2.5 NETINFO - Network Information</a></p></blockquote>
+		<p><a href="#S3">3 User Operations</a></p>
+		<blockquote><p><a href="#S3_1">3.1 NICK - User Introduction and Nick Change</a></p></blockquote>
+		<blockquote><blockquote><p><a href="#S3_1_1">3.1.1 Nick Collisions</a></p></blockquote></blockquote>
+		<blockquote><p><a href="#S3_2">3.2 MODE, UMODE2 - User Mode Change</a></p></blockquote>
+		<blockquote><p><a href="#S3_3">3.3 QUIT - User Disconnect</a></p></blockquote>
+		<blockquote><p><a href="#S3_4">3.4 KILL - Force Disconnect</a></p></blockquote>
+		<blockquote><p><a href="#S3_5">3.5 SETHOST/CHGHOST - Change virtual host</a></p></blockquote>
+		<blockquote><p><a href="#S3_6">3.6 SETIDENT/CHGIDENT - Change a user's username</a></p></blockquote>
+		<blockquote><p><a href="#S3_7">3.7 SETNAME/CHGNAME - Change a user's realname</a></p></blockquote>
+		<blockquote><p><a href="#S3_8">3.8 WHOIS - User Information</a></p></blockquote>
+		<p><a href="#S1">4 Server Operations</a></p>
+		<blockquote><p><a href="#S4_1">4.1 SERVER - Server Introduction</a></p></blockquote>
+		<blockquote><p><a href="#S4_2">4.2 SQUIT - Server Removal</a></p></blockquote>
+		<blockquote><p><a href="#S4_3">4.3 SDESC - Server Description</a></p></blockquote>
+		<blockquote><p><a href="#S4_4">4.4 PING - Live Connection Query</a></p></blockquote>
+		<blockquote><p><a href="#S4_5">4.5 PONG - Live Connection Reply</a></p></blockquote>
+		<blockquote><p><a href="#S4_6">4.6 STATS - Server Stats</a></p></blockquote>
+		<p><a href="#S5">5 Channel Operations</a></p>
+		<blockquote><p><a href="#S5_1">5.1 SJOIN - Channel Burst</a></p></blockquote>
+		<blockquote><p><a href="#S5_2">5.2 JOIN - Channel Join</a></p></blockquote>
+		<blockquote><p><a href="#S5_3">5.3 PART - Channel Part</a></p></blockquote>
+		<blockquote><p><a href="#S5_4">5.4 KICK - Channel Kick</a></p></blockquote>
+		<blockquote><p><a href="#S5_5">5.5 MODE - Channel Mode</a></p></blockquote>
+		<blockquote><p><a href="#S5_6">5.6 INVITE - Invite a user to a channel</a></p></blockquote>
+		<blockquote><p><a href="#S5_7">5.7 SAJOIN - Channel Force Join</a></p></blockquote>
+		<blockquote><p><a href="#S5_8">5.8 SAPART - Channel Force Part</a></p></blockquote>
+		<blockquote><p><a href="#S5_9">5.9 SAMODE - Channel Force Mode</a></p></blockquote>
+		<blockquote><p><a href="#S5_10">5.10 TOPIC - Chanel Topic</a></p></blockquote>
+		<p><a href="#S6">6 Services Commands</a></p>
+		<blockquote><p><a href="#S6_1">6.1 SVSKILL - Force Disconnect by Service</a></p></blockquote>
+		<blockquote><p><a href="#S6_2">6.2 SVSMODE, SVS2MODE - Force User Mode Change</a></p></blockquote>
+		<blockquote><p><a href="#S6_3">6.3 SVSSNO, SVS2SNO - Forced SNomask Change</a></p></blockquote>
+		<blockquote><p><a href="#S6_4">6.4 SVSNICK - Forced Nick Change</a></p></blockquote>
+		<blockquote><p><a href="#S6_5">6.5 SVSJOIN - Forced Join</a></p></blockquote>
+		<blockquote><p><a href="#S6_6">6.6 SVSPART - Forced Part</a></p></blockquote>
+		<blockquote><p><a href="#S6_7">6.7 SVSO - Oper Permissions</a></p></blockquote>
+		<blockquote><p><a href="#S6_8">6.8 SVSNOOP - Oper Lockdown</a></p></blockquote>
+		<blockquote><p><a href="#S6_9">6.9 SVSNLINE - RealName Ban</a></p></blockquote>
+		<blockquote><p><a href="#S6_10">6.10 SVSFLINE - File Ban</a></p></blockquote>
+		<p><a href="#S7">7 Messaging</a></p>
+		<blockquote><p><a href="#S7_1">7.1 PRIVMSG, NOTICE - Simple Message Transmission</a></p></blockquote>
+		<blockquote><p><a href="#S7_2">7.2 SENDUMODE, SMO - Usermode-based Delivery</a></p></blockquote>
+		<blockquote><p><a href="#S7_3">7.3 SENDSNO - SNomask-based Delivery</a></p></blockquote>
+		<blockquote><p><a href="#S7_4">7.4 CHATOPS - IRCop Chat</a></p></blockquote>
+		<blockquote><p><a href="#S7_5">7.5 WALLOPS - Wallop Chat</a></p></blockquote>
+		<blockquote><p><a href="#S7_6">7.6 GLOBOPS - FailOp Chat</a></p></blockquote>
+		<blockquote><p><a href="#S7_7">7.7 ADCHAT - Admin Chat</a></p></blockquote>
+		<blockquote><p><a href="#S7_8">7.8 NACHAT - NetAdmin Chat</a></p></blockquote>
+		<p><a href="#S8">8 Ban Control</a></p>
+		<blockquote><p><a href="#S8_1">8.1 TKL - Master Ban Control</a></p></blockquote>
+		<blockquote><blockquote><p><a href="#S8_1_1">8.1.1 GLINE - Network-wide user@host ban</a></p></blockquote></blockquote>
+		<blockquote><blockquote><p><a href="#S8_1_2">8.1.2 GZLINE - Network-wide IP ban</a></p></blockquote></blockquote>
+		<blockquote><blockquote><p><a href="#S8_1_3">8.1.3 SQLINE, UNSQLINE - Network-wide Nickname ban</a></p></blockquote></blockquote>
+		<blockquote><blockquote><p><a href="#S8_1_4">8.1.4 SPAMFILTER - Message Spam Filtration System</a></p></blockquote></blockquote>
+		<p><a href="#S9">9 Base64 Tables</a></p>
+		<blockquote><p><a href="#S9_1">9.1 Table for SJB64 (NICK and SJOIN).</a></p></blockquote>
+		<blockquote><p><a href="#S9_2">9.2 Table for NICKIP.</a></p></blockquote>
+		<hr/>
+		<h1><a name="S1"></a>1 Introduction</h1>
+		<p>This document describes the UnrealIRCd server-to-server protocol as of protocol 2307 (Unreal 3.2.4).</p>
+		<h2>A word about clocks.</h2>
+		<p>Unreal is very time-dependant. Users and channels, for example, are timestamped, and if server clocks are not synchronized properly, things can go very wrong very fast. See <a href="http://vulnscan.org/UnrealIrcd/faq/#67">http://vulnscan.org/UnrealIrcd/faq/#67</a> for more information on this. Note that there is a slight difference between server time and what is actually reported by the UNIX date command or by the C time() function. Unreal can apply an offset to the real time to create the server time, allowing servers to be virtually synchronized when synchronizing the real clocks is not possible (such as on shell servers).
+			I should make it quite clear that GMT time is used for everything. To be specific, timestamps in unreal are 32-bit integer values (actually, however many bits the time_t type is, which is 32 on 32-bit systems such as x86). This integer value is the number of seconds that have elapsed since Midnight January 1, 1970 GMT (can be referred to as Epoch time in the UNIX world). This means that timezones are no problem, nor is daylight savings time (or whatever your country of choice calls it).</p>
+		<hr/>
+		<h1><a name="S2"></a>2 Server Negotiation</h1>
+		<p>The first step to establish a server-to-server communication is to negotiate the connection as a server. Negotiation is done using standard IRC commands - no PROTOCTL options are in force until the link is established. The first step is to open a TCP/IP connection to the target server. The target port must be one described by a listen {} block in the remote server's configuration, and that listen block must not have the clientsonly option. After the connection is open, you will be treated as any other connection and be greeted with the "Looking up your hostname..." and "Checking identd..." notices as you would for a client. As these are NOTICE messages and your session as a server isn't established, they should simply be ignored. Use the commands below to introduce a server connection.</p>
+		<h2><a name="S2_1"></a>2.1 PASS - Connection Password</h2>
+		<p><b>Syntax:</b> <tt>PASS :<i>link password</i></tt></p>
+		<p>The PASS command is used to transmit the password required for a server link. It must match the password specified in the remote server's link::password-receive (which can be crypted), otherwise the link will be rejected. This should be the first message sent.</p>
+		<h2><a name="S2_2"></a>2.2 PROTOCTL - Server Protocol Negotiation</h2>
+		<p><b>Syntax:</b> <tt>PROTOCTL <i>protocol options</i></tt></p>
+		<p>The PROTOCTL command sets several protocol options. The tokens supported are listed below.</p>
+		<ul>
+			<li>NOQUIT : When a netsplit occurs, only send a SQUIT message for each server lost. This server will assume that clients on these servers were also lost and will send the appropriate QUIT messages to local clients and to any non-NOQUIT servers.</li>
+			<li>TOKEN : Use tokenized commands. Tokens are case-sensitive, shortened versions of command names. Tokens will be usually one or two characters.</li>
+			<li>NICKv2 : Use extended NICK message for introducing users. See the NICK command for information about this.</li>
+			<li>VHP : When introducing a user, send his cloaked host as if it were a vhost. Usually used for services to avoid having duplicate code.</li>
+			<li>SJOIN : Supports SJOIN version 1 which is no longer in use. Use with SJ3.</li>
+			<li>SJOIN2 : Supports SJOIN version 2 which is no longer in use. Use with SJ3.</li>
+			<li>UMODE2 : Supports the UMODE2 command, which is a shortened version of MODE for usermode changes.</li>
+			<li>VL : Supports V:Line information. Extends the SERVER message to include version information used in deny version{} blocks. Note that this is assumed - unreal will always send its own version information.</li>
+			<li>SJ3 : Supports SJOIN version 3.</li>
+			<li>NS : Supports server numerics which provides a shorthand for server names. In any circumstance where a :server.name is permitted (the server is the message's real source), @servernumeric may be used instead. In addition, the server.name parameter in the NICK message may be simply the server's numeric. Requires VL support.</li>
+			<li>SJB64 : Timestamps in NICK and SJOIN are expressed in base64 rather than base10.</li>
+			<li>TKLEXT : Supports exntended TKL messages for spamfilter support.</li>
+			<li>NICKIP : Adds an IP parameter to the NICK message, which is the base64 encoding of the user's ip address (in network byte order). Requires NICKv2.</li>
+			<li>NICKCHARS : Indicates the set of enabled nickchar options (see the regular documention for info about this).</li>
+			<li>CHANMODES : (Not required to be sent) This is the same as the CHANMODES value in the 005 for client connections. Useful for autodetecting things like what modes are valid for ChanServ MLOCK, for example.</li>
+			<li>CLK : Supports an extra field in NICK for sending the cloaked host (not vhost).</li>
+		</ul>
+		<p>The syntax examples here follow the conventions for TOKEN and also NS in cases of server-only messages.</p>
+		<h2><a name="S2_3"></a>2.3 SERVER - Server Negotiation</h2>
+		<p><b>Note:</b> This message is also used for introducing additional servers, the format of this message in those cases is described later.</p>
+		<p><b>Syntax (normal):</b> <tt>SERVER <i>server.name</i> 1 :<i>server description</i></tt></p>
+		<p><b>Syntax (with VL):</b> <tt>SERVER <i>server.name</i> 1 :U<i>protocolversion</i>-<i>protocolflags</i> <i>server description</i></tt></p>
+		<p><b>Syntax (with VL and NS):</b> <tt>SERVER <i>server.name</i> 1 :U<i>protocolversion</i>-<i>protocolflags</i>-<i>servernumeric</i> <i>server description</i></tt></p>
+		<p>The literal 1 in the parameter list is the hopcount parameter. Since you are a direct link, your own hopcount will be 1.</p>
+		<p>The server.name is the same as that in the remote server's link:: block. When received from unreal servers, this will be the value of that server's me::name. The protocol version is the numeric protocol version (2306 for example), and the protocol flags are the server's compilation flags (described below). These two fields are checked against the deny version {} blocks in the remote server's configuration. A value of 0 for either field prevents deny version{} checking for that field. The server description can be anything. When received from unreal servers, it'll be the value of me::description.</p>
+		<p>The following version numbers have been used previously:</p>
+		<ul>
+			<li>2309 - Unreal 3.2.6, 3.2.7, 3.2.8</li>
+			<li>2308 - Unreal 3.2.5</li>
+			<li>2307 - Unreal 3.2.4</li>
+			<li>2306 - Unreal 3.2.3</li>
+			<li>2305 - Unreal 3.2.2</li>
+			<li>2304 - Unreal 3.2.1</li>
+			<li>2303 - Unreal 3.2beta* through 3.2 Release</li>
+			<li>2302 - Unreal 3.1.1 through 3.1.4</li>
+			<li>2301 - Unreal 3.1 Release</li>
+			<li>2300 - Unreal 3.0 Release</li>
+		</ul>
+		<p>The compile flags as specified in protocol flags are:</p>
+		<ul>
+			<li>c : Server is chrooted (#define CHROOTDIR).</li>
+			<li>C : Server has command line config (-f option) enabled (#define CMDLINE_CONFIG).</li>
+			<li>D : Server is in debugmode (#define DEBUGMODE).</li>
+			<li>F : Using filedescriptor lists.</li>
+			<li>h : Server is compiled with hub support (#define HUB or answer "Hub" to relevant ./Config prompt).</li>
+			<li>i : Server shows invisible users in /TRACE.</li>
+			<li>n : NOSPOOF (pingcookies) is enabled (#define NOSPOOF or answer "Yes" to relevant ./Config prompt).</li>
+			<li>V : Server is using valloc().</li>
+			<li>W : Windows IRCd.</li>
+			<li>Y : Syslog logging enabled.</li>
+			<li>6 : Server has IPv6 support (#define INET6 or answer "yes" to relevant ./Config prompt).</li>
+			<li>X : Server has badword stripping (user and channel modes +G) (#define STRIPBADWORDS).</li>
+			<li>P : Server is using poll().</li>
+			<li>e : Server has SSL Support (#define USE_SSL or answer "yes" (and have ssl libraries installed) to relevant ./Config prompt).</li>
+			<li>O : Server has OperOverride enabled (#undef NO_OPEROVERRIDE or answer "no" to relevant ./Config prompt).</li>
+			<li>o : Server has disabled Oper verify (#undef OPEROVERRIDE_VERIFY or answer "no" to relevant ./Config prompt).</li>
+			<li>Z : Server has ziplink support (#define ZIP_LINKS or answer "yes" to relevant ./Config prompt AND have the zlib dev libraries).</li>
+			<li>E : Server has extended channel mode support.</li>
+			<li>3 : 3rd party modules are loaded or some system libraries are wonky.</li>
+			<li>m : Private message handling is 'tainted' (one or modules registered a USERMSG hook).</li>
+			<li>M : Channel message handling is 'tainted' (one or modules registered a CHANMSG hook).</li>
+			<li>Additional Version flags can be added by 3rd-party modules.</li>
+		</ul>
+		<h2><a name="S2_4"></a>2.4 EOS - End Of Synch (TOKEN: ES)</h2>
+		<p><b>Syntax:</b> ES</p>
+		<p>Marks the end of the synching process. This is really optional, but it might be a good idea to send it anyway when you really are done synching. Once you send this, unreal will announce &quot;Client connecting&quot; or &quot;Client exiting&quot; notices (to those with snomask +F) for users (unless your server is U:Lined), and joins will be counted toward channel flood controls (chanmode +f).</p>
+		<p>Sending EOS only marks your server as synched, but does not do so for servers behind you. EOS would need to be sent on those servers' behalf as well.</p>
+		<h2><a name="S2_5"></a>2.5 NETINFO - Network Information (TOKEN: AO)</h2>
+		<p><b>Syntax:</b> AO <i>maxglobal</i> <i>currenttime</i> <i>protocolversion</i> <i>cloakhash</i> 0 0 0 :<i>networkname</i></p>
+		<p>This tells the other server your current network configuration. The max global is the highest number of concurrent users network-wide that this server has seen. The current time is a timestamp value. Protocolversion is the same as that in the SERVER command. Cloakhash is a hash representing the configured cloak keys. It may be a * if you are implementing services. The network name is that specified in set::network-name. The cloak-prefix is currently not sent here (and thus unreal won't generate warning for mismatching cloak prefixes, but they should be the same anyway).</p>
+		<p>It is NETINFO, not EOS, that triggers the &quot;Link bla bla bla is now synched&quot; notices, but NETINFO does not imply synching is actually complete (see EOS).</p>
+		<hr/>
+		<h1><a name="S3"></a>3 User Operations</h1>
+		<p>One important function of servers is it must notify all other servers about all of the users behind it. These commands represent the operations that can result in the change of a user's global state.</p>
+		<h2><a name="S3_1"></a>3.1 NICK - User Introduction and Nick Change (TOKEN: &amp;)</h2>
+		<p><b>Syntax (nick change):</b> <tt>:<i>oldnick</i> &amp; <i>newnick</i> :<i>timestamp</i></tt></p>
+		<p>This format of the NICK message indicates an existing user is changing his or her nickname. If a collision occurs, see the section on Nick Collisions below. The timestamp is the new nickname's timestamp.</p>
+		<p><b>Syntax (normal):</b> <tt>&amp; <i>nick</i> <i>hopcount</i> <i>timestamp</i>	<i>username</i> <i>hostname</i> <i>server</i> <i>servicestamp</i> :<i>realname</i></tt></p>
+		<p><b>Syntax (NICKv2):</b> <tt>&amp; <i>nick</i> <i>hopcount</i> <i>timestamp</i>	<i>username</i> <i>hostname</i> <i>server</i> <i>servicestamp</i> <i>+usermodes</i> <i>virtualhost</i> :<i>realname</i></tt></p>
+		<p><b>Syntax (NICKv2+CLK):</b> <tt>&amp; <i>nick</i> <i>hopcount</i> <i>timestamp</i>	<i>username</i> <i>hostname</i> <i>server</i> <i>servicestamp</i> <i>+usermodes</i> <i>virtualhost</i> <i>cloakhost</i> :<i>realname</i></tt>
+		<p><b>Syntax (NICKv2+NICKIP):</b> <tt>&amp; <i>nick</i> <i>hopcount</i> <i>timestamp</i> <i>username</i> <i>hostname</i> <i>server</i> <i>servicestamp</i> <i>+usermodes</i> <i>virtualhost</i> <i>nickipaddr</i> :<i>realname</i></tt></p>
+		<p><b>Syntax (NICKv2+NICKIP+CLK):</b> <tt>&amp; <i>nick</i> <i>hopcount</i> <i>timestamp</i>	<i>username</i> <i>hostname</i> <i>server</i> <i>servicestamp</i> <i>+usermodes</i> <i>virtualhost</i> <i>cloakhost</i> <i>nickipaddr</i> :<i>realname</i></tt>
+		<p><b>Note:</b> Because each server normally does its own cloak generation, Unreal does not expect to receive NICK messages with the CLK info, so do not send it. It will send this info to a server it has received a PROTOCTL CLK from however.</p>
+		<p>This format of the NICK message introduces a new user to the network. If PROTOCTL VHP is enabled, the user's cloaked host is put in the virtualhost field, otherwise it'll be * unless the user is +t. With the addition of CLK, VHP is no longer necessary for determining the cloak host.</p>
+		<h3><a name="S3_1_1"></a>3.1.1 Nick Collisions</h3>
+		<p>A nick collision occurs when a server receives a NICK message (or &amp; token) introducing a user that the server already sees on the network. When a collision occurs, one or both of the colliding clients must be disconnected. The timestamp is examined to determine which client loses. The client with the earlier timestamp remains. If both clients have equal timestamps, both are removed. Currently, Unreal handles NICK collisions both passively and agressively:</p>
+		<ul>
+			<li><b>Aggressive Handling:</b> The server actively sends a KILL message back across the link to terminate that end's client.</li>
+			<li><b>Passive Handling:</b> Upon receipt of a NICK message that should "win", the server simply silently exits it's own client.</li>
+		</ul>
+		<h2><a name="S3_2"></a>3.2 MODE, UMODE2 - User Mode Change (TOKEN: G or |)</h2>
+		<p><b>Syntax (MODE):</b> <tt>:<i>user</i> G <i>user</i> <i>modechange</i></tt></p>
+		<p><b>Syntax (UMODE2):</b> <tt>:<i>user</i> | <i>modechange</i></tt></p>
+		<p>This indicates a usermode change. The modechange can consist of zero or more strings of characters, each prefixed with either a + or -; the only delimiter between them being said + or -. If no + or - is at the beginning of the mode string, a + should be implied.</p>
+		<p>Some user modes are never sent between servers. Specifically, usermode +s and +O are not sent between servers. Modules can define additional usermodes that also might not be sent between servers. The UMODE2 saves bandwidth by not including the redundant target field for usermode changes, so use it when possible.</p>
+		<h2><a name="S3_3"></a>3.3 QUIT - User Disconnect (TOKEN: ,)</h2>
+		<p><b>Syntax:</b> <tt>:<i>user</i> , :<i>reason</i></tt></p>
+		<p>This command indicates that a user has disconnected. The reason field is filled in with the reason the user disconnected, which will be any of: quit message provided by the user in a /quit command, kill message for local operator kills, "Client exited" if the user does a brutal quit (clean (by TCP's definition) disconnect without sending a QUIT message), or a socket error message if present.</p>
+		<p>The QUIT message must NOT be prefixed when passing on to other servers. Only local user quit messages are affected by set::prefix-quit.</p>
+		<h2><a name="S3_4"></a>3.4 KILL - Force Disconnect (TOKEN: .)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> . <i>target</i> :<i>killpath</i>!<i>source</i> (<i>reason</i>)</tt></p>
+		<p>Used to indicate that an operator has used KILL on a user not on the same server. Anything beyond the last ! in the kill path is used as the reason. The source (reason) part is simply a standard used by Unreal. As each server passes on a KILL message, it usually prepends the bottommost part (up to the first .) of it's name followed by a ! character. When unreal receives a KILL from a directly connected irc operator, it will usually add that oper's vhost (or realhost if -x) as the first hop in the kill path, then follow with it's own name as mentioned before if it is passing to another server.</p>
+		<p>A server can also send KILLs on it's own. This is done in cases involving nickname collisions, fake senders, bad direction, and other cases of protocol errors. Usually, in these cases, the server puts it's own name as the source, and also prefixes with <i>bottompart</i>! like for any other ircop on that server. For example: @3 . someone :irc!irc.example.com (Nick collision)</p>
+		<h2><a name="S3_5"></a>3.5 SETHOST/CHGHOST - Change virtual host (TOKEN: AA or AL)</h2>
+		<p><b>Syntax (SETHOST):</b> <tt>:<i>source</i> AA <i>newvhost</i></tt></p>
+		<p><b>Syntax (CHGHOST):</b> <tt>:<i>source</i> AL <i>target</i> <i>newvhost</i></tt></p>
+		<p>Indicates the change of a user's virtual host. Currently, servers are expected to assume UMODE2 +xt on the target user in both commands. (In the case of SETHOST, the target is the sender.) Servers using PROTOCTL VHP will receive the cloaked host in a SETHOST message when a user activates his cloaked host. A server can also send CHGHOST (from one of it's opered clients) to change a user's hostname. This is generally used by HostServ implementations. To disable a cloaked host, use CHGHOST to set the user's virtual host equal to his real host, or use SVSMODE -xt, but the latter requires services.</p>
+		<h2><a name="S3_6"></a>3.6 SETIDENT/CHGIDENT - Change a user's username (TOKEN: AD or AZ)</h2>
+		<p><b>Syntax (SETIDENT):</b> <tt>:<i>source</i> AD <i>newusername</i></tt></p>
+		<p><b>Syntax (CHGIDENT):</b> <tt>:<i>source</i> AZ <i>target</i> <i>newusername</i></tt></p>
+		<p>Indicates the change of a user's username. No usermode change is associated with this. Unreal does not use a distinguished virtual username, so servers should only keep the original username (from the NICK message) if they intend to allow the user to reset the original username. Servers can use CHGIDENT to change a user's username.</p>
+		<h2><a name="S3_7"></a>3.7 SETNAME/CHGNAME - Change a user's realname (TOKEN: AE or BK)</h2>
+		<p><b>Syntax (SETNAME):</b> <tt>:<i>source</i> AE :<i>newrealname</i></tt></p>
+		<p><b>Syntax (CHGNAME):</b> <tt>:<i>source</i> BK <i>target</i> :<i>newrealname</i></tt></p>
+		<p>Indicates the change of a user's realname. No usermode change is associated with this. Unreal does not use a distinguished virtual realname, so servers should only keep the original realname (from the NICK message) if they intend to allow the user to reset the original realname. Servers can use CHGNAME to change a user's username. Note that servers must NOT check that the sender be an IRCop in SETNAME - normal users are permitted to use SETNAME.</p>
+		<h2><a name="#S3_8"></a>3.8 WHOIS - User Information (TOKEN: #)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> # [<i>from-server</i> ]<i>nick</i></tt></p>
+		<p>Requests the information on a user. This works exactly like the user /whois command - in fact, the source parameter must be a user, or the command will do nothing. <i>from-server</i> is the server to request the information from; if a server recives a WHOIS message without this parameter, it should return its own information on the user, otherwise it should pass the message to the given server. Note that <i>from-server</i> may name a user instead of a server (such as when a user uses /whois nick nick), in which case the the nick should be interpreted as naming the server that user is on. <i>nick</i> may be several users seperated by commas, but may not contain wildcards.</p>
+		<p>The reply to a WHOIS message uses the same numeric replies as the user command.</p>
+		<hr/>
+		<h1><a name="S4"></a>4 Server Operations</h1>
+		<p>This is different from server negotiation. Negotiation is when you are first connecting. Server introduction is used for introducing additional servers behind an existing server (aka hubbing). Hubbing is limited as specified by the hub, leaf, and leafdepth parameters in the link block and attempted violation of a hub restriction results in termination of the link. If no hub or leaf directive is given your server is a leaf by default, so any introduction of any server behind you would be an automatic drop. U:Lines don't matter here; services must be configured as a hub in the link block. The reason is U:Line is a permission rule, but hub privilege is a network structure rule.</p>
+		<h2><a name="S4_1"></a>4.1 SERVER - Server Introduction (TOKEN: ')</h2>
+		<p><b>Note: This command is also used for negotiation. Be warned that the token for this command is NOT VALID at that time! See section 2.3 for the syntax for negotiation.</b></p>
+		<p><b>Syntax (without PROTOCTL NS):</b> <tt>:<i>source</i> SERVER <i>new.server</i> <i>hopcount</i> :<i>description</i></tt></p>
+		<p><b>Syntax (with PROTOCTL NS):</b> <tt>@<i>sourcenumeric</i> SERVER <i>new.server</i> <i>hopcount</i> <i>numeric</i> :<i>description</i></tt></p>
+		<p>The command indicates that the server named new.server is being introduced by the source (the source is the server which new.server is directly linked to). The hopcount will be the number of links the receiving server would have to cross to reach new.server. In other words, new.server introduced itself with a hopcount of 1, and as the SERVER message is passed along, hopcount is incremented.</p>
+		<p>As an example, a services server faking a SERVER message for JUPE functionality would use a hopcount of 2.</p>
+		<h2><a name="S4_2"></a>4.2 SQUIT - Server Removal (TOKEN: -)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> SQUIT <i>server.name</i> <i>:reason</i></tt></p>
+		<p>From an IRCop or when server.name is not behind the source, this command requests the removal of the specified server.name. The command in this case is treated very much like KILL in the respect that the message is broadcasted to all servers, except server.name and any servers behind it. When the SQUIT reaches server.name's uplink, that server closes the link to server.name (which would then generate it's own SQUIT on behalf of it's uplink for the servers behind it).</p>
+		<p>A server can also use SQUIT in the same manner as QUIT to note the removal of a server behind it, or that it itself is quitting. In the former case, server.name is behind source, and the message is forward on to all other servers. In the latter case, source and server.name are equal, the receiving server closes the link and forwards the SQUIT message.</p>
+		<p>Unreal closes a direct link by simply sending an ERROR message and then closing the TCP connection. This typically causes the other end to generate an SQUIT bearing the message "Client exited" or similar, however, the ERROR will usually cause the server to send a message to all IRCops.</p>
+		<h2><a name="S4_3"></a>4.3 SDESC - Server Description (TOKEN: AG)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> AG :<i>newdesc</i></tt></p>
+		<p>The server to which source is connected to should have it's description updated to newdesc. This does NOT include the VL inforamtion.</p>
+		<h2><a name="S4_4">4.4 PING - Live Connection Query (TOKEN: 8)</a></h2>
+		<p><b>Syntax:</b> <tt>8 <i>source</i>[ :<i>destination</i>]</tt></p>
+		<p>Used to check if a connection is still live if it has been &quot;quiet&quot; for a certain amount of time. Typically, unreal will send PING requests at intervals determined by the class::pingfreq setting. PINGs originating from the direct uplink will use the token, but it seems PINGs originating from a distant server will not.</p>
+		<p>The response to a PING is sent with the <a href="#S4_5">PONG</a> command.</p>
+		<p>When receiving a two-parameter PING, the second parameter is the target. If the target isn't you, you can either reply on behalf of that target (using its name instead of yours), or if there is a real connection representing the target, forward the PING to the target.</p>
+		<h2><a name="S4_5">4.5 PONG - Live Connection Reply (TOKEN: 9)</a></h2>
+		<p><b>Syntax:</b> <tt>9 <i>source</i>[ :<i>destination</i>]</tt></p>
+		<p>Used to respond to a <a href="#S4_4">PING</a> query.</p>
+		<p><b>Responding to a ping:</b> Once a PING is received, you usually have an amount of time to respond equal to your class::pingfreq. The correct response will always have two parameters. If you received one parameter, then the received parameter becomes the second parameter of your response, and the first parameter is your server name. If you received two parameters, the response returns both parameters in reverse order.</p>
+		<p>For example, the response to <tt>8 uplink.server</tt> is <tt>9 my.name uplink.server</tt>, while the response to <tt>PING distant.server your.server</tt> is <tt>9 your.server distant.server</tt>. Unreal typically includes a : prior to the last parameter. This isn't required if that parameter contains no spaces, but it is especially important to not include the colon when reversing the parameters, or else Unreal mistake it for a single-parameter PONG.
+		<p>If a two-parameter PONG is received, the second parameter names the target. If the target is not you, and a real connection represents that target, you should forward the PONG message via that connection.</p>
+		<h2><a name="#S4_6"></a>4.6 STATS - Server Stats (TOKEN: 2)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> 2 [<i>type</i> [<i>server</i>] [<i>extended-params</i>]]</tt></p>
+		<p>Requests statistics or configuration information from a server. This command is used to transport cross-server STATS requests from users (eg: /stats o other.server), and should only be sent from a user (not a server). With no parameters, this will cause unreal to simply dump its help output. <i>type</i> is the type of stats to request, <i>server</i> names a server (or a user on that server) to request stats from, and <i>extended-params</i> is used to filter output from STATS G, etc. When received, it is up to the receiver to determine what stats to support and how to reply, but generally numeric replies are used. For the list of unreal's stats types, type /stats in a client for the helptext dump.</p>
+		<p><b>Note:</b> Stats set as oper-only (see set::oper-only-stats) will be refused from a server. In this case, it will be necessary to send the stats request from a psuedo-oper (such as a services agent, etc) for services/stats/etc.</p>
+		<hr/>
+		<h1><a name="S5"></a>5 Channel Operations</h1>
+		<p>These commands deal with the state of channels across the network. Unreal only supports Network Channels, where the first character is a # character.</p>
+		<h2><a name="S5_1"></a>5.1 SJOIN - Channel Burst (TOKEN: ~)</h2>
+		<p><b>Syntax:</b> <tt>@<i>servernumeric</i> ~ <i>timestamp</i> <i>channel</i> +<i>modes</i>[ <i>modeparams</i>] :<i>memberlist</i> <i>&amp;ban</i> <i>"exempt</i> <i>'invex</i></tt></p>
+		<p>Timestamp is the channel timestamp and can be !b64 as defined by PROTOCTL SJB64. Modes should only include those in the last three mode sets listed in CHANMODES. Modeparams is one parameter for each mode character that requires one. Memberlist is a series of users (all of which must at least be behind the server sending the SJOIN), each user is prefixed with one or more characters indicating their status. Owners (+q) are prefixed with *, admins (+a) ~, ops (+o) @, halfops (+h) %, voices (+v) +. Normal users are not prefixed with anything. Ban, ban exception, and invite exception masks are also included, with bans prefixed with &amp;, ban exceptions prefixed with ", and invite exceptions with '. Note that when a &amp;, " or ' is encountered as the first character, further processing of ~, *, @, %, or + characters must not continue because ban, exempt, and invite masks can contain any of those characters. (Plus it's just not right for a ban mask to be marked as a channel admin...)</p>
+		<p>If the channel didn't already exist it is created with the information given in the SJOIN. Otherwise the timestamp is used to determine how the SJOIN information is handled. As a given, all members are joined into the channel, regardless. The mode information (modes, modeparams, memberlist prefixes, bans, exempts, and invites) is subject to the timestamp rules:</p>
+		<ul>
+			<li>If the channel's current timestamp is equal to the timestamp in SJOIN, then the mode information is merged.</li>
+			<li>If the channel's current timestamp is less than the SJOIN timestamp, then the mode information is ignored.</li>
+			<li>If the channel's current timestamp is greater than the SJOIN timestamp, then the channel's existing mode information is cleared (for example, deop, etc all local clients), and the SJOIN mode information is added.</li>
+		</ul>
+		<p>When merging modes, conflicting modes (including +p vs +s, differing +l limits or +k keys, etc) are handled as follows:</p>
+		<ul>
+			<li><b>Private (+p) vs. Secret (+s):</b> Secret (+s) is preferred. Private (+p) is removed. (Note: there is a <a href="http://bugs.unrealircd.org/view.php?id=2391">bug</a> in Unreal versions prior to 3.2.3 in which a desynch will occur in which one side is +p and the other is +s. Update to Unreal 3.2.4 if you have problems with this.)</li>
+			<li><b>Strip Color (+S) vs. Block Color (+c):</b> Block (+c) is preferred. Strip (+S) is removed. (Note: Bug for +p vs. +s in prior unreal versions apply here as well.)</li>
+			<li><b>Channel Limit:</b> Numericly larger limit is preferred (for example, +l 30 versus +l 15 : +l 30 wins).</li>
+			<li><b>Channel Key:</b> &quot;Larger&quot; key (as defined by strcmp) is preferred (for example, +k moo versus +k meow : +k moo wins).</li>
+			<li><b>Channel Link:</b> &quot;Larger&quot; link name (as defined by stricmp - not case sensitive) is preferred (for example, +L #moo versus +L #meow : +L #moo wins, but +L #Meow versus +L #meow : values are equal).</li>
+			<li><b>Flood String:</b> Not really sure on this. I think larger value in each component wins.</li>
+			<li><b>Join-Throttle:</b> Highest of time period wins, if equal, highest of join amount wins (so +j 3:40 beats +j 5:20 but +j 5:20 beats +j 3:20).</li>
+			<li>Parameterized modes in third party modules will define their own conflict resolution formula.</li>
+		</ul>
+		<h2><a name="S5_2"></a>5.2 JOIN - Channel Join (TOKEN: C)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> C <i>#channel</i></tt></p>
+		<p>Indicates a user has joined a channel. Only one channel is sent this way, and the key is not sent even if the user gave one one joining. If the channel parameter is the special "0" case, the server must interpret the message as a PART for all channels the user is on.</p>
+		<h2><a name="S5_3"></a>5.3 PART - Channel Part (TOKEN: D)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> D <i>#channel</i>[ :<i>reason</i></tt>]</p>
+		<p>Indicates a user has left a channel. Only one channel is sent this way. The reason parameter may be left out if no reason was given.</p>
+		<h2><a name="S5_4"></a>5.4 KICK - Channel Kick (TOKEN: H)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> H <i>#channel</i> <i>user</i> :<i>reason</i></tt></p>
+		<p>Orders the forced removal of user from #channel with the given reason. When updating state for this command, it should be the same as if :user PART #channel had been received - the user is removed from #channel's memberlist.</p>
+		<h2><a name="S5_5"></a>5.5 MODE - Channel Mode (TOKEN: G)</h2>
+		<p><b>Note:</b> This is the same command as that used for usermode changes.</p>
+		<p><b>Syntax:</b> <tt>:<i>source</i> G <i>#channel</i> <i>modechange</i> <i>modeparams</i>[ <i>timestamp</i>]</tt></p>
+		<p>Changes the specified modes on the given channel. If the source is a server and the last parameter is numeric, it is interpreted as timestamp (although it can also be consumed as a parameter for modes. For example: :server.name MODE #channel +l 4 &lt;-- 4 will be a timestamp and the +l parameter). When a mode change is timestamped in this way, the mode is treated as it is with SJOIN: the MODE message is ignored if the timestamp is greater than the channel timestamp. (If the timestamp is equal, the mode is simply added replacing any conflicting modes already in place.)</p>
+		<p>A services implementation can easily clear all entries in a list mode such as bans with SVSMODE (see below).</p>
+		<h2><a name="S5_6"></a>5.6 INVITE - Invite a user to a channel (TOKEN: *)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> * <i>target</i> <i>#channel</i></tt></p>
+		<p>Sends to target an invitation to join #channel. If the source is a channel operator on #channel, or a U:Lined server, the invitation grants the user the temporary ability to join the channel regardless of any bans or some restricting channel modes (not +O or +A).</p>
+		<h2><a name="S5_7"></a>5.7 SAJOIN - Channel Force Join (TOKEN: AX)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> AX <i>targetuser</i> <i>#channel</i></tt></p>
+		<p>This requests the forced join of targetuser to #channel. This type of forced join overrides bans, and most modes. The server to which targetuser is connected to must actually acknowledge the join for it to occur. Service implementations may ignore this command, as they would only ever receive it if an SAJOIN was targeted at a service client, in which case it should be ignored...</p>
+		<h2><a name="S5_8"></a>5.8 SAPART - Channel Force Part (TOKEN: AY)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> AY <i>targetuser</i> <i>#channel</i>[ :<i>reason</i>]</tt></p>
+		<p>This requests the forced part of targetuser from #channel. This is slightly different from a KICK in that the user's removal is announced with PART. The server to which targetuser is connected to must actually acknowledge the part for it to occur. Service implementations may ignore this command, as they would only ever receive it if an SAPART was targeted at a service client, in which case it should be ignored...</p>
+		<p>The reason field is optional. If provided the acknowledging PART message should prefix the message with &quot;SAPart:&quot;.</p>
+		<h2><a name="S5_9"></a>5.9 SAMODE - Channel Force Mode (TOKEN: o)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> o <i>#channel</i> <i>modechange</i> <i>modeparams</i></tt></p>
+		<p>This has the same parameters as for MODE. The only difference is that servers probably will never receive this (but is best to document just in case), and that absolutely NO permission checking is done on anything.</p>
+		<h2><a name="S5_10"></a>5.10 TOPIC - Channel Topic (TOKEN: ) )</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> ) <i>#channel</i> <i>nick</i> <i>timestamp</i> :<i>topic</i></tt></p>
+		<p>Changes the channel topic information. This format is used when synching, as well as when a topic is changed normally. Nick is the user who changed the topic (depending on compile options, it can be just nick or a full nick!user@host), timestamp is when the change occured, and topic is the new topic text. Normally, only a newer timestamp will actually change the topic, but a U:Lined server can use an older timestamp as well (such as for TOPICLOCK).
+		<hr/>
+		<h1><a name="S6"></a>6 Services Commands</h1>
+		<p>These are commands typically employed by a service implementation, in addition to some of the normal commands. All of the commands listed here require the sender to be correctly U:Lined. This means that the services server name must appear within a ulines {} block in the unrealircd.conf configuration for ALL servers in the network. All servers and clients behind a U:Lined server are themselves U:Lined.</p>
+		<h2><a name="S6_1"></a>6.1 SVSKILL - Force Disconnect by Service (TOKEN: h)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> h <i>target</i> :<i>reason</i></tt></p>
+		<p>This command is similar to KILL but differs in several ways. First of all: there is no mutilation of the reason value. The reason given is the exact reason used to generate QUIT messages sent to users. Second, it is silent; no server notice is generated in response to this command. Third, it can only be used by a U:Lined server or client (such as services).</p>
+		<p>Because this command can be dangerous in the hands of an abusive person, service implementations should avoid granting humans control over the reason parameter. In cases of commands where a person has control over such parameter, either use a regular KILL instead, or otherwise modify the reason so that operators can be held accountable if necessary.</p>
+		<h2><a name="S6_2"></a>6.2 SVSMODE, SVS2MODE - Force User Mode Change (TOKEN: n or v)</h2>
+		<p><b>Syntax (SVSMODE):</b> <tt>:<i>source</i> n <i>target</i> +<i>usermodes</i></tt></p>
+		<p><b>Syntax (SVS2MODE):</b> <tt>:<i>source</i> v <i>target</i> +<i>usermodes</i></tt></p>
+		<p>Judging by these commands alone, you'd think they are identical. Both commands force a usermode change to occur. This is typically used by services to set +r on a user who has successfully identified. They differ in that SVS2MODE also sends the mode change to the user, while SVSMODE does not (hidden mode change).</p>
+		<p>SVSMODE and SVS2MODE also give special treatment to usermode +d. Rather than setting the deaf mode like you might expect, SVS(2)MODE +d allows services to change a user's services stamp (which is given in the NICK message). This could allow services to set the service stamp to an easily identifiable value that could then be used to say "hey, this person identified already". The syntax of this is: +d <i>newservicestamp</i> and can be combined with setting other usermodes as well. The deaf mode <b>can</b> be set by using +d without the service stamp parameter; however, in this case you <b>cannot</b> set the service stamp in the same SVS(2)MODE message.</p>
+		<p><b>Note:</b> Do <b>NOT</b> use SVSMODE to remove IRCop status from a user. Use the SVSO command for that instead.</p>
+		<p>Alternatively, target can name a channel. In this case, the mode change parameter can consist of a - character, followed by any or all of: b, e, I, q, a, o, h, or v. These characters cause the corresponding lists to be cleared of all entries. For example: SVSMODE #channel -b removes ALL bans from #channel, and SVSMODE #channel -qaohv turns ALL users on #channel into normal users (removes all owner, admin, op, halfop, and voice status). In this case, the uplink will acknowledge with a MODE listing the bans, etc that were removed.</p>
+		<p>To completely clear a channel of all modes: MODE #channel -cfijklmnprstzACGMKLNOQRSTVu (plus any added by third-party module) followed by SVSMODE #channel -beIqaohv.</p>
+		<h2><a name="S6_3"></a>6.3 SVSSNO, SVS2SNO - Forced SNomask Change (TOKEN: BV or BW)</h2>
+		<p><b>Syntax (SVSSNO):</b> <tt>:<i>source</i> BV <i>target</i> +<i>snomasks</i></tt></p>
+		<p><b>Syntax (SVS2SNO):</b> <tt>:<i>source</i> BW <i>target</i> +<i>snomask</i></tt></p>
+		<p>Changes a user's snomasks. The difference between SVSSNO and SVS2SNO is the same as with SVSMODE versus SVS2MODE. If the user is not +s, you must add it via SVSMODE +s. For example:</p>
+		<pre>:OperServ v someuser +s
+:OperServ BW someuser +ks</pre>
+		<h2><a name="S6_4"></a>6.4 SVSNICK - Forced Nick Change (TOKEN: e)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> e <i>target</i> <i>newnick</i> :<i>newtimestamp</i></tt></p>
+		<p>Forces the specified user to change his nick to newnick and also sets the nick timestamp to newtimestamp (so, for example, services could protect identified users from a nick collision by simply setting the nick timestamp to something way less than "now" - though currently this requires actually changing the nick too). SVSNICK requires the server to which the target is connected to acknowledge the nick change. If the user specified by newnick already exists, then target will be disconnected (even if it's something like a case-change).</p>
+		<h2><a name="S6_5"></a>6.5 SVSJOIN - Forced Join (TOKEN: BX)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> BX <i>target</i> <i>#channel</i></tt></p>
+		<p>This is identical to SAJOIN with a few exceptions: 1) It is U:Line-only. 2) No opernotice on use. 3) Bans and restricting modes are respected, a prior INVITE message must be sent to cause bans to be ignored.</p>
+		<h2><a name="S6_6"></a>6.6 SVSPART - Forced Part (TOKEN: BT)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> BT <i>target</i> <i>#channel</i> :<i>reason</i></tt></p>
+		<p>Also identical to SAPART with a few exceptions: no static prefix on the optional part reason, and no global notice, and requires a U:Line. Usage recommendation of SVSPART versus KICK is the same as for SVSKILL versus KILL.</p>
+		<h2><a name="S6_7"></a>6.7 SVSO - Oper Permissions (TOKEN: BB)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> BB <i>target</i> <i>flagchanges</i></tt></p>
+		<p>This allows a service to add or remove IRCop permission flags for a user. Flagchanges is formatted similar to that of MODE with the exception that operflags are used instead of usermodes. If the change string consists only of -, then all oper permissions, usermodes, and snomasks are removed (as if the user had himself typed MODE nick -Oo).</p>
+		<p>If you are granting IRCop permissions to a user who is not currently an IRCop, you should follow up with an SVSMODE +o or SVSMODE +O as appropriate. For example:</p>
+<pre>:OperServ BB somenick +o
+:OperServ BW somenick +cefknoqsSv
+:OperServ AL somenick local.oper.somethinghere.net
+:OperServ v somenick +Ohs </pre>
+		<h2><a name="S6_8"></a>6.8 SVSNOOP - Oper Lockdown (TOKEN: f)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> f <i>(op)</i><i>server.name</i></tt></p>
+		<p>The (op) parameter is either a + or - indicating if NOOP mode should be activated (+) or deactivated (-). When NOOP mode is activated, all IRCops on the server are deopered (including local operators) and the /oper command is disabled. IRCop privileges can still be granted through use of SVSO. On UnrealIRCd, it is not necessary to masskill all IRCops on the nooped server, as they are deopered automatically.</p>
+		<h2><a name="S6_9"></a>6.9 SVSNLINE - RealName Ban (TOKEN: BR)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> BR <i>op</i> <i>reason</i> :<i>realname mask</i></tt></p>
+		<p>Op is either + (add) or - (remove). In the case of +, reason is a space-escaped string (all space chars are encoded as _). If -, reason is ignored.</p>
+		<h2><a name="S6_10"></a>6.10 SVSFLINE - File Ban (TOKEN: BC)</h2>
+		<p><b>Syntax (add):</b> <tt>:<i>source</i> BC + <i>filemask</i> :<i>reason</i></tt></p>
+		<p><b>Syntax (remove):</b> <tt>:<i>source</i> BC - <i>filemask</i></tt></p>
+		<p><b>Syntax (clear):</b> <tt>:<i>source</i> BC *</tt></p>
+		<p>Adds or removes a DCCDENY item for the specified filemask on all servers. These DCCDENYs are hard dccdenies - the /dccallow command cannot override it. The last form removes all dccdenies added via SVSFLINE.</p>
+		<hr/>
+		<h1><a name="S7"></a>7 Messaging</h1>
+		<p>What good is Internet Relay <b>CHAT</b> if users cannot <b>CHAT</b>? This section addresses the commands through which arbitrary user messages are sent.</p>
+		<h2><a name="S7_1"></a>7.1 PRIVMSG, NOTICE - Simple Message Transmission (Token: ! or B)</h2>
+		<p><b>PRIVMSG Syntax:</b> <tt>:<i>source</i> ! <i>target</i> :<i>message</i></tt></p>
+		<p><b>NOTICE Syntax:</b> <tt>:<i>source</i> B <i>target</i> :<i>message</i></tt></p>
+		<p>Sends a messages to the given target. The target either names a single client, or identifies a list of clients in which the message is to be sent to. The available targets include:</p>
+		<ul>
+			<li><i>nickname</i>: Names a single user to whom the message is delivered.</li>
+			<li><i>nickname</i>@<i>servermask</i>: Also names a single user, but the message will only be delivered if the user is connected to a server matching the specified servermask. This is typically used for sending messages to services. The target must not be changed at any point along the path it must travel for delivery, even up to the final receipt of the message by the target. This allows the target to know it has been sent a message in this way.</li>
+			<li>#<i>channelname</i>: Sends a message to all users on the specified channel (except when channel is a moderated auditorium (+mu), in which case the wierd +mu sending behavior goes off).</li>
+			<li><i>modeprefix</i>#<i>channelname</i>: Sends a message to all users on the given channel having the given status or higher. For example: + means all voices, halfops, etc.</li>
+			<li>$<i>servermask</i>: Sends a message to ALL users on all servers matching the specified servermask (known as a server broadcast message). The RFC requirements of having a TLD with no wildcards is not applied to U:Lined clients.</li>
+		</ul>
+		<p>Unreal does not support the #hostmask format.</p>
+		<h2><a name="S7_2"></a>7.2 SENDUMODE, SMO - Usermode-based Delivery (TOKEN: AP or AU)</h2>
+		<p><b>Syntax:</b> <tt>@<i>servernumeric</i> AU <i>umode</i> :<i>message</i></tt></p>
+		<p>Sends the specified message to all users with the given mode. Only one usermode may be given. This is a server-only command if you can't tell from the sender prefix :) .</p>
+		<p>The message will be displayed as coming from the receiving client's own server. It may be appropriate to add a &quot;*** Notice (or other leader here) -- from blah:&quot; if you wish to clarify where the message is from.</p>
+		<h2><a name="S7_3"></a>7.3 SENDSNO - SNomask-based Delivery (TOKEN: Ss)</h2>
+		<p><b>Syntax:</b> <tt>@<i>servernumeric</i> Ss <i>snomask</i> :<i>message</i></tt></p>
+		<p>Sends the specified message to all users with the given snomask. Only one snomask may be given. This is a server-only command if you can't tell from the sender prefix :) .</p>
+		<p>The message will be displayed as coming from the receiving client's own server. It may be appropriate to add a &quot;*** Notice (or other leader here) -- from blah:&quot; if you wish to clarify where the message is from.</p>
+		<h2><a name="S7_4"></a>7.4 CHATOPS - IRCop Chat (TOKEN: p)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> p :<i>message</i></tt></p>
+		<p>Sends the message to all IRCops on all servers.</p>
+		<h2><a name="S7_5"></a>7.5 WALLOPS - Wallop Chat (TOKEN: =)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> = :<i>message</i></tt></p>
+		<p>Sends the message to all users with usermode +w, whether they are ircops or not.</p>
+		<h2><a name="S7_6"></a>7.6 GLOBOPS - FailOp Chat (TOKEN: ])</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> ] :<i>message</i></tt></p>
+		<p>Send the message to all IRCops with usermode +g.</p>
+		<h2><a name="S7_7"></a>7.7 ADCHAT - Admin Chat (TOKEN: x)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> x :<i>message</i></tt></p>
+		<p>Send the message to all Server and Network Admins (usermode +A).</p>
+		<h2><a name="S7_8"></a>7.8 NACHAT - NetAdmin Chat (TOKEN: AC)</h2>
+		<p><b>Syntax:</b> <tt>:<i>source</i> AC :<i>message</i></tt></p>
+		<p>Send the message to all Network Admins (usermode +N).</p>
+		<hr/>
+		<h1><a name="S8"></a>8 Ban Control</h1>
+		<p>Sometimes, you have the misfortune of encountering a user who has no purpose but to serve as an annoyance to your server or network. These commands transmit network-wide ban information amongst each other.</p>
+		<h2><a name="S8_1"></a>8.1 TKL - Master Ban Control (TOKEN: BD)</h2>
+		<p>The TKL command seems to have one oddity about it: the real ban source is included in the TKL command rather than in the sender prefix. Most likely this is done for synching reasons (so that the *line ban can be credited to the proper person even if he/she is offline). For this reason, the command syntax is given without any sender prefix at all. It is still permissible to use one, however.</p>
+		<h3><a name="S8_1_1"></a>8.1.1 GLINE - Network-wide user@host ban</h3>
+		<p><b>Add Syntax (TKL):</b> <tt>BD + G <i>userpart</i> <i>hostpart</i> <i>source</i> <i>expiretimestamp</i> <i>settimestamp</i> :<i>reason</i></tt></p>
+		<p><b>Remove Syntax (TKL):</b> <tt>BD - G <i>userpart</i> <i>hostpart</i> <i>source</i></tt></p>
+		<p>Adds and Removes Network-wide user@host bans, known as G:Lines. The GLINE command itself must not be used. The userpart and hostpart are the user portion and hostname portion of the ban mask. The expiretimestamp is 0 if the G:Line should not expire, otherwise it will expire at the given time. It is an absolute time, not relative, thus it's imperitive to have reasonably synchrnoized clocks or bans may be removed too early or even immediately!</p>
+		<h3><a name="S8_1_2"></a>8.1.2 GZLINE - Network-wide IP ban</h3>
+		<p><b>Add Syntax (TKL):</b> <tt>BD + Z * <i>ipmask</i> <i>source</i> <i>expiretimestamp</i> <i>settimestamp</i> :<i>reason</i></tt></p>
+		<p><b>Remove Syntax (TKL):</b> <tt>BD - Z * <i>ipmask</i> <i>source</i></tt></p>
+		<p>Adds and Removes Network-wide IP bans, known as Global Z:Lines. The GZLINE command itself must not be used. Ipmask permits CIDR notation as well as wildcard masks.</p>
+		<h3><a name="S8_1_3"></a>8.1.3 SQLINE, UNSQLINE - Network-wide Nickname ban (TOKEN: c or d)</h3>
+		<p><b>Add Syntax (TKL):</b> <tt>BD + Q <i>hold</i> <i>nickmask</i> <i>source</i> <i>expiretimestamp</i> <i>settimestamp</i> :<i>reason</i></tt></p>
+		<p><b>Add Syntax (SQLINE):</b> <tt>:<i>source</i> c <i>nickmask</i> :<i>reason</i></tt></p>
+		<p><b>Remove Syntax (TKL):</b> <tt>BD - Q <i>hold</i> <i>nickmask</i> <i>source</i></tt></p>
+		<p><b>Remove Syntax (UNSQLINE):</b> <tt>:<i>source</i> d <i>nickmask</i></tt></p>
+		<p>In the TKL syntax, the hold parameter is either a * to mark the qline as a nick ban, or an H to mark it as a services hold. A services hold does not trigger qline rejection notice, and is typically used by NickServ to reserve registered nicks until they are released by the owner. The (UN)SQLINE syntax can only be used by a server, but any user can be used as the source for the TKL syntax. Unlike G and GZ lines, Q:Lines do not cause existing matching users to be disconnected or otherwise affected.</p>
+		<p>The TKL syntax is preferred, since it is more flexible, but (UN)SQLINE is permitted for compatibility.</p>
+		<h3><a name="S8_1_4"></a>8.1.4 SPAMFILTER - Message Spam Filtration System</h3>
+		<p>Proper use of spamfilter in TKL commands requires use of PROTOCTL TKLEXT, which increases the number of parameters allowed in TKL.</p>
+		<p><b>Add Syntax (TKL):</b> <tt>BD + F <i>target(s)</i> <i>action</i> <i>source</i> 0 <i>settimestamp</i> <i>tklduration</i> <i>tklreason</i> :<i>regex</i></tt></p>
+		<p><b>Remove Syntax (TKL):</b> <tt>BD - F <i>target(s)</i> <i>action</i> <i>source</i> 0 <i>settimestap</i> :<i>regex</i></tt></p>
+		<p>Adds and Removes network-wide spamfilters. The SPAMFILTER command itself must not be used. See <a href="http://vulnscan.org/UnrealIrcd/unreal32docs.html#feature_spamfilter">http://vulnscan.org/UnrealIrcd/unreal32docs.html#feature_spamfilter</a> for a list of valid targets. For actions, a single character is used to identify the action to be taken:</p>
+		<ul>
+			<li>K (kill) - The user is simply disconnected, with the reason given.</li>
+			<li>S (tempshun) - A temporary shun is placed on the user. This shun is applied only to that user, and disappears if the user reconnects.</li>
+			<li>s (shun) - A regular shun on the user's IP address is added. This causes all users with the same hostname to be shunned, but they will also stay shunned if they reconnect.</li>
+			<li>k (kline) - A K:Line is added on the user's IP address.</li>
+			<li>z (zline) - A Z:Line is added on the user's IP address.</li>
+			<li>g (gline) - A G:Line is added on the user's IP address.</li>
+			<li>Z (gzline) - A Global Z:Line is added on the user's IP address.</li>
+			<li>b (block) - Messages (or users!) matching the filter are simply blocked.</li>
+			<li>d (dccblock) - The user is prevented from sending files using DCC for the remainder of his session (in other words, until he quits).</li>
+			<li>v (viruschan) - User is removed from all channels, joined to the viruschan as defined in conf, and cannot message anything but that channel.</li>
+			<li>w (warn) - No action on the user is taken. Only the Spamfilter notice is sent to opers with snomask +S.</li>
+		</ul>
+		<h1><a name="S9">9 Base64 Tables</a></h1>
+		<p>Unreal uses base64 encoding to allow saving bandwidth by encoding numbers in a more compact format. Unreal uses two different variations of base64, one used for the SJB64 PROTOCTL option (in NICK and SJOIN), and one used for NICKIP.</p>
+		<h2><a name="S9_1">9.1 Table for SJB64 (NICK and SJOIN).</a></h2>
+		<p>In NICK and SJOIN, remember that the timestamp will be prefixed with ! to signal a base64 timestamp.</p>
+		<p>Just like in base10, the least significant &quot;digit&quot; is last.</p>
+		<pre> 0 0            17 H            34 Y            51 p
+ 1 1            18 I            35 Z            52 q
+ 2 2            19 J            36 a            53 r
+ 3 3            20 K            37 b            54 s
+ 4 4            21 L            38 c            55 t
+ 5 5            22 M            39 d            56 u
+ 6 6            23 N            40 e            57 v
+ 7 7            24 O            41 f            58 w
+ 8 8            25 P            42 g            59 x
+ 9 9            26 Q            43 h            60 y
+10 A            27 R            44 i            61 z
+11 B            28 S            45 j            62 {
+12 C            29 T            46 k            63 }
+13 D            30 U            47 l
+14 E            31 V            48 m
+15 F            32 W            49 n
+16 G            33 X            50 o</pre>
+		<h2><a name="S9_2">9.2 Table for NICKIP.</a></h2>
+		<p>In this table, the IP is encoded in network byte order. In terms of IPs, this means the first byte of the address really is first. Each &quot;digit&quot; in the base64 encoded IP corresponds to 6 bits of the IP address.</p>
+		<p>An IPv4 address is 32 bits, so 6 base64 &quot;digits&quot; are needed. Since base64 requires values to come in multiples of 4 &quot;digits&quot;, padding characters (=) need to be added if a value comes up short. In the case of IPv4 addresses, two are needed.</p>
+		<p>IPv6 addresses are 128-bit. They therefore need 22 base64 &quot;digits&quot; plus 2 pad characters.</p>
+		<pre> 0 A            17 R            34 i            51 z
+ 1 B            18 S            35 j            52 0
+ 2 C            19 T            36 k            53 1
+ 3 D            20 U            37 l            54 2
+ 4 E            21 V            38 m            55 3
+ 5 F            22 W            39 n            56 4
+ 6 G            23 X            40 o            57 5
+ 7 H            24 Y            41 p            58 6
+ 8 I            25 Z            42 q            59 7
+ 9 J            26 a            43 r            60 8
+10 K            27 b            44 s            61 9
+11 L            28 c            45 t            62 +
+12 M            29 d            46 u            63 /
+13 N            30 e            47 v
+14 O            31 f            48 w         (pad) =
+15 P            32 g            49 x
+16 Q            33 h            50 y</pre>
+	</body>
+</html>

doc/technical/token.txt

@@ -1,122 +1,109 @@
-Token List (c) 2002 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
-(As of Unreal3.2-beta11)
+Token List (c) 2002-2004 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
 
-Command        Token 
+Command     Token 
 ------------------------------------------------------------------------------------------------
-PRIVMSG        !
-WHO            \
-WHOIS          #
-WHOWAS         $
-USER           %
-NICK           &
-SERVER         '
-LIST           (
-TOPIC          )
-INVITE         *
-VERSION        +
-QUIT           ,
-SQUIT          -
-KILL           .
-INFO           /
-LINKS          0
-SUMMON         1
-STATS          2
-USERS          3
-HELP           4
-HELPOP         4
-ERROR          5
-AWAY           6
-CONNECT        7
-PING           8
-PONG           9
-OPER           ;
-PASS           <
-WALLOPS        =
-TIME           >
-NAMES          ?
-ADMIN          @
-NOTICE         B
-JOIN           C
-PART           D
-LUSERS         E
-MOTD           F
-MODE           G
-KICK           H
-USERHOST       J
-ISON           K
-REHASH         O
-RESTART        P
-CLOSE          Q
-DIE            R
-HASH           S
-DNS            T
-SILENCE        U
-AKILL          V
-KLINE          W
-UNKLINE        X
-RAKILL         Y
-GNOTICE        Z
-GOPER          [
-GLOBOPS        ]
-LOCOPS         ^
-PROTOCTL       _
-WATCH          `
-TRACE          b
-SQLINE         c
-UNSQLINE       d
-SVSNICK        e
-SVSNOOP        f
-SVSKILL        h
-SVSMODE        n
-SAMODE         o
-CHATOPS        p
-ZLINE          q
-UNZLINE        r
-RULES          t
-MAP            u
-SVS2MODE       v
-DALINFO        w
-ADCHAT         x
-MKPASSWD       y
-ADDLINE        z
-GLINE          }
-SETHOST        AA
-NACHAT         AC
-SETIDENT       AD
-SETNAME        AE
-LAG            AF
-SDESC          AG
-KNOCK          AI
-CREDITS        AJ
-LICENSE        AK
-CHGHOST        AL
-RPING          AM
-RPONG          AN
-NETINFO        AO
-SENDUMODE      AP
-ADDMODE        AQ
-ADDOMODE       AR
-SVSMODE        AS
-SMO            AU
-OPERMOTD       AV
-TSCTL          AW
-SAJOIN         AX
-SAPART         AY
-CHGIDENT       AZ
-SWHOIS         BA
-SVSO           BB
-SVSFLINE       BC
-TKL            BD
-VHOST          BE
-BOTMOTD        BF
-HTM            BH
-SHUN           BL
-SVSJOIN        BR
-SVSPART        BT
-SJOIN          ~
-UMODE2         |
-
-
-
-
-
+PRIVMSG     !
+WHOIS       #
+NICK        &
+SERVER      '
+TOPIC       )
+INVITE      *
+VERSION     +
+QUIT        ,
+SQUIT       -
+KILL        .
+INFO        /
+LINKS       0
+STATS       2
+HELP        4
+ERROR       5
+AWAY        6
+CONNECT     7
+PING        8
+PONG        9
+PASS        <
+TIME        >
+ADMIN       @
+SETHOST     AA
+NACHAT      AC
+SETIDENT    AD
+SETNAME     AE
+LAG         AF
+SDESC       AG
+KNOCK       AI
+CREDITS     AJ
+LICENSE     AK
+CHGHOST     AL
+RPING       AM
+RPONG       AN
+NETINFO     AO
+SENDUMODE   AP
+ADDMOTD     AQ
+ADDOMOTD    AR
+SVSMOTD     AS
+SMO         AU
+OPERMOTD    AV
+TSCTL       AW
+SAJOIN      AX
+SAPART      AY
+CHGIDENT    AZ
+NOTICE      B
+SWHOIS      BA
+SVSO        BB
+SVSFLINE    BC
+TKL         BD
+VHOST       BE
+BOTMOTD     BF
+HTM         BH
+DCCDENY     BI
+UNDCCDENY   BJ
+CHGNAME     BK
+SHUN        BL
+CYCLE       BP
+MODULE      BQ
+SVSNLINE    BR
+SVSPART     BT
+SVSLUSERS   BU
+SVSSNO      BV
+SVS2SNO     BW
+SVSJOIN     BX
+SVSSILENCE  Bs
+SVSWATCH    Bw
+JOIN        C
+PART        D
+LUSERS      E
+EOS         ES
+MOTD        F
+MODE        G
+KICK        H
+REHASH      O
+RESTART     P
+CLOSE       Q
+SENDSNO     Ss
+DNS         T
+TEMPSHUN    Tz
+SILENCE     U
+AKILL       V
+UNKLINE     X
+RAKILL      Y
+GLOBOPS     ]
+LOCOPS      ^
+PROTOCTL    _
+WATCH       `
+TRACE       b
+SQLINE      c
+UNSQLINE    d
+SVSNICK     e
+SVSNOOP     f
+SVSKILL     h
+SVSMODE     n
+SAMODE      o
+CHATOPS     p
+UNZLINE     r
+RULES       t
+MAP         u
+SVS2MODE    v
+DALINFO     w
+ADMINCHAT   x
+UMODE2      |
+SJOIN       ~

doc/technical/vl.txt

@@ -1,9 +1,14 @@
 VL Information (c) 2002 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
-(As of Unreal3.2-beta11)
 
 Protocol       Version
 ------------------------------------------------------------------------------------------------
-2303           3.2-Selene
+2309           3.2.6, 3.2.7, 3.2.8
+2308           3.2.5
+2307           3.2.4
+2306           3.2.3
+2305           3.2.2
+2304           3.2.1
+2303           3.2-beta*, 3.2-RC*, 3.2
 2302           3.1.1-Darkshades, 3.1.2-Darkshades, 3.1.3-Komara, 3.1.4-Meadows
 2301           3.1-Silverheart
 2300           3.0-Morrigana
@@ -28,5 +33,5 @@ e              SSL supported
 O              OperOverride enabled
 o              OperOverride without verify
 Z              Zip links supported
-3              3rd party modules (were) loaded
+3              3rd party modules (were) loaded or unreal is any other way 'tainted' (eg: bad libs)
 E              Extended channel modes supported

doc/translations.txt

@@ -0,0 +1,45 @@
+==[ Translations ]============================================================
+
+Starting with the release of Unreal 3.2 we have begun accepting translated
+documentation files. For now, only translations of unreal32docs.html and
+example.conf are accepted. Other stuff might be translated later, but
+this will probably be postponed to 3.3 (numerics/ircd text/help.conf/etc).
+
+There a few requirements however:
+- When you submit your translation it should be a translation of the
+  very latest doc... So be sure to translate the cvs version of
+  unreal32docs.html (www.vulnscan.org/UnrealIrcd/unreal32docs.html).
+- Of course the translation should be correct.. So also 'technically',
+  it's therefore recommended that have some real experience with Unreal ;)
+- If you are accepted and start working on it, it would be nice if you
+  could put your docs-in-progress online somewhere so we can see how
+  progress is going a bit.
+- You should use a proper HTML editor, this especially excludes Microsoft
+  Word and Frontpage since it enlarges the .html file by (at least) 30%.
+  Don't worry, there are enough free&simple html editors out there that
+  work perfectly fine, you won't need to be an HTML expert at all!
+- Someone, usually the person who translated it, needs to be willing
+  to actively maintain the docs. This is very important! If docs are
+  out of date (out-of-synch) there will be confusion among users.
+  Translators will receive once a week (and right before every release)
+  all changes that were made in unreal32docs.html. Then the translator
+  should update his/her doc and send it in (or commit it via cvs).
+  Count on an average of 15 minutes a week (it varies).
+
+Now, we should tell you that the first-time translation of unreal32docs.html
+is a LOT of work.. probably 20 hours or so. After that, the weekly updates
+take really just 5, 10, 15 minutes a week, which is pretty much "no time".
+Now why would you translate at all? Well, by translating UnrealIRCd
+documentation you will help out your fellow citizens and/or other people
+of that language, you will make Unreal a bit more 'internationalized',
+and it's a worthwile contribution to the UnrealIRCd project.
+Upon successful completion you will also receive an @unrealircd.org
+forwarder email address, and of course your name will be in the docs.
+
+If you want to start translating a document, please send an email to
+coders@lists.unrealircd.org and mention the language you are willing
+to translate to.. You will then receive an email back saying you can
+go ahead (or not). This is mainly to avoid multiple persons working 
+on the same translation.
+
+==============================================================================

extras/defizzer.c

@@ -35,12 +35,7 @@ DLLFUNC int h_defizzer_connect(aClient *sptr);
 static Hook *LocConnect = NULL;
 ModuleInfo DefizzerModInfo;
 
-#ifndef DYNAMIC_LINKING
-ModuleHeader defizzer_Header
-#else
-#define defizzer_Header Mod_Header
-ModuleHeader Mod_Header
-#endif
+ModuleHeader MOD_HEADER(defizzer)
   = {
 	"defizzer",	/* Name of module */
 	"$Id$", /* Version */
@@ -49,43 +44,25 @@ ModuleHeader Mod_Header
 	NULL 
     };
 
-
-/* The purpose of these ifdefs, are that we can "static" link the ircd if we
- * want to
-*/
-
-/* This is called on module init, before Server Ready */
-#ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
-#else
-int    defizzer_Init(ModuleInfo *modinfo)
-#endif
+DLLFUNC int MOD_INIT(defizzer)(ModuleInfo *modinfo)
 {
 	bcopy(modinfo,&DefizzerModInfo,modinfo->size);
 	LocConnect = HookAddEx(DefizzerModInfo.handle, HOOKTYPE_PRE_LOCAL_CONNECT, h_defizzer_connect);
 	return MOD_SUCCESS;
 }
 
-/* Is first run when server is 100% ready */
-#ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Load(int module_load)
-#else
-int    defizzer_Load(int module_load)
-#endif
+DLLFUNC int MOD_LOAD(defizzer)(int module_load)
 {
+	return MOD_SUCCESS;
 }
 
 
-/* Called when module is unloaded */
-#ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Unload(int module_unload)
-#else
-int	defizzer_Unload(int module_unload)
-#endif
+DLLFUNC int MOD_UNLOAD(defizzer)(int module_unload)
 {
 	HookDel(LocConnect);
 	return MOD_SUCCESS;
 }
+
 static void ban_fizzer(aClient *cptr)
 {
 	int i;
@@ -148,4 +125,4 @@ DLLFUNC int h_defizzer_connect(aClient *sptr)
 		return exit_client(sptr, sptr, &me, "Fizzer client");
 	}	
 	return 0;
-}
+}

help.conf

@@ -25,21 +25,29 @@ help {
 	" ==-------------------------oOo--------------------------==";
 };
 
+/* note: indexes were generated by cat somecmds|sort|column -c 70
+ *       along with tab->space conversion (tabwidth 8).
+ *       Perhaps we should automate this step :). -- Syzop
+ */
+
 help Usercmds {
 	" Currently the following User commands are available.";
 	" Use /HELPOP <command name> to get more information about";
 	" a specific command.";
 	" -";
-	" ==-----------------oOo-----------------==";
-	" ADMIN   KICK    MOTD    QUIT     VERSION";
-	" AWAY    KNOCK   NAMES   RULES    VHOST";
-	" CREDITS LICENSE NICK    SETNAME  WATCH";
-	" CYCLE   LINKS   NOTICE  SILENCE  WHO";
-	" DALINFO LIST    PART    STATS    WHOIS";
-	" INVITE  LUSERS  PING    TIME     WHOWAS";
-	" ISON    MAP     PONG    TOPIC";
-	" JOIN    MODE    PRIVMSG USERHOST";
-	" ==-----------------oOo-----------------==";
+	" ==-------------------------oOo-------------------------==";
+	" ADMIN           LICENSE         PART            USERHOST";
+	" AWAY            LINKS           PING            USERIP";
+	" CREDITS         LIST            PONG            VERSION";
+	" CYCLE           LUSERS          PRIVMSG         VHOST";
+	" DALINFO         MAP             QUIT            WATCH";
+	" DCCALLOW        MODE            RULES           WHO";
+	" INVITE          MODULE          SETNAME         WHOIS";
+	" ISON            MOTD            SILENCE         WHOWAS";
+	" JOIN            NAMES           STATS";
+	" KICK            NICK            TIME";
+	" KNOCK           NOTICE          TOPIC";
+	" ==-------------------------oOo-------------------------==";
 };
 
 help Opercmds {
@@ -47,16 +55,19 @@ help Opercmds {
 	" Use /HELPOP <command name> to get more information about";
 	" a specific command.";
 	" -";
-	" ==----------------oOo---------------==";
-	" OPER     WALLOPS GLOBOPS  CHATOPS LOCOPS    DNS";
-	" ADCHAT   NACHAT  KILL     KLINE   ZLINE     SPAMFILTER";
-	" GLINE    SHUN    GZLINE   HTM     TSCTL     TEMPSHUN";
-	" REHASH   RESTART DIE";
-	" LAG      SETHOST SETIDENT CHGHOST CHGIDENT";
-	" CHGNAME  SQUIT   CONNECT  DCCDENY UNDCCDENY";
-	" SAJOIN   SAPART  SAMODE   RPING   TRACE";
-	" OPERMOTD SDESC   MKPASSWD CLOSE   MODULE";
-	" ==----------------oOo---------------==";
+	" ==-------------------------oOo-------------------------==";
+	" ADCHAT          DNS             NACHAT          SETIDENT";
+	" ADDMOTD         GLINE           OPER            SHUN";
+	" ADDOMOTD        GLOBOPS         OPERMOTD        SPAMFILTER";
+	" CHATOPS         GZLINE          REHASH          SQUIT";
+	" CHGHOST         HTM             RESTART         TEMPSHUN";
+	" CHGIDENT        KILL            RPING           TRACE";
+	" CHGNAME         KLINE           SAJOIN          TSCTL";
+	" CLOSE           LAG             SAMODE          UNDCCDENY";
+	" CONNECT         LOCOPS          SAPART          WALLOPS";
+	" DCCDENY         MKPASSWD        SDESC           ZLINE";
+	" DIE             MODULE          SETHOST";
+	" ==-------------------------oOo-------------------------==";
 };
 
 help Svscmds {
@@ -67,13 +78,13 @@ help Svscmds {
 	" Use /HELPOP <command name> to get more information about";
 	" a specific command.";
 	" -";
-	" ==-----------oOo-----------==";
-	" SVSNICK  SVSMODE  SVSKILL   SVSWATCH";
-	" SVSNOOP  SVSJOIN  SVSPART   SVSSILENCE";
-	" SVSO     SWHOIS   SQLINE    SVSNLINE";
-	" UNSQLINE SVS2MODE SVSFLINE  SVSSNO";
-	" SVSMOTD  SVS2SNO  SVSLUSERS";
-	" ==-----------oOo-----------==";
+	" ==-------------------------oOo-------------------------==";
+	" SQLINE          SVSKILL         SVSNLINE    SVSSILENCE";
+	" SVS2MODE        SVSLUSERS       SVSNOLAG    SVSSNO";
+	" SVS2SNO         SVSMODE         SVSNOOP     SVSWATCH";
+	" SVSFLINE        SVSMOTD         SVSO        SWHOIS";
+	" SVSJOIN         SVSNICK         SVSPART     UNSQLINE";
+	" ==-------------------------oOo-------------------------==";
 };
 
 help Umodes {
@@ -116,7 +127,7 @@ help Snomasks {
 	" server notices you will receive.";
 	" Usage: /MODE nick +s <snomask>";
 	"    Ex: /MODE blah +s +cF-j";
-	" The parameter specifies which snomasks you want (or don't want)."
+	" The parameter specifies which snomasks you want (or don't want).";
 	" You can also remove all snomasks by simply doing /MODE nick -s.";
 	"-";
 	" Below is a list of possible snomasks:";
@@ -130,7 +141,9 @@ help Snomasks {
 	" k = View KILL notices";
 	" n = View nick changes on local server";
 	" N = View nick changes on remote servers";
+	" o = View oper-up notices";
 	" q = View rejected nick changes due to Q:lines";
+	" s = View general notices";
 	" S = View spamfilter matches";
 	" v = View usage of /VHOST command";
 	" ==-------------------------oOo------------------------==";
@@ -146,12 +159,14 @@ help Chmodes {
 	" a <nickname> = Gives Channel Admin to the user";
 	" q <nickname> = Gives Owner status to the user";
 	" -";
-	" b <nick!ident@host> = Bans the nick!ident@host from the channel [h]";
+	" b <nick!ident@host> = Bans the nick!ident@host from the channel";
+	"	Extended bantypes (for more info see /HELPOP EXTBANS) [h]";
 	" c = Block messages containing mIRC color codes [o]";
 	" e <nick!ident@host> = Overrides a ban for matching users [h]";
-	" f [*]<lines>:<seconds> = Flood protection [o]";
-	" (Users will be kicked after saying <lines> in <seconds> and banned if * is specified)";
+	" I <nick!ident@host> = Overrides +i for matching users [h]";
+	" f <floodparams> = Flood protection (for more info see /HELPOP CHMODEF) [o]";
 	" i = A user must be invited to join the channel [h]";
+	" j <joins:sec> = Throttle joins per-user to 'joins' per 'sec' seconds [o]";
 	" k <key> = Users must specify <key> to join [h]";
 	" l <number of max users> = Channel may hold at most <number> of users [o]";
 	" m = Moderated channel (only +vhoaq users may speak) [h]";
@@ -164,7 +179,7 @@ help Chmodes {
 	" A = Server/Net Admin only channel (settable by Admins)";
 	" C = No CTCPs allowed in the channel [o]";
 	" G = Filters out all Bad words in messages with <censored> [o]";
-	" M = Must be using a registered nick (+r) to talk [o]";
+	" M = Must be using a registered nick (+r), or have voice access to talk [o]";
 	" K = /KNOCK is not allowed [o]";
 	" L <chan2> = Channel link (If +l is full, the next user will auto-join <chan2>) [q]";
 	" N = No Nickname changes are permitted in the channel [o]";
@@ -180,39 +195,96 @@ help Chmodes {
 	" ==------------------------------oOo----------------------------==";
 };
 
+help ExtBans {
+	" Extended bantypes: ";
+	" -";
+	" ==-Type--------Name---------------------------Explanation-----------------------==";
+	"         |               | People matching these bans can join but are unable to   ";
+	"   ~q    |     Quiet     | speak, unless they have +v or higher.                   ";
+	"         |               | Example:                                                ";
+	"         |               | +bb ~q:*!*@blah.blah.com ~q:nick*!*@*                   ";
+	"-----------------------------------------------------------------------------------";
+	"         |               | People matching these bans cannot change nicks, unless  ";
+	"    ~n   |  nickchange   | they have +v or higher.                                 ";
+	"         |               | Example:                                                ";
+	"         |               | +bb ~n:*!*@*.aol.com ~n:nick*!*@*                       ";
+	"-----------------------------------------------------------------------------------";
+	"         |               | If the user is in this channel then (s)he is unable to  ";
+	"         |   [prefix]    | join. A prefix can also be specified (+/%/@/&/~) which  ";
+	"    ~c   |    channel    | means that it will only match if the user has that      ";
+	"         |               | rights or higher on the specified channel.              ";
+	"         |               | Example:  +b ~c:#lamers,    +e ~c:@#trusted             ";
+	"-----------------------------------------------------------------------------------";
+	"         |               | If the realname of a user matches this then (s)he is    ";
+	"         |               | unable to join.                                         ";
+	"    ~r   |   realname    | Example: +b ~r:*Stupid_bot_script*                      ";
+	"         |               | NOTE: an underscore ('_') matches both a space (' ') and";
+	"         |               | an underscore ('_'), so this ban would                  ";
+	"         |               | match 'Stupid bot script v1.4'.                         ";
+	" ==------------------------------------------------------------------------------==";
+};
+
+help Chmodef {
+	" The +f channel mode provides comprehensive flood protection for a channel.";
+	" This mode allows you to prevent join, nick change, CTCP, text, and knock";
+	" floods. The syntax for this mode's parameter is as follows:";
+	" -";
+	" +f [<amount><type>{#<action>}{,...}]:<seconds>";
+	" -";
+	" The amount specifies the number of times the specified flood must occur";
+	" before action is taken. Below are the available types:";
+	" -";
+	" ==-----Type-----Name--------Default Action---Other Actions-----==";
+	"        c        CTCP        +C               m, M";
+	"        j        Join        +i               R";
+	"        k        Knock       +K";
+	"        m        Messages    +m               M";
+	"        n        Nickchange  +N";
+	"        t        Text        kick             b";
+	" -";
+	" The difference between type m and t is that m is tallied for the entire";
+	" channel whereas t is tallied per user.";
+	" -";
+	" If you choose to specify an action for a mode, you may also specify a";
+	" time (in minutes) after which the specific action will be reversed.";
+};
+
+
 help Oflags {
 	" Here you will find the flags that can be placed inside of the O:Lines";
 	" -";
-	" ==----------------------oOo--------------------==";
-	" o = Local Operator";
-	" O = Global Operator";
-	" a = Gets +a on oper up. Is Services Administrator";
-	" A = Gets +A on oper up. Is Server Administrator";
-	" C = Gets +C on oper up. Is Co Administrator";
-	" N = Gets +N on oper up. Is Network Administrator";
+	" ==-------------------------------oOo-----------------------------==";
+	" o (locop)            Local Operator";
+	" O (globop)           Global Operator";
+	" C (coadmin)          Gets +C on oper up. Is Co Administrator";
+	" A (admin)            Gets +A on oper up. Is Server Administrator";
+	" a (services-admin)   Gets +a on oper up. Is Services Administrator";
+	" N (netadmin)         Gets +N on oper up. Is Network Administrator";
 	" -";
-	" r = Access to /REHASH server";
-	" R = Access to /RESTART server";
-	" D = Access to /DIE server";
-	" h = Oper receives umode +h (helpop)";
-	" g = Oper can send /GLOBOPS";
-	" w = Oper can send /WALLOPS";
-	" n = Oper can send Local Server Notices";
-	" G = Oper can send Global Server Notices";
-	" c = Access to do local /SQUITs and /CONNECTs";
-	" L = Access to do global /SQUITs and /CONNECTs";
-	" k = Access to do local /KILLs";
-	" K = Access to do global /KILLs";
-	" b = Oper can /KLINE users from server";
-	" B = Oper can remove Klines";
-	" z = Can add Z:Lines";
-	" Z = Can add global Z:Lines";
-	" t = Can use /GLINE and /SHUN";
-	" v = Can use OperOverride";
-	" q = Can use +q";
-	" H = Gets +x on oper up";
-	" W = Gets +W on oper up";
-	" ==----------------------oOo--------------------==";
+	" r (can_rehash)       Access to /REHASH server";
+	" R (can_restart)      Access to /RESTART server";
+	" D (can_die)          Access to /DIE server";
+	" h (helpop)           Oper receives umode +h (helpop)";
+	" g (can_globops)      Oper can send /GLOBOPS";
+	" w (can_wallops)      Oper can send /WALLOPS";
+	" n (can_localnotice)  Oper can send Local Server Notices";
+	" G (can_globalnotice) Oper can send Global Server Notices";
+	" c (can_localroute)   Access to do local /SQUITs and /CONNECTs";
+	" L (can_globalroute)  Access to do global /SQUITs and /CONNECTs";
+	" k (can_localkill)    Access to do local /KILLs";
+	" K (can_globalkill)   Access to do global /KILLs";
+	" b (can_kline)        Oper can /KLINE users from server";
+	" B (can_unkline)      Oper can remove Klines";
+	" z (can_zline)        Can add Z:Lines";
+	" Z (can_gzline)       Can add global Z:Lines";
+	" t (can_gkline)       Can use /GLINE, /SHUN and /SPAMFILTER";
+	" v (can_override)     Can use OperOverride";
+	" q (can_setq)         Can use +q";
+	" H (get_host)         Gets +x on oper up";
+	" W (get_umodew)       Gets +W on oper up";
+	" X (can_addline)      Can use /ADDLINE";
+	" d (can_dccdeny)      Can use /DCCDENY";
+	" ==-------------------------------oOo-----------------------------==";
 };
 
 
@@ -232,31 +304,61 @@ help Whois {
 	" -";
 	" Syntax:  WHOIS <user>";
 	" Example: WHOIS hAtbLaDe";
+	" -";
+	" Status flags:";
+	" The list of channels shown in the WHOIS reply can include one or more";
+	" status flags to indicate information about the channel. These flags are";
+	" described below:";
+	" ~ - User is a Channel Owner (+q)";
+	" & - User is a Channel Admin (+a)";
+	" @ - User is a Channel Operator (+o)";
+	" % - User is a Halfop (+h)";
+	" + - User is Voiced (+v)";
+	" ! - User has channels hidden in whois (+p) and you are an IRC Operator";
+	" ? - The channel is secret (+s) and you are an IRC Operator";
 };
 
 help Who {
 	" Retrieves information about users";
 	" -";
 	" Syntax:";
-	" /WHO [+|-][acghmnsuCM] [args]";
+	" /WHO [+|-][acghimnsuMRI] [args]";
 	" Flags are specified like channel modes, the flags cgmnsu all have arguments";
 	" Flags are set to a positive check by +, a negative check by -";
 	" The flags available:";
 	" Flag a: user is away";
 	" Flag c <channel>: user is on <channel>, no wildcards accepted";
-	" Flag g <gcos/realname>: user has string <gcos> in their GCOS,";
+	" Flag g <gcos/realname>: user has string <gcos> in his/her GCOS,";
 	" wildcards accepted, oper only";
-	" Flag h <host>: user has string <host> in their hostname, wildcards are accepted";
-	" Flag m <usermodes>: user has <usermodes> set on them, only o/A/a for nonopers";
-	" Flag n <nick>: user has string <nick> in their nickname, wildcards accepted";
+	" Flag h <host>: user has string <host> in his/her hostname, wildcards are accepted";
+	" Flag i <ip>: user has string <ip> in his/her IP address";
+	" Flag m <usermodes>: user has <usermodes> set, only o/C/A/a/N for nonopers";
+	" Flag n <nick>: user has string <nick> in his/her nickname, wildcards accepted";
 	" Flag s <server>: user is on server <server>, wildcards not accepted";
-	" Flag u <user>: user has string <user> in their username, wildcards accepted";
+	" Flag u <user>: user has string <user> in his/her username, wildcards accepted";
 	" Behavior flags:";
-	" Flag C: show first visible channel user is in";
 	" Flag M: check for user in channels I am a member of";
+	" Flag R: show users' real hostnames";
+	" Flag I: show users' IP addresses";
 	" -";
 	" For backwards compatibility, /who 0 o still shows +o users";
 	" Example: WHO +m o";
+	" -";
+	" Status flags:";
+	" The who command shows several flags in the returned result to indicate";
+	" different information about the user. These flags are explained below:";
+	" G - User is /away (gone)";
+	" H - User is not /away (here)";
+	" r - User is using a registered nickname";
+	" B - User is a bot (+B)";
+	" * - User is an IRC Operator";
+	" ~ - User is a Channel Owner (+q)";
+	" & - User is a Channel Admin (+a)";
+	" @ - User is a Channel Operator (+o)";
+	" % - User is a Halfop (+h)";
+	" + - User is Voiced (+v)";
+	" ! - User is +H and you are an IRC Operator";
+	" ? - User is only visible because you are an IRC Operator";
 };
 
 help Whowas {
@@ -427,6 +529,14 @@ help Userhost {
 	" Example: USERHOST hAtbLaDe";
 };
 
+help Userip {
+	" Returns the userip of the user in question.";
+	" Usually used by scripts or bots.";
+	" -";
+	" Syntax: USERIP <nickname>";
+	" Example: USERIP codemastr";
+};
+
 help Topic {
 	" Sets/Changes the topic of the channel in question,";
 	" or just display the current Topic.";
@@ -439,11 +549,14 @@ help Topic {
 
 help Invite {
 	" Sends a user an Invitation to join a particular channel.";
-	" You must be an Operator on the channel in order to";
-	" invite a user into it.";
+	" If the channel is +i, you must be an Operator to use this";
+	" command, otherwise any user may use the command.";
+	" Invite without parameters lists the channels you have been";
+	" invited to.";
 	" -";
-	" Syntax:  INVITE <user> <channel>";
+	" Syntax:  INVITE [<user> <channel>]";
 	" Example: INVITE hAtbLaDe #Support";
+	" Example: INVITE";
 };
 
 help Kick {
@@ -473,7 +586,7 @@ help Watch {
 	" -";
 	" Syntax: WATCH +nick1 +nick2 +nick3 (Add nicknames)";
 	"         WATCH -nick (Delete nicknames)";
-	"         WATCH (View the watchlist)";
+	"         WATCH (View which users are online)";
 };
 
 help List {
@@ -502,9 +615,11 @@ help Privmsg {
 	"  Send a message to a channel.";
 	"  Ex: /PRIVMSG #room Hi all";
 	" /PRIVMSG <prefix><#channel> <text>";
-	"  Send a message to users with <prefix> in <#channel> only";
-	"  Ex: /PRIVMSG @#room This goes to all ops";
-	"      /PRIVMSG +%@#room This goes to all +v, +h and +o's.";
+	"  Send a message to users with <prefix> and higher in <#channel> only";
+	"  Ex: /PRIVMSG @#room This goes to +oaq";
+	"      /PRIVMSG +#room This goes to +vhoaq";
+	"  NOTE: You need at least voice in order to send to +#chan/%#chan/@#chan";
+	"        and at least ops to send to &#chan/~#chan.";
 	" /PRIVMSG $<mask> <text>";
 	"  Send a message to all users on servers matching <mask> [Oper only]";
 	"  This is shown in the status window by most clients.";
@@ -527,9 +642,11 @@ help Notice {
 	"  Send a notice to a channel.";
 	"  Ex: /NOTICE #room Hi all, this is annoying";
 	" /NOTICE <prefix><#channel> <text>";
-	"  Send a notice to users with <prefix> in <#channel> only";
-	"  Ex: /NOTICE @#room This goes to all ops";
-	"      /NOTICE +%@#room This goes to all +v, +h and +o's.";
+	"  Send a notice to users with <prefix> and higher in <#channel> only";
+	"  Ex: /NOTICE @#room This goes to +oaq";
+	"      /NOTICE +#room This goes to +vhoaq";
+	"  NOTE: You need at least voice in order to send to +#chan/%#chan/@#chan";
+	"        and at least ops to send to &#chan/~#chan.";
 	" /NOTICE $<mask> <text>";
 	"  Send a notice to all users on servers matching <mask> [Oper only]";
 	"  This is shown in the status window by most clients.";
@@ -665,10 +782,10 @@ help Nachat {
 };
 
 help Kill {
-	" Forcefully Disconnects a user from an IRC Server.";
+	" Forcefully Disconnects users from an IRC Server.";
 	" IRC Operator only command.";
 	" -";
-	" Syntax:  KILL <user> <reason>";
+	" Syntax:  KILL <user1>,<user2>,<user3>,... <reason>";
 	" Example: KILL Jack16 Cloning is not allowed";
 };
 
@@ -794,7 +911,7 @@ help Restart {
 	" -";
 	" Syntax: RESTART";
 	"         RESTART <password>";
-	"         RESTART <server> <password>";
+	"         RESTART <password> <reason>";
 };
 
 help Die {
@@ -903,9 +1020,10 @@ help Sapart {
 	" Forces a user to part a channel.";
 	" Services Admin Command";
 	" -";
-	" Syntax:  SAPART <nick> <channel>,[<channel2>..]";
+	" Syntax:  SAPART <nick> <channel>,[<channel2>..] [<comment>]";
 	" Example: SAPART hAtbLaDe #OperHelp";
 	"          SAPART hAtbLaDe #Support,#IRCHelp";
+	"          SAPART hAtbLaDe #Support,#IRCHelp Go away";
 };
 
 help Samode {
@@ -951,13 +1069,16 @@ help Sdesc {
 };
 
 help Mkpasswd {
-	" This command will Encrypt the string it has been given";
-	" So you can add it directly to the unrealircd.conf if you use";
-	" Encrypted passwords. Type can be crypt, sha1, or md5. Sha1";
-	" and md5 are only available when compiled with SSL support.";
+	" This command will return a 'hash' of the string that has been specified,";
+	" you can use this hash for any encrypted passwords in your configuration file:";
+	" eg: for oper::password, vhost::password, etc.";
+	" Available types (in order of 'secureness'):";
+	"    *NIX: crypt, md5, sha1 [*], ripemd160 [*]";
+	" Windows: crypt [*], md5, sha1, ripemd160 [*]";
+	" [*: only available if compiled with SSL support]";
 	" -";
 	" Syntax:  MKPASSWD <method> <password>";
-	" Example: MKPASSWD crypt mpsare";
+	" Example: MKPASSWD md5 IamTeh1337";
 };
 
 help Module {
@@ -1041,7 +1162,7 @@ help Svskill {
 };
 
 help Svsnoop {
-	" Enables or disables whether Global IRCop functions";
+	" Enables or disables whether IRCop functions";
 	" exist on the server in question or not.";
 	" Must be sent through an U:Lined server.";
 	" -";
@@ -1053,7 +1174,7 @@ help Svsjoin {
 	" Forces a user to join a channel.";
 	" Must be sent through an U:Lined server.";
 	" -";
-	" Syntax:  SVSJOIN <nick> <channel>[,<channel2>..]";
+	" Syntax:  SVSJOIN <nick> <channel>[,<channel2>..] [key1[,key2[..]]]";
 	" Example: SVSJOIN hAtbLaDe #jail";
 	"          SVSJOIN hAtbLaDe #jail,#zoo";
 };
@@ -1062,9 +1183,10 @@ help Svspart {
 	" Forces a user to leave a channel.";
 	" Must be sent through an U:Lined server.";
 	" -";
-	" Syntax:  SVSPART <nick> <channel>[,<channel2>..]";
+	" Syntax:  SVSPART <nick> <channel>[,<channel2>..] [<comment>]";
 	" Example: SVSPART hAtbLaDe #Hanson";
 	"          SVSPART hAtbLaDe #Hanson,#AOL";
+	"          SVSPART hAtbLaDe #Hanson,#AOL You must leave";
 };
 
 help Svso {
@@ -1134,9 +1256,11 @@ help Svsnline {
 	" Must be sent through an U:Lined server.";
 	" The reason must be a single parameter therefore";
 	" spaces are indicated by _, Unreal will internally";
-	" translate these to spaces";
+	" translate these to spaces.";
 	" -";
-	" Syntax:  SVSNLINE +/- <reason_for_ban> :<realname>";
+	" Syntax:  SVSNLINE + <reason_for_ban> :<realname> (To add a ban)";
+	"          SVSNLINE - :<realname> (To remove a ban)";
+	"          SVSNLINE * (To clear all bans)";
 	" Example: SVSNLINE + sub7_drone :*sub7*";
 };
 
@@ -1152,18 +1276,18 @@ help Svslusers {
 
 help Svswatch {
 	" Changes the WATCH list of a user.";
-	" Must be sent trough an U:Lined server.";
+	" Must be sent through an U:Lined server.";
 	" Syntax: SVSWATCH <nick> :<watch parameters>";
 	" Example: SVSWATCH Blah :+Blih!*@* +Bluh!*@* +Bleh!*@*.com";
 };
 
 help Svssilence {
 	" Changes the SILENCE list of a user.";
-	" Must be sent trough an U:Lined server.";
+	" Must be sent through an U:Lined server.";
 	" In contrast to the SILENCE command, you can add/remove";
 	" multiple entries in one line.";
 	" Syntax: SVSSILENCE <nick> :<silence parameters>";
-	" Example: SILENCE Blah :+*!*@*.com +*!*@*.bla.co.uk";
+	" Example: SVSSILENCE Blah :+*!*@*.com +*!*@*.bla.co.uk";
 };
 
 help Svssno {
@@ -1180,9 +1304,24 @@ help Svs2sno {
 	" Must be sent through an U:Lined server.";
 	" -";
 	" Syntax:  SVS2SNO <nickname> <snomasks>";
-	" Example: SVSSNO joe +Gc";
+	" Example: SVS2SNO joe +Gc";
 };
 
+help Svsnolag {
+        " Enable 'no fake lag' for a user.";
+        " Must be sent through an U:Lined server.";
+        " -";
+        " Syntax:  SVSNOLAG [+|-] <nickname>";
+        " Example: SVSNOLAG + joe";
+};
+
+help Svs2nolag {
+        " Enable 'no fake lag' for a user.";
+        " Must be sent through an U:Lined server.";
+        " -";
+        " Syntax:  SVS2NOLAG [+|-] <nickname>";
+        " Example: SVS2NOLAG + joe";
+};
 
 help Spamfilter {
 	" This command adds/removes global spam filters.";
@@ -1191,12 +1330,13 @@ help Spamfilter {
 	" Use: /spamfilter [add|del|remove|+|-] [type] [action] [tkltime] [reason] [regex]";
 	" [type]    specifies the target type, you can specify multiple targets:";
 	"           'c' channel msg, 'p' private msg, 'n' private notice,";
-	"           'N' channel notice, 'P' part msg, 'q' quit msg, 'd' dcc";
+	"           'N' channel notice, 'P' part msg, 'q' quit msg, 'd' dcc,";
+	"           'a' away, 't' topic, 'u' user (nick!user@host:realname ban)";
 	" [action]  specifies the action to be taken (only 1 action can be specified):";
 	"           'kill', 'tempshun' (only shun current session), 'shun',";
 	"           'kline', 'gline', 'zline', 'gzline', 'block' (blocks the msg),";
 	"           'dccblock' (unable to send any dccs), 'viruschan' (part all channels";
-	"           and join the virus help chan).";
+	"           and join the virus help chan), 'warn' (warn for IRC Operators).";
 	" [regex]   this is the actual regex where we should block on";
 	" [tkltime] the duration of the *LINEs placed by action (use '-' to use the default";
 	"           set::spamfilter::ban-time, this value is ignored for block/tempshun');";
@@ -1225,3 +1365,24 @@ help Tempshun {
 	" Example: TEMPSHUN evilguy suspected infection";
 	"          TEMPSHUN -niceguy";
 };
+
+help DccAllow {
+	" For help on the DCCALLOW system, type '/DCCALLOW HELP'";
+	/* It would be useless and bad to include it here since that
+	 * stuff quickly gets out-of-synch.
+	 */
+};
+
+help Addmotd {
+	" Adds a line to the end of the MOTD ";
+	" -";
+	" Syntax:  ADDMOTD <text>";
+	" Example: ADDMOTD Play nice!";
+};
+
+help Addomotd {
+	" Adds a line to the end of the OPERMOTD ";
+	" -";
+	" Syntax:  ADDOMOTD <text>";
+	" Example: ADDOMOTD Abuse it and lose it!";
+};

include/auth.h

@@ -31,8 +31,9 @@ typedef	struct {
 #define AUTHTYPE_SSL_CLIENTCERT 4
 #define AUTHTYPE_RIPEMD160  5
 
-#ifdef USE_SSL
+/* md5 is always available and enabled as of Unreal3.2.1 */
 #define AUTHENABLE_MD5
+#ifdef USE_SSL
 #define AUTHENABLE_SHA1
 #define AUTHENABLE_SSL_CLIENTCERT
 #define AUTHENABLE_RIPEMD160
@@ -47,11 +48,7 @@ typedef	struct {
 #endif
 #endif
 
-	
 #ifdef _WIN32
-#ifndef AUTHENABLE_MD5
-#define AUTHENABLE_MD5
-#endif
 #ifndef AUTHENABLE_SHA1
 #define AUTHENABLE_SHA1
 #endif

include/common.h

@@ -36,7 +36,7 @@
 #include <process.h>
 #include <io.h>
 #endif
-//#include "dynconf.h"
+#include "types.h"
 #include "config.h"
 #ifdef	PARAMH
 #include <sys/param.h>
@@ -96,12 +96,12 @@ void free();
 #define TS time_t
 
 
-extern int match(char *, char *);
+extern int match(const char *, const char *);
 #define mycmp(a,b) \
  ( (toupper(a[0])!=toupper(b[0])) || smycmp((a)+1,(b)+1) )
-extern int smycmp(char *, char *);
+extern int smycmp(const char *, const char *);
 #ifndef GLIBC2_x
-extern int myncmp(char *, char *, int);
+extern int myncmp(const char *, const char *, int);
 #endif
 
 #ifdef NEED_STRTOK
@@ -125,7 +125,15 @@ extern char *inet_ntoa(struct IN_ADDR);
 extern int inet_netof(struct IN_ADDR);
 #endif
 
-int  global_count, max_global_count;
+#ifndef HAVE_INET_NTOP
+const char *inet_ntop(int, const void *, char *, size_t);
+#endif
+
+#ifndef HAVE_INET_PTON
+int inet_pton(int af, const char *src, void *dst);
+#endif
+
+MODVAR int  global_count, max_global_count;
 extern char *myctime(time_t);
 extern char *strtoken(char **, char *, char *);
 
@@ -140,10 +148,11 @@ extern char *strtoken(char **, char *, char *);
 
 #define DupString(x,y) do{int l=strlen(y);x=MyMalloc(l+1);(void)memcpy(x,y, l+1);}while(0)
 
-extern u_char tolowertab[], touppertab[];
+extern MODVAR u_char tolowertab[], touppertab[];
 
-#if defined(CHINESE_NICK) || defined(JAPANESE_NICK)
+#if defined(NICK_GB2312) || defined(NICK_GBK) || defined(NICK_GBK_JAP)
 #define USE_LOCALE
+#include <ctype.h>
 #endif
 
 #ifndef USE_LOCALE
@@ -166,7 +175,7 @@ extern u_char tolowertab[], touppertab[];
 #undef isspace
 #undef iscntrl
 #endif
-extern unsigned char char_atribs[];
+extern MODVAR unsigned char char_atribs[];
 
 #define PRINT 1
 #define CNTRL 2
@@ -175,6 +184,7 @@ extern unsigned char char_atribs[];
 #define DIGIT 16
 #define SPACE 32
 #define ALLOW 64
+#define ALLOWN 128
 
 #ifndef KLINE_TEMP
 #define KLINE_PERM 0
@@ -199,6 +209,7 @@ extern unsigned char char_atribs[];
 #define isgraph(c) ((char_atribs[(u_char)(c)]&PRINT) && ((u_char)(c) != 0x32))
 #define ispunct(c) (!(char_atribs[(u_char)(c)]&(CNTRL|ALPHA|DIGIT)))
 #endif
+#define iswseperator(c) (!isalnum(c) && !((u_char)c >= 128))
 
 #ifndef MALLOCD
 #define MyFree free
@@ -240,66 +251,18 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ );
  #define EXPAR4 ""
 #endif /* EXTCMODE */
 
-#define PROTOCTL_CLIENT_1         \
-		"MAP"             \
-		" KNOCK"          \
-		" SAFELIST"       \
-		" HCN"	          \
-		" MAXCHANNELS=%i" \
-		" MAXBANS=%i"     \
-		" NICKLEN=%i"     \
-		" TOPICLEN=%i"    \
-		" KICKLEN=%i"     \
-		" MAXTARGETS=%i"  \
-		" AWAYLEN=%i"	  \
-		" :are supported by this server"
-#define PROTOCTL_PARAMETERS_1	  \
-		MAXCHANNELSPERUSER, \
-		MAXBANS, \
-		NICKLEN, \
-		TOPICLEN, \
-		TOPICLEN, \
-		MAXTARGETS, \
-		TOPICLEN
-
 #ifdef PREFIX_AQ
-#define CHPFIX	"(qaohv)~&@%+"
-#define CHPAR1	"be"
+#define CHPFIX        "(qaohv)~&@%+"
+#define CHPAR1        "beI"
 #else
-#define CHPFIX	"(ohv)@%+"
-#define CHPAR1	"beqa"
+#define CHPFIX        "(ohv)@%+"
+#define CHPAR1        "beIqa"
 #endif /* PREFIX_AQ */
 
-#define CHPAR2	"kfL"
-#define CHPAR3	"l"
-#define CHPAR4	"psmntirRcOAQKVGCuzNSM"
+#define CHPAR2        "kfL"
+#define CHPAR3        "l"
+#define CHPAR4        "psmntirRcOAQKVCuzNSM"
 
-#define PROTOCTL_CLIENT_2	  \
-		"WALLCHOPS"	  \
-		" WATCH=%i"	  \
-		" SILENCE=%i"	  \
-		" MODES=%i"	  \
-		" CHANTYPES=%s"   \
-		" PREFIX=%s"      \
-		" CHANMODES=%s%s,%s%s,%s%s,%s%s" \
-		" NETWORK=%s" 	  \
-		" CASEMAPPING=%s" \
-		" EXTBAN=~,%s" \
-		" :are supported by this server"
-
-#define PROTOCTL_PARAMETERS_2	  \
-		MAXWATCH, \
-		SILENCE_LIMIT, \
-		MAXMODEPARAMS, \
-		"#", \
-		CHPFIX, \
-		CHPAR1, EXPAR1, \
-		CHPAR2, EXPAR2, \
-		CHPAR3, EXPAR3, \
-		"psmntirRcOAQKVGCuzNSM", EXPAR4, \
-		ircnet005, \
-		"ascii", \
-		extbanstr
 
 /* Server-Server PROTOCTL -Stskeeps
  * Please check send_proto() for more. -- Syzop
@@ -314,7 +277,8 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ );
                         " SJ3" \
                         " NS" \
                         " SJB64" \
-                        " TKLEXT"
+                        " TKLEXT" \
+			" NICKIP"
 
 #ifdef _WIN32
 /*
@@ -322,7 +286,6 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ );
  * Windows' internal strerror() function doesn't work with socket errors.
  */
 extern int DisplayString(HWND hWnd, char *InBuf, ...);
-#undef	strerror
 #else
 typedef int SOCKET;
 #define INVALID_SOCKET -1
@@ -336,8 +299,9 @@ extern int lu_noninv, lu_inv, lu_serv, lu_oper,
     lu_unknown, lu_channel, lu_lu, lu_lulocal, lu_lserv,
     lu_clu, lu_mlu, lu_cglobalu, lu_mglobalu;
 
-TS   now;
+MODVAR TS   now;
 
+#ifndef _WIN32
 #if defined(__STDC__)
 #define __const         const
 #define __signed        signed
@@ -360,6 +324,9 @@ TS   now;
 #endif
 #endif
 #endif
+#else
+#define inline __inline
+#endif
 
 #define READBUF_SIZE 8192
 

include/config.h

@@ -76,11 +76,6 @@
  */
 #define SHOW_SECRET
 
-/*
- * This allows you to see modes in /list
-*/
-#define LIST_SHOW_MODES
-
 /*
  * Admin's chat...
  */
@@ -92,24 +87,12 @@
 */
 #undef SECURECHANMSGSONLYGOTOSECURE
 
-/*
- * be compatible with older cloak keys? If you link to servers beta4 and 
- * earlier without this the cloak keys will produce diff results
- * Not recommended, however, as beta4 and earlier 3.2 has an insecure
- * cloak algo -griever
- */
-#undef COMPAT_BETA4_KEYS
-
-/*
-  If you want SHUN_NOTICES, define this
-*/
-#undef SHUN_NOTICES
-
 /*
    If you want to support chinese and/or japanese nicks
 */
-#undef CHINESE_NICK
-#undef JAPANESE_NICK
+#undef NICK_GB2312
+#undef NICK_GBK
+#undef NICK_GBK_JAP
 
 /*
   Remote rehash
@@ -126,39 +109,14 @@
 */
 #undef STRIPBADWORDS_CHAN_ALWAYS
 
-/*
- * NO_OPEROVERRIDE
- *   This will disable OperMode, OperTopic and Banwalks
-*/
-#undef NO_OPEROVERRIDE
-
-/*
- * OPEROVERRIDE_VERIFY
- *   This will prompt opers before permitting them to join +p/+s
- *   channels, decreasing the chances of someone "accidentally"
- *   entering a random channel.
- */
-#undef OPEROVERRIDE_VERIFY
-
 /*
  * THROTTLING
  *   This will only allow 1 connection per ip in set::throttle::period time
+ * NOTE: There's no reason to disable this (anymore) since it can be fully
+ *       configured in the unrealircd.conf. Keep the define...
  */
 #define THROTTLING
 
-/*
- * NAZIISH_CHBAN_HANDLING (formerly ANNOYING_BAN_THING)
- *   Reject bans that are matched by existing bans, causes chanserv
- *   To flood-kick an akicked user if their akick is matched by another
- *   Ban, but if you don't mind, this can free up ban list space I guess
- */
-#undef NAZIISH_CHBAN_HANDLING
-
-/*
- * Disable /sethost, /setident, /chgname, /chghost, /chgident
-*/
-#undef DISABLE_USERMOD
-
 /*
  * No spoof code
  *
@@ -178,18 +136,18 @@
  */
 #define HOSTILENAME		/* [DO NOT CHANGE!] */
 
-/*
- * This makes topics include nick!user@host instead of nick in topic whoset, 
- * ALL servers must be Unreal3.2-beta12 or higher, and services may have some
- * problems with this
-*/
-#undef TOPIC_NICK_IS_NUHOST
-
 /*
  * Use JOIN instead of SJOIN on every remotely sent JOIN
 */
 #undef JOIN_INSTEAD_OF_SJOIN_ON_REMOTEJOIN
 
+/*
+ * So called 'smart' banning: if this is enabled and a ban on like *!*@*h.com is present,
+ * then you cannot add a ban like *!*@*blah.com. In other words.. the ircd tries to be "smart".
+ * In general this is considered quite annoying. This was on by default until Unreal 3.2.8.
+ */
+#undef SOCALLEDSMARTBANNING
+
 /*
 ** Freelinks garbage collector -Stskeeps
 **
@@ -241,7 +199,11 @@
  *       the maintainer.
  */
 
-/* #undef	DEBUGMODE	   define DEBUGMODE to enable debugging mode.*/
+/* DEBUGMODE: This should only be used when tracing a problem. It creates
+ * an insane amount of log output which can be very useful for debugging.
+ * You should *NEVER* enable this setting on production servers.
+ */
+/* #undef	DEBUGMODE */
 
 /*
  * Full pathnames and defaults of irc system's support files. Please note that
@@ -255,22 +217,38 @@
 #define OPATH   	"oper.motd"	/* Operators MOTD file */
 #define	LPATH		"debug.log"	/* Where the debug file lives, if DEBUGMODE */
 #define	PPATH		"ircd.pid"	/* file for server pid */
-#define lPATH		"ircd.log"	/* server log file */
 #define VPATH		"ircd.svsmotd"	/* Services MOTD append. */
 #define BPATH		"bot.motd"	/* Bot MOTD */
 #define IRCDTUNE 	"ircd.tune"	/* tuning .. */
 
 /* CHROOTDIR
  *
- * Define for value added security if you are a rooter.
+ * This enables running the IRCd chrooted (requires initial root privileges,
+ * but will be dropped to IRC_USER/IRC_GROUP privileges if those are defined).
  *
- * All files you access must be in the directory you define as DPATH.
+ * The directory to chroot to is simply DPATH (which is set via ./Config).
  * (This may effect the PATH locations above, though you can symlink it)
  *
- * You may want to define IRC_UID and IRC_GID
+ * Usually you only simply need to enable this, and set IRC_USER and 
+ * IRC_GROUP, you don't need to create a special chroot environment.. 
+ * UnrealIRCd will do that by itself (Unreal will create /dev/random, 
+ * etc. etc.).
+ *
+ * Change to '#define CHROOTDIR' to enable...
  */
 /* #define CHROOTDIR    */
 
+/*
+ * IRC_USER
+ *
+ * If you start the server as root but wish to have it run as another user,
+ * define IRC_USER to that user name.  This should only be defined if you 
+ * are running as root and even then perhaps not.
+ */
+/* #define IRC_USER  "<user name>" */
+/* #define IRC_GROUP "<group name>" */
+
+
 /* SHOW_INVISIBLE_LUSERS
  *
  * As defined this will show the correct invisible count for anyone who does
@@ -286,9 +264,25 @@
  *       that the 'new' access lets them. Note also that defining this is
  *       a major security hole if your ircd goes down and some other user
  *       starts up the server with a new conf file that has some extra
- *       O-lines. So don't use this unless you're debugging.
+ *       O-lines.
+ *       Naturally, for non-suid/sgid ircds, this setting does not matter,
+ *       hence command line parameters are always permitted then.
  */
-#undef	CMDLINE_CONFIG		/* allow conf-file to be specified on command line */
+#undef	CMDLINE_CONFIG
+
+/** FAKELAG_CONFIGURABLE makes it possible to make certain classes exempted
+ * from 'fake lag' (that is, the artificial delay that is added by the ircd
+ * to prevent flooding, which causes the messages/commands of the user to
+ * slow down). Naturally, incorrect use of this feature can cause SEVERE
+ * issues, in fact it can easily bring your whole IRCd down if one of the
+ * users with class::options::nofakelag does a good flood at full speed.
+ * Hence, this is disabled by default, and you need to explicitly enable it
+ * here IF YOU KNOW WHAT YOU ARE DOING. People complaining their ircd
+ * ""crashed"" because of this setting will be shot. </DISCLAIMER>
+ * Common usage for this are: a trusted bot ran by an IRCOp, that you only
+ * want to give "flood access" and nothing else, and other such things.
+ */
+#undef FAKELAG_CONFIGURABLE
 
 /*
  * Size of the LISTEN request.  Some machines handle this large
@@ -313,19 +307,6 @@
 #define	BUFFERPOOL     (18 * MAXSENDQLENGTH)
 #endif
 
-/*
- * IRC_UID
- *
- * If you start the server as root but wish to have it run as another user,
- * define IRC_UID to that UID.  This should only be defined if you are running
- * as root and even then perhaps not.
- * use #define IRC_UID <uid>
- * and #define IRC_GID <gid>
- */
- 
-#undef	IRC_UID
-#undef	IRC_GID 
-
 /*
  * CLIENT_FLOOD
  *
@@ -343,17 +324,13 @@
 
 #define NO_FLOOD_AWAY
 
-/*
- * Define your network service names here.
+/* You can define the nickname of NickServ here (usually "NickServ").
+ * This is ONLY used for the ""infamous IDENTIFY feature"", which is:
+ * whenever a user connects with a server password but there isn't
+ * a server password set, the password is sent to NickServ in an
+ * 'IDENTIFY <pass>' message.
  */
-#define ChanServ "ChanServ"
-#define MemoServ "MemoServ"
 #define NickServ "NickServ"
-#define OperServ "OperServ"
-#define HelpServ "HelpServ"
-#define StatServ "StatServ"
-#define InfoServ "InfoServ"
-#define BotServ "BotServ"
 
 /*
  * How many open targets can one nick have for messaging nicks and
@@ -374,25 +351,13 @@
 #define PORTNUM 6667		/* 6667 is default */
 
 /*
- * Maximum number of network connections your server will allow.  This should
- * never exceed max. number of open file descrpitors and wont increase this.
- * Should remain LOW as possible. Most sites will usually have under 30 or so
- * connections. A busy hub or server may need this to be as high as 50 or 60.
- * Making it over 100 decreases any performance boost gained from it being low.
- * if you have a lot of server connections, it may be worth splitting the load
- * over 2 or more servers.
- * 1 server = 1 connection, 1 user = 1 connection.
- * This should be at *least* 3: 1 listen port, 1 dns port + 1 client
- *
- * Note: this figure will be too high for most systems. If you get an
- * fd-related error on compile, change this to 256.
- *
- * Windows users: This should be a fairly high number.  Some operations
- * will slow down because of this, but it is _required_ because of the way
- * windows NT(and possibly 95) allocate fd handles. A good number is 16384.
+ * Maximum number of network connections your server will allow.
+ * This is usually configured via ./Config on *NIX,
+ * the setting mentioned below is the default for Windows.
+ * 2004-10-13: 1024 -> 4096
  */
 #ifndef MAXCONNECTIONS
-#define MAXCONNECTIONS	1024
+#define MAXCONNECTIONS	4096
 #endif
 
 /*
@@ -402,7 +367,7 @@
  * 8MB or less  core memory : 500	(at least 1/4 of max users)
  * 8MB-16MB     core memory : 500-750	(1/4 -> 1/2 of max users)
  * 16MB-32MB    core memory : 750-1000	(1/2 -> 3/4 of max users)
- * 32MB or more core memory : 1000+	(> 3/4 if max users)
+ * 32MB or more core memory : 1000+	(> 3/4 of max users)
  * where max users is the expected maximum number of users.
  * (100 nicks/users ~ 25k)
  * NOTE: this is directly related to the amount of memory ircd will use whilst
@@ -417,12 +382,13 @@
 
 /*
  * Time interval to wait and if no messages have been received, then check for
- * PINGFREQUENCY and CONNECTFREQUENCY
+ * pings, outgoing connects, events, and a couple of other things.
  * Imo this is quite useless nowdays, it only saves _some_ cpu on tiny networks
  * with like 10 users all of them being inactive. On a normal network with >30
  * users this value is completely irrelevant.
  * The original value here was 60 (which was [hopefuly] never reached and was
  * stupid anyway), changed to 2.
+ * DO NOT SET THIS TO ANYTHING MORE THAN 5. BETTER YET, JUST LEAVE IT AT 2!
  */
 #define TIMESEC  2
 
@@ -431,15 +397,10 @@
  * PINGFREQUENCY seconds, then the server will attempt to check for
  * an active link with a PING message. If no reply is received within
  * (PINGFREQUENCY * 2) seconds, then the connection will be closed.
+ * NOTE: This is simply the class::pingfreq for the default class, nothing fancy ;)
  */
 #define PINGFREQUENCY    120	/* Recommended value: 120 */
 
-/*
- * If the connection to to uphost is down, then attempt to reconnect every
- * CONNECTFREQUENCY  seconds.
- */
-#define CONNECTFREQUENCY 600	/* Recommended value: 600 */
-
 /*
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY
@@ -473,19 +434,19 @@
 
 /*
  * Use much faster badwords replace routine (>100 times faster).
+ * Disabling this is not supported.
  */
 #define FAST_BADWORD_REPLACE
 
 /*
- * Only important for people using IPv6 (default should be ok for now) -Onliner
- * Because ip6.arpa is still not delegated for the 6bone (3ffe::/16)
- * this options allows you to still resolve it using ip6.int.
+ * Forces Unreal to use compressed IPv6 addresses rather than expanding them
  */
-#define SIXBONE_HACK
+#undef IPV6_COMPRESSED
 
 /*
  * Extended channel modes. This extends the channel modes with yet another
  * 32 possible modes which can also be used in modules.
+ * This is now pretty much required.
  */
 #define EXTCMODE
 
@@ -495,6 +456,23 @@
  */
 #define NEWCHFLOODPROT
 
+/* JoinThrottle (chanmode +j): +j x:y throttles users to X joins per Y seconds (per-user).
+ * In peak situations (eg: just after a server restart with thousand clients joining
+ * hundreds of channels) it can use like ~200k, but in normal circumstances you should
+ * count on just ~10-50k.
+ */
+#define JOINTHROTTLE
+
+/* Detect slow spamfilters? This requires a little more cpu time when processing
+ * any spamfilter (like on text/connect/..) but will save you from slowing down
+ * your IRCd to a near-halt (well, in most cases.. there are still cases like when
+ * it goes into a loop that it will still stall completely... forever..).
+ * This is kinda experimental, and requires getrusage.
+ */
+#ifndef _WIN32
+#define SPAMFILTER_DETECTSLOW
+#endif
+
 /* ------------------------- END CONFIGURATION SECTION -------------------- */
 #define MOTD MPATH
 #define RULES RPATH
@@ -502,6 +480,10 @@
 #define	CONFIGFILE CPATH
 #define	IRCD_PIDFILE PPATH
 
+#if defined(CHROOTDIR) && !defined(IRC_USER)
+#error "ERROR: It makes no sense to define CHROOTDIR but not IRC_USER and IRC_GROUP! Please define IRC_USER and IRC_GROUP properly as the user/group to change to."
+#endif
+
 #ifdef	__osf__
 #define	OSF
 /* OSF defines BSD to be its version of BSD */

include/dynconf.h

@@ -27,10 +27,6 @@
 
 typedef struct zNetwork aNetwork;
 struct zNetwork {
-	long	key;
-	long	key2;
-	long	key3;
-	long	keycrc;
 	unsigned x_inah:1;
 	char *x_ircnetwork;
 	char *x_ircnet005;
@@ -74,6 +70,7 @@ typedef struct zConfiguration aConfiguration;
 struct zConfiguration {
 	unsigned som:1;
 	unsigned hide_ulines:1;
+	unsigned flat_map:1;
 	unsigned allow_chatops:1;
 	unsigned webtv_support:1;
 	unsigned no_oper_hiding:1;
@@ -84,15 +81,18 @@ struct zConfiguration {
 	unsigned use_ban_version:1;
 	unsigned mkpasswd_for_everyone:1;
 	unsigned allow_part_if_shunned:1;
-	unsigned use_egd;
+	unsigned check_target_nick_bans:1;
+	unsigned use_egd : 1;
 	long host_timeout;
 	int  host_retries;
 	char *name_server;
+	char *dns_bindip;
 #ifdef THROTTLING
 	long throttle_period;
 	char throttle_count;
 #endif
 	char *kline_address;
+	char *gline_address;
 	long conn_modes;
 	long oper_modes;
 	char *oper_snomask;
@@ -102,6 +102,7 @@ struct zConfiguration {
 	char *oper_only_stats;
 	OperStat *oper_only_stats_ext;
 	int  maxchannelsperuser;
+	int  maxdccallow;
 	int  anti_spam_quit_message_time;
 	char *egd_path;
 	char *static_quit;
@@ -109,16 +110,26 @@ struct zConfiguration {
 #ifdef USE_SSL
 	char *x_server_cert_pem;
 	char *x_server_key_pem;
+	char *x_server_cipher_list;
 	char *trusted_ca_file;
 	long ssl_options;
+	int ssl_renegotiate_bytes;
+	int ssl_renegotiate_timeout;
+	
+#elif defined(_WIN32)
+	void *bogus1, *bogus2, *bogus3, *bogus5;
+	long bogus4;
+	int bogus6, bogus7;
 #endif
 	enum UHAllowed userhost_allowed;
 	char *restrict_usermodes;
 	char *restrict_channelmodes;
+	char *restrict_extendedbans;
 	char *channel_command_prefix;
 	long unknown_flood_bantime;
 	long unknown_flood_amount;
 	struct ChMode modes_on_join;
+	int level_on_join;
 #ifdef NO_FLOOD_AWAY
 	unsigned char away_count;
 	long away_period;
@@ -138,24 +149,37 @@ struct zConfiguration {
 	long spamfilter_ban_time;
 	char *spamfilter_ban_reason;
 	char *spamfilter_virus_help_channel;
+	char spamfilter_vchan_deny;
 	SpamExcept *spamexcept;
 	char *spamexcept_line;
+	long spamfilter_detectslow_warn;
+	long spamfilter_detectslow_fatal;
+	int maxbans;
+	int maxbanlength;
+	int timesynch_enabled;
+	int timesynch_timeout;
+	char *timesynch_server;
+	int pingpong_warning;
+	int watch_away_notification;
 	aNetwork network;
 };
 
 #ifndef DYNCONF_C
-extern aConfiguration iConf;
+extern MODVAR aConfiguration iConf;
 #endif
 
-#define KLINE_ADDRESS		iConf.kline_address
+#define KLINE_ADDRESS			iConf.kline_address
+#define GLINE_ADDRESS			iConf.gline_address
 #define CONN_MODES			iConf.conn_modes
 #define OPER_MODES			iConf.oper_modes
 #define OPER_SNOMASK			iConf.oper_snomask
 #define CONNECT_SNOMASK			iConf.user_snomask
 #define SHOWOPERMOTD			iConf.som
 #define HIDE_ULINES			iConf.hide_ulines
+#define FLAT_MAP			iConf.flat_map
 #define ALLOW_CHATOPS			iConf.allow_chatops
 #define MAXCHANNELSPERUSER		iConf.maxchannelsperuser
+#define MAXDCCALLOW			iConf.maxdccallow
 #define WEBTV_SUPPORT			iConf.webtv_support
 #define NO_OPER_HIDING			iConf.no_oper_hiding
 #define DONT_RESOLVE			iConf.dont_resolve
@@ -164,6 +188,7 @@ extern aConfiguration iConf;
 #define HOST_TIMEOUT			iConf.host_timeout
 #define HOST_RETRIES			iConf.host_retries
 #define NAME_SERVER			iConf.name_server
+#define DNS_BINDIP			iConf.dns_bindip
 #define IDENT_CHECK			iConf.ident_check
 #define FAILOPER_WARN			iConf.fail_oper_warn
 #define SHOWCONNECTINFO			iConf.show_connect_info
@@ -191,15 +216,12 @@ extern aConfiguration iConf;
 #define SSL_SERVER_CERT_PEM		(iConf.x_server_cert_pem ? iConf.x_server_cert_pem : "server.cert.pem")
 #define SSL_SERVER_KEY_PEM		(iConf.x_server_key_pem ? iConf.x_server_key_pem : "server.key.pem")
 
-#define CLOAK_KEY1			iConf.network.key
-#define CLOAK_KEY2			iConf.network.key2
-#define CLOAK_KEY3			iConf.network.key3
-#define CLOAK_KEYCRC			iConf.network.keycrc
 #define STATIC_QUIT			iConf.static_quit
 #define STATIC_PART			iConf.static_part
 #define UHOST_ALLOWED			iConf.userhost_allowed
 #define RESTRICT_USERMODES		iConf.restrict_usermodes
 #define RESTRICT_CHANNELMODES		iConf.restrict_channelmodes
+#define RESTRICT_EXTENDEDBANS		iConf.restrict_extendedbans
 #ifdef THROTTLING
 #define THROTTLING_PERIOD		iConf.throttle_period
 #define THROTTLING_COUNT		iConf.throttle_count
@@ -208,6 +230,7 @@ extern aConfiguration iConf;
 #define UNKNOWN_FLOOD_BANTIME		iConf.unknown_flood_bantime
 #define UNKNOWN_FLOOD_AMOUNT		iConf.unknown_flood_amount
 #define MODES_ON_JOIN			iConf.modes_on_join.mode
+#define LEVEL_ON_JOIN			iConf.level_on_join
 
 #ifdef NO_FLOOD_AWAY
 #define AWAY_PERIOD			iConf.away_period
@@ -238,4 +261,133 @@ extern aConfiguration iConf;
 #define SPAMFILTER_BAN_TIME		iConf.spamfilter_ban_time
 #define SPAMFILTER_BAN_REASON	iConf.spamfilter_ban_reason
 #define SPAMFILTER_VIRUSCHAN	iConf.spamfilter_virus_help_channel
+#define SPAMFILTER_VIRUSCHANDENY	iConf.spamfilter_vchan_deny
 #define SPAMFILTER_EXCEPT		iConf.spamexcept_line
+#define SPAMFILTER_DETECTSLOW_WARN	iConf.spamfilter_detectslow_warn
+#define SPAMFILTER_DETECTSLOW_FATAL	iConf.spamfilter_detectslow_fatal
+
+#define CHECK_TARGET_NICK_BANS	iConf.check_target_nick_bans
+
+#define MAXBANS		iConf.maxbans
+#define MAXBANLENGTH	iConf.maxbanlength
+
+#define TIMESYNCH	iConf.timesynch_enabled
+#define TIMESYNCH_TIMEOUT	iConf.timesynch_timeout
+#define TIMESYNCH_SERVER	iConf.timesynch_server
+
+#define PINGPONG_WARNING	iConf.pingpong_warning
+
+#define WATCH_AWAY_NOTIFICATION	iConf.watch_away_notification
+
+/* Used for "is present?" and duplicate checking */
+struct SetCheck {
+	unsigned has_show_opermotd:1;
+	unsigned has_hide_ulines:1;
+	unsigned has_flat_map:1;
+	unsigned has_allow_chatops:1;
+	unsigned has_webtv_support:1;
+	unsigned has_no_oper_hiding:1;
+	unsigned has_ident_check:1;
+	unsigned has_fail_oper_warn:1;
+	unsigned has_show_connect_info:1;
+	unsigned has_dont_resolve:1;
+	unsigned has_mkpasswd_for_everyone:1;
+	unsigned has_allow_part_if_shunned:1;
+	unsigned has_ssl_egd:1;
+	unsigned has_ssl_server_cipher_list :1;
+	unsigned has_dns_timeout:1;
+	unsigned has_dns_retries:1;
+	unsigned has_dns_nameserver:1;
+	unsigned has_dns_bind_ip:1;
+#ifdef THROTTLING
+	unsigned has_throttle_period:1;
+	unsigned has_throttle_connections:1;
+#endif
+	unsigned has_kline_address:1;
+	unsigned has_gline_address:1;
+	unsigned has_modes_on_connect:1;
+	unsigned has_modes_on_oper:1;
+	unsigned has_snomask_on_connect:1;
+	unsigned has_snomask_on_oper:1;
+	unsigned has_auto_join:1;
+	unsigned has_oper_auto_join:1;
+	unsigned has_check_target_nick_bans:1;
+	unsigned has_pingpong_warning:1;
+	unsigned has_watch_away_notification:1;
+	unsigned has_oper_only_stats:1;
+	unsigned has_maxchannelsperuser:1;
+	unsigned has_maxdccallow:1;
+	unsigned has_anti_spam_quit_message_time:1;
+	unsigned has_egd_path:1;
+	unsigned has_static_quit:1;
+	unsigned has_static_part:1;
+#ifdef USE_SSL
+	unsigned has_ssl_certificate:1;
+	unsigned has_ssl_key:1;
+	unsigned has_ssl_trusted_ca_file:1;
+	unsigned has_ssl_options:1;
+	unsigned has_renegotiate_timeout : 1;
+	unsigned has_renegotiate_bytes : 1;
+#endif
+	unsigned has_allow_userhost_change:1;
+	unsigned has_restrict_usermodes:1;
+	unsigned has_restrict_channelmodes:1;
+	unsigned has_restrict_extendedbans:1;
+	unsigned has_channel_command_prefix:1;
+	unsigned has_anti_flood_unknown_flood_bantime:1;
+	unsigned has_anti_flood_unknown_flood_amount:1;
+	unsigned has_modes_on_join:1;
+	unsigned has_level_on_join:1;
+#ifdef NO_FLOOD_AWAY
+	unsigned has_anti_flood_away_count:1;
+	unsigned has_anti_flood_away_period:1;
+#endif
+	unsigned has_anti_flood_nick_flood:1;
+	unsigned has_ident_connect_timeout:1;
+	unsigned has_ident_read_timeout:1;
+	unsigned has_default_bantime:1;
+	unsigned has_who_limit:1;
+	unsigned has_maxbans:1;
+	unsigned has_maxbanlength:1;
+	unsigned has_silence_limit:1;
+#ifdef NEWCHFLOODPROT
+	unsigned has_modef_default_unsettime:1;
+	unsigned has_modef_max_unsettime:1;
+#endif
+	unsigned has_ban_version_tkl_time:1;
+	unsigned has_spamfilter_ban_time:1;
+	unsigned has_spamfilter_ban_reason:1;
+	unsigned has_spamfilter_virus_help_channel:1;
+	unsigned has_spamfilter_virus_help_channel_deny:1;
+	unsigned has_spamfilter_except:1;
+	unsigned has_hosts_host_on_oper_up:1;
+	unsigned has_network_name:1;
+	unsigned has_default_server:1;
+	unsigned has_services_server:1;
+	unsigned has_hosts_global:1;
+	unsigned has_hosts_admin:1;
+	unsigned has_hosts_local:1;
+	unsigned has_hosts_servicesadmin:1;
+	unsigned has_hosts_netadmin:1;
+	unsigned has_hosts_coadmin:1;
+	unsigned has_hiddenhost_prefix:1;
+	unsigned has_prefix_quit:1;
+	unsigned has_help_channel:1;
+	unsigned has_stats_server:1;
+	unsigned has_cloak_keys:1;
+	unsigned has_options_webtv_support:1;
+	unsigned has_options_hide_ulines:1;
+	unsigned has_options_flat_map:1;
+	unsigned has_options_show_opermotd:1;
+	unsigned has_options_identd_check:1;
+	unsigned has_options_fail_oper_warn:1;
+	unsigned has_options_dont_resolve:1;
+	unsigned has_options_show_connect_info:1;
+	unsigned has_options_mkpasswd_for_everyone:1;
+	unsigned has_options_allow_part_if_shunned:1;
+	int cgiirc_type; /* cheat :( */
+	unsigned has_cgiirc_hosts:1;
+	unsigned has_cgiirc_webpass:1;
+};
+
+

include/fdlist.h

@@ -13,7 +13,7 @@ void delfrom_fdlist(int a, fdlist * b);
 void init_fdlist(fdlist * b);
 
 #ifndef NO_FDLIST
-extern fdlist oper_fdlist;
+extern MODVAR fdlist oper_fdlist;
 #endif
 
 

include/h.h

@@ -25,28 +25,29 @@
  * Most of the externs and prototypes thrown in here to 'cleanup' things.
  * -avalon
  */
+#include "setup.h"
 #ifndef NO_FDLIST
 #include "fdlist.h"
 #endif
-extern char *extraflags;
-extern int tainted;
+extern MODVAR char *extraflags;
+extern MODVAR int tainted;
 /* for the new s_err.c */
 extern char *getreply(int);
 #define rpl_str(x) getreply(x)
 #define err_str(x) getreply(x)
-extern Member *freemember;
-extern Membership *freemembership;
-extern MembershipL *freemembershipL;
-extern TS nextconnect, nextdnscheck, nextping;
-extern aClient *client, me, *local[];
-extern aChannel *channel;
-extern struct stats *ircstp;
-extern int bootopt;
-extern time_t TSoffset;
+extern MODVAR Member *freemember;
+extern MODVAR Membership *freemembership;
+extern MODVAR MembershipL *freemembershipL;
+extern MODVAR TS nextconnect, nextdnscheck, nextping;
+extern MODVAR aClient *client, me, *local[];
+extern MODVAR aChannel *channel;
+extern MODVAR struct stats *ircstp;
+extern MODVAR int bootopt;
+extern MODVAR time_t TSoffset;
 /* Prototype added to force errors -- Barubary */
 extern TS check_pings(TS now);
 extern TS TS2ts(char *s);
-extern time_t timeofday;
+extern MODVAR time_t timeofday;
 /* newconf */
 #define get_sendq(x) ((x)->class ? (x)->class->sendq : MAXSENDQLENGTH) 
 /* get_recvq is only called in send.c for local connections */
@@ -55,53 +56,53 @@ extern time_t timeofday;
 #define CMD_FUNC(x) int (x) (aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 #ifndef NO_FDLIST
-extern float currentrate;
-extern float currentrate2;		/* outgoing */
-extern float highest_rate;
-extern float highest_rate2;
-extern int  lifesux;
-extern int  LRV;
-extern time_t   LCF;
-extern int  currlife;
-extern int  HTMLOCK;
-extern int  noisy_htm;
-extern long lastsendK, lastrecvK;
+extern MODVAR float currentrate;
+extern MODVAR float currentrate2;		/* outgoing */
+extern MODVAR float highest_rate;
+extern MODVAR float highest_rate2;
+extern MODVAR int  lifesux;
+extern MODVAR int  LRV;
+extern MODVAR time_t   LCF;
+extern MODVAR int  currlife;
+extern MODVAR int  HTMLOCK;
+extern MODVAR int  noisy_htm;
+extern MODVAR long lastsendK, lastrecvK;
 #endif
 
 /*
  * Configuration linked lists
 */
-extern ConfigItem_me		*conf_me;
-extern ConfigItem_class 	*conf_class;
-extern ConfigItem_class		*default_class;
-extern ConfigItem_admin 	*conf_admin;
-extern ConfigItem_admin		*conf_admin_tail;
-extern ConfigItem_drpass	*conf_drpass;
-extern ConfigItem_ulines	*conf_ulines;
-extern ConfigItem_tld		*conf_tld;
-extern ConfigItem_oper		*conf_oper;
-extern ConfigItem_listen	*conf_listen;
-extern ConfigItem_allow		*conf_allow;
-extern ConfigItem_except	*conf_except;
-extern ConfigItem_vhost		*conf_vhost;
-extern ConfigItem_link		*conf_link;
-extern ConfigItem_ban		*conf_ban;
-extern ConfigItem_badword	*conf_badword_channel;
-extern ConfigItem_badword       *conf_badword_message;
-extern ConfigItem_badword	*conf_badword_quit;
-extern ConfigItem_deny_dcc	*conf_deny_dcc;
-extern ConfigItem_deny_channel  *conf_deny_channel;
-extern ConfigItem_deny_link	*conf_deny_link;
-extern ConfigItem_allow_channel *conf_allow_channel;
-extern ConfigItem_deny_version	*conf_deny_version;
-extern ConfigItem_log		*conf_log;
-extern ConfigItem_alias		*conf_alias;
-extern ConfigItem_include	*conf_include;
-extern ConfigItem_help		*conf_help;
-extern ConfigItem_offchans	*conf_offchans;
+extern MODVAR ConfigItem_me		*conf_me;
+extern MODVAR ConfigItem_class 	*conf_class;
+extern MODVAR ConfigItem_class		*default_class;
+extern MODVAR ConfigItem_admin 	*conf_admin;
+extern MODVAR ConfigItem_admin		*conf_admin_tail;
+extern MODVAR ConfigItem_drpass	*conf_drpass;
+extern MODVAR ConfigItem_ulines	*conf_ulines;
+extern MODVAR ConfigItem_tld		*conf_tld;
+extern MODVAR ConfigItem_oper		*conf_oper;
+extern MODVAR ConfigItem_listen	*conf_listen;
+extern MODVAR ConfigItem_allow		*conf_allow;
+extern MODVAR ConfigItem_except	*conf_except;
+extern MODVAR ConfigItem_vhost		*conf_vhost;
+extern MODVAR ConfigItem_link		*conf_link;
+extern MODVAR ConfigItem_ban		*conf_ban;
+extern MODVAR ConfigItem_badword	*conf_badword_channel;
+extern MODVAR ConfigItem_badword       *conf_badword_message;
+extern MODVAR ConfigItem_badword	*conf_badword_quit;
+extern MODVAR ConfigItem_deny_dcc	*conf_deny_dcc;
+extern MODVAR ConfigItem_deny_channel  *conf_deny_channel;
+extern MODVAR ConfigItem_deny_link	*conf_deny_link;
+extern MODVAR ConfigItem_allow_channel *conf_allow_channel;
+extern MODVAR ConfigItem_allow_dcc *conf_allow_dcc;
+extern MODVAR ConfigItem_deny_version	*conf_deny_version;
+extern MODVAR ConfigItem_log		*conf_log;
+extern MODVAR ConfigItem_alias		*conf_alias;
+extern MODVAR ConfigItem_include	*conf_include;
+extern MODVAR ConfigItem_help		*conf_help;
+extern MODVAR ConfigItem_offchans	*conf_offchans;
 extern int		completed_connection(aClient *);
 extern void clear_unknown();
-extern EVENT(tkl_check_expire);
 extern EVENT(e_unload_module_delayed);
 #ifdef THROTTLING
 extern EVENT(e_clean_out_throttling_buckets);
@@ -110,9 +111,10 @@ extern EVENT(e_clean_out_throttling_buckets);
 extern void  module_loadall(int module_load);
 extern long set_usermode(char *umode);
 extern char *get_modestr(long umodes);
-extern void tkl_stats(aClient *cptr, int type, char *para);
 extern void                    config_error(char *format, ...) __attribute__((format(printf,1,2)));
-extern int			config_verbose;
+extern void config_warn(char *format, ...) __attribute__((format(printf,1,2)));
+
+extern MODVAR int config_verbose;
 extern void config_progress(char *format, ...) __attribute__((format(printf,1,2)));
 extern void       ipport_seperate(char *string, char **ip, char **port);
 ConfigItem_class	*Find_class(char *name);
@@ -120,28 +122,27 @@ ConfigItem_deny_dcc	*Find_deny_dcc(char *name);
 ConfigItem_oper		*Find_oper(char *name);
 ConfigItem_listen	*Find_listen(char *ipmask, int port);
 ConfigItem_ulines	*Find_uline(char *host);
-ConfigItem_except	*Find_except(char *host, short type);
+ConfigItem_except	*Find_except(aClient *, char *host, short type);
 ConfigItem_tld		*Find_tld(aClient *cptr, char *host);
 ConfigItem_link		*Find_link(char *username, char *hostname, char *ip, char *servername);
-ConfigItem_ban 		*Find_ban(char *host, short type);
-ConfigItem_ban 		*Find_banEx(char *host, short type, short type2);
+ConfigItem_cgiirc *Find_cgiirc(char *username, char *hostname, char *ip, CGIIRCType type);
+ConfigItem_ban 		*Find_ban(aClient *, char *host, short type);
+ConfigItem_ban 		*Find_banEx(aClient *,char *host, short type, short type2);
 ConfigItem_vhost	*Find_vhost(char *name);
 ConfigItem_deny_channel *Find_channel_allowed(char *name);
 ConfigItem_alias	*Find_alias(char *name);
 ConfigItem_help 	*Find_Help(char *command);
 int			AllowClient(aClient *cptr, struct hostent *hp, char *sockhost, char *username);
-int parse_netmask(const char *text, struct IN_ADDR *addr, int *b);
-int match_ipv4(struct IN_ADDR *addr, struct IN_ADDR *mask, int b);
-#ifdef INET6
-int match_ipv6(struct IN_ADDR *addr, struct IN_ADDR *mask, int b);
-#endif
-extern struct tm motd_tm, smotd_tm;
-extern Link	*Servers;
+int parse_netmask(const char *text, struct irc_netmask *netmask);
+int match_ip(struct IN_ADDR addr, char *uhost, char *mask, struct irc_netmask *netmask);
+ConfigItem_ban  *Find_ban_ip(aClient *sptr);
+extern MODVAR struct tm motd_tm, smotd_tm;
+extern MODVAR Link	*Servers;
 void add_ListItem(ListStruct *, ListStruct **);
 ListStruct *del_ListItem(ListStruct *, ListStruct **);
 /* Remmed out for win32 compatibility.. as stated of 467leaf win32 port.. */
 extern aClient *find_match_server(char *mask);
-extern LoopStruct loop;
+extern MODVAR LoopStruct loop;
 extern int del_banid(aChannel *chptr, char *banid);
 extern int del_exbanid(aChannel *chptr, char *banid);
 #ifdef SHOWCONNECTINFO
@@ -155,11 +156,11 @@ extern int del_exbanid(aChannel *chptr, char *banid);
 #define BREPORT_FIN_ID	"NOTICE AUTH :*** Received identd response\r\n"
 #define BREPORT_FAIL_ID	"NOTICE AUTH :*** No ident response; username prefixed with ~\r\n"
 
-extern char REPORT_DO_DNS[256], REPORT_FIN_DNS[256], REPORT_FIN_DNSC[256],
+extern MODVAR char REPORT_DO_DNS[256], REPORT_FIN_DNS[256], REPORT_FIN_DNSC[256],
     REPORT_FAIL_DNS[256], REPORT_DO_ID[256], REPORT_FIN_ID[256],
     REPORT_FAIL_ID[256];
 
-extern int R_do_dns, R_fin_dns, R_fin_dnsc, R_fail_dns,
+extern MODVAR int R_do_dns, R_fin_dns, R_fin_dnsc, R_fail_dns,
     R_do_id, R_fin_id, R_fail_id;
 
 #endif
@@ -183,12 +184,14 @@ extern int del_silence(aClient *, char *);
 extern void send_user_joins(aClient *, aClient *);
 extern void clean_channelname(char *);
 extern int do_nick_name(char *);
+extern int do_remote_nick_name(char *);
 extern int can_send(aClient *, aChannel *, char *, int);
 extern long get_access(aClient *, aChannel *);
 extern int is_chan_op(aClient *, aChannel *);
 extern int has_voice(aClient *, aChannel *);
 extern int is_chanowner(aClient *, aChannel *);
 extern Ban *is_banned(aClient *, aChannel *, int);
+extern Ban *is_banned_with_nick(aClient *, aChannel *, int, char *);
 extern int parse_help(aClient *, char *, char *);
 
 extern void ircd_log(int, char *, ...) __attribute__((format(printf,2,3)));
@@ -205,29 +208,33 @@ extern int attach_conf(aClient *, aConfItem *);
 extern void inittoken();
 extern void reset_help();
 
-extern char *debugmode, *configfile, *sbrk0;
+extern MODVAR char *debugmode, *configfile, *sbrk0;
 extern char *getfield(char *);
 extern void get_sockhost(aClient *, char *);
+#ifndef _WIN32
 extern char *strerror(int);
+#else
+extern MODFUNC char *sock_strerror(int);
+#endif
 extern int dgets(int, char *, int);
 extern char *inetntoa(char *);
 
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
-/* #ifndef _WIN32 XXX why was this?? -- Syzop. */
+#ifndef HAVE_SNPRINTF
 extern int snprintf (char *str, size_t count, const char *fmt, ...);
+#endif
+#ifndef HAVE_VSNPRINTF
 extern int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
-/* #endif */
 #endif
 
 #ifdef _WIN32
-extern int dbufalloc, dbufblocks, debuglevel;
+extern MODVAR int dbufalloc, dbufblocks, debuglevel;
 #else
 extern int dbufalloc, dbufblocks, debuglevel, errno, h_errno;
 #endif
-extern short LastSlot; /* last used index in local client array */
-extern int OpenFiles;  /* number of files currently open */
-extern int debuglevel, portnum, debugtty, maxusersperchannel;
-extern int readcalls, udpfd, resfd;
+extern MODVAR short LastSlot; /* last used index in local client array */
+extern MODVAR int OpenFiles;  /* number of files currently open */
+extern MODVAR int debuglevel, portnum, debugtty, maxusersperchannel;
+extern MODVAR int readcalls, udpfd, resfd;
 extern aClient *add_connection(aClient *, int);
 extern int add_listener(aConfItem *);
 extern void add_local_domain(char *, int);
@@ -260,15 +267,12 @@ extern void send_authports(aClient *);
 
 
 extern void restart(char *);
-extern void send_channel_modes(aClient *, aChannel *);
 extern void server_reboot(char *);
 extern void terminate(), write_pidfile();
 extern void *MyMallocEx(size_t size);
 extern int advanced_check(char *userhost, int ipstat);
 extern int send_queued(aClient *);
 /* i know this is naughty but :P --stskeeps */
-extern void send_channel_modes_sjoin(aClient *cptr, aChannel *chptr);
-extern void send_channel_modes_sjoin3(aClient *cptr, aChannel *chptr);
 extern void sendto_locfailops(char *pattern, ...) __attribute__((format(printf,1,2)));
 extern void sendto_connectnotice(char *nick, anUser *user, aClient *sptr, int disconnect, char *comment);
 extern void sendto_serv_butone_nickcmd(aClient *one, aClient *sptr, char *nick, int hopcount,
@@ -310,20 +314,17 @@ extern void sendto_opers(char *, ...) __attribute__((format(printf,1,2)));
 extern void sendto_umode(int, char *, ...) __attribute__((format(printf,2,3)));
 extern void sendto_umode_raw(int, char *, ...) __attribute__((format(printf,2,3)));
 extern void sendto_snomask(int snomask, char *pattern, ...) __attribute__((format(printf,2,3)));
+extern void sendto_snomask_global(int snomask, char *pattern, ...) __attribute__((format(printf,2,3)));
+extern void sendto_snomask_normal(int snomask, char *pattern, ...) __attribute__((format(printf,2,3)));
+extern void sendto_snomask_normal_global(int snomask, char *pattern, ...) __attribute__((format(printf,2,3)));
 extern void sendnotice(aClient *to, char *pattern, ...) __attribute__((format(printf,2,3)));
-extern int writecalls, writeb[];
+extern MODVAR int writecalls, writeb[];
 extern int deliver_it(aClient *, char *, int);
 extern int  check_for_chan_flood(aClient *cptr, aClient *sptr, aChannel *chptr);
 extern int  check_for_target_limit(aClient *sptr, void *target, const char *name);
-extern char *stripbadwords_message(char *str, int *);
-extern char *stripbadwords_channel(char *str, int *);
-extern char *stripbadwords_quit(char *str, int *);
-extern char *stripbadwords(char *, ConfigItem_badword *, int *);
-extern unsigned char *StripColors(unsigned char *);
-extern const char *StripControlCodes(unsigned char *text);
 extern char *canonize(char *buffer);
-extern int webtv_parse(aClient *sptr, char *string);
-extern ConfigItem_deny_dcc *dcc_isforbidden(aClient *cptr, aClient *sptr, aClient *target, char *filename);
+extern ConfigItem_deny_dcc *dcc_isforbidden(aClient *sptr, char *filename);
+extern ConfigItem_deny_dcc *dcc_isdiscouraged(aClient *sptr, char *filename);
 extern int check_registered(aClient *);
 extern int check_registered_user(aClient *);
 extern char *get_client_name(aClient *, int);
@@ -333,6 +334,7 @@ extern int exit_client(aClient *, aClient *, aClient *, char *);
 extern void initstats(), tstats(aClient *, char *);
 extern char *check_string(char *);
 extern char *make_nick_user_host(char *, char *, char *);
+extern inline char *make_nick_user_host_r(char *namebuf, char *nick, char *name, char *host);
 extern char *make_user_host(char *, char *);
 extern int parse(aClient *, char *, char *);
 extern int do_numeric(int, aClient *, aClient *, int, char **);
@@ -340,8 +342,6 @@ extern int hunt_server(aClient *, aClient *, char *, int, int, char **);
 extern int hunt_server_token(aClient *, aClient *, char *, char *, char *, int, int, char **);
 extern int hunt_server_token_quiet(aClient *, aClient *, char *, char *, char *, int, int, char **);
 extern aClient *next_client(aClient *, char *);
-extern int m_umode(aClient *, aClient *, int, char **);
-extern int m_names(aClient *, aClient *, int, char **);
 extern int m_server_estab(aClient *);
 extern void umode_init(void);
 extern long umode_get(char, int, int (*)(aClient *, int));
@@ -379,7 +379,7 @@ extern struct hostent *get_res(char *);
 extern struct hostent *gethost_byaddr(char *, Link *);
 extern struct hostent *gethost_byname(char *, Link *);
 extern void flush_cache();
-extern int init_resolver(int);
+extern void init_resolver(int firsttime);
 extern time_t timeout_query_list(time_t);
 extern time_t expire_cache(time_t);
 extern void del_queries(char *);
@@ -391,7 +391,7 @@ extern int add_to_client_hash_table(char *, aClient *);
 extern int del_from_client_hash_table(char *, aClient *);
 extern int add_to_channel_hash_table(char *, aChannel *);
 extern int del_from_channel_hash_table(char *, aChannel *);
-extern int add_to_watch_hash_table(char *, aClient *);
+extern int add_to_watch_hash_table(char *, aClient *, int);
 extern int del_from_watch_hash_table(char *, aClient *);
 extern int hash_check_watch(aClient *, int);
 extern int hash_del_watch_list(aClient *);
@@ -410,52 +410,57 @@ extern time_t atime(char *xtime);
 
 /* Mode externs
 */
-extern long UMODE_INVISIBLE; /*  0x0001	 makes user invisible */
-extern long UMODE_OPER;      /*  0x0002	 Operator */
-extern long UMODE_WALLOP;    /*  0x0004	 send wallops to them */
-extern long UMODE_FAILOP;    /*  0x0008	 Shows some global messages */
-extern long UMODE_HELPOP;    /*  0x0010	 Help system operator */
-extern long UMODE_REGNICK;   /*  0x0020	 Nick set by services as registered */
-extern long UMODE_SADMIN;    /*  0x0040	 Services Admin */
-extern long UMODE_ADMIN;     /*  0x0080	 Admin */
-extern long UMODE_SERVNOTICE;/* 0x0100	 server notices such as kill */
-extern long UMODE_LOCOP;     /* 0x0200	 Local operator -- SRB */
-extern long UMODE_RGSTRONLY; /* 0x0400  Only reg nick message */
-extern long UMODE_WEBTV;     /* 0x0800  WebTV Client */
-extern long UMODE_SERVICES;  /* 0x4000	 services */
-extern long UMODE_HIDE;	     /* 0x8000	 Hide from Nukes */
-extern long UMODE_NETADMIN;  /* 0x10000	 Network Admin */
-extern long UMODE_COADMIN;   /* 0x80000	 Co Admin */
-extern long UMODE_WHOIS;     /* 0x100000	 gets notice on /whois */
-extern long UMODE_KIX;       /* 0x200000	 usermode +q */
-extern long UMODE_BOT;       /* 0x400000	 User is a bot */
-extern long UMODE_SECURE;    /*	0x800000	 User is a secure connect */
-extern long UMODE_VICTIM;    /* 0x8000000	 Intentional Victim */
-extern long UMODE_DEAF;      /* 0x10000000       Deaf */
-extern long UMODE_HIDEOPER;  /* 0x20000000	 Hide oper mode */
-extern long UMODE_SETHOST;   /* 0x40000000	 used sethost */
-extern long UMODE_STRIPBADWORDS; /* 0x80000000	 */
-extern long UMODE_HIDEWHOIS; /* hides channels in /whois */
-extern long UMODE_NOCTCP;    /* blocks all ctcp (except dcc and action) */
-extern long AllUmodes, SendUmodes;
+extern MODVAR long UMODE_INVISIBLE; /*  0x0001	 makes user invisible */
+extern MODVAR long UMODE_OPER;      /*  0x0002	 Operator */
+extern MODVAR long UMODE_WALLOP;    /*  0x0004	 send wallops to them */
+extern MODVAR long UMODE_FAILOP;    /*  0x0008	 Shows some global messages */
+extern MODVAR long UMODE_HELPOP;    /*  0x0010	 Help system operator */
+extern MODVAR long UMODE_REGNICK;   /*  0x0020	 Nick set by services as registered */
+extern MODVAR long UMODE_SADMIN;    /*  0x0040	 Services Admin */
+extern MODVAR long UMODE_ADMIN;     /*  0x0080	 Admin */
+extern MODVAR long UMODE_SERVNOTICE;/* 0x0100	 server notices such as kill */
+extern MODVAR long UMODE_LOCOP;     /* 0x0200	 Local operator -- SRB */
+extern MODVAR long UMODE_RGSTRONLY; /* 0x0400  Only reg nick message */
+extern MODVAR long UMODE_WEBTV;     /* 0x0800  WebTV Client */
+extern MODVAR long UMODE_SERVICES;  /* 0x4000	 services */
+extern MODVAR long UMODE_HIDE;	     /* 0x8000	 Hide from Nukes */
+extern MODVAR long UMODE_NETADMIN;  /* 0x10000	 Network Admin */
+extern MODVAR long UMODE_COADMIN;   /* 0x80000	 Co Admin */
+extern MODVAR long UMODE_WHOIS;     /* 0x100000	 gets notice on /whois */
+extern MODVAR long UMODE_KIX;       /* 0x200000	 usermode +q */
+extern MODVAR long UMODE_BOT;       /* 0x400000	 User is a bot */
+extern MODVAR long UMODE_SECURE;    /*	0x800000	 User is a secure connect */
+extern MODVAR long UMODE_VICTIM;    /* 0x8000000	 Intentional Victim */
+extern MODVAR long UMODE_DEAF;      /* 0x10000000       Deaf */
+extern MODVAR long UMODE_HIDEOPER;  /* 0x20000000	 Hide oper mode */
+extern MODVAR long UMODE_SETHOST;   /* 0x40000000	 used sethost */
+extern MODVAR long UMODE_STRIPBADWORDS; /* 0x80000000	 */
+extern MODVAR long UMODE_HIDEWHOIS; /* hides channels in /whois */
+extern MODVAR long UMODE_NOCTCP;    /* blocks all ctcp (except dcc and action) */
+extern MODVAR long AllUmodes, SendUmodes;
 
-extern long SNO_KILLS;
-extern long SNO_CLIENT;
-extern long SNO_FLOOD;
-extern long SNO_FCLIENT;
-extern long SNO_JUNK;
-extern long SNO_VHOST;
-extern long SNO_EYES;
-extern long SNO_TKL;
-extern long SNO_NICKCHANGE;
-extern long SNO_FNICKCHANGE;
-extern long SNO_QLINE;
-extern long SNO_SNOTICE;
-extern long SNO_SPAMF;
+extern MODVAR long SNO_KILLS;
+extern MODVAR long SNO_CLIENT;
+extern MODVAR long SNO_FLOOD;
+extern MODVAR long SNO_FCLIENT;
+extern MODVAR long SNO_JUNK;
+extern MODVAR long SNO_VHOST;
+extern MODVAR long SNO_EYES;
+extern MODVAR long SNO_TKL;
+extern MODVAR long SNO_NICKCHANGE;
+extern MODVAR long SNO_FNICKCHANGE;
+extern MODVAR long SNO_QLINE;
+extern MODVAR long SNO_SNOTICE;
+extern MODVAR long SNO_SPAMF;
+extern MODVAR long SNO_OPER;
 
 #ifdef EXTCMODE
 /* Extended chanmodes... */
-extern Cmode_t EXTMODE_NONOTICE;
+extern MODVAR Cmode_t EXTMODE_NONOTICE;
+#ifdef STRIPBADWORDS
+extern MODVAR Cmode_t EXTMODE_STRIPBADWORDS;
+#endif
+extern MODVAR Cmode_t EXTMODE_JOINTHROTTLE;
 #endif
 
 #ifndef HAVE_STRLCPY
@@ -474,8 +479,8 @@ extern int dopacket(aClient *, char *, int);
 extern void debug(int, char *, ...);
 #if defined(DEBUGMODE)
 extern void send_usage(aClient *, char *);
-extern void send_listinfo(aClient *, char *);
 extern void count_memory(aClient *, char *);
+extern int checkprotoflags(aClient *, int, char *, int);
 #endif
 
 #ifdef INET6
@@ -495,8 +500,8 @@ char	*Inet_ia2pNB(struct IN_ADDR *ia, int compressed);
 /*
  * CommandHash -Stskeeps
 */
-extern aCommand *CommandHash[256];
-extern aCommand *TokenHash[256];
+extern MODVAR aCommand *CommandHash[256];
+extern MODVAR aCommand *TokenHash[256];
 extern void	init_CommandHash(void);
 extern aCommand	*add_Command_backend(char *cmd, int (*func)(), unsigned char parameters, unsigned char token, int flags);
 extern void	add_Command(char *cmd, char *token, int (*func)(), unsigned char parameters);
@@ -538,14 +543,9 @@ extern aClient *find_server_b64_or_real(char *name);
 extern aClient *find_server_by_base64(char *b64);
 extern int is_chanownprotop(aClient *cptr, aChannel *chptr);
 extern int is_skochanop(aClient *cptr, aChannel *chptr);
-extern char *make_virthost(char *curr, char *new, int mode);
+extern char *make_virthost(aClient *sptr, char *curr, char *new, int mode);
 extern int  channel_canjoin(aClient *sptr, char *name);
 extern char *collapse(char *pattern);
-extern void send_list(aClient *cptr, int numsend);
-extern int  find_tkline_match_zap(aClient *cptr);
-extern int  find_shun(aClient *cptr);
-extern aTKline *find_qline(aClient *cptr, char *nick, int *ishold);
-extern void tkl_synch(aClient *sptr);
 extern void dcc_sync(aClient *sptr);
 extern void report_flines(aClient *sptr);
 extern void report_network(aClient *sptr);
@@ -585,7 +585,7 @@ extern time_t rfc2time(char *s);
 extern char *rfctime(time_t t, char *buf);
 extern void *MyMallocEx(size_t size);
 #ifdef USE_SSL
-extern char  *ssl_get_cipher(SSL *ssl);
+extern MODFUNC char  *ssl_get_cipher(SSL *ssl);
 #endif
 extern long config_checkval(char *value, unsigned short flags);
 extern void config_status(char *format, ...) __attribute__((format(printf,1,2)));
@@ -593,14 +593,14 @@ extern void init_random();
 extern u_char getrandom8();
 extern u_int16_t getrandom16();
 extern u_int32_t getrandom32();
-extern char trouble_info[1024];
+extern MODVAR char trouble_info[1024];
 #define EVENT_DRUGS BASE_VERSION
-extern void rejoin_doparts(aClient *sptr);
-extern void rejoin_dojoinandmode(aClient *sptr);
+extern void rejoin_doparts(aClient *sptr, char did_parts[]);
+extern void rejoin_dojoinandmode(aClient *sptr, char did_parts[]);
 extern void ident_failed(aClient *cptr);
 
-extern char extchmstr[4][64];
-extern char extbanstr[EXTBANTABLESZ+1];
+extern MODVAR char extchmstr[4][64];
+extern MODVAR char extbanstr[EXTBANTABLESZ+1];
 #ifdef EXTCMODE
 extern int extcmode_default_requirechop(aClient *, aChannel *, char *, int, int);
 extern int extcmode_default_requirehalfop(aClient *, aChannel *, char *, int, int);
@@ -629,23 +629,23 @@ extern int l_commands_Load(int);
 #endif
 extern void sendto_chmodemucrap(aClient *, aChannel *, char *);
 extern void verify_opercount(aClient *, char *);
-extern int place_host_ban(aClient *sptr, int action, char *reason, long time);
 extern int valid_host(char *host);
 extern int count_oper_sessions(char *);
 extern char *unreal_mktemp(char *dir, char *suffix);
+extern char *unreal_getpathname(char *filepath, char *path);
 extern char *unreal_getfilename(char *path);
 extern int unreal_copyfile(char *src, char *dest);
+extern int unreal_copyfileex(char *src, char *dest, int tryhardlink);
 extern time_t unreal_getfilemodtime(char *filename);
 extern void unreal_setfilemodtime(char *filename, time_t mtime);
 extern void DeleteTempModules(void);
-extern Extban *extbaninfo;
+extern MODVAR Extban *extbaninfo;
 extern Extban *findmod_by_bantype(char c);
 extern Extban *ExtbanAdd(Module *reserved, ExtbanInfo req);
 extern void ExtbanDel(Extban *);
 extern void extban_init(void);
 extern char *trim_str(char *str, int len);
-extern char *ban_realhost, *ban_virthost, *ban_ip;
-extern void join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int flags);
+extern MODVAR char *ban_realhost, *ban_virthost, *ban_ip;
 extern char *unreal_checkregex(char *s, int fastsupport, int check_broadness);
 extern int banact_stringtoval(char *s);
 extern char *banact_valtostring(int val);
@@ -654,34 +654,133 @@ extern char banact_valtochar(int val);
 extern int spamfilter_gettargets(char *s, aClient *sptr);
 extern char *spamfilter_target_inttostring(int v);
 extern Spamfilter *unreal_buildspamfilter(char *s);
-extern int dospamfilter(aClient *sptr, char *str_in, int type, char *target);
 extern char *our_strcasestr(char *haystack, char *needle);
 extern int spamfilter_getconftargets(char *s);
 extern void remove_oper_snomasks(aClient *sptr);
 extern char *spamfilter_inttostring_long(int v);
 extern int check_channelmask(aClient *, aClient *, char *);
 extern aChannel *get_channel(aClient *cptr, char *chname, int flag);
-extern char backupbuf[];
+extern MODVAR char backupbuf[];
 extern void add_invite(aClient *, aChannel *);
 extern void channel_modes(aClient *, char *, char *, aChannel *);
-extern char modebuf[BUFSIZE], parabuf[BUFSIZE];
+extern MODVAR char modebuf[BUFSIZE], parabuf[BUFSIZE];
 extern int op_can_override(aClient *sptr);
 extern aClient *find_chasing(aClient *sptr, char *user, int *chasing);
-extern long opermode;
-extern void do_mode(aChannel *, aClient *, aClient *, int, char **, time_t, int);
-extern void set_mode(aChannel *, aClient *, int, char **, u_int *,
-                     char[MAXMODEPARAMS][MODEBUFLEN + 3], int);
+extern MODVAR long opermode;
 extern void add_user_to_channel(aChannel *chptr, aClient *who, int flags);
 extern int add_banid(aClient *, aChannel *, char *);
 extern int add_exbanid(aClient *cptr, aChannel *chptr, char *banid);
 extern void sub1_from_channel(aChannel *);
-extern aCtab cFlagTab[];
+extern MODVAR aCtab cFlagTab[];
 extern char *unreal_encodespace(char *s);
 extern char *unreal_decodespace(char *s);
-extern Link *helpign;
-extern aMotd *rules;
-extern fdlist default_fdlist, busycli_fdlist, serv_fdlist, oper_fdlist;
-extern void DCCdeny_add(char *filename, char *reason, int type);
+extern MODVAR Link *helpign;
+extern MODVAR aMotd *rules;
+extern MODVAR fdlist default_fdlist, busycli_fdlist, serv_fdlist, oper_fdlist;
+extern void DCCdeny_add(char *filename, char *reason, int type, int type2);
 extern void DCCdeny_del(ConfigItem_deny_dcc *deny);
 extern void dcc_wipe_services(void);
 extern void reread_motdsandrules();
+extern MODVAR int SVSNOOP;
+extern int callbacks_check(void);
+extern void callbacks_switchover(void);
+extern int efunctions_check(void);
+extern void efunctions_switchover(void);
+extern char *encode_ip(u_char *);
+extern char *decode_ip(char *);
+extern void sendto_fconnectnotice(char *nick, anUser *user, aClient *sptr, int disconnect, char *comment);
+extern void sendto_one_nickcmd(aClient *cptr, aClient *sptr, char *umodes);
+extern int on_dccallow_list(aClient *to, aClient *from);
+extern int add_dccallow(aClient *sptr, aClient *optr);
+extern int del_dccallow(aClient *sptr, aClient *optr);
+extern void delete_linkblock(ConfigItem_link *link_ptr);
+extern void delete_classblock(ConfigItem_class *class_ptr);
+extern void del_async_connects(void);
+extern void make_extbanstr(void);
+extern void isupport_init(void);
+extern int do_cmd(aClient *cptr, aClient *sptr, char *cmd, int parc, char *parv[]);
+extern void create_snomask(aClient *sptr, anUser *user, char *snomask);
+extern MODVAR char *me_hash;
+extern MODVAR int dontspread;
+/* Efuncs */
+extern MODVAR int (*do_join)(aClient *, aClient *, int, char **);
+extern MODVAR void (*join_channel)(aChannel *chptr, aClient *cptr, aClient *sptr, int flags);
+extern MODVAR int (*can_join)(aClient *cptr, aClient *sptr, aChannel *chptr, char *key, char *link, char *parv[]);
+extern MODVAR void (*do_mode)(aChannel *chptr, aClient *cptr, aClient *sptr, int parc, char *parv[], time_t sendts, int samode);
+extern MODVAR void (*set_mode)(aChannel *chptr, aClient *cptr, int parc, char *parv[], u_int *pcount,
+    char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], int bounce);
+extern MODVAR int (*m_umode)(aClient *, aClient *, int, char **);
+extern MODVAR int (*register_user)(aClient *cptr, aClient *sptr, char *nick, char *username, char *umode, char *virthost, char *ip);
+extern MODVAR int (*tkl_hash)(unsigned int c);
+extern MODVAR char (*tkl_typetochar)(int type);
+extern MODVAR aTKline *(*tkl_add_line)(int type, char *usermask, char *hostmask, char *reason, char *setby,
+                  TS expire_at, TS set_at, TS spamf_tkl_duration, char *spamf_tkl_reason);
+extern MODVAR aTKline *(*tkl_del_line)(aTKline *tkl);
+extern MODVAR void (*tkl_check_local_remove_shun)(aTKline *tmp);
+extern MODVAR aTKline *(*tkl_expire)(aTKline * tmp);
+extern MODVAR EVENT((*tkl_check_expire));
+extern MODVAR int (*find_tkline_match)(aClient *cptr, int xx);
+extern MODVAR int (*find_shun)(aClient *cptr);
+extern MODVAR int (*find_spamfilter_user)(aClient *sptr, int flags);
+extern MODVAR aTKline *(*find_qline)(aClient *cptr, char *nick, int *ishold);
+extern MODVAR int  (*find_tkline_match_zap)(aClient *cptr);
+extern MODVAR int  (*find_tkline_match_zap_ex)(aClient *cptr, aTKline **rettk);
+extern MODVAR void (*tkl_stats)(aClient *cptr, int type, char *para);
+extern MODVAR void (*tkl_synch)(aClient *sptr);
+extern MODVAR int (*m_tkl)(aClient *cptr, aClient *sptr, int parc, char *parv[]);
+extern MODVAR int (*place_host_ban)(aClient *sptr, int action, char *reason, long duration);
+extern MODVAR int (*dospamfilter)(aClient *sptr, char *str_in, int type, char *target, int flags, aTKline **rettk);
+extern MODVAR int (*dospamfilter_viruschan)(aClient *sptr, aTKline *tk, int type);
+extern MODVAR void (*send_list)(aClient *cptr, int numsend);
+extern MODVAR char *(*stripbadwords_channel)(char *str, int *blocked);
+extern MODVAR char *(*stripbadwords_message)(char *str, int *blocked);
+extern MODVAR char *(*stripbadwords_quit)(char *str, int *blocked);
+extern MODVAR unsigned char *(*StripColors)(unsigned char *text);
+extern MODVAR const char *(*StripControlCodes)(unsigned char *text);
+extern MODVAR void (*spamfilter_build_user_string)(char *buf, char *nick, aClient *acptr);
+extern MODVAR int (*is_silenced)(aClient *sptr, aClient *acptr);
+/* /Efuncs */
+extern MODVAR aMotd *opermotd, *svsmotd, *motd, *botmotd, *smotd;
+extern MODVAR int max_connection_count;
+extern int add_listmode(Ban **list, aClient *cptr, aChannel *chptr, char *banid);
+extern int del_listmode(Ban **list, aChannel *chptr, char *banid);
+extern int Halfop_mode(long mode);
+extern void chanfloodtimer_add(aChannel *chptr, char mflag, long mbit, time_t when);
+extern void chanfloodtimer_del(aChannel *chptr, char mflag, long mbit);
+extern char *clean_ban_mask(char *, int, aClient *);
+extern void chanfloodtimer_stopchantimers(aChannel *chptr);
+extern int find_invex(aChannel *chptr, aClient *sptr);
+extern void DoMD5(unsigned char *mdout, unsigned char *src, unsigned long n);
+#ifdef JOINTHROTTLE
+aJFlood *cmodej_addentry(aClient *cptr, aChannel *chptr);
+void cmodej_delentry(aJFlood *e);
+void cmodej_deluserentries(aClient *cptr);
+void cmodej_delchannelentries(aChannel *chptr);
+#endif
+extern void charsys_reset(void);
+extern void charsys_addmultibyterange(char s1, char e1, char s2, char e2);
+extern void charsys_addallowed(char *s);
+extern void charsys_reset(void);
+extern MODVAR char langsinuse[4096];
+extern MODVAR aTKline *tklines[TKLISTLEN];
+extern char *cmdname_by_spamftarget(int target);
+extern int isipv6(struct IN_ADDR *addr);
+extern void inet4_to_inet6(const void *src_in, void *dst_in);
+extern void unrealdns_delreq_bycptr(aClient *cptr);
+extern void inet6_to_inet4(const void *src, void *dst);
+extern void sendtxtnumeric(aClient *to, char *pattern, ...) __attribute__((format(printf,2,3)));;
+extern void unrealdns_gethostbyname_link(char *name, ConfigItem_link *conf);
+extern void unrealdns_delasyncconnects(void);
+extern int is_autojoin_chan(char *chname);
+extern void unreal_free_hostent(struct hostent *he);
+extern int match_esc(const char *mask, const char *name);
+extern int iplist_onlist(IPList *iplist, char *ip);
+extern struct hostent *unreal_create_hostent(char *name, struct IN_ADDR *addr);
+extern char *unreal_time_synch_error(void);
+extern int unreal_time_synch(int timeout);
+extern int extban_is_banned_helper(char *buf);
+extern char *getcloak(aClient *sptr);
+extern void kick_insecure_users(aChannel *);
+extern int file_exists(char* file);
+extern void free_motd(aMotd *m);
+extern void fix_timers(void);

include/inet.h

@@ -30,6 +30,9 @@
 #define	__u_l	unsigned long
 #endif
 
+extern int inet_pton(int af, const char *src, void *dst);
+extern const char *inet_ntop(int af, const void *src, char *dst, size_t cnt);
+
 #ifdef __STDC__
 # ifndef _WIN32
 extern __u_l inet_addr(char *);
@@ -54,3 +57,7 @@ extern __u_l inet_network();
 extern __u_l inet_lnaof();
 #endif
 #undef __u_l
+
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif

include/macros.h

@@ -0,0 +1,37 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/macros.h
+ *   Copyright (c) 2004 Dominick Meglio & The UnrealIRCd Team
+ *
+ *   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 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#include "setup.h"
+
+/* Calculate the size of an array */
+#define ARRAY_SIZEOF(x) (sizeof((x))/sizeof((x)[0]))
+
+/* Allocate a dynamic local variable */
+#if defined(HAVE_C99_VARLEN_ARRAY)
+#define DYN_LOCAL(type, name, size) type name[size]
+#define DYN_FREE(name)
+#elif defined(HAVE_ALLOCA)
+#define DYN_LOCAL(type, name, size) type *name = (size ? alloca(size) : NULL)
+#define DYN_FREE(name)
+#else
+#define DYN_LOCAL(type, name, size) type *name = (size ? malloc(size) : NULL)
+#define DYN_FREE(name) (name ? free(name) : 0)
+#endif

include/md5.h

@@ -0,0 +1,28 @@
+/*
+ * This is an OpenSSL-compatible implementation of the RSA Data Security,
+ * Inc. MD5 Message-Digest Algorithm.
+ *
+ * Written by Solar Designer <solar@openwall.com> in 2001, and placed in
+ * the public domain.  See md5.c for more information.
+ */
+
+#if defined(USE_SSL)
+#include <openssl/md5.h>
+#elif !defined(_MD5_H)
+#define _MD5_H
+
+/* Any 32-bit or wider unsigned integer data type will do */
+typedef unsigned long MD5_u32plus;
+
+typedef struct {
+	MD5_u32plus lo, hi;
+	MD5_u32plus a, b, c, d;
+	unsigned char buffer[64];
+	MD5_u32plus block[16];
+} MD5_CTX;
+
+extern void MD5_Init(MD5_CTX *ctx);
+extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
+extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
+
+#endif

include/modules.h

@@ -21,40 +21,51 @@
 #ifndef MODULES_H
 #define MODULES_H
 #include "types.h"
-#define MOD_VERSION	"3.2-b5-1"
-#define MOD_WE_SUPPORT  "3.2-b5*"
 #define MAXCUSTOMHOOKS  30
-#define MAXHOOKTYPES	70
+#define MAXHOOKTYPES	100
+#define MAXCALLBACKS	30
+#define MAXEFUNCTIONS	60
 #if defined(_WIN32)
-#define DLLFUNC	_declspec(dllexport)
-#define irc_dlopen(x,y) LoadLibrary(x)
-#define irc_dlclose FreeLibrary
-#define irc_dlsym(x,y,z) z = (void *)GetProcAddress(x,y)
-#undef irc_dlerror
+ #define MOD_EXTENSION "dll"
+ #define DLLFUNC	_declspec(dllexport)
+ #define irc_dlopen(x,y) LoadLibrary(x)
+ #define irc_dlclose FreeLibrary
+ #define irc_dlsym(x,y,z) z = (void *)GetProcAddress(x,y)
+ #define irc_dlerror our_dlerror
 #elif defined(HPUX)
-#define irc_dlopen(x,y) shl_load(x,y,0L)
-#define irc_dlsym(x,y,z) shl_findsym(x,y,z)
-#define irc_dlclose shl_unload
-#define irc_dlerror() strerror(errno)
+ #define MOD_EXTENSION "so"
+ #define irc_dlopen(x,y) shl_load(x,y,0L)
+ #define irc_dlsym(x,y,z) shl_findsym(x,y,z)
+ #define irc_dlclose shl_unload
+ #define irc_dlerror() strerror(errno)
 #else
-#define irc_dlopen dlopen
-#define irc_dlclose dlclose
-#if defined(UNDERSCORE)
-#define irc_dlsym(x,y,z) z = obsd_dlsym(x,y)
-#else
-#define irc_dlsym(x,y,z) z = dlsym(x,y)
-#endif
-#define irc_dlerror dlerror
-#define DLLFUNC 
+ #define MOD_EXTENSION "so"
+ #define irc_dlopen dlopen
+ #define irc_dlclose dlclose
+ #if defined(UNDERSCORE)
+  #define irc_dlsym(x,y,z) z = obsd_dlsym(x,y)
+ #else
+  #define irc_dlsym(x,y,z) z = dlsym(x,y)
+ #endif
+ #define irc_dlerror dlerror
+ #define DLLFUNC 
 #endif
 
 #define EVENT(x) void (x) (void *data)
 
+/* Casts to int, void, void *, and char * function pointers */
+#define TO_INTFUNC(x) (int (*)())(x)
+#define TO_VOIDFUNC(x) (void (*)())(x)
+#define TO_PVOIDFUNC(x) (void *(*)())(x)
+#define TO_PCHARFUNC(x) (char *(*)())(x)
+
 typedef struct _mod_symboltable Mod_SymbolDepTable;
 typedef struct _event Event;
 typedef struct _eventinfo EventInfo;
 typedef struct _irchook Hook;
 typedef struct _hooktype Hooktype;
+typedef struct _irccallback Callback;
+typedef struct _ircefunction Efunction;
 
 /*
  * Module header that every module must include, with the name of
@@ -87,15 +98,19 @@ typedef struct {
 } ModuleInfo;
 
 
-#define MOBJ_EVENT   0x0001
-#define MOBJ_HOOK    0x0002
-#define MOBJ_COMMAND 0x0004
-#define MOBJ_HOOKTYPE 0x0008
-#define MOBJ_VERSIONFLAG 0x0010
-#define MOBJ_SNOMASK 0x0020
-#define MOBJ_UMODE 0x0040
-#define MOBJ_CMDOVERRIDE 0x0080
-#define MOBJ_EXTBAN 0x0100
+#define MOBJ_EVENT        0x0001
+#define MOBJ_HOOK         0x0002
+#define MOBJ_COMMAND      0x0004
+#define MOBJ_HOOKTYPE     0x0008
+#define MOBJ_VERSIONFLAG  0x0010
+#define MOBJ_SNOMASK      0x0020
+#define MOBJ_UMODE        0x0040
+#define MOBJ_CMDOVERRIDE  0x0080
+#define MOBJ_EXTBAN       0x0100
+#define MOBJ_CALLBACK     0x0200
+#define MOBJ_ISUPPORT	  0x0400
+#define MOBJ_EFUNCTION    0x0800
+#define MOBJ_CMODE        0x1000
 
 typedef struct {
         long mode;
@@ -208,6 +223,17 @@ typedef struct {
 	 * aExtCMtableParam *: their parameter
 	 */
 	int			(*sjoin_check)(aChannel *, CmodeParam *, CmodeParam *);
+
+	/** Is this mode being unloaded?
+	 * This is set to 1 if the chanmode module providing this mode is unloaded
+	 * and we are waiting to see if in our new round of loads a "new" chanmode
+	 * module will popup to take this mode. This only happens during a rehash,
+	 * should never be 0 outside an internal rehash.
+	 */
+	char unloaded;
+	
+	/** Module owner */
+        Module *owner;
 } Cmode;
 
 typedef struct {
@@ -234,12 +260,17 @@ typedef struct {
 
 #define EXTBANTABLESZ		32
 
+typedef enum ExtbanOptions { EXTBOPT_CHSVSMODE=0x1 } ExtbanOptions;
+
 typedef struct {
 	/** extbans module */
 	Module *owner;
 	/** extended ban character */
 	char	flag;
 
+	/** extban options */
+	ExtbanOptions options;
+
 	/** access checking [optional].
 	 * aClient *: the client
 	 * aChannel *: the channel
@@ -274,8 +305,9 @@ typedef struct {
 
 typedef struct {
 	char	flag;
+	ExtbanOptions options;
 	int			(*is_ok)(aClient *, aChannel *, char *para, int, int, int);
-	char *		(*conv_param)(char *);
+	char *			(*conv_param)(char *);
 	int			(*is_banned)(aClient *, aChannel *, char *, int);
 } ExtbanInfo;
 
@@ -291,6 +323,13 @@ typedef struct _versionflag {
 	ModuleChild *parents;
 } Versionflag;
 
+typedef struct _isupport {
+	struct _isupport *prev, *next;
+	char *token;
+	char *value;
+	Module *owner;
+} Isupport;
+
 typedef struct _ModuleObject {
 	struct _ModuleObject *prev, *next;
 	short type;
@@ -304,6 +343,10 @@ typedef struct _ModuleObject {
 		Umode *umode;
 		Cmdoverride *cmdoverride;
 		Extban *extban;
+		Callback *callback;
+		Efunction *efunction;
+		Isupport *isupport;
+		Cmode *cmode;
 	} object;
 } ModuleObject;
 
@@ -318,6 +361,39 @@ struct _irchook {
 	Module *owner;
 };
 
+struct _irccallback {
+	Callback *prev, *next;
+	short type;
+	union {
+		int (*intfunc)();
+		void (*voidfunc)();
+		char *(*pcharfunc)();
+	} func;
+	Module *owner;
+	char willberemoved; /* will be removed on next rehash? (eg the 'old'/'current' one) */
+};
+
+/* Definition of an efunction: a MANDATORY Extern Function (in a module),
+ * for things like do_join, join_channel, etc.
+ * The difference between callbacks and efunctions are:
+ * - efunctions are mandatory, while callbacks can be optional (depends!)
+ * - efunctions are ment for internal usage, so 3rd party modules are not allowed
+ *   to add them.
+ * - all efunctions are declared as function pointers in modules.c
+ */
+struct _ircefunction {
+	Efunction *prev, *next;
+	short type;
+	union {
+		int (*intfunc)();
+		void (*voidfunc)();
+		void *(*pvoidfunc)();
+		char *(*pcharfunc)();
+	} func;
+	Module *owner;
+	char willberemoved; /* will be removed on next rehash? (eg the 'old'/'current' one) */
+};
+
 struct _hooktype {
 	short id;
 	char *string;
@@ -356,7 +432,8 @@ struct _Module
 	unsigned char options;
 	unsigned char errorcode;
 	char *tmp_file;
-	unsigned char compilecheck; /* feel free to rename this mess, but mod->flags sucks :[. */
+	unsigned long mod_sys_version;
+	unsigned int compiler_version;
 };
 /*
  * Symbol table
@@ -425,8 +502,10 @@ void    EventStatus(aClient *sptr);
 void    SetupEvents(void);
 void	LockEventSystem(void);
 void	UnlockEventSystem(void);
-extern Hook		*Hooks[MAXHOOKTYPES];
-extern Hooktype		Hooktypes[MAXCUSTOMHOOKS];
+extern MODVAR Hook		*Hooks[MAXHOOKTYPES];
+extern MODVAR Hooktype		Hooktypes[MAXCUSTOMHOOKS];
+extern MODVAR Callback *Callbacks[MAXCALLBACKS], *RCallbacks[MAXCALLBACKS];
+extern MODVAR Efunction *Efunctions[MAXEFUNCTIONS];
 
 void    Module_Init(void);
 char    *Module_Create(char *path);
@@ -445,6 +524,11 @@ void *obsd_dlsym(void *handle, char *symbol);
 Versionflag *VersionflagAdd(Module *module, char flag);
 void VersionflagDel(Versionflag *vflag, Module *module);
 
+Isupport *IsupportAdd(Module *module, const char *token, const char *value);
+void IsupportSetValue(Isupport *isupport, const char *value);
+void IsupportDel(Isupport *isupport);
+Isupport *IsupportFind(const char *token);
+
 #define add_Hook(hooktype, func) HookAddMain(NULL, hooktype, func, NULL, NULL)
 #define HookAdd(hooktype, func) HookAddMain(NULL, hooktype, func, NULL, NULL)
 #define HookAddEx(module, hooktype, func) HookAddMain(module, hooktype, func, NULL, NULL)
@@ -492,6 +576,24 @@ void HooktypeDel(Hooktype *hooktype, Module *module);
 #define RunHook6(hooktype,a,b,c,d,e,f) do { Hook *h; for (h = Hooks[hooktype]; h; h = h->next) (*(h->func.intfunc))(a,b,c,d,e,f); } while(0)
 #define RunHook7(hooktype,a,b,c,d,e,f,g) do { Hook *h; for (h = Hooks[hooktype]; h; h = h->next) (*(h->func.intfunc))(a,b,c,d,e,f,g); } while(0)
 
+#define CallbackAdd(cbtype, func) CallbackAddMain(NULL, cbtype, func, NULL, NULL)
+#define CallbackAddEx(module, cbtype, func) CallbackAddMain(module, cbtype, func, NULL, NULL)
+#define CallbackAddVoid(cbtype, func) CallbackAddMain(NULL, cbtype, NULL, func, NULL)
+#define CallbackAddVoidEx(module, cbtype, func) CallbackAddMain(module, cbtype, NULL, func, NULL)
+#define CallbackAddPChar(cbtype, func) CallbackAddMain(NULL, cbtype, NULL, NULL, func)
+#define CallbackAddPCharEx(module, cbtype, func) CallbackAddMain(module, cbtype, NULL, NULL, func)
+
+extern Callback	*CallbackAddMain(Module *module, int cbtype, int (*intfunc)(), void (*voidfunc)(), char *(*pcharfunc)());
+extern Callback	*CallbackDel(Callback *cb);
+
+#define EfunctionAdd(module, cbtype, func) EfunctionAddMain(module, cbtype, func, NULL, NULL, NULL)
+#define EfunctionAddVoid(module, cbtype, func) EfunctionAddMain(module, cbtype, NULL, func, NULL, NULL)
+#define EfunctionAddPVoid(module, cbtype, func) EfunctionAddMain(module, cbtype, NULL, NULL, func, NULL)
+#define EfunctionAddPChar(module, cbtype, func) EfunctionAddMain(module, cbtype, NULL, NULL, NULL, func)
+
+extern Efunction	*EfunctionAddMain(Module *module, int eftype, int (*intfunc)(), void (*voidfunc)(), void *(*pvoidfunc)(), char *(*pcharfunc)());
+extern Efunction	*EfunctionDel(Efunction *cb);
+
 Command *CommandAdd(Module *module, char *cmd, char *tok, int (*func)(), unsigned char params, int flags);
 void CommandDel(Command *command);
 int CommandExists(char *name);
@@ -539,12 +641,65 @@ int CallCmdoverride(Cmdoverride *ovr, aClient *cptr, aClient *sptr, int parc, ch
 #define HOOKTYPE_UMODE_CHANGE 36
 #define HOOKTYPE_TOPIC 37
 #define HOOKTYPE_REHASH_COMPLETE 38
+#define HOOKTYPE_TKL_ADD 39
+#define HOOKTYPE_TKL_DEL 40
+#define HOOKTYPE_LOCAL_KILL 41
+#define HOOKTYPE_LOG 42
+#define HOOKTYPE_REMOTE_JOIN 43
+#define HOOKTYPE_REMOTE_PART 44
+#define HOOKTYPE_REMOTE_KICK 45
+#define HOOKTYPE_LOCAL_SPAMFILTER 46
+#define HOOKTYPE_SILENCED 47
+#define HOOKTYPE_POST_SERVER_CONNECT 48
+#define HOOKTYPE_RAWPACKET_IN 49
+#define HOOKTYPE_LOCAL_NICKPASS 50
 
 /* Hook return values */
 #define HOOK_CONTINUE 0
 #define HOOK_ALLOW -1
 #define HOOK_DENY 1
 
+/* Callback types */
+#define CALLBACKTYPE_CLOAK 1
+#define CALLBACKTYPE_CLOAKKEYCSUM 2
+#define CALLBACKTYPE_CLOAK_EX 3
+
+/* Efunction types */
+#define EFUNC_DO_JOIN       				1
+#define EFUNC_JOIN_CHANNEL  				2
+#define EFUNC_CAN_JOIN      				3
+#define EFUNC_DO_MODE       				4
+#define EFUNC_SET_MODE      				5
+#define EFUNC_M_UMODE						6
+#define EFUNC_REGISTER_USER					7
+#define EFUNC_TKL_HASH						8
+#define EFUNC_TKL_TYPETOCHAR				9
+#define EFUNC_TKL_ADD_LINE					10
+#define EFUNC_TKL_DEL_LINE					11
+#define EFUNC_TKL_CHECK_LOCAL_REMOVE_SHUN	12
+#define EFUNC_TKL_EXPIRE					13
+#define EFUNC_TKL_CHECK_EXPIRE				14
+#define EFUNC_FIND_TKLINE_MATCH				15
+#define EFUNC_FIND_SHUN						16
+#define EFUNC_FIND_SPAMFILTER_USER			17
+#define EFUNC_FIND_QLINE					18
+#define EFUNC_FIND_TKLINE_MATCH_ZAP			19
+#define EFUNC_TKL_STATS						20
+#define EFUNC_TKL_SYNCH						21
+#define EFUNC_M_TKL							22
+#define EFUNC_PLACE_HOST_BAN				23
+#define EFUNC_DOSPAMFILTER					24
+#define EFUNC_DOSPAMFILTER_VIRUSCHAN		25
+#define EFUNC_FIND_TKLINE_MATCH_ZAP_EX		26
+#define EFUNC_SEND_LIST						27
+#define EFUNC_STRIPBADWORDS_CHANNEL			28
+#define EFUNC_STRIPBADWORDS_MESSAGE			29
+#define EFUNC_STRIPBADWORDS_QUIT			30
+#define EFUNC_STRIPCOLORS					31
+#define EFUNC_STRIPCONTROLCODES				32
+#define EFUNC_SPAMFILTER_BUILD_USER_STRING	33
+#define EFUNC_IS_SILENCED					34
+
 /* Module flags */
 #define MODFLAG_NONE	0x0000
 #define MODFLAG_LOADED	0x0001 /* Fully loaded */
@@ -563,25 +718,27 @@ int CallCmdoverride(Cmdoverride *ovr, aClient *cptr, aClient *sptr, int parc, ch
 #define CONFIG_EXCEPT 4
 #define CONFIG_DENY 5
 #define CONFIG_ALLOW 6
+#define CONFIG_CLOAKKEYS 7
 
 #ifdef DYNAMIC_LINKING
-#define MOD_HEADER(name) Mod_Header
-#define MOD_TEST(name) Mod_Test
-#define MOD_INIT(name) Mod_Init
-#define MOD_LOAD(name) Mod_Load
-#define MOD_UNLOAD(name) Mod_Unload
+ #define MOD_HEADER(name) Mod_Header
+ #define MOD_TEST(name) Mod_Test
+ #define MOD_INIT(name) Mod_Init
+ #define MOD_LOAD(name) Mod_Load
+ #define MOD_UNLOAD(name) Mod_Unload
 #else
-#define MOD_HEADER(name) name##_Header
-#define MOD_TEST(name) name##_Test
-#define MOD_INIT(name) name##_Init
-#define MOD_LOAD(name) name##_Load
-#define MOD_UNLOAD(name) name##_Unload
+ #define MOD_HEADER(name) name##_Header
+ #define MOD_TEST(name) name##_Test
+ #define MOD_INIT(name) name##_Init
+ #define MOD_LOAD(name) name##_Load
+ #define MOD_UNLOAD(name) name##_Unload
 #endif
 
+#define CLOAK_KEYCRC	RCallbacks[CALLBACKTYPE_CLOAKKEYCSUM]->func.pcharfunc()
+
 #ifdef DYNAMIC_LINKING
-/* ugly alert!!!! */
-#include "version.h"
-char Mod_Version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9;
+ #include "modversion.h"
 #endif
 
 #endif
+

include/modversion.h

@@ -0,0 +1,104 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/modversion.h
+ *   (C) 2004-2005 Bram Matthys and The UnrealIRCd Team
+ *
+ *   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 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#include "version.h"
+
+/* What all this is for? Well, it's simple...
+ * Example: When someone compiles a module with zip support, but the
+ * core was not compiled with zip support, then the module will read
+ * things incorrect in the struct because the module sees an extra
+ * field half-way the struct but in the core that field does not exist,
+ * hence all data is shifted 4 bytes causing all kinds of odd crashes,
+ * memory corruption, and weird problems.
+ * This is an attempt to prevent this a bit, but there are a lot more
+ * options that cause binary incompatability (eg: changing nicklen),
+ * we just take the most common ones...
+ *
+ * NOTE: On win32 we allow ssl and zip inconsistencies because we
+ *       explicitly use "padding" in the structs: we add a useless
+ *       placeholder so everything is still aligned correctly.
+ *       In the process of doing so, we waste several bytes per-user,
+ *       but this prevents (most) binary incompatability problems
+ *       making it easier for module coders to ship dll's.
+ */
+ #if defined(USE_SSL) && !defined(_WIN32)
+  #define MYTOKEN_SSL "/SSL"
+ #else
+  #define MYTOKEN_SSL ""
+ #endif
+ #if defined(ZIP_LINKS) && !defined(_WIN32)
+  #define MYTOKEN_ZIP "/ZIP"
+ #else
+  #define MYTOKEN_ZIP ""
+ #endif
+ #if defined(NOSPOOF)
+  #define MYTOKEN_NOSPOOF "/NOSPF"
+ #else
+  #define MYTOKEN_NOSPOOF ""
+ #endif
+ #if !defined(EXTCMODE)
+  #define MYTOKEN_EXTCMODE "/NOEXTC"
+ #else
+  #define MYTOKEN_EXTCMODE ""
+ #endif
+ #if !defined(JOINTHROTTLE)
+  #define MYTOKEN_JOINTHROTTLE "/NOJTHR"
+ #else
+  #define MYTOKEN_JOINTHROTTLE ""
+ #endif
+ #if !defined(NO_FLOOD_AWAY)
+  #define MYTOKEN_NOFLDAWAY "/NONFA"
+ #else
+  #define MYTOKEN_NOFLDAWAY ""
+ #endif
+ #if !defined(NEWCHFLOODPROT)
+  #define MYTOKEN_NEWCHF "/NOCHF"
+ #else
+  #define MYTOKEN_NEWCHF ""
+ #endif
+ #ifdef INET6
+  #define MYTOKEN_INET6 "/IPV6"
+ #else
+  #define MYTOKEN_INET6 ""
+ #endif
+
+#ifdef __GNUC__
+ #if defined(__GNUC_PATCHLEVEL__)
+  #define GCCVER ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8) + __GNUC_PATCHLEVEL__)
+ #else
+  #define GCCVER ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8))
+ #endif
+#else
+ #define GCCVER 0
+#endif
+  
+
+#ifdef UNREALCORE
+  char our_mod_version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
+                               MYTOKEN_SSL MYTOKEN_ZIP MYTOKEN_NOSPOOF MYTOKEN_EXTCMODE MYTOKEN_JOINTHROTTLE \
+                               MYTOKEN_NOFLDAWAY MYTOKEN_NEWCHF MYTOKEN_INET6;
+  unsigned int our_compiler_version = GCCVER;
+#else
+  DLLFUNC char Mod_Version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
+                               MYTOKEN_SSL MYTOKEN_ZIP MYTOKEN_NOSPOOF MYTOKEN_EXTCMODE MYTOKEN_JOINTHROTTLE \
+                               MYTOKEN_NOFLDAWAY MYTOKEN_NEWCHF MYTOKEN_INET6;
+  DLLFUNC unsigned int compiler_version = GCCVER;
+#endif

include/msg.h

@@ -239,7 +239,6 @@
 #define MSG_TSCTL 	"TSCTL"
 #define TOK_TSCTL 	"AW"
 #define MSG_SVSJOIN 	"SVSJOIN"
-#define TOK_SVSJOIN 	"BR"
 #define MSG_SAJOIN 	"SAJOIN"
 #define TOK_SAJOIN 	"AX"
 #define MSG_SVSPART 	"SVSPART"
@@ -300,23 +299,14 @@
 
 #define MAXPARA    	15
 
-extern int m_join(), m_part(), m_mode();
-extern int m_nick(), m_error();
+extern int m_error();
 extern int m_dns();
-extern int m_tkl();
-extern int m_motd(), m_user();
 extern int m_info(), m_summon();
 extern int m_users(), m_version();
-extern int m_names();
-extern int m_lusers(), m_umode();
-extern int m_motd();
-extern int m_service(), m_watch();
 extern int m_dalinfo();
 extern int m_credits();
 extern int m_license();
-extern int m_botmotd();
-extern int m_opermotd();
-extern int m_module(), m_alias(), m_tkl(), m_opermotd();
+extern int m_module(), m_alias();
 extern int m_rehash(), m_die(), m_restart();
 #endif
 

include/numeric.h

@@ -33,11 +33,11 @@
 #define	RPL_YOURHOST         002
 #define	RPL_CREATED          003
 #define	RPL_MYINFO           004
-#define RPL_PROTOCTL	     005
+#define RPL_ISUPPORT	     005
 
 #define RPL_REDIR	     10
 
-#define RPL_REMOTEPROTOCTL 105
+#define RPL_REMOTEISUPPORT 105
 
 /*
  * Errors are in the range from 400-599 currently and are grouped by what
@@ -127,6 +127,9 @@
 #define ERR_NOOPERHOST       491
 #define ERR_NOCTCP	     492
 
+#define ERR_CHANOWNPRIVNEEDED 499
+
+#define ERR_TOOMANYJOINS     500
 #define ERR_UMODEUNKNOWNFLAG 501
 #define ERR_USERSDONTMATCH   502
 
@@ -134,6 +137,9 @@
 #define ERR_TOOMANYWATCH     512
 #define ERR_NEEDPONG         513
 
+#define ERR_TOOMANYDCC       514
+
+#define ERR_DISABLED         517
 #define ERR_NOINVITE		 518
 #define ERR_ADMONLY			 519
 #define ERR_OPERONLY		 520
@@ -178,8 +184,12 @@
 #define RPL_TOPIC            332
 #define RPL_TOPICWHOTIME     333
 
+#define RPL_INVITELIST       336
+#define RPL_ENDOFINVITELIST  337
+
 #define RPL_LISTSYNTAX       334
 #define RPL_WHOISBOT	     335
+#define RPL_USERIP	     340
 #define RPL_INVITING         341
 #define	RPL_SUMMONING        342
 
@@ -189,8 +199,8 @@
 #define RPL_ENDOFWHO         315
 #define RPL_NAMREPLY         353
 #define RPL_ENDOFNAMES       366
-#define RPL_INVITELIST	     346
-#define RPL_ENDOFINVITELIST  347
+#define RPL_INVEXLIST	     346
+#define RPL_ENDOFINVEXLIST   347
 
 #define RPL_EXLIST	     348
 #define RPL_ENDOFEXLIST      349
@@ -264,6 +274,7 @@
 #define RPL_STATSVLINE	     227
 #define RPL_STATSBANVER	     228
 #define RPL_STATSSPAMF       229
+#define RPL_STATSEXCEPTTKL   230
 #define RPL_SERVICEINFO      231
 #define RPL_RULES            232
 #define	RPL_SERVICE          233
@@ -305,6 +316,7 @@
 #define RPL_HELPFWD	     294
 #define RPL_HELPIGN	     295
 
+
 /*
  * New /MAP format.
  */
@@ -324,6 +336,9 @@
  * These are also in the range 600-799.
  */
 
+#define RPL_REAWAY           597
+#define RPL_GONEAWAY         598
+#define RPL_NOTAWAY          599
 #define RPL_LOGON            600
 #define RPL_LOGOFF           601
 #define RPL_WATCHOFF         602
@@ -332,8 +347,22 @@
 #define RPL_NOWOFF           605
 #define RPL_WATCHLIST        606
 #define RPL_ENDOFWATCHLIST   607
+#define RPL_CLEARWATCH       608
+#define RPL_NOWISAWAY        609
+
+#define RPL_DCCSTATUS        617
+#define RPL_DCCLIST          618
+#define RPL_ENDOFDCCLIST     619
+#define RPL_DCCINFO          620
+
 #define RPL_DUMPING			 640
 #define RPL_DUMPRPL			 641
 #define RPL_EODUMP           642
 
+#define RPL_SPAMCMDFWD       659
+
+#define RPL_WHOISSECURE      671
+
+#define ERR_CANNOTDOCOMMAND 972
+#define ERR_CANNOTCHANGECHANMODE 974
 #define ERR_NUMERICERR       999

include/proto.h

@@ -55,10 +55,6 @@ EVENT(loop_event);
 /* support.c */
 char *my_itoa(int i);
 
-/* s_kline.c */
-int  find_tkline_match(aClient *cptr, int xx);
-extern EVENT(tkl_check_expire);
-
 /* s_serv.c */
 void load_tunefile(void);
 extern EVENT(save_tunefile);

include/res.h

@@ -1,74 +1,82 @@
-/*
- * ircd/res_def.h (C)opyright 1992 Darren Reed.
+/* OMG... OMG! WHAT AN INCLUDE HORROR !!! */
+#undef strcasecmp
+#undef strncasecmp
+#ifdef WIN32
+#include <win32/ares/setup.h>
+#endif
+#include <ares.h>
+#include <ares_version.h>
+#undef strcasecmp
+#undef strncasecmp
+#ifndef GOT_STRCASECMP
+#define	strcasecmp	mycmp
+#define	strncasecmp	myncmp
+#endif
+
+
+
+typedef enum {
+	DNSREQ_CLIENT = 1,
+	DNSREQ_LINKCONF = 2,
+	DNSREQ_CONNECT = 3
+} DNSReqType;
+
+typedef struct _dnsreq DNSReq;
+
+/* Depending on the request type, some fields are filled in:
+ * cptr: DNSREQ_CLIENT, DNSREQ_CONNECT
+ * link: DNSREQ_LINKCONF, DNSREQ_CONNECT
  */
 
-#define	RES_INITLIST	1
-#define	RES_CALLINIT	2
-#define RES_INITSOCK	4
-#define RES_INITDEBG	8
-#define RES_INITCACH    16
-
-#define MAXPACKET	1024
-#define MAXALIASES	35
-#define MAXADDRS	35
-
-#define	AR_TTL		300	/* minimum TTL in seconds for dns cache entries */
-
-struct	hent {
-	char	*h_name;	/* official name of host */
-	char	*h_aliases[MAXALIASES];	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	/* list of addresses from name server */
-	struct	IN_ADDR	h_addr_list[MAXADDRS];
-#define	h_addr	h_addr_list[0]	/* address, for backward compatiblity */
+struct _dnsreq {
+	DNSReq *prev, *next;
+	char *name; /**< Name being resolved (only for DNSREQ_LINKCONF and DNSREQ_CONNECT) */
+	char ipv6; /**< Resolving for ipv6 or ipv4? */
+	DNSReqType type; /**< DNS Request type (DNSREQ_*) */
+	aClient *cptr; /**< Client the request is for, NULL if client died OR unavailable */
+	ConfigItem_link *linkblock; /**< Linkblock */
 };
 
-typedef	struct	reslist {
-	int	id;
-	int	sent;	/* number of requests sent */
-	int	srch;
-	time_t	ttl;
-	char	type;
-	char	retries; /* retry counter */
-	char	sends;	/* number of sends (>1 means resent) */
-	char	resend;	/* send flag. 0 == dont resend */
-	time_t	sentat;
-	time_t	timeout;
-	struct	IN_ADDR	addr;
-	char	*name;
-	struct	reslist	*next;
-	Link	cinfo;
-	struct	hent he;
-	} ResRQ;
+typedef struct _dnscache DNSCache;
 
-typedef	struct	cache {
-	time_t	expireat;
-	time_t	ttl;
-	struct hostent he;
-	struct	cache	*hname_next, *hnum_next, *list_next;
-	} aCache;
+struct _dnscache {
+	DNSCache *prev, *next;		/**< Previous and next in linked list */
+	DNSCache *hprev, *hnext;	/**< Previous and next in hash list */
+	char *name;					/**< The hostname */
+	struct IN_ADDR addr;		/**< Stored IP address */
+	time_t expires;				/**< When record expires */
+};
 
-typedef struct	cachetable {
-	aCache	*num_list;
-	aCache	*name_list;
-	} CacheTable;
+typedef struct _dnsstats DNSStats;
 
-#define ARES_CACSIZE	101
+struct _dnsstats {
+	unsigned int cache_hits;
+	unsigned int cache_misses;
+	unsigned int cache_adds;
+};
 
-#define	MAXCACHED	81
-#ifdef _WIN32
-typedef unsigned short u_int16_t;
-#endif
-extern struct __res_state ircd_res;
-extern int ircd_res_init();
-extern u_int ircd_res_randomid();
-extern u_int16_t ircd_getshort(const u_char *msgp);
-extern u_int32_t ircd_getlong(const u_char *msgp);
-extern void ircd__putshort(register u_int16_t s, register u_char *msgp);
-extern void ircd__putlong(register u_int32_t l,register u_char *msgp);
-extern int ircd_dn_expand(const u_char *msg, const u_char *eom, const u_char *src, char *dst, int dstsiz);
-extern int __ircd_dn_skipname(const u_char *ptr, const u_char *eom);
-extern int ircd_dn_comp(const char *src, u_char *dst, int dstsiz, u_char **dnptrs, u_char **lastdnptr);
-extern int ircd_res_mkquery(int op, const char *dname, int class, int type, const u_char *data, 
-	int datalen, const u_char *newrr_in, u_char *buf, int buflen);
+/** Time to keep cache records. */
+#define DNSCACHE_TTL			600
+
+/** Size of the hash table (prime!).
+ * Consumes <this>*4 on ia32 and <this>*4 on 64 bit
+ * 241 seems a good bet.. which ~1k on ia32 and ~2k on ia64.
+ */
+#define DNS_HASH_SIZE	241
+
+/** Max # of entries we want in our cache.
+ * This:
+ * a) prevents us from using too much memory, and
+ * b) prevents us from keeping useless cache records
+ *
+ * A dnscache item is roughly ~80 bytes in size (slightly more on x86),
+ * so 241*80=~20k, which seems reasonable ;).
+ */
+#define DNS_MAX_ENTRIES	DNS_HASH_SIZE
+
+
+extern ares_channel resolver_channel;
+
+extern void init_resolver(int);
+
+struct hostent *unrealdns_doclient(aClient *cptr);

include/setup.h.in

@@ -186,9 +186,6 @@
 /* Local hostname of the server */
 #undef DOMAINNAME
 
-/* The OS name and version of the server */
-#undef MYOSNAME
-
 /* The default permissions for configuration files */
 #undef DEFAULT_PERMISSIONS
 
@@ -225,18 +222,27 @@
 /* Define if you want IPv6 enabled */
 #undef INET6
 
+/* Define if you want modes shown in /list */
+#undef LIST_SHOW_MODES
+
+/* Define if you want nick!user@host shown for the topic setter */
+#undef TOPIC_NICK_IS_NUHOST
+
+/* Define if you want users to be notified when their shun is removed */
+#undef SHUN_NOTICES
+
+/* Define if you want OperOverride disabled */
+#undef NO_OPEROVERRIDE
+
+/* Define if you want opers to have to use /invite to join +s/+p channels */
+#undef OPEROVERRIDE_VERIFY
+
+/* Define if you want to disable /set* and /chg* */
+#undef DISABLE_USERMOD
+
 /* Define if your system prepends an underscore to symbols */
 #undef UNDERSCORE
 
-/* Define if you have gethostbyname_r with 3 parameters */
-#undef HAVE_GETHOSTBYNAME_R_3
-
-/* Define if you have gethostbyname_r with 5 parameters */
-#undef HAVE_GETHOSTBYNAME_R_5
-
-/* Define if you have gethostbyname_r with 6 parameters */
-#undef HAVE_GETHOSTBYNAME_R_6
-
 /* Define if rlim_t is long long */
 #undef LONG_LONG_RLIM_T
 
@@ -254,3 +260,21 @@
 
 /* Define if you have strlncat */
 #undef HAVE_STRLNCAT
+
+/* Define if you have inet_pton */
+#undef HAVE_INET_PTON
+
+/* Define if you have inet_ntop */
+#undef HAVE_INET_NTOP
+
+/* Define if you have a compiler with C99 variable length array support */
+#undef HAVE_C99_VARLEN_ARRAY
+
+/* Define if you have alloca.h */
+#undef HAVE_ALLOCA_H
+
+/* Define if you have alloca */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if your system has no in6addr_any. */
+#undef NO_IN6ADDR_ANY

include/sjoin.h

@@ -30,7 +30,7 @@ struct SynchList {
 	aSynchList *next, *prev;
 };
 
-aSynchList *SJSynchList = NULL;
+MODVAR aSynchList *SJSynchList = NULL;
 
 aSynchList *make_synchlist()
 {

include/struct.h

@@ -37,6 +37,8 @@
 #include <openssl/err.h>    
 #include <openssl/evp.h>
 #include <openssl/rand.h>
+#include <openssl/md5.h>
+#include <openssl/ripemd.h>
 #endif
 #include "common.h"
 #include "sys.h"
@@ -50,6 +52,7 @@
 #ifdef STDDEFH
 # include <stddef.h>
 #endif
+#include "md5.h"
 
 #ifdef HAVE_SYSLOG
 # include <syslog.h>
@@ -69,8 +72,12 @@
 
 #include "channel.h"
 
+#if defined(_WIN32) && !defined(NOSPOOF)
+ #error "Compiling win32 without nospoof is VERY insecure and NOT supported"
+#endif
 
-extern int sendanyways;
+
+extern MODVAR int sendanyways;
 
 
 typedef struct aloopStruct LoopStruct;
@@ -98,9 +105,11 @@ typedef struct _configitem_listen ConfigItem_listen;
 typedef struct _configitem_allow ConfigItem_allow;
 typedef struct _configflag_allow ConfigFlag_allow;
 typedef struct _configitem_allow_channel ConfigItem_allow_channel;
+typedef struct _configitem_allow_dcc ConfigItem_allow_dcc;
 typedef struct _configitem_vhost ConfigItem_vhost;
 typedef struct _configitem_except ConfigItem_except;
 typedef struct _configitem_link	ConfigItem_link;
+typedef struct _configitem_cgiirc ConfigItem_cgiirc;
 typedef struct _configitem_ban ConfigItem_ban;
 typedef struct _configitem_badword ConfigItem_badword;
 typedef struct _configitem_deny_dcc ConfigItem_deny_dcc;
@@ -140,6 +149,7 @@ typedef struct _cmdoverride Cmdoverride;
 typedef struct SMember Member;
 typedef struct SMembership Membership;
 typedef struct SMembershipL MembershipL;
+typedef struct JFlood aJFlood;
 
 #ifdef ZIP_LINKS
 typedef struct  Zdata   aZdata;
@@ -162,14 +172,12 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	REALLEN	 	50
 #define	TOPICLEN	307
 #define	CHANNELLEN	32
-#define	PASSWDLEN 	32	/* orig. 20, changed to 32 for nickpasswords */
+#define	PASSWDLEN 	48	/* was 20, then 32, now 48. */
 #define	KEYLEN		23
 #define LINKLEN		32
 #define	BUFSIZE		512	/* WARNING: *DONT* CHANGE THIS!!!! */
 #define	MAXRECIPIENTS 	20
 #define	MAXKILLS	20
-#define	MAXBANS		60
-#define	MAXBANLENGTH	1024
 #define	MAXSILELENGTH	NICKLEN+USERLEN+HOSTLEN+10
 #define UMODETABLESZ (sizeof(long) * 8)
 /*
@@ -183,7 +191,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 /* NOTE: this must be down here so the stuff from struct.h IT uses works */
 #include "whowas.h"
 
-/* Loggin types */
+/* Logging types */
 #define LOG_ERROR 0x0001
 #define LOG_KILL  0x0002
 #define LOG_TKL   0x0004
@@ -194,6 +202,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define LOG_SACMDS 0x0080
 #define LOG_CHGCMDS 0x0100
 #define LOG_OVERRIDE 0x0200
+#define LOG_SPAMFILTER 0x0400
 
 
 /*
@@ -259,6 +268,8 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	SetClient(x)		((x)->status = STAT_CLIENT)
 #define	SetLog(x)		((x)->status = STAT_LOG)
 
+#define IsSynched(x)	(x->serv->flags.synced)
+
 /* opt.. */
 #define OPT_SJOIN	0x0001
 #define OPT_NOT_SJOIN	0x0002
@@ -276,13 +287,17 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define OPT_NOT_VHP	0x2000
 #define OPT_TKLEXT	0x4000
 #define OPT_NOT_TKLEXT	0x8000
+#define OPT_NICKIP	0x10000
+#define OPT_NOT_NICKIP  0x20000
+#define OPT_CLK	0x10000
+#define OPT_NOT_CLK  0x20000
 
 /* client->flags (32 bits): 28 used, 4 free */
 #define	FLAGS_PINGSENT   0x0001	/* Unreplied ping sent */
 #define	FLAGS_DEADSOCKET 0x0002	/* Local socket is dead--Exiting soon */
 #define	FLAGS_KILLED     0x0004	/* Prevents "QUIT" from being sent for this */
 #define	FLAGS_BLOCKED    0x0008	/* socket is in a blocked condition */
-#define FLAGS_UNOCCUP1   0x0010 /* [FREE] */
+#define FLAGS_OUTGOING   0x0010 /* outgoing connection, do not touch cptr->listener->clients */
 #define	FLAGS_CLOSING    0x0020	/* set when closing to suppress errors */
 #define	FLAGS_LISTEN     0x0040	/* used to mark clients which we listen() on */
 #define	FLAGS_CHKACCESS  0x0080	/* ok to check clients access if set */
@@ -293,7 +308,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	FLAGS_GOTID      0x1000	/* successful ident lookup achieved */
 #define	FLAGS_DOID       0x2000	/* I-lines say must use ident return */
 #define	FLAGS_NONL       0x4000	/* No \n in buffer */
-#define FLAGS_TS8        0x8000	/* Why do you want to know? */
+#define FLAGS_CGIIRC     0x8000 /* CGI IRC host: flag set = ip/host data has been filled in already */
 #define FLAGS_ULINE      0x10000	/* User/server is considered U-lined */
 #define FLAGS_SQUIT      0x20000	/* Server has been /squit by an oper */
 #define FLAGS_PROTOCTL   0x40000	/* Received a PROTOCTL message */
@@ -305,14 +320,14 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #ifdef ZIP_LINKS
 #define FLAGS_ZIP        0x1000000
 #endif
-#define FLAGS_UNOCCUP2   0x2000000 /* [FREE] */
+#define FLAGS_DCCNOTICE  0x2000000 /* Has the user seen a notice on how to use DCCALLOW already? */
 #define FLAGS_SHUNNED    0x4000000
 #define FLAGS_VIRUS      0x8000000 /* tagged by spamfilter */
 #ifdef USE_SSL
 #define FLAGS_SSL        0x10000000
 #endif
-#define FLAGS_UNOCCUP4   0x20000000 /* [FREE] */
-#define FLAGS_DCCBLOCK   0x40000000
+#define FLAGS_NOFAKELAG  0x20000000 /* Exception from fake lag */
+#define FLAGS_DCCBLOCK   0x40000000 /* Block all DCC send requests */
 #define FLAGS_MAP        0x80000000	/* Show this entry in /map */
 /* Dec 26th, 1997 - added flags2 when I ran out of room in flags -DuffJ */
 
@@ -321,7 +336,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
  * -DuffJ
  */
 
-#define SNO_DEFOPER "+kscfvGq"
+#define SNO_DEFOPER "+kscfvGqo"
 #define SNO_DEFUSER "+ks"
 
 #define SEND_UMODES (SendUmodes)
@@ -343,7 +358,10 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define PROTO_VHP		0x0400	/* Send hostnames in NICKv2 even if not sethosted */
 #define PROTO_SJB64		0x0800
 #define PROTO_TKLEXT	0x1000	/* TKL extension: 10 parameters instead of 8 (3.2RC2) */
-/* note: client->proto is currently a 'short' (max is 0x8000) */
+#define PROTO_NICKIP	0x2000  /* Send IP addresses in the NICK command */
+#define PROTO_NAMESX	0x4000  /* Send all rights in NAMES output */
+#define PROTO_CLK		0x8000	/* Send cloaked host in the NICK command (regardless of +x/-x) */
+#define PROTO_UHNAMES	0x10000  /* Send n!u@h in NAMES */
 
 /*
  * flags macros.
@@ -386,16 +404,17 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	IsDead(x)		((x)->flags & FLAGS_DEADSOCKET)
 #define GotProtoctl(x)		((x)->flags & FLAGS_PROTOCTL)
 #define IsBlocked(x)		((x)->flags & FLAGS_BLOCKED)
+#define IsOutgoing(x)		((x)->flags & FLAGS_OUTGOING)
 #define GotNetInfo(x) 		((x)->flags & FLAGS_NETINFO)
 #define SetNetInfo(x)		((x)->flags |= FLAGS_NETINFO)
+#define IsCGIIRC(x)			((x)->flags & FLAGS_CGIIRC)
 
 #define IsShunned(x)		((x)->flags & FLAGS_SHUNNED)
 #define SetShunned(x)		((x)->flags |= FLAGS_SHUNNED)
 #define ClearShunned(x)		((x)->flags &= ~FLAGS_SHUNNED)
 #define IsVirus(x)			((x)->flags & FLAGS_VIRUS)
 #define SetVirus(x)			((x)->flags |= FLAGS_VIRUS)
-#define ClearVirus(x)		((x)->flags |= FLAGS_VIRUS)
-
+#define ClearVirus(x)		((x)->flags &= ~FLAGS_VIRUS)
 #ifdef USE_SSL
 #define IsSecure(x)		((x)->flags & FLAGS_SSL)
 #else
@@ -410,10 +429,16 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define IsZipStart(x)	(0)
 #endif
 
+/* Fake lag exception */
+#define IsNoFakeLag(x)      ((x)->flags & FLAGS_NOFAKELAG)
+#define SetNoFakeLag(x)     ((x)->flags |= FLAGS_NOFAKELAG)
+#define ClearNoFakeLag(x)   ((x)->flags &= ~FLAGS_NOFAKELAG)
+
 #define IsHybNotice(x)		((x)->flags & FLAGS_HYBNOTICE)
 #define SetHybNotice(x)         ((x)->flags |= FLAGS_HYBNOTICE)
 #define ClearHybNotice(x)	((x)->flags &= ~FLAGS_HYBNOTICE)
 #define IsHidden(x)             ((x)->umodes & UMODE_HIDE)
+#define IsSetHost(x)			((x)->umodes & UMODE_SETHOST)
 #define IsHideOper(x)		((x)->umodes & UMODE_HIDEOPER)
 #ifdef USE_SSL
 #define IsSSL(x)		IsSecure(x)
@@ -425,6 +450,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #endif
 
 #define GetHost(x)			(IsHidden(x) ? (x)->user->virthost : (x)->user->realhost)
+#define GetIP(x)			((x->user && x->user->ip_str) ? x->user->ip_str : (MyConnect(x) ? Inet_ia2p(&x->ip) : NULL))
 
 #define SetKillsF(x)		((x)->user->snomask |= SNO_KILLS)
 #define SetClientF(x)		((x)->user->snomask |= SNO_CLIENT)
@@ -443,8 +469,12 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	DoingDNS(x)		((x)->flags & FLAGS_DOINGDNS)
 #define	SetAccess(x)		((x)->flags |= FLAGS_CHKACCESS); Debug((DEBUG_DEBUG, "SetAccess(%s)", (x)->name))
 #define SetBlocked(x)		((x)->flags |= FLAGS_BLOCKED)
+#define SetOutgoing(x)		do { x->flags |= FLAGS_OUTGOING; } while(0)
+#define SetCGIIRC(x)		do { x->flags |= FLAGS_CGIIRC; } while(0)
 #define	DoingAuth(x)		((x)->flags & FLAGS_AUTH)
 #define	NoNewLine(x)		((x)->flags & FLAGS_NONL)
+#define IsDCCNotice(x)		((x)->flags & FLAGS_DCCNOTICE)
+#define SetDCCNotice(x)		do { x->flags |= FLAGS_DCCNOTICE; } while(0)
 #define SetRegNick(x)		((x)->umodes & UMODE_REGNICK)
 #define SetHidden(x)            ((x)->umodes |= UMODE_HIDE)
 #define SetHideOper(x)      ((x)->umodes |= UMODE_HIDEOPER)
@@ -478,17 +508,27 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 /*
  * ProtoCtl options
  */
-#define DontSendQuit(x)		((x)->proto & PROTO_NOQUIT)
-#define IsToken(x)		((x)->proto & PROTO_TOKEN)
-#define SupportSJOIN(x)		((x)->proto & PROTO_SJOIN)
-#define SupportNICKv2(x)	((x)->proto & PROTO_NICKv2)
-#define SupportSJOIN2(x)	((x)->proto & PROTO_SJOIN2)
-#define SupportUMODE2(x)	((x)->proto & PROTO_UMODE2)
-#define SupportNS(x)		((x)->proto & PROTO_NS)
-#define SupportVL(x)		((x)->proto & PROTO_VL)
-#define SupportSJ3(x)		((x)->proto & PROTO_SJ3)
-#define SupportVHP(x)		((x)->proto & PROTO_VHP)
-#define SupportTKLEXT(x)	((x)->proto & PROTO_TKLEXT)
+#ifndef DEBUGMODE
+#define CHECKPROTO(x,y)	((x)->proto & y)
+#else
+#define CHECKPROTO(x,y) (checkprotoflags(x, y, __FILE__, __LINE__))
+#endif
+
+#define DontSendQuit(x)		(CHECKPROTO(x, PROTO_NOQUIT))
+#define IsToken(x)		(CHECKPROTO(x, PROTO_TOKEN))
+#define SupportSJOIN(x)		(CHECKPROTO(x, PROTO_SJOIN))
+#define SupportNICKv2(x)	(CHECKPROTO(x, PROTO_NICKv2))
+#define SupportNICKIP(x)	(CHECKPROTO(x, PROTO_NICKIP))
+#define SupportSJOIN2(x)	(CHECKPROTO(x, PROTO_SJOIN2))
+#define SupportUMODE2(x)	(CHECKPROTO(x, PROTO_UMODE2))
+#define SupportNS(x)		(CHECKPROTO(x, PROTO_NS))
+#define SupportVL(x)		(CHECKPROTO(x, PROTO_VL))
+#define SupportSJ3(x)		(CHECKPROTO(x, PROTO_SJ3))
+#define SupportVHP(x)		(CHECKPROTO(x, PROTO_VHP))
+#define SupportTKLEXT(x)	(CHECKPROTO(x, PROTO_TKLEXT))
+#define SupportNAMESX(x)	(CHECKPROTO(x, PROTO_NAMESX))
+#define SupportCLK(x)		(CHECKPROTO(x, PROTO_CLK))
+#define SupportUHNAMES(x)	(CHECKPROTO(x, PROTO_UHNAMES))
 
 #define SetSJOIN(x)		((x)->proto |= PROTO_SJOIN)
 #define SetNoQuit(x)		((x)->proto |= PROTO_NOQUIT)
@@ -501,6 +541,9 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define SetSJ3(x)		((x)->proto |= PROTO_SJ3)
 #define SetVHP(x)		((x)->proto |= PROTO_VHP)
 #define SetTKLEXT(x)	((x)->proto |= PROTO_TKLEXT)
+#define SetNAMESX(x)	((x)->proto |= PROTO_NAMESX)
+#define SetCLK(x)		((x)->proto |= PROTO_CLK)
+#define SetUHNAMES(x)	((x)->proto |= PROTO_UHNAMES)
 
 #define ClearSJOIN(x)		((x)->proto &= ~PROTO_SJOIN)
 #define ClearNoQuit(x)		((x)->proto &= ~PROTO_NOQUIT)
@@ -532,6 +575,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define OFLAG_LNOTICE	0x00004000	/* Oper can send local serv notices */
 #define OFLAG_GNOTICE	0x00008000	/* Oper can send global notices */
 #define OFLAG_ADMIN		0x00010000	/* Admin */
+#define OFLAG_ADDLINE	0x00020000	/* Oper can use /addline */
 #define OFLAG_ZLINE		0x00080000	/* Oper can use /zline and /unzline */
 #define OFLAG_NETADMIN	0x00200000	/* netadmin gets +N */
 #define OFLAG_COADMIN	0x00800000	/* co admin gets +C */
@@ -544,7 +588,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define OFLAG_UMODEQ	0x80000000	/* can set +q */
 #define OFLAG_LOCAL	(OFLAG_REHASH|OFLAG_HELPOP|OFLAG_GLOBOP|OFLAG_WALLOP|OFLAG_LOCOP|OFLAG_LROUTE|OFLAG_LKILL|OFLAG_KLINE|OFLAG_UNKLINE|OFLAG_LNOTICE)
 #define OFLAG_GLOBAL	(OFLAG_LOCAL|OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE)
-#define OFLAG_ISGLOBAL	(OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE)
+#define OFLAG_ISGLOBAL	(OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE|OFLAG_TKL|OFLAG_GZL|OFLAG_OVERRIDE)
 #define OFLAG_NADMIN	(OFLAG_NETADMIN | OFLAG_SADMIN | OFLAG_ADMIN | OFLAG_GLOBAL | OFLAG_UMODEQ | OFLAG_DCCDENY)
 #define OFLAG_ADMIN_	(OFLAG_ADMIN | OFLAG_GLOBAL | OFLAG_DCCDENY)
 #define OFLAG_COADMIN_	(OFLAG_COADMIN | OFLAG_GLOBAL | OFLAG_DCCDENY)
@@ -555,6 +599,7 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define OPCanDCCDeny(x)	((x)->oflag & OFLAG_DCCDENY)
 #define OPCanTKL(x)	((x)->oflag & OFLAG_TKL)
 #define OPCanGZL(x)	((x)->oflag & OFLAG_GZL)
+#define OPCanAddline(x)   ((x)->oflag & OFLAG_ADDLINE)
 #define OPCanZline(x)   ((x)->oflag & OFLAG_ZLINE)
 #define OPCanRehash(x)	((x)->oflag & OFLAG_REHASH)
 #define OPCanDie(x)	((x)->oflag & OFLAG_DIE)
@@ -576,6 +621,11 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define OPIsNetAdmin(x) ((x)->oflag & OFLAG_NETADMIN)
 #define OPIsCoAdmin(x)	((x)->oflag & OFLAG_COADMIN)
 #define OPIsWhois(x)    ((x)->oflag & OFLAG_WHOIS)
+#ifdef SHOW_SECRET
+#define OPCanSeeSecret(x) IsAnOper(x)
+#else
+#define OPCanSeeSecret(x) IsNetAdmin(x)
+#endif
 
 #define OPSetRehash(x)	((x)->oflag |= OFLAG_REHASH)
 #define OPSetDie(x)	((x)->oflag |= OFLAG_DIE)
@@ -633,6 +683,9 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	DEBUG_MALLOC 9		/* malloc/free calls */
 #define	DEBUG_LIST  10		/* debug list use */
 
+/* blah */
+#define IsSkoAdmin(sptr) (IsAdmin(sptr) || IsNetAdmin(sptr) || IsSAdmin(sptr))
+
 /*
  * defines for curses in client
  */
@@ -640,6 +693,21 @@ typedef unsigned int u_int32_t;	/* XXX Hope this works! */
 #define	CURSES_TERM	1
 #define	TERMCAP_TERM	2
 
+/* Dcc deny types (see src/s_extra.c) */
+#define DCCDENY_HARD	0
+#define DCCDENY_SOFT	1
+
+/* Linked list dcc flags */
+#define DCC_LINK_ME		1 /* My dcc allow */
+#define DCC_LINK_REMOTE	2 /* I need to remove dccallows from these clients when I die */
+
+struct irc_netmask
+{
+	short int type;
+	struct IN_ADDR mask;
+	short int bits;
+};
+
 struct FloodOpt {
 	unsigned short nmsg;
 	TS   firstmsg;
@@ -653,7 +721,9 @@ struct MotdItem {
 struct aloopStruct {
 	unsigned do_garbage_collect : 1;
 	unsigned ircd_booted : 1;
-	unsigned do_bancheck : 1;
+	unsigned do_bancheck : 1; /* perform *line bancheck? */
+	unsigned do_bancheck_spamf_user : 1; /* perform 'user' spamfilter bancheck */
+	unsigned do_bancheck_spamf_away : 1; /* perform 'away' spamfilter bancheck */
 	unsigned ircd_rehashing : 1;
 	unsigned tainted : 1;
 	aClient *rehash_save_cptr, *rehash_save_sptr;
@@ -684,12 +754,14 @@ struct User {
 	Membership *channel;		/* chain of channel pointer blocks */
 	Link *invited;		/* chain of invite pointer blocks */
 	Link *silence;		/* chain of silence pointer blocks */
+	Link *dccallow;		/* chain of dccallowed entries */
 	char *away;		/* pointer to away message */
 	u_int32_t servicestamp;	/* Services' time stamp variable */
 	signed char refcnt;	/* Number of times this block is referenced */
 	unsigned short joined;		/* number of channels joined */
 	char username[USERLEN + 1];
 	char realhost[HOSTLEN + 1];
+	char cloakedhost[HOSTLEN + 1]; /* cloaked host (masked host for caching). NOT NECESSARILY THE SAME AS virthost. */
 	char *virthost;
 	char *server;
 	char *swhois;		/* special whois thing */
@@ -699,6 +771,7 @@ struct User {
 #ifdef	LIST_DEBUG
 	aClient *bcptr;
 #endif
+	char *ip_str;		/* The IP in string form */
 	char *operlogin;	/* Only used if person is/was opered, used for oper::maxlogins */
 	struct {
 		time_t nick_t;
@@ -708,6 +781,10 @@ struct User {
 		unsigned char away_c;	/* number of times away has been set */
 #endif
 	} flood;
+#ifdef JOINTHROTTLE
+	aJFlood *jflood;
+#endif
+	TS lastaway;
 };
 
 struct Server {
@@ -735,6 +812,7 @@ struct Server {
 #define M_ALIAS			0x0020
 #define M_RESETIDLE		0x0040
 #define M_VIRUS			0x0080
+#define M_ANNOUNCE		0x0100
 
 
 /* tkl:
@@ -758,6 +836,12 @@ struct Server {
 #define SPAMF_PART			0x0010 /* P */
 #define SPAMF_QUIT			0x0020 /* q */
 #define SPAMF_DCC			0x0040 /* d */
+#define SPAMF_USER			0x0080 /* u */
+#define SPAMF_AWAY			0x0100 /* a */
+#define SPAMF_TOPIC			0x0200 /* t */
+
+/* Other flags only for function calls: */
+#define SPAMFLAG_NOWARN		0x0001
 
 struct _spamfilter {
 	unsigned short action; /* see BAN_ACT* */
@@ -770,7 +854,10 @@ struct t_kline {
 	aTKline *prev, *next;
 	int type;
 	unsigned short subtype; /* subtype (currently spamfilter only), see SPAMF_* */
-	Spamfilter *spamf;
+	union {
+		Spamfilter *spamf;
+		struct irc_netmask *netmask;
+	} ptr;
 	char usermask[USERLEN + 3];
 	char *hostmask, *reason, *setby;
 	TS expire_at, set_at;
@@ -794,19 +881,19 @@ typedef struct ircstatsx {
 	int  global_max;	/* global max */
 } ircstats;
 
-extern ircstats IRCstats;
+extern MODVAR ircstats IRCstats;
 
 #include "modules.h"
 
-extern Umode *Usermode_Table;
-extern short	 Usermode_highest;
+extern MODVAR Umode *Usermode_Table;
+extern MODVAR short	 Usermode_highest;
 
-extern Snomask *Snomask_Table;
-extern short Snomask_highest;
+extern MODVAR Snomask *Snomask_Table;
+extern MODVAR short Snomask_highest;
 
 #ifdef EXTCMODE
-extern Cmode *Channelmode_Table;
-extern unsigned short Channelmode_highest;
+extern MODVAR Cmode *Channelmode_Table;
+extern MODVAR unsigned short Channelmode_highest;
 #endif
 
 extern Umode *UmodeAdd(Module *module, char ch, int options, int (*allowed)(aClient *sptr, int what), long *mode);
@@ -820,6 +907,12 @@ extern Cmode *CmodeAdd(Module *reserved, CmodeInfo req, Cmode_t *mode);
 extern void CmodeDel(Cmode *cmode);
 #endif
 
+typedef struct {
+	EXTCM_PAR_HEADER
+	unsigned short num;
+	unsigned short t;
+} aModejEntry;
+
 #define LISTENER_NORMAL		0x000001
 #define LISTENER_CLIENTSONLY	0x000002
 #define LISTENER_SERVERSONLY	0x000004
@@ -879,15 +972,19 @@ struct Client {
 #ifdef NOSPOOF
 	u_int32_t nospoof;	/* Anti-spoofing random number */
 #endif
-	short proto;		/* ProtoCtl options */
+	int proto;		/* ProtoCtl options */
 	long sendM;		/* Statistics: protocol messages send */
 	long sendK;		/* Statistics: total k-bytes send */
 	long receiveM;		/* Statistics: protocol messages received */
 #ifdef ZIP_LINKS
 	struct Zdata *zip;	/* zip data */
+#elif defined(_WIN32)
+	void *zip_NOTUSED; /* (win32 binary compatability) */
 #endif
 #ifdef USE_SSL
 	SSL		*ssl;
+#elif defined(_WIN32)
+	void	*ssl_NOTUSED; /* (win32 binary compatability) */
 #endif
 #ifndef NO_FDLIST
 	long lastrecvM;		/* to check for activity --Mika */
@@ -991,6 +1088,7 @@ struct _configflag_tld
 #define BAN_ACT_BLOCK		8
 #define BAN_ACT_DCCBLOCK	9
 #define BAN_ACT_VIRUSCHAN	10
+#define BAN_ACT_WARN		11
 
 
 #define CRULE_ALL		0
@@ -1017,11 +1115,17 @@ struct _configitem_admin {
 	char	   *line; 
 };
 
+#define CLASS_OPT_NOFAKELAG		0x1
+
 struct _configitem_class {
 	ConfigItem *prev, *next;
 	ConfigFlag flag;
 	char	   *name;
 	int	   pingfreq, connfreq, maxclients, sendq, recvq, clients;
+	int xrefcount; /* EXTRA reference count, 'clients' also acts as a reference count but
+	                * link blocks also refer to classes so a 2nd ref. count was needed.
+	                */
+	unsigned int options;
 };
 
 struct _configflag_allow {
@@ -1039,6 +1143,7 @@ struct _configitem_allow {
 	unsigned short		maxperip;
 	int					port;
 	ConfigItem_class	*class;
+	struct irc_netmask	*netmask;
 	ConfigFlag_allow	flags;
 };
 
@@ -1049,6 +1154,7 @@ struct _configitem_oper {
 	anAuthStruct	 *auth;
 	ConfigItem_class *class;
 	ConfigItem	 *from;
+	unsigned long	 modes;
 	long		 oflags;
 	int			maxlogins;
 };
@@ -1057,6 +1163,7 @@ struct _configitem_oper_from {
 	ConfigItem       *prev, *next;
 	ConfigFlag 	 flag;
 	char		 *name;
+	struct irc_netmask	*netmask;
 };
 
 struct _configitem_drpass {
@@ -1076,9 +1183,10 @@ struct _configitem_ulines {
 struct _configitem_tld {
 	ConfigItem 	*prev, *next;
 	ConfigFlag_tld 	flag;
-	char 		*mask, *motd_file, *rules_file, *smotd_file, *channel;
+	char 		*mask, *motd_file, *rules_file, *smotd_file;
+	char 		*botmotd_file, *opermotd_file, *channel;
 	struct tm	motd_tm, smotd_tm;
-	aMotd		*rules, *motd, *smotd;
+	aMotd		*rules, *motd, *smotd, *botmotd, *opermotd;
 	u_short		options;
 };
 
@@ -1112,29 +1220,50 @@ struct _configitem_link {
 	time_t			hold;
 #ifdef USE_SSL
 	char		*ciphers;
+#elif defined(_WIN32)
+	void *ciphers_NOTUSED;
 #endif
 #ifdef ZIP_LINKS
 	int compression_level;
 #endif
 };
 
+typedef enum {
+	CGIIRC_PASS=1, CGIIRC_WEBIRC=2
+} CGIIRCType;
+
+struct _configitem_cgiirc {
+	ConfigItem  *prev, *next;
+	ConfigFlag  flag;
+	CGIIRCType type;
+	char *username;
+	char *hostname;
+	anAuthStruct *auth;
+};
+
 struct _configitem_except {
 	ConfigItem      *prev, *next;
 	ConfigFlag_except      flag;
 	int type;
 	char		*mask;
+	struct irc_netmask *netmask;
 };
 
 struct _configitem_ban {
 	ConfigItem		*prev, *next;
 	ConfigFlag_ban	flag;
 	char			*mask, *reason;
-	struct IN_ADDR netmask;
-	int bits;
-	short masktype;
+	struct irc_netmask	*netmask;
 	unsigned short action;
 };
 
+typedef struct _iplist IPList;
+struct _iplist {
+	IPList *prev, *next;
+	char *mask;
+/*	struct irc_netmask  *netmask; */
+};
+
 #ifdef FAST_BADWORD_REPLACE
 #define BADW_TYPE_INVALID 0x0
 #define BADW_TYPE_FAST    0x1
@@ -1188,6 +1317,12 @@ struct _configitem_allow_channel {
 	char			*channel;
 };
 
+struct _configitem_allow_dcc {
+	ConfigItem		*prev, *next;
+	ConfigFlag_ban	flag;
+	char			*filename;
+};
+
 struct _configitem_log {
 	ConfigItem *prev, *next;
 	ConfigFlag flag;
@@ -1211,24 +1346,25 @@ struct _configitem_unknown_ext {
 	ConfigEntry     *ce_entries;
 };
 
-#define ALIAS_SERVICES 1
-#define ALIAS_STATS 2
-#define ALIAS_NORMAL 3
-#define ALIAS_COMMAND 4
+
+typedef enum { 
+	ALIAS_SERVICES=1, ALIAS_STATS, ALIAS_NORMAL, ALIAS_COMMAND, ALIAS_CHANNEL, ALIAS_REAL
+} AliasType;
 
 struct _configitem_alias {
 	ConfigItem *prev, *next;
 	ConfigFlag flag;
 	ConfigItem_alias_format *format;
 	char *alias, *nick;
-	short type;
+	AliasType type;
+	unsigned int spamfilter:1;
 };
 
 struct _configitem_alias_format {
 	ConfigItem *prev, *next;
 	ConfigFlag flag;
 	char *nick;
-	short type;
+	AliasType type;
 	char *format, *parameters;
 	regex_t expr;
 };
@@ -1415,6 +1551,10 @@ struct Channel {
 	Link *invites;
 	Ban *banlist;
 	Ban *exlist;		/* exceptions */
+	Ban *invexlist;         /* invite list */
+#ifdef JOINTHROTTLE
+	aJFlood *jflood;
+#endif
 	char chname[1];
 };
 
@@ -1479,8 +1619,9 @@ struct liststruct {
 #define	CHFL_BAN     	0x0020	/* ban channel flag */
 #define CHFL_CHANOWNER 	0x0040	/* channel owner */
 #define CHFL_CHANPROT  	0x0080	/* chan op protection */
-#define CHFL_HALFOP		0x0100	/* halfop */
-#define CHFL_EXCEPT		0x0200	/* phase this out ? +e */
+#define CHFL_HALFOP	0x0100	/* halfop */
+#define CHFL_EXCEPT	0x0200	/* phase this out ? +e */
+#define CHFL_INVEX	0x0400  /* invite exception */
 
 #define	CHFL_OVERLAP    (CHFL_CHANOWNER|CHFL_CHANPROT|CHFL_CHANOP|CHFL_VOICE|CHFL_HALFOP)
 
@@ -1489,21 +1630,21 @@ struct liststruct {
 #define	MODE_CHANOP		CHFL_CHANOP
 #define	MODE_VOICE		CHFL_VOICE
 #define	MODE_PRIVATE		0x0004
-#define	MODE_SECRET			0x0008
+#define	MODE_SECRET		0x0008
 #define	MODE_MODERATED  	0x0010
 #define	MODE_TOPICLIMIT 	0x0020
 #define MODE_CHANOWNER		0x0040
 #define MODE_CHANPROT		0x0080
-#define	MODE_HALFOP			0x0100
-#define MODE_EXCEPT			0x0200
-#define	MODE_BAN			0x0400
+#define	MODE_HALFOP		0x0100
+#define MODE_EXCEPT		0x0200
+#define	MODE_BAN		0x0400
 #define	MODE_INVITEONLY 	0x0800
 #define	MODE_NOPRIVMSGS 	0x1000
-#define	MODE_KEY			0x2000
-#define	MODE_LIMIT			0x4000
-#define MODE_RGSTR			0x8000
-#define MODE_RGSTRONLY 		 	0x10000
-#define MODE_LINK			0x20000
+#define	MODE_KEY		0x2000
+#define	MODE_LIMIT		0x4000
+#define MODE_RGSTR		0x8000
+#define MODE_RGSTRONLY 		0x10000
+#define MODE_LINK		0x20000
 #define MODE_NOCOLOR		0x40000
 #define MODE_OPERONLY   	0x80000
 #define MODE_ADMONLY   		0x100000
@@ -1513,9 +1654,7 @@ struct liststruct {
 #define MODE_NOINVITE  		0x1000000
 #define MODE_FLOODLIMIT		0x2000000
 #define MODE_MODREG		0x4000000
-#ifdef STRIPBADWORDS
-#define MODE_STRIPBADWORDS	0x8000000
-#endif
+#define MODE_INVEX		0x8000000
 #define MODE_NOCTCP		0x10000000
 #define MODE_AUDITORIUM		0x20000000
 #define MODE_ONLYSECURE		0x40000000
@@ -1525,7 +1664,7 @@ struct liststruct {
 /*
  * mode flags which take another parameter (With PARAmeterS)
  */
-#define	MODE_WPARAS	(MODE_HALFOP|MODE_CHANOP|MODE_VOICE|MODE_CHANOWNER|MODE_CHANPROT|MODE_BAN|MODE_KEY|MODE_LINK|MODE_LIMIT|MODE_EXCEPT)
+#define	MODE_WPARAS (MODE_HALFOP|MODE_CHANOP|MODE_VOICE|MODE_CHANOWNER|MODE_CHANPROT|MODE_BAN|MODE_KEY|MODE_LINK|MODE_LIMIT|MODE_EXCEPT|MODE_INVEX)
 /*
  * Undefined here, these are used in conjunction with the above modes in
  * the source.
@@ -1553,14 +1692,15 @@ struct liststruct {
 
 #define	BadPtr(x) (!(x) || (*(x) == '\0'))
 
-#define	isvalid(c) (((c) >= 'A' && (c) <= '~') || isdigit(c) || (c) == '-')
+/** Is valid character in nick? [not for external usage, use do_check_nickname instead!] */
+#define isvalid(c)   (char_atribs[(u_char)(c)]&ALLOWN)
 
 /* remote fds are set to -256, else its a local fd (a local fd
  * can get -1 or -2 in case it has been closed). -- Syzop
  */
 #define	MyConnect(x)			((x)->fd != -256)
 #define	MyClient(x)			(MyConnect(x) && IsClient(x))
-#define	MyOper(x)			(MyConnect(x) && IsOper(x))
+#define	MyOper(x)			(MyConnect(x) && IsAnOper(x))
 
 #ifdef CLEAN_COMPILE
 #define TStime() (time(NULL) + TSoffset)
@@ -1607,14 +1747,17 @@ struct liststruct {
 
 /* misc variable externs */
 
-extern char *version, *infotext[], *dalinfotext[], *unrealcredits[];
-extern char *generation, *creation;
-extern char *gnulicense[];
+extern MODVAR char *version, *infotext[], *dalinfotext[], *unrealcredits[];
+extern MODVAR char *generation, *creation;
+extern MODVAR char *gnulicense[];
 /* misc defines */
 
 #define	FLUSH_BUFFER	-2
 #define	COMMA		","
 
+#define PARTFMT		":%s PART %s"
+#define PARTFMT2	":%s PART %s :%s"
+
 #ifdef USE_SSL
 #include "ssl.h"
 #endif
@@ -1662,12 +1805,48 @@ typedef struct {
 	unsigned  parameters : 1;
 } aCtab;
 
+#ifdef JOINTHROTTLE
+/** A jointhrottle item, this is a double linked list.
+ * prev_u    Previous entry of user
+ * next_u    Next entry of user
+ * prev_c    Previous entry of channel
+ * next_c    Next entry of channel
+ * chptr     The channel this entry applies to
+ * cptr      The user this entry applies to
+ * firstjoin Timestamp of "first join" (since last timer reset)
+ * numjoin   Number of joins since that period
+ * CLARIFICATION:
+ * Why a double linked list? Well, the following operations need to be performed:
+ * - if user quits, entry must be removed
+ * - if channel is destroyed, entry must be removed
+ * (and of course, more, but these are the most important ones affecting this decision)
+ * While it would be possible to have a linked list only by user (for example),
+ * that would mean that upon channel destroy ALL entries would have to be searched
+ * trough, which might mean for example 800*8=6400 entries in a peak situation
+ * (such as after a server restart and hundreds of clients connecting&joining).
+ * For obvious reasons, that would be a very bad idea :).
+ * So this costs us 2 pointers (8b on ia32) per entry, but in case of channel destroy
+ * it means we only have for example 20 entries to scan trough rather than 2000.
+ * Worth the extra memory :). -- Syzop
+ * Note that in normal situations it won't be that bad since we will try to
+ * regulary free up some entries.
+ */
+struct JFlood {
+	aJFlood *prev_u, *next_u;
+	aJFlood *prev_c, *next_c;
+	aChannel *chptr;
+	aClient *cptr;
+	time_t firstjoin;
+	unsigned short numjoins;
+};
+#endif
+
 void	init_throttling_hash();
 int	hash_throttling(struct IN_ADDR *in);
 struct	ThrottlingBucket	*find_throttling_bucket(struct IN_ADDR *in);
 void	add_throttling_bucket(struct IN_ADDR *in);
 void	del_throttling_bucket(struct ThrottlingBucket *bucket);
-int	throttle_can_connect(struct IN_ADDR *in);
+int	throttle_can_connect(aClient *, struct IN_ADDR *in);
 
 #endif
 
@@ -1675,11 +1854,8 @@ int	throttle_can_connect(struct IN_ADDR *in);
 
 #define MARK_AS_OFFICIAL_MODULE(modinf)	do { if (modinf && modinf->handle) ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);  } while(0)
 
-#ifdef PREFIX_AQ
- #define CHANOPPFX "~&@"
-#else
- #define CHANOPPFX "@"
-#endif
+/* old.. please don't use anymore */
+#define CHANOPPFX "@"
 
 /* used for is_banned type field: */
 #define BANCHK_JOIN		0	/* checking if a ban forbids the person from joining */

include/sys.h

@@ -21,6 +21,25 @@
 
 #ifndef	__sys_include__
 #define __sys_include__
+
+/* alloca stuff */
+#ifdef _WIN32
+# include <malloc.h>
+# define alloca _alloca
+#else /* _WIN32 */
+# ifdef HAVE_ALLOCA
+#  if defined(_AIX) && !defined(__GNUC__)
+    #pragma alloca
+#  endif /* _AIX */
+#  if defined(HAVE_ALLOCA_H)
+#   include <alloca.h>
+#  endif /* HAVE_ALLOCA_H */
+#  if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && !defined(alloca)
+#   define alloca __builtin_alloca
+#  endif /* __GNUC__ */
+# endif /* HAVE_ALLOCA */
+#endif /* !_WIN32 */
+
 #ifdef ISC202
 #include <net/errno.h>
 #else
@@ -113,6 +132,13 @@ extern	char	*rindex(char *, char);
 #define dn_skipname  __dn_skipname
 #endif
 
+/*
+ * Mac OS X Tiger Support (Intel Only)
+ */
+#if defined(macosx) || (defined(__APPLE__) && defined(__MACH__))
+#define OSXTIGER
+#endif
+
 #ifndef _WIN32
 extern VOIDSIG dummy();
 #endif
@@ -128,6 +154,8 @@ typedef unsigned int u_int;
 #define MYOSNAME OSName
 extern char OSName[256];
 #define PATH_MAX MAX_PATH
+#else
+#define MYOSNAME getosname()
 #endif
 #ifdef DEBUGMODE
 // #define ircsprintf sprintf
@@ -142,6 +170,9 @@ typedef unsigned short u_int16_t;
  *  IPv4 or IPv6 structures?
  */
 
+# define MYDUMMY_SIZE 128
+
+
 #ifdef INET6
 
 # define AND16(x) ((x)[0]&(x)[1]&(x)[2]&(x)[3]&(x)[4]&(x)[5]&(x)[6]&(x)[7]&(x)[8]&(x)[9]&(x)[10]&(x)[11]&(x)[12]&(x)[13]&(x)[14]&(x)[15])
@@ -160,7 +191,6 @@ typedef unsigned short u_int16_t;
 //#  define uint32_t __u32
 // # endif
 
-# define MYDUMMY_SIZE 128
 char mydummy[MYDUMMY_SIZE];
 char mydummy2[MYDUMMY_SIZE];
 
@@ -170,7 +200,7 @@ char mydummy2[MYDUMMY_SIZE];
 #  endif
 # endif
 
-# if defined(linux)
+# if defined(linux) && defined(NO_IN6ADDR_ANY)
 static const struct in6_addr in6addr_any = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0
 };
@@ -232,7 +262,7 @@ static const struct in6_addr in6addr_any = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 #define CLOSE_SOCK(fd) closesocket(fd)
 #define IOCTL(x, y, z) ioctlsocket((x), (y), (z))
 #define ERRNO WSAGetLastError()
-#define STRERROR(x) nt_strerror(x)
+#define STRERROR(x) sock_strerror(x)
 #define SET_ERRNO(x) WSASetLastError(x)
 /* Error constant portability */
 #define P_EMFILE        WSAEMFILE

include/types.h

@@ -1,5 +1,5 @@
 /*
- *   Unreal Internet Relay Chat Daemon, src/url.c
+ *   Unreal Internet Relay Chat Daemon, include/types.h
  *   (C) 2003 The UnrealIRCd Team
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -24,4 +24,20 @@ typedef void                    (*vFP)();       /* Void function pointer */
 typedef int                     (*iFP)();       /* Integer function pointer */
 typedef char                    (*cFP)();       /* char * function pointer */
 
+#ifndef MODVAR
+ #if defined(MODULE_COMPILE) && defined(_WIN32)
+  #define MODVAR __declspec(dllimport)
+ #else
+  #define MODVAR
+ #endif
+#endif
+
+#ifndef MODFUNC
+ #ifdef _WIN32
+  #define MODFUNC __declspec(dllexport)
+ #else
+  #define MODFUNC
+ #endif
+#endif
+
 #endif

include/url.h

@@ -1,11 +1,12 @@
 #ifndef URL_H
 #define URL_H
+#include "types.h"
 
-int url_is_valid(char *);
-char *url_getfilename(char *);
-char *download_file(char *, char **);
-void download_file_async(char *, time_t, vFP);
-void url_do_transfers_async(void);
-void url_init(void);
+int MODFUNC url_is_valid(char *);
+char MODFUNC *url_getfilename(char *);
+char MODFUNC *download_file(char *, char **);
+void MODFUNC download_file_async(char *, time_t, vFP);
+void MODFUNC url_do_transfers_async(void);
+void MODFUNC url_init(void);
 
 #endif

include/version.h

@@ -23,15 +23,37 @@
 #endif
      /**/
 #define COMPILEINFO DEBUGMODESET DEBUGSET
-/*
- * Version Unreal3.2
+
+/* Version info follows
+ * Please be sure to update ALL fields when changing the version.
+ * Also don't forget to bump the protocol version every release.
  */
-#define UnrealProtocol 		2303
+
+/** These UNREAL_VERSION_* macros can be used so (3rd party) modules
+ * can easily distinguish versions.
+ */
+
+/** The generation version number (eg: 3 for Unreal3*) */
+#define UNREAL_VERSION_GENERATION   3
+
+/** The major version number (eg: 2 for Unreal3.2*) */
+#define UNREAL_VERSION_MAJOR        2
+
+/** The minor version number (eg: 1 for Unreal3.2.1), negative numbers for unstable/alpha/beta */
+#define UNREAL_VERSION_MINOR        8
+
+/** Year + week of the year (with Monday as first day of the week).
+ * Can be useful if the above 3 versionids are insufficient for you (eg: you want to support CVS).
+ * This is updated automatically on the CVS server every Monday. so don't touch it.
+ */
+#define UNREAL_VERSION_TIME         200914
+
+#define UnrealProtocol 		2309
 #define PATCH1  		"3"
 #define PATCH2  		".2"
-#define PATCH3  		""
+#define PATCH3  		".8"
 #define PATCH4  		""
-#define PATCH5  		""
+#define PATCH5  		".1"
 #define PATCH6  		""
 #define PATCH7  		""
 #define PATCH8  		COMPILEINFO

include/win32/ares/ares.h

@@ -0,0 +1,333 @@
+/* $Id$ */
+
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ * Copyright (C) 2007-2008 by Daniel Stenberg
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef ARES__H
+#define ARES__H
+
+/*
+ * Define WIN32 when build target is Win32 API
+ */
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#define WIN32
+#endif
+
+#include <sys/types.h>
+
+#include <winsock.h>
+#include <windows.h>
+
+/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
+   libc5-based Linux systems. Only include it on system that are known to
+   require it! */
+#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
+    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY)
+#include <sys/select.h>
+#endif
+#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
+#include <sys/bsdskt.h>
+#endif
+
+#if defined(WATT32)
+  #include <netinet/in.h>
+  #include <sys/socket.h>
+  #include <tcp.h>
+#elif defined(WIN32)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <winsock.h>
+#  include <windows.h>
+//#  include <ws2tcpip.h>
+#else
+  #include <sys/socket.h>
+  #include <netinet/in.h>
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define ARES_SUCCESS            0
+
+/* Server error codes (ARES_ENODATA indicates no relevant answer) */
+#define ARES_ENODATA            1
+#define ARES_EFORMERR           2
+#define ARES_ESERVFAIL          3
+#define ARES_ENOTFOUND          4
+#define ARES_ENOTIMP            5
+#define ARES_EREFUSED           6
+
+/* Locally generated error codes */
+#define ARES_EBADQUERY          7
+#define ARES_EBADNAME           8
+#define ARES_EBADFAMILY         9
+#define ARES_EBADRESP           10
+#define ARES_ECONNREFUSED       11
+#define ARES_ETIMEOUT           12
+#define ARES_EOF                13
+#define ARES_EFILE              14
+#define ARES_ENOMEM             15
+#define ARES_EDESTRUCTION       16
+#define ARES_EBADSTR            17
+
+/* ares_getnameinfo error codes */
+#define ARES_EBADFLAGS          18
+
+/* ares_getaddrinfo error codes */
+#define ARES_ENONAME            19
+#define ARES_EBADHINTS          20
+
+/* Flag values */
+#define ARES_FLAG_USEVC         (1 << 0)
+#define ARES_FLAG_PRIMARY       (1 << 1)
+#define ARES_FLAG_IGNTC         (1 << 2)
+#define ARES_FLAG_NORECURSE     (1 << 3)
+#define ARES_FLAG_STAYOPEN      (1 << 4)
+#define ARES_FLAG_NOSEARCH      (1 << 5)
+#define ARES_FLAG_NOALIASES     (1 << 6)
+#define ARES_FLAG_NOCHECKRESP   (1 << 7)
+
+/* Option mask values */
+#define ARES_OPT_FLAGS          (1 << 0)
+#define ARES_OPT_TIMEOUT        (1 << 1)
+#define ARES_OPT_TRIES          (1 << 2)
+#define ARES_OPT_NDOTS          (1 << 3)
+#define ARES_OPT_UDP_PORT       (1 << 4)
+#define ARES_OPT_TCP_PORT       (1 << 5)
+#define ARES_OPT_SERVERS        (1 << 6)
+#define ARES_OPT_DOMAINS        (1 << 7)
+#define ARES_OPT_LOOKUPS        (1 << 8)
+#define ARES_OPT_SOCK_STATE_CB  (1 << 9)
+#define ARES_OPT_SORTLIST       (1 << 10)
+#define ARES_OPT_SOCK_SNDBUF    (1 << 11)
+#define ARES_OPT_SOCK_RCVBUF    (1 << 12)
+#define ARES_OPT_TIMEOUTMS      (1 << 13)
+#define ARES_OPT_ROTATE         (1 << 14)
+
+/* Nameinfo flag values */
+#define ARES_NI_NOFQDN                  (1 << 0)
+#define ARES_NI_NUMERICHOST             (1 << 1)
+#define ARES_NI_NAMEREQD                (1 << 2)
+#define ARES_NI_NUMERICSERV             (1 << 3)
+#define ARES_NI_DGRAM                   (1 << 4)
+#define ARES_NI_TCP                     0
+#define ARES_NI_UDP                     ARES_NI_DGRAM
+#define ARES_NI_SCTP                    (1 << 5)
+#define ARES_NI_DCCP                    (1 << 6)
+#define ARES_NI_NUMERICSCOPE            (1 << 7)
+#define ARES_NI_LOOKUPHOST              (1 << 8)
+#define ARES_NI_LOOKUPSERVICE           (1 << 9)
+/* Reserved for future use */
+#define ARES_NI_IDN                     (1 << 10)
+#define ARES_NI_IDN_ALLOW_UNASSIGNED    (1 << 11)
+#define ARES_NI_IDN_USE_STD3_ASCII_RULES (1 << 12)
+
+/* Addrinfo flag values */
+#define ARES_AI_CANONNAME               (1 << 0)
+#define ARES_AI_NUMERICHOST             (1 << 1)
+#define ARES_AI_PASSIVE                 (1 << 2)
+#define ARES_AI_NUMERICSERV             (1 << 3)
+#define ARES_AI_V4MAPPED                (1 << 4)
+#define ARES_AI_ALL                     (1 << 5)
+#define ARES_AI_ADDRCONFIG              (1 << 6)
+/* Reserved for future use */
+#define ARES_AI_IDN                     (1 << 10)
+#define ARES_AI_IDN_ALLOW_UNASSIGNED    (1 << 11)
+#define ARES_AI_IDN_USE_STD3_ASCII_RULES (1 << 12)
+#define ARES_AI_CANONIDN                (1 << 13)
+
+#define ARES_AI_MASK (ARES_AI_CANONNAME|ARES_AI_NUMERICHOST|ARES_AI_PASSIVE| \
+                      ARES_AI_NUMERICSERV|ARES_AI_V4MAPPED|ARES_AI_ALL| \
+                      ARES_AI_ADDRCONFIG)
+#define ARES_GETSOCK_MAXNUM 16 /* ares_getsock() can return info about this
+                                  many sockets */
+#define ARES_GETSOCK_READABLE(bits,num) (bits & (1<< (num)))
+#define ARES_GETSOCK_WRITABLE(bits,num) (bits & (1 << ((num) + \
+                                         ARES_GETSOCK_MAXNUM)))
+
+
+/*
+ * Typedef our socket type
+ */
+
+#ifndef ares_socket_typedef
+#ifdef WIN32
+typedef SOCKET ares_socket_t;
+#define ARES_SOCKET_BAD INVALID_SOCKET
+#else
+typedef int ares_socket_t;
+#define ARES_SOCKET_BAD -1
+#endif
+#define ares_socket_typedef
+#endif /* ares_socket_typedef */
+
+typedef void (*ares_sock_state_cb)(void *data,
+                                   ares_socket_t socket_fd,
+                                   int readable,
+                                   int writable);
+
+struct apattern;
+
+/* NOTE about the ares_options struct to users and developers.
+
+   This struct will remain looking like this. It will not be extended nor
+   shrunk in future releases, but all new options will be set by ares_set_*()
+   options instead of with the ares_init_options() function.
+
+   Eventually (in a galaxy far far away), all options will be settable by
+   ares_set_*() options and the ares_init_options() function will become
+   deprecated.
+
+   When new options are added to c-ares, they are not added to this
+   struct. And they are not "saved" with the ares_save_options() function but
+   instead we encourage the use of the ares_dup() function. Needless to say,
+   if you add config options to c-ares you need to make sure ares_dup()
+   duplicates this new option.
+
+ */
+struct ares_options {
+  int flags;
+  int timeout; /* in seconds or milliseconds, depending on options */
+  int tries;
+  int ndots;
+  unsigned short udp_port;
+  unsigned short tcp_port;
+  int socket_send_buffer_size;
+  int socket_receive_buffer_size;
+  struct in_addr *servers;
+  int nservers;
+  char **domains;
+  int ndomains;
+  char *lookups;
+  ares_sock_state_cb sock_state_cb;
+  void *sock_state_cb_data;
+  struct apattern *sortlist;
+  int nsort;
+};
+
+struct ares_config_info {
+	int timeout;
+	int tries;
+	int numservers;
+	char **servers;
+};
+
+struct hostent;
+struct timeval;
+struct sockaddr;
+struct ares_channeldata;
+typedef struct ares_channeldata *ares_channel;
+typedef void (*ares_callback)(void *arg, int status, int timeouts,
+                              unsigned char *abuf, int alen);
+typedef void (*ares_host_callback)(void *arg, int status, int timeouts,
+                                   struct hostent *hostent);
+typedef void (*ares_nameinfo_callback)(void *arg, int status, int timeouts,
+                                       char *node, char *service);
+typedef int  (*ares_sock_create_callback)(ares_socket_t socket_fd,
+                                          int type, void *data);
+
+int ares_init(ares_channel *channelptr);
+int ares_init_options(ares_channel *channelptr, struct ares_options *options,
+                      int optmask);
+int ares_save_options(ares_channel channel, struct ares_options *options,
+                      int *optmask);
+void ares_destroy_options(struct ares_options *options);
+int ares_dup(ares_channel *dest, ares_channel src);
+void ares_destroy(ares_channel channel);
+void ares_cancel(ares_channel channel);
+void ares_set_socket_callback(ares_channel channel,
+                              ares_sock_create_callback callback,
+                              void *user_data);
+void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
+               ares_callback callback, void *arg);
+void ares_query(ares_channel channel, const char *name, int dnsclass,
+                int type, ares_callback callback, void *arg);
+void ares_search(ares_channel channel, const char *name, int dnsclass,
+                 int type, ares_callback callback, void *arg);
+void ares_gethostbyname(ares_channel channel, const char *name, int family,
+                        ares_host_callback callback, void *arg);
+int ares_gethostbyname_file(ares_channel channel, const char *name,
+                            int family, struct hostent **host);
+void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
+                        int family, ares_host_callback callback, void *arg);
+void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa,
+                      socklen_t salen, int flags,
+                      ares_nameinfo_callback callback,
+                      void *arg);
+int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
+int ares_getsock(ares_channel channel, int *socks, int numsocks);
+struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
+                             struct timeval *tv);
+void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
+void ares_process_fd(ares_channel channel, ares_socket_t read_fd,
+                     ares_socket_t write_fd);
+
+int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
+                 int rd, unsigned char **buf, int *buflen);
+int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
+                     int alen, char **s, long *enclen);
+int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
+                     int alen, unsigned char **s, long *enclen);
+
+#if !defined(HAVE_STRUCT_IN6_ADDR) && !defined(s6_addr)
+struct in6_addr {
+  union {
+    unsigned char _S6_u8[16];
+  } _S6_un;
+};
+#define s6_addr _S6_un._S6_u8
+#endif
+
+struct addrttl {
+  struct in_addr ipaddr;
+  int            ttl;
+};
+struct addr6ttl {
+  struct in6_addr ip6addr;
+  int             ttl;
+};
+
+/*
+** Parse the buffer, starting at *abuf and of length alen bytes, previously
+** obtained from an ares_search call.  Put the results in *host, if nonnull.
+** Also, if addrttls is nonnull, put up to *naddrttls IPv4 addresses along with
+** their TTLs in that array, and set *naddrttls to the number of addresses
+** so written.
+*/
+int ares_parse_a_reply(const unsigned char *abuf, int alen,
+                       struct hostent **host,
+                       struct addrttl *addrttls, int *naddrttls);
+int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
+                       struct hostent **host,
+                       struct addr6ttl *addrttls, int *naddrttls);
+int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
+                         int addrlen, int family, struct hostent **host);
+int ares_parse_ns_reply(const unsigned char *abuf, int alen,
+                       struct hostent **host);
+void ares_free_string(void *str);
+void ares_free_hostent(struct hostent *host);
+const char *ares_strerror(int code);
+
+int ares_get_config(struct ares_config_info *d, ares_channel c);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* ARES__H */

include/win32/ares/ares_version.h

@@ -0,0 +1,25 @@
+/* $Id$ */
+
+#ifndef ARES__VERSION_H
+#define ARES__VERSION_H
+
+#define ARES_VERSION_MAJOR 1
+#define ARES_VERSION_MINOR 6
+#define ARES_VERSION_PATCH 0
+#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
+                       (ARES_VERSION_MINOR<<8)|\
+                       (ARES_VERSION_PATCH))
+#define ARES_VERSION_STR "1.6.0"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+const char *ares_version(int *version);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
+

include/win32/ares/config-win32.h

@@ -0,0 +1,284 @@
+#ifndef __ARES_CONFIG_WIN32_H
+#define __ARES_CONFIG_WIN32_H
+
+/* $Id$ */
+
+/* Copyright (C) 2004 - 2008 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+/* ================================================================ */
+/*    ares/config-win32.h - Hand crafted config file for Windows    */
+/* ================================================================ */
+
+/* ---------------------------------------------------------------- */
+/*                          HEADER FILES                            */
+/* ---------------------------------------------------------------- */
+
+/* Define if you have the <getopt.h> header file.  */
+#if defined(__MINGW32__)
+#define HAVE_GETOPT_H 1
+#endif
+
+/* Define if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define if you have the <sys/time.h> header file */
+/* #define HAVE_SYS_TIME_H 1 */
+
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H 1
+
+/* Define if you have the <process.h> header file.  */
+#define HAVE_PROCESS_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \
+    defined(__POCC__)
+#define HAVE_UNISTD_H 1
+#endif
+
+/* Define if you have the <windows.h> header file.  */
+#define HAVE_WINDOWS_H 1
+
+/* Define if you have the <winsock.h> header file.  */
+#define HAVE_WINSOCK_H 1
+
+/* Define if you have the <winsock2.h> header file.  */
+//#define HAVE_WINSOCK2_H 1
+
+/* Define if you have the <ws2tcpip.h> header file.  */
+//#define HAVE_WS2TCPIP_H 1
+
+/* ---------------------------------------------------------------- */
+/*                        OTHER HEADER INFO                         */
+/* ---------------------------------------------------------------- */
+
+/* Define if sig_atomic_t is an available typedef. */
+#define HAVE_SIG_ATOMIC_T 1
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+/* #define TIME_WITH_SYS_TIME 1 */
+
+/* ---------------------------------------------------------------- */
+/*                             FUNCTIONS                            */
+/* ---------------------------------------------------------------- */
+
+/* Define if you have the ioctlsocket function. */
+#define HAVE_IOCTLSOCKET 1
+
+/* Define if you have a working ioctlsocket FIONBIO function. */
+#define HAVE_IOCTLSOCKET_FIONBIO 1
+
+/* Define if you have the strcasecmp function. */
+/* #define HAVE_STRCASECMP 1 */
+
+/* Define if you have the strdup function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the stricmp function. */
+#define HAVE_STRICMP 1
+
+/* Define if you have the strncasecmp function. */
+/* #define HAVE_STRNCASECMP 1 */
+
+/* Define if you have the strnicmp function. */
+#define HAVE_STRNICMP 1
+
+/* Define if you have the gethostname function.  */
+#define HAVE_GETHOSTNAME 1
+
+/* Define if you have the recv function. */
+#define HAVE_RECV 1
+
+/* Define to the type of arg 1 for recv. */
+#define RECV_TYPE_ARG1 SOCKET
+
+/* Define to the type of arg 2 for recv. */
+#define RECV_TYPE_ARG2 char *
+
+/* Define to the type of arg 3 for recv. */
+#define RECV_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for recv. */
+#define RECV_TYPE_ARG4 int
+
+/* Define to the function return type for recv. */
+#define RECV_TYPE_RETV int
+
+/* Define if you have the recvfrom function. */
+#define HAVE_RECVFROM 1
+
+/* Define to the type of arg 1 for recvfrom. */
+#define RECVFROM_TYPE_ARG1 SOCKET
+
+/* Define to the type pointed by arg 2 for recvfrom. */
+#define RECVFROM_TYPE_ARG2 char
+
+/* Define to the type of arg 3 for recvfrom. */
+#define RECVFROM_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for recvfrom. */
+#define RECVFROM_TYPE_ARG4 int
+
+/* Define to the type pointed by arg 5 for recvfrom. */
+#define RECVFROM_TYPE_ARG5 struct sockaddr
+
+/* Define to the type pointed by arg 6 for recvfrom. */
+#define RECVFROM_TYPE_ARG6 int
+
+/* Define to the function return type for recvfrom. */
+#define RECVFROM_TYPE_RETV int
+
+/* Define if you have the send function. */
+#define HAVE_SEND 1
+
+/* Define to the type of arg 1 for send. */
+#define SEND_TYPE_ARG1 SOCKET
+
+/* Define to the type qualifier of arg 2 for send. */
+#define SEND_QUAL_ARG2 const
+
+/* Define to the type of arg 2 for send. */
+#define SEND_TYPE_ARG2 char *
+
+/* Define to the type of arg 3 for send. */
+#define SEND_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for send. */
+#define SEND_TYPE_ARG4 int
+
+/* Define to the function return type for send. */
+#define SEND_TYPE_RETV int
+
+/* Specifics for the Watt-32 tcp/ip stack */
+#ifdef WATT32
+  #define SOCKET              int
+  #define NS_INADDRSZ         4
+  #define HAVE_ARPA_NAMESER_H 1
+  #define HAVE_ARPA_INET_H    1
+  #define HAVE_NETDB_H        1
+  #define HAVE_NETINET_IN_H   1
+  #define HAVE_SYS_SOCKET_H   1
+  #define HAVE_NETINET_TCP_H  1
+  #define HAVE_AF_INET6       1
+  #define HAVE_PF_INET6       1
+  #define HAVE_STRUCT_IN6_ADDR     1
+  #define HAVE_STRUCT_SOCKADDR_IN6 1
+  #undef HAVE_WINSOCK_H
+  #undef HAVE_WINSOCK2_H
+  #undef HAVE_WS2TCPIP_H
+#endif
+
+/* ---------------------------------------------------------------- */
+/*                       TYPEDEF REPLACEMENTS                       */
+/* ---------------------------------------------------------------- */
+
+/* Define this if in_addr_t is not an available 'typedefed' type */
+#define in_addr_t unsigned long
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define ssize_t if it is not an available 'typedefed' type */
+#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
+#elif defined(_WIN64)
+#define ssize_t __int64
+#else
+#define ssize_t int
+#endif
+
+/* ---------------------------------------------------------------- */
+/*                          STRUCT RELATED                          */
+/* ---------------------------------------------------------------- */
+
+/* Define this if you have struct addrinfo */
+#define HAVE_STRUCT_ADDRINFO 1
+
+/* Define this if you have struct sockaddr_storage */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define this if you have struct timeval */
+#define HAVE_STRUCT_TIMEVAL 1
+
+/* ---------------------------------------------------------------- */
+/*                        COMPILER SPECIFIC                         */
+/* ---------------------------------------------------------------- */
+
+/* Define to avoid VS2005 complaining about portable C functions */
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#define _CRT_NONSTDC_NO_DEPRECATE 1
+#endif
+
+/* VS2008 does not support Windows build targets prior to WinXP, */
+/* so, if no build target has been defined we will target WinXP. */
+#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0501
+#  endif
+#  ifndef WINVER
+#    define WINVER 0x0501
+#  endif
+#  if (_WIN32_WINNT < 0x0501) || (WINVER < 0x0501)
+#    error VS2008 does not support Windows build targets prior to WinXP
+#  endif
+#endif
+
+/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */
+/* convoluted, compiler dependant and in some cases even build target dependat. */
+#if defined(HAVE_WS2TCPIP_H)
+#  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  endif
+#endif
+
+/* ---------------------------------------------------------------- */
+/*                         IPV6 COMPATIBILITY                       */
+/* ---------------------------------------------------------------- */
+
+/* Define this if you have address family AF_INET6 */
+#ifdef HAVE_WINSOCK2_H
+#define HAVE_AF_INET6 1
+#endif
+
+/* Define this if you have protocol family PF_INET6 */
+#ifdef HAVE_WINSOCK2_H
+#define HAVE_PF_INET6 1
+#endif
+
+/* Define this if you have struct in6_addr */
+#ifdef HAVE_WS2TCPIP_H
+#define HAVE_STRUCT_IN6_ADDR 1
+#endif
+
+/* Define this if you have struct sockaddr_in6 */
+#ifdef HAVE_WS2TCPIP_H
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+#endif
+
+/* Define this if you have sockaddr_in6 with scopeid */
+#ifdef HAVE_WS2TCPIP_H
+#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+#endif
+
+
+#endif  /* __ARES_CONFIG_WIN32_H */

include/win32/ares/setup.h

@@ -0,0 +1,155 @@
+#ifndef __ARES_SETUP_H
+#define __ARES_SETUP_H
+
+/* $Id$ */
+
+/* Copyright (C) 2004 - 2008 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+/*
+ * Define WIN32 when build target is Win32 API
+ */
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#define WIN32
+#endif
+
+/*
+ * Include configuration script results or hand-crafted
+ * configuration file for platforms which lack config tool.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+
+#ifdef WIN32
+#include "config-win32.h"
+#endif
+
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * Tru64 needs _REENTRANT set for a few function prototypes and
+ * things to appear in the system header files. Unixware needs it
+ * to build proper reentrant code. Others may also need it.
+ */
+
+#ifdef NEED_REENTRANT
+#  ifndef _REENTRANT
+#    define _REENTRANT
+#  endif
+#endif
+
+/*
+ * Include header files for windows builds before redefining anything.
+ * Use this preproessor block only to include or exclude windows.h,
+ * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
+ * to any other further and independant block.  Under Cygwin things work
+ * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
+ * never be included when __CYGWIN__ is defined.  configure script takes
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
+ */
+
+#ifdef HAVE_WINDOWS_H
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  ifdef HAVE_WINSOCK2_H
+#    include <winsock2.h>
+#    ifdef HAVE_WS2TCPIP_H
+#       include <ws2tcpip.h>
+#    endif
+#  else
+#    ifdef HAVE_WINSOCK_H
+#      include <winsock.h>
+#    endif
+#  endif
+#endif
+
+/*
+ * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
+ * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
+ * undefine USE_WINSOCK.
+ */
+
+#undef USE_WINSOCK
+
+#ifdef HAVE_WINSOCK2_H
+#  define USE_WINSOCK 2
+#else
+#  ifdef HAVE_WINSOCK_H
+#    define USE_WINSOCK 1
+#  endif
+#endif
+
+/*
+ * Work-arounds for systems without configure support
+ */
+
+#ifndef HAVE_CONFIG_H
+
+#if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \
+    defined(__POCC__)
+#else
+#define ssize_t int
+#endif
+
+#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
+#define HAVE_SYS_TIME_H
+#endif
+
+#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
+#define HAVE_UNISTD_H 1
+#endif
+
+#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
+#define HAVE_SYS_UIO_H
+#endif
+
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * Recent autoconf versions define these symbols in config.h. We don't
+ * want them (since they collide with the libcurl ones when we build
+ *  --enable-debug) so we undef them again here.
+ */
+
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef VERSION
+#undef PACKAGE
+
+/* IPv6 compatibility */
+#if !defined(HAVE_AF_INET6)
+#if defined(HAVE_PF_INET6)
+#define AF_INET6 PF_INET6
+#else
+#define AF_INET6 AF_MAX+1
+#endif
+#endif
+
+/*
+ * Include macros and defines that should only be processed once.
+ */
+
+#ifndef __SETUP_ONCE_H
+#include "setup_once.h"
+#endif
+
+#endif /* __ARES_SETUP_H */

include/win32/ares/setup_once.h

@@ -0,0 +1,523 @@
+#ifndef __SETUP_ONCE_H
+#define __SETUP_ONCE_H
+
+/* $Id$ */
+
+/* Copyright (C) 2004 - 2008 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+
+/********************************************************************
+ *                              NOTICE                              *
+ *                             ========                             *
+ *                                                                  *
+ *  Content of header files lib/setup_once.h and ares/setup_once.h  *
+ *  must be kept in sync. Modify the other one if you change this.  *
+ *                                                                  *
+ ********************************************************************/
+
+
+/*
+ * Inclusion of common header files.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#else
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#endif
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
+
+
+/*
+ * Definition of timeval struct for platforms that don't have it.
+ */
+
+#ifndef HAVE_STRUCT_TIMEVAL
+struct timeval {
+ long tv_sec;
+ long tv_usec;
+};
+#endif
+
+
+/*
+ * If we have the MSG_NOSIGNAL define, make sure we use
+ * it as the fourth argument of function send()
+ */
+
+#ifdef HAVE_MSG_NOSIGNAL
+#define SEND_4TH_ARG MSG_NOSIGNAL
+#else
+#define SEND_4TH_ARG 0
+#endif
+
+
+/*
+ * Windows build targets have socklen_t definition in
+ * ws2tcpip.h but some versions of ws2tcpip.h do not
+ * have the definition. It seems that when the socklen_t
+ * definition is missing from ws2tcpip.h the definition
+ * for INET_ADDRSTRLEN is also missing, and that when one
+ * definition is present the other one also is available.
+ */
+
+#if defined(WIN32) && !defined(HAVE_CONFIG_H)
+#  if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \
+      (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )
+#    define socklen_t int
+#  endif
+#endif
+
+
+#if defined(__minix)
+/* Minix doesn't support recv on TCP sockets */
+#define sread(x,y,z) (ssize_t)read((RECV_TYPE_ARG1)(x), \
+                                   (RECV_TYPE_ARG2)(y), \
+                                   (RECV_TYPE_ARG3)(z))
+
+#elif defined(HAVE_RECV)
+/*
+ * The definitions for the return type and arguments types
+ * of functions recv() and send() belong and come from the
+ * configuration file. Do not define them in any other place.
+ *
+ * HAVE_RECV is defined if you have a function named recv()
+ * which is used to read incoming data from sockets. If your
+ * function has another name then don't define HAVE_RECV.
+ *
+ * If HAVE_RECV is defined then RECV_TYPE_ARG1, RECV_TYPE_ARG2,
+ * RECV_TYPE_ARG3, RECV_TYPE_ARG4 and RECV_TYPE_RETV must also
+ * be defined.
+ *
+ * HAVE_SEND is defined if you have a function named send()
+ * which is used to write outgoing data on a connected socket.
+ * If yours has another name then don't define HAVE_SEND.
+ *
+ * If HAVE_SEND is defined then SEND_TYPE_ARG1, SEND_QUAL_ARG2,
+ * SEND_TYPE_ARG2, SEND_TYPE_ARG3, SEND_TYPE_ARG4 and
+ * SEND_TYPE_RETV must also be defined.
+ */
+
+#if !defined(RECV_TYPE_ARG1) || \
+    !defined(RECV_TYPE_ARG2) || \
+    !defined(RECV_TYPE_ARG3) || \
+    !defined(RECV_TYPE_ARG4) || \
+    !defined(RECV_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_recv
+  /* */
+#else
+#define sread(x,y,z) (ssize_t)recv((RECV_TYPE_ARG1)(x), \
+                                   (RECV_TYPE_ARG2)(y), \
+                                   (RECV_TYPE_ARG3)(z), \
+                                   (RECV_TYPE_ARG4)(0))
+#endif
+#else /* HAVE_RECV */
+#ifndef sread
+  /* */
+  Error Missing_definition_of_macro_sread
+  /* */
+#endif
+#endif /* HAVE_RECV */
+
+
+#if defined(__minix)
+/* Minix doesn't support send on TCP sockets */
+#define swrite(x,y,z) (ssize_t)write((SEND_TYPE_ARG1)(x), \
+                                    (SEND_TYPE_ARG2)(y), \
+                                    (SEND_TYPE_ARG3)(z))
+
+#elif defined(HAVE_SEND)
+#if !defined(SEND_TYPE_ARG1) || \
+    !defined(SEND_QUAL_ARG2) || \
+    !defined(SEND_TYPE_ARG2) || \
+    !defined(SEND_TYPE_ARG3) || \
+    !defined(SEND_TYPE_ARG4) || \
+    !defined(SEND_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_send
+  /* */
+#else
+#define swrite(x,y,z) (ssize_t)send((SEND_TYPE_ARG1)(x), \
+                                    (SEND_TYPE_ARG2)(y), \
+                                    (SEND_TYPE_ARG3)(z), \
+                                    (SEND_TYPE_ARG4)(SEND_4TH_ARG))
+#endif
+#else /* HAVE_SEND */
+#ifndef swrite
+  /* */
+  Error Missing_definition_of_macro_swrite
+  /* */
+#endif
+#endif /* HAVE_SEND */
+
+
+#if 0
+#if defined(HAVE_RECVFROM)
+/*
+ * Currently recvfrom is only used on udp sockets.
+ */
+#if !defined(RECVFROM_TYPE_ARG1) || \
+    !defined(RECVFROM_TYPE_ARG2) || \
+    !defined(RECVFROM_TYPE_ARG3) || \
+    !defined(RECVFROM_TYPE_ARG4) || \
+    !defined(RECVFROM_TYPE_ARG5) || \
+    !defined(RECVFROM_TYPE_ARG6) || \
+    !defined(RECVFROM_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_recvfrom
+  /* */
+#else
+#define sreadfrom(s,b,bl,f,fl) (ssize_t)recvfrom((RECVFROM_TYPE_ARG1)  (s),  \
+                                                 (RECVFROM_TYPE_ARG2 *)(b),  \
+                                                 (RECVFROM_TYPE_ARG3)  (bl), \
+                                                 (RECVFROM_TYPE_ARG4)  (0),  \
+                                                 (RECVFROM_TYPE_ARG5 *)(f),  \
+                                                 (RECVFROM_TYPE_ARG6 *)(fl))
+#endif
+#else /* HAVE_RECVFROM */
+#ifndef sreadfrom
+  /* */
+  Error Missing_definition_of_macro_sreadfrom
+  /* */
+#endif
+#endif /* HAVE_RECVFROM */
+
+
+#ifdef RECVFROM_TYPE_ARG6_IS_VOID
+#  define RECVFROM_ARG6_T int
+#else
+#  define RECVFROM_ARG6_T RECVFROM_TYPE_ARG6
+#endif
+#endif /* if 0 */
+
+
+/*
+ * Uppercase macro versions of ANSI/ISO is*() functions/macros which
+ * avoid negative number inputs with argument byte codes > 127.
+ */
+
+#define ISSPACE(x)  (isspace((int)  ((unsigned char)x)))
+#define ISDIGIT(x)  (isdigit((int)  ((unsigned char)x)))
+#define ISALNUM(x)  (isalnum((int)  ((unsigned char)x)))
+#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
+#define ISGRAPH(x)  (isgraph((int)  ((unsigned char)x)))
+#define ISALPHA(x)  (isalpha((int)  ((unsigned char)x)))
+#define ISPRINT(x)  (isprint((int)  ((unsigned char)x)))
+#define ISUPPER(x)  (isupper((int)  ((unsigned char)x)))
+#define ISLOWER(x)  (islower((int)  ((unsigned char)x)))
+
+#define ISBLANK(x)  (int)((((unsigned char)x) == ' ') || \
+                          (((unsigned char)x) == '\t'))
+
+
+/*
+ * Typedef to 'unsigned char' if bool is not an available 'typedefed' type.
+ */
+
+#ifndef HAVE_BOOL_T
+typedef unsigned char bool;
+#define HAVE_BOOL_T
+#endif
+
+
+/*
+ * Default definition of uppercase TRUE and FALSE.
+ */
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+
+/*
+ * Typedef to 'int' if sig_atomic_t is not an available 'typedefed' type.
+ */
+
+#ifndef HAVE_SIG_ATOMIC_T
+typedef int sig_atomic_t;
+#define HAVE_SIG_ATOMIC_T
+#endif
+
+
+/*
+ * Convenience SIG_ATOMIC_T definition
+ */
+
+#ifdef HAVE_SIG_ATOMIC_T_VOLATILE
+#define SIG_ATOMIC_T static sig_atomic_t
+#else
+#define SIG_ATOMIC_T static volatile sig_atomic_t
+#endif
+
+
+/*
+ * Default return type for signal handlers.
+ */
+
+#ifndef RETSIGTYPE
+#define RETSIGTYPE void
+#endif
+
+
+/*
+ * Macro used to include code only in debug builds.
+ */
+
+#ifdef CURLDEBUG
+#define DEBUGF(x) x
+#else
+#define DEBUGF(x) do { } while (0)
+#endif
+
+
+/*
+ * Macro used to include assertion code only in debug builds.
+ */
+
+#if defined(CURLDEBUG) && defined(HAVE_ASSERT_H)
+#define DEBUGASSERT(x) assert(x)
+#else
+#define DEBUGASSERT(x) do { } while (0)
+#endif
+
+
+/*
+ * Macro SOCKERRNO / SET_SOCKERRNO() returns / sets the *socket-related* errno
+ * (or equivalent) on this platform to hide platform details to code using it.
+ */
+
+#ifdef USE_WINSOCK
+#define SOCKERRNO         ((int)WSAGetLastError())
+#define SET_SOCKERRNO(x)  (WSASetLastError((int)(x)))
+#else
+#define SOCKERRNO         (errno)
+#define SET_SOCKERRNO(x)  (errno = (x))
+#endif
+
+
+/*
+ * Macro ERRNO / SET_ERRNO() returns / sets the NOT *socket-related* errno
+ * (or equivalent) on this platform to hide platform details to code using it.
+ */
+
+/*UNREALUNREALUNREALEDIT#ifdef WIN32
+#define ERRNO         ((int)GetLastError())
+#define SET_ERRNO(x)  (SetLastError((DWORD)(x)))
+#else
+#define ERRNO         (errno)
+#define SET_ERRNO(x)  (errno = (x))
+#endif*/
+
+
+/*
+ * Portable error number symbolic names defined to Winsock error codes.
+ */
+
+#ifdef USE_WINSOCK
+#undef  EBADF            /* override definition in errno.h */
+#define EBADF            WSAEBADF
+#undef  EINTR            /* override definition in errno.h */
+#define EINTR            WSAEINTR
+#undef  EINVAL           /* override definition in errno.h */
+#define EINVAL           WSAEINVAL
+#define EWOULDBLOCK      WSAEWOULDBLOCK
+#define EINPROGRESS      WSAEINPROGRESS
+#define EALREADY         WSAEALREADY
+#define ENOTSOCK         WSAENOTSOCK
+#define EDESTADDRREQ     WSAEDESTADDRREQ
+#define EMSGSIZE         WSAEMSGSIZE
+#define EPROTOTYPE       WSAEPROTOTYPE
+#define ENOPROTOOPT      WSAENOPROTOOPT
+#define EPROTONOSUPPORT  WSAEPROTONOSUPPORT
+#define ESOCKTNOSUPPORT  WSAESOCKTNOSUPPORT
+#define EOPNOTSUPP       WSAEOPNOTSUPP
+#define EPFNOSUPPORT     WSAEPFNOSUPPORT
+#define EAFNOSUPPORT     WSAEAFNOSUPPORT
+#define EADDRINUSE       WSAEADDRINUSE
+#define EADDRNOTAVAIL    WSAEADDRNOTAVAIL
+#define ENETDOWN         WSAENETDOWN
+#define ENETUNREACH      WSAENETUNREACH
+#define ENETRESET        WSAENETRESET
+#define ECONNABORTED     WSAECONNABORTED
+#define ECONNRESET       WSAECONNRESET
+#define ENOBUFS          WSAENOBUFS
+#define EISCONN          WSAEISCONN
+#define ENOTCONN         WSAENOTCONN
+#define ESHUTDOWN        WSAESHUTDOWN
+#define ETOOMANYREFS     WSAETOOMANYREFS
+#define ETIMEDOUT        WSAETIMEDOUT
+#define ECONNREFUSED     WSAECONNREFUSED
+#define ELOOP            WSAELOOP
+#ifndef ENAMETOOLONG     /* possible previous definition in errno.h */
+#define ENAMETOOLONG     WSAENAMETOOLONG
+#endif
+#define EHOSTDOWN        WSAEHOSTDOWN
+#define EHOSTUNREACH     WSAEHOSTUNREACH
+#ifndef ENOTEMPTY        /* possible previous definition in errno.h */
+#define ENOTEMPTY        WSAENOTEMPTY
+#endif
+#define EPROCLIM         WSAEPROCLIM
+#define EUSERS           WSAEUSERS
+#define EDQUOT           WSAEDQUOT
+#define ESTALE           WSAESTALE
+#define EREMOTE          WSAEREMOTE
+#endif
+
+
+/*
+ *  Actually use __32_getpwuid() on 64-bit VMS builds for getpwuid()
+ */
+
+#if defined(VMS) && \
+    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64)
+#define getpwuid __32_getpwuid
+#endif
+
+
+/*
+ * Macro argv_item_t hides platform details to code using it.
+ */
+
+#ifdef VMS
+#define argv_item_t  __char_ptr32
+#else
+#define argv_item_t  char *
+#endif
+
+
+/*
+ * We use this ZERO_NULL to avoid picky compiler warnings,
+ * when assigning a NULL pointer to a function pointer var.
+ */
+
+#define ZERO_NULL 0
+
+
+#if defined (__LP64__) && defined(__hpux) && !defined(_XOPEN_SOURCE_EXTENDED)
+#include <sys/socket.h>
+/* HP-UX has this oddity where it features a few functions that don't work
+   with socklen_t so we need to convert to ints
+
+   This is due to socklen_t being a 64bit int under 64bit ABI, but the
+   pre-xopen (default) interfaces require an int, which is 32bits.
+
+   Therefore, Anytime socklen_t is passed by pointer, the libc function
+   truncates the 64bit socklen_t value by treating it as a 32bit value.
+
+
+   Note that some socket calls are allowed to have a NULL pointer for
+   the socklen arg.
+*/
+
+inline static int Curl_hp_getsockname(int s, struct sockaddr *name,
+                                      socklen_t *namelen)
+{
+  int rc;
+  if(namelen) {
+     int len = *namelen;
+     rc = getsockname(s, name, &len);
+     *namelen = len;
+   }
+  else
+     rc = getsockname(s, name, 0);
+  return rc;
+}
+
+inline static int Curl_hp_getsockopt(int  s, int level, int optname,
+                                     void *optval, socklen_t *optlen)
+{
+  int rc;
+  if(optlen) {
+    int len = *optlen;
+    rc = getsockopt(s, level, optname, optval, &len);
+    *optlen = len;
+  }
+  else
+    rc = getsockopt(s, level, optname, optval, 0);
+  return rc;
+}
+
+inline static int Curl_hp_accept(int sockfd, struct sockaddr *addr,
+                                 socklen_t *addrlen)
+{
+  int rc;
+  if(addrlen) {
+     int len = *addrlen;
+     rc = accept(sockfd, addr, &len);
+     *addrlen = len;
+  }
+  else
+     rc = accept(sockfd, addr, 0);
+  return rc;
+}
+
+
+inline static ssize_t Curl_hp_recvfrom(int s, void *buf, size_t len, int flags,
+                                       struct sockaddr *from,
+                                       socklen_t *fromlen)
+{
+  ssize_t rc;
+  if(fromlen) {
+    int fromlen32 = *fromlen;
+    rc = recvfrom(s, buf, len, flags, from, &fromlen32);
+    *fromlen = fromlen32;
+  }
+  else {
+    rc = recvfrom(s, buf, len, flags, from, 0);
+  }
+  return rc;
+}
+
+#define getsockname(a,b,c) Curl_hp_getsockname((a),(b),(c))
+#define getsockopt(a,b,c,d,e) Curl_hp_getsockopt((a),(b),(c),(d),(e))
+#define accept(a,b,c) Curl_hp_accept((a),(b),(c))
+#define recvfrom(a,b,c,d,e,f) Curl_hp_recvfrom((a),(b),(c),(d),(e),(f))
+
+#endif /* HPUX work-around */
+
+
+#endif /* __SETUP_ONCE_H */
+

include/win32/regex.h

@@ -1,7 +1,7 @@
 /*
   regex.h - POSIX.2 compatible regexp interface and TRE extensions
 
-  Copyright (C) 2001-2003 Ville Laurikari <vl@iki.fi>.
+  Copyright (C) 2001-2004 Ville Laurikari <vl@iki.fi>.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2 (June
@@ -27,6 +27,10 @@
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
 
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif /* HAVE_LIBUTF8_H */
+
 #ifdef TRE_USE_SYSTEM_REGEX_H
 /* Include the system regex.h to make TRE ABI compatible with the
    system regex. */
@@ -47,6 +51,17 @@ extern "C" {
 typedef int reg_errcode_t;
 #endif /* !HAVE_REG_ERRCODE_T */
 
+#if !defined(REG_NOSPEC) && !defined(REG_LITERAL)
+#define REG_LITERAL 0x1000
+#endif
+
+/* Extra regcomp() flags. */
+#define REG_RIGHT_ASSOC (REG_LITERAL << 1)
+
+/* Extra regexec() flags. */
+#define REG_APPROX_MATCHER	 0x1000
+#define REG_BACKTRACKING_MATCHER (REG_APPROX_MATCHER << 1)
+
 #else /* !TRE_USE_SYSTEM_REGEX_H */
 
 /* If the we're not using system regex.h, we need to define the
@@ -55,7 +70,7 @@ typedef int reg_errcode_t;
 typedef int regoff_t;
 typedef struct {
   size_t re_nsub;  /* Number of parenthesized subexpressions. */
-  void *value;     /* For internal use only. */
+  void *value;	   /* For internal use only. */
 } regex_t;
 
 typedef struct {
@@ -65,45 +80,50 @@ typedef struct {
 
 
 typedef enum {
-  REG_OK = 0,           /* No error. */
+  REG_OK = 0,		/* No error. */
   /* POSIX regcomp() return error codes.  (In the order listed in the
-     standard.)  */
-  REG_NOMATCH,          /* No match. */
-  REG_BADPAT,           /* Invalid regexp. */
-  REG_ECOLLATE,         /* Unknown collating element. */
-  REG_ECTYPE,           /* Unknown character class name. */
-  REG_EESCAPE,          /* Trailing backslash. */
-  REG_ESUBREG,          /* Invalid back reference. */
-  REG_EBRACK,           /* "[]" imbalance */
-  REG_EPAREN,           /* "\(\)" or "()" imbalance */
-  REG_EBRACE,           /* "\{\}" or "{}" imbalance */
-  REG_BADBR,            /* Invalid content of {} */
-  REG_ERANGE,           /* Invalid use of range operator */
-  REG_ESPACE,           /* Out of memory.  */
+     standard.)	 */
+  REG_NOMATCH,		/* No match. */
+  REG_BADPAT,		/* Invalid regexp. */
+  REG_ECOLLATE,		/* Unknown collating element. */
+  REG_ECTYPE,		/* Unknown character class name. */
+  REG_EESCAPE,		/* Trailing backslash. */
+  REG_ESUBREG,		/* Invalid back reference. */
+  REG_EBRACK,		/* "[]" imbalance */
+  REG_EPAREN,		/* "\(\)" or "()" imbalance */
+  REG_EBRACE,		/* "\{\}" or "{}" imbalance */
+  REG_BADBR,		/* Invalid content of {} */
+  REG_ERANGE,		/* Invalid use of range operator */
+  REG_ESPACE,		/* Out of memory.  */
   REG_BADRPT
 } reg_errcode_t;
 
 /* POSIX regcomp() flags. */
-#define REG_EXTENDED    1
-#define REG_ICASE       (REG_EXTENDED << 1)
-#define REG_NEWLINE     (REG_ICASE << 1)
-#define REG_NOSUB       (REG_NEWLINE << 1)
+#define REG_EXTENDED	1
+#define REG_ICASE	(REG_EXTENDED << 1)
+#define REG_NEWLINE	(REG_ICASE << 1)
+#define REG_NOSUB	(REG_NEWLINE << 1)
 
 /* Extra regcomp() flags. */
-#define REG_BASIC       0
-#define REG_LITERAL     (REG_NOSUB << 1)
+#define REG_BASIC	0
+#define REG_LITERAL	(REG_NOSUB << 1)
+#define REG_RIGHT_ASSOC (REG_LITERAL << 1)
 
 /* POSIX regexec() flags. */
 #define REG_NOTBOL 1
 #define REG_NOTEOL (REG_NOTBOL << 1)
 
+/* Extra regexec() flags. */
+#define REG_APPROX_MATCHER	 (REG_NOTEOL << 1)
+#define REG_BACKTRACKING_MATCHER (REG_APPROX_MATCHER << 1)
+
 #endif /* !TRE_USE_SYSTEM_REGEX_H */
 
 /* REG_NOSPEC and REG_LITERAL mean the same thing. */
-#if defined(REG_LITERAL)
-#define REG_NOSPEC      REG_LITERAL
+#ifdef REG_LITERAL
+#define REG_NOSPEC	REG_LITERAL
 #elif defined(REG_NOSPEC)
-#define REG_LITERAL     REG_NOSPEC
+#define REG_LITERAL	REG_NOSPEC
 #endif /* defined(REG_NOSPEC) */
 
 /* The maximum number of iterations in a bound expression. */
@@ -144,24 +164,24 @@ int regwnexec(const regex_t *preg, const wchar_t *string, size_t len,
 
 /* Approximate matching parameter struct. */
 typedef struct {
-  int cost_ins;        /* Default cost of an inserted character. */
-  int cost_del;        /* Default cost of a deleted character. */
+  int cost_ins;	       /* Default cost of an inserted character. */
+  int cost_del;	       /* Default cost of a deleted character. */
   int cost_subst;      /* Default cost of a substituted character. */
-  int max_cost;        /* Maximum allowed cost of a match. */
+  int max_cost;	       /* Maximum allowed cost of a match. */
 
-  int max_ins;         /* Maximum allowed number of inserts. */
-  int max_del;         /* Maximum allowed number of deletes. */
+  int max_ins;	       /* Maximum allowed number of inserts. */
+  int max_del;	       /* Maximum allowed number of deletes. */
   int max_subst;       /* Maximum allowed number of substitutes. */
-  int max_err;         /* Maximum allowed number of errors total. */
+  int max_err;	       /* Maximum allowed number of errors total. */
 } regaparams_t;
 
 /* Approximate matching result struct. */
 typedef struct {
   size_t nmatch;       /* Length of pmatch[] array. */
   regmatch_t *pmatch;  /* Submatch data. */
-  int cost;            /* Cost of the match. */
-  int num_ins;         /* Number of inserts in the match. */
-  int num_del;         /* Number of deletes in the match. */
+  int cost;	       /* Cost of the match. */
+  int num_ins;	       /* Number of inserts in the match. */
+  int num_del;	       /* Number of deletes in the match. */
   int num_subst;       /* Number of substitutes in the match. */
 } regamatch_t;
 
@@ -183,6 +203,45 @@ int regawnexec(const regex_t *preg, const wchar_t *string, size_t len,
 void regaparams_default(regaparams_t *params);
 #endif /* TRE_APPROX */
 
+#ifdef TRE_WCHAR
+typedef wchar_t tre_char_t;
+#else /* !TRE_WCHAR */
+typedef unsigned char tre_char_t;
+#endif /* !TRE_WCHAR */
+
+typedef struct {
+  int (*get_next_char)(tre_char_t *c, unsigned int *pos_add, void *context);
+  void (*rewind)(size_t pos, void *context);
+  int (*compare)(size_t pos1, size_t pos2, size_t len, void *context);
+  void *context;
+} tre_str_source;
+
+int reguexec(const regex_t *preg, const tre_str_source *string,
+	     size_t nmatch, regmatch_t pmatch[], int eflags);
+
+/* Returns the version string.	The returned string is static. */
+char *tre_version(void);
+
+/* Returns the value for a config parameter.  The type to which `result'
+   must point to depends of the value of `query', see documentation for
+   more details. */
+int tre_config(int query, void *result);
+
+enum {
+  TRE_CONFIG_APPROX,
+  TRE_CONFIG_WCHAR,
+  TRE_CONFIG_MULTIBYTE,
+  TRE_CONFIG_SYSTEM_ABI,
+  TRE_CONFIG_VERSION
+};
+
+/* Returns 1 if the compiled pattern has back references, 0 if not. */
+int tre_have_backrefs(const regex_t *preg);
+
+/* Returns 1 if the compiled pattern uses approximate matching features,
+   0 if not. */
+int tre_have_approx(const regex_t *preg);
+
 #ifdef __cplusplus
 }
 #endif

include/win32/setup.h

@@ -30,7 +30,6 @@
 #undef  SYSSYSLOGH
 #define NOINDEX
 #define NOBCOPY
-#define NEED_STRERROR
 #define NEED_STRTOKEN
 #undef  NEED_STRTOK
 #undef  NEED_INET_ADDR
@@ -43,10 +42,18 @@
 #undef  POSIX_SIGNALS
 #undef  TIMES_2
 #undef  GETRUSAGE_2
+#define HAVE_ALLOCA
+/* vc 2005 */
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#	define HAVE_VSNPRINTF
+#	define HAVE_SNPRINTF
+#	define snprintf _snprintf
+#endif
 #define SPATH "."
 #define DPATH "."
 #define DOMAINNAME "irc.net"
 #define NO_U_TYPES
 #define NEED_U_INT32_T
 #define PREFIX_AQ
+#define LIST_SHOW_MODES
 #endif

include/win32/tre-config.h

@@ -1,6 +1,18 @@
 /* tre-config.h.  This file defines all compile time definitions
    that are needed in `regex.h' for Win32. */
 
+#ifndef HAVE_ALLOCA
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+#endif
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+ */
+#define HAVE_ALLOCA_H 1
+
+/* Define to 1 if you have the <libutf8.h> header file. */
+/* #undef HAVE_LIBUTF8_H */
+
 /* Define to 1 if the system has the type `reg_errcode_t'. */
 /* #undef HAVE_REG_ERRCODE_T */
 
@@ -14,13 +26,29 @@
 #define TRE_APPROX 1
 
 /* Define to enable multibyte character set support. */
-#undef TRE_MULTIBYTE
-
-/* Define to include the system regex.h from TRE regex.h */
-/* #undef TRE_USE_SYSTEM_REGEX_H */
+#define TRE_MULTIBYTE 1
 
 /* Define to the absolute path to the system regex.h */
 /* #undef TRE_SYSTEM_REGEX_H_PATH */
 
+/* Define if you want TRE to use alloca() instead of malloc() when allocating
+   memory needed for regexec operations. */
+#define TRE_USE_ALLOCA 1
+
+/* Define to include the system regex.h from TRE regex.h */
+/* #undef TRE_USE_SYSTEM_REGEX_H */
+
 /* Define to enable wide character (wchar_t) support. */
-#undef TRE_WCHAR
+#define TRE_WCHAR 1
+
+/* TRE version string. */
+#define TRE_VERSION "0.7.5"
+
+/* TRE version level 1. */
+#define TRE_VERSION_1 0
+
+/* TRE version level 2. */
+#define TRE_VERSION_2 7
+
+/* TRE version level 3. */
+#define TRE_VERSION_3 5

include/zip.h

@@ -54,7 +54,7 @@ struct Zdata {
 #endif /* ZIP_LINKS */
 
 
-extern int zip_init(struct Client *, int);
-extern void zip_free(struct Client *);
-extern char *unzip_packet(struct Client *, char *, int *);
-extern char *zip_buffer(struct Client *, char *, int *, int);
+extern MODFUNC int zip_init(struct Client *, int);
+extern MODFUNC void zip_free(struct Client *);
+extern MODFUNC char *unzip_packet(struct Client *, char *, int *);
+extern MODFUNC char *zip_buffer(struct Client *, char *, int *, int);

m_template.c

@@ -1,6 +1,6 @@
 /*
  *   IRC - Internet Relay Chat, src/modules/%FILE%
- *   (C) 2004 The UnrealIRCd Team
+ *   (C) 2005 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
  *   the programmers.
@@ -44,7 +44,7 @@
 #include "version.h"
 #endif
 
-DLLFUNC int m_%COMMAND%(aClient *cptr, aClient *sptr, int parc, char *parv[]);
+DLLFUNC CMD_FUNC(m_%COMMAND%);
 
 #define MSG_%UCOMMAND% 	"%UCOMMAND%"	
 #define TOK_%UCOMMAND% 	"%TOKEN%"	
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_%COMMAND%)
 
 DLLFUNC int MOD_INIT(m_%COMMAND%)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_%UCOMMAND%, TOK_%UCOMMAND%, m_%COMMAND%, %MAXPARA%);
+	CommandAdd(modinfo->handle, MSG_%UCOMMAND%, TOK_%UCOMMAND%, m_%COMMAND%, %MAXPARA%, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_%COMMAND%)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_%COMMAND%)(int module_unload)
 {
-	if (del_Command(MSG_%UCOMMAND%, TOK_%UCOMMAND%, m_%COMMAND%) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_%COMMAND%).name);
-	}
 	return MOD_SUCCESS;
 }
 

makefile.win32

@@ -4,6 +4,7 @@
 CC=cl
 LINK=link
 RC=rc
+MT=mt
 
 ############################ USER CONFIGURATION ############################
 
@@ -54,11 +55,19 @@ RC=rc
 #
 ######### END SSL ########
 
-###### RELEASE BUILD #####
-#To make a release build comment out the next line a release build
-#does not contain debugging symbols and can not be used to locate
-#the source of a crash or bug
-DEBUG=1
+###### _EXTRA_ DEBUGGING #####
+# We always build releases with debugging information, since otherwise
+# we cannot trace the source of a crash. Plus we do not mind the extra
+# performance hit caused by not enabling super-optimization, tracing
+# crashes properly is more important.
+# You can choose (at your own risk) to enable EVEN MORE debugging,
+# note that this causes /MDd to be used instead of /MD which can make
+# libraries incompatible, plus all the other side-effects such as
+# requiring a different dll we do not ship (and maybe you are not even
+# allowed to ship due to license agreements), etc...
+# In any case, this probably should not be used, unless debugging a
+# problem locally, in which case it can be useful.
+#DEBUGEXTRA=1
 #
 #
 #### END RELEASE BUILD ###
@@ -100,74 +109,142 @@ OPENSSL_LIB=/LIBPATH:"$(OPENSSL_LIB_DIR)"
 !ENDIF
 !ENDIF
 
-!IFDEF DEBUG
-DBGCFLAG=/MTd /Zi
-DBGLFLAG=/debug /debugtype:BOTH
+!IFDEF DEBUGEXTRA
+DBGCFLAG=/MDd /Zi /Od
+DBGCFLAGST=/MTd /Zi /Od
+DBGLFLAG=/debug
+MODDBGCFLAG=/LDd /MDd /Zi
 !ELSE
-DBGCFLAG=/MT /O2 /G5
+DBGCFLAG=/MD /Zi
+DBGCFLAGST=/MT /Zi
+DBGLFLAG=/debug
+MODDBGCFLAG=/LDd /MD /Zi
 !ENDIF 
 
 FD_SETSIZE=/D FD_SETSIZE=16384
-CFLAGS=$(DBGCFLAG) $(LIBCURL_INC)  $(ZLIB_INC) $(OPENSSL_INC) /I ./INCLUDE /Fosrc/ /nologo \
- $(ZIPCFLAGS) $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) $(NS_ADDRESS) /D STATIC_LINKING \
- /D NOSPOOF=1 /c 
+CFLAGS=$(DBGCFLAG) $(LIBCURL_INC) $(ZLIB_INC) $(OPENSSL_INC) /J /I ./INCLUDE /I ./INCLUDE/WIN32/ARES /Fosrc/ /nologo \
+ $(ZIPCFLAGS) $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) $(NS_ADDRESS) /D NOSPOOF=1 /c /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
+CFLAGSST=$(DBGCFLAGST) $(LIBCURL_INC) $(ZLIB_INC) $(OPENSSL_INC) /J /I ./INCLUDE /I ./INCLUDE/WIN32/ARES /Fosrc/ /nologo \
+ $(ZIPCFLAGS) $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) $(NS_ADDRESS) /D NOSPOOF=1 /c /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
 LFLAGS=kernel32.lib user32.lib gdi32.lib shell32.lib ws2_32.lib advapi32.lib \
- dbghelp.lib oldnames.lib libcmt.lib comctl32.lib comdlg32.lib $(ZLIB_LIB) $(ZIPLIB) \
- $(OPENSSL_LIB) $(SSLLIBS) $(LIBCURL_LIB) $(CURLLIB) /nodefaultlib /nologo $(DBGLFLAG) \
- /out:WIRCD.EXE
+ dbghelp.lib oldnames.lib comctl32.lib comdlg32.lib $(ZLIB_LIB) $(ZIPLIB) \
+ $(OPENSSL_LIB) $(SSLLIBS) $(LIBCURL_LIB) $(CURLLIB) /def:wircd.def /implib:wircd.lib \
+ /nologo $(DBGLFLAG) /out:WIRCD.EXE
+MODCFLAGS=$(MODDBGCFLAG) $(SSLCFLAGS) $(ZIPCFLAGS) $(CURLCFLAGS) /J /Fesrc/modules/ \
+ /Fosrc/modules/ /nologo $(LIBCURL_INC) $(ZLIB_INC) $(OPENSSL_INC) /I ./INCLUDE /D \
+ DYNAMIC_LINKING /D NOSPOOF /D MODULE_COMPILE /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
+MODLFLAGS=/link /def:src/modules/module.def wircd.lib $(OPENSSL_LIB) $(SSLLIBS) \
+ $(ZLIB_LIB) $(ZIPLIB) $(LIBCURL_LIB) $(CURLLIB)
 
 INCLUDES=./include/struct.h ./include/config.h ./include/sys.h \
  ./include/common.h ./include/version.h ./include/h.h ./include/numeric.h \
  ./include/msg.h ./include/setup.h ./include/dynconf.h
 
-OBJ_FILES=SRC/CHANNEL.OBJ SRC/SEND.OBJ SRC/SOCKET.OBJ \
+EXP_OBJ_FILES=SRC/CHANNEL.OBJ SRC/SEND.OBJ SRC/SOCKET.OBJ \
  SRC/S_CONF.OBJ SRC/FDLIST.OBJ SRC/DBUF.OBJ  \
  SRC/CLOAK.OBJ SRC/HASH.OBJ SRC/PARSE.OBJ SRC/IRCD.OBJ \
  SRC/S_NUMERIC.OBJ SRC/WHOWAS.OBJ  SRC/S_AUTH.OBJ \
  SRC/HELP.OBJ SRC/S_MISC.OBJ SRC/MATCH.OBJ SRC/CRULE.OBJ \
  SRC/S_DEBUG.OBJ  SRC/SUPPORT.OBJ SRC/LIST.OBJ \
  SRC/S_ERR.OBJ SRC/PACKET.OBJ SRC/S_BSD.OBJ \
- SRC/S_SERV.OBJ SRC/S_USER.OBJ SRC/WIN32GUI.OBJ \
- SRC/VERSION.OBJ SRC/RES_INIT.OBJ SRC/RES_COMP.OBJ SRC/RES_MKQUERY.OBJ SRC/RES_SKIPNAME.OBJ \
- SRC/S_KLINE.OBJ SRC/S_EXTRA.OBJ SRC/IRCSPRINTF.OBJ SRC/LUSERS.OBJ \
- SRC/SCACHE.OBJ SRC/ALN.OBJ SRC/BADWORDS.OBJ SRC/WEBTV.OBJ SRC/RES.OBJ SRC/MODULES.OBJ \
+ SRC/S_SERV.OBJ SRC/S_USER.OBJ SRC/CHARSYS.OBJ \
+ SRC/VERSION.OBJ SRC/S_KLINE.OBJ SRC/S_EXTRA.OBJ SRC/IRCSPRINTF.OBJ SRC/LUSERS.OBJ \
+ SRC/SCACHE.OBJ SRC/ALN.OBJ SRC/RES.OBJ SRC/MODULES.OBJ \
  SRC/S_SVS.OBJ SRC/EVENTS.OBJ SRC/UMODES.OBJ SRC/AUTH.OBJ SRC/CIDR.OBJ SRC/SSL.OBJ \
- SRC/SERVICE.OBJ SRC/DEBUG.OBJ SRC/RANDOM.OBJ SRC/EXTCMODES.OBJ \
- SRC/EXTBANS.OBJ $(ZIPOBJ) $(CURLOBJ)
+ SRC/RANDOM.OBJ SRC/EXTCMODES.OBJ SRC/MD5.OBJ SRC/API-ISUPPORT.OBJ SRC/API-COMMAND.OBJ \
+ SRC/EXTBANS.OBJ SRC/TIMESYNCH.OBJ $(ZIPOBJ) $(CURLOBJ)
 
-MOD_FILES=SRC/L_COMMANDS.OBJ SRC/M_CHGHOST.OBJ SRC/M_SDESC.OBJ SRC/M_SETIDENT.OBJ \
- SRC/M_SETNAME.OBJ SRC/M_SETHOST.OBJ SRC/M_CHGIDENT.OBJ SRC/M_SVSMOTD.OBJ \
- SRC/M_SVSNLINE.OBJ SRC/M_WHO.OBJ SRC/M_SWHOIS.OBJ SRC/M_SVSMODE.OBJ \
- SRC/M_AWAY.OBJ SRC/M_SVSNOOP.OBJ SRC/M_MKPASSWD.OBJ SRC/M_SVSO.OBJ SRC/M_SVSNICK.OBJ \
- SRC/M_ADMINCHAT.OBJ SRC/M_AKILL.OBJ SRC/M_CHGNAME.OBJ SRC/M_GUEST.OBJ SRC/M_HTM.OBJ \
- SRC/M_LAG.OBJ SRC/M_MESSAGE.OBJ SRC/M_NACHAT.OBJ SRC/M_OPER.OBJ \
- SRC/M_PINGPONG.OBJ SRC/M_QUIT.OBJ SRC/M_RAKILL.OBJ SRC/M_RPING.OBJ SRC/M_SENDUMODE.OBJ \
- SRC/M_SQLINE.OBJ SRC/M_KILL.OBJ SRC/M_TSCTL.OBJ SRC/M_UNKLINE.OBJ \
- SRC/M_UNSQLINE.OBJ SRC/M_UNZLINE.OBJ SRC/M_WHOIS.OBJ \
- SRC/M_TKL.OBJ SRC/M_VHOST.OBJ \
- SRC/M_CYCLE.OBJ SRC/M_SVSJOIN.OBJ SRC/M_SVSPART.OBJ SRC/M_SVSLUSERS.OBJ \
- SRC/M_SVSWATCH.OBJ SRC/M_SVSSILENCE.OBJ SRC/M_SENDSNO.OBJ SRC/M_SVSSNO.OBJ \
- SRC/M_SAJOIN.OBJ SRC/M_SAPART.OBJ SRC/M_SAMODE.OBJ SRC/M_KICK.OBJ SRC/M_TOPIC.OBJ \
- SRC/M_INVITE.OBJ SRC/M_LIST.OBJ SRC/M_TIME.OBJ SRC/M_SVSKILL.OBJ SRC/M_KNOCK.OBJ \
- SRC/M_UMODE2.OBJ SRC/M_SQUIT.OBJ SRC/M_PROTOCTL.OBJ SRC/M_SJOIN.OBJ SRC/M_PASS.OBJ \
- SRC/M_USERHOST.OBJ SRC/M_ISON.OBJ SRC/M_SILENCE.OBJ SRC/M_ADDLINE.OBJ SRC/M_ADDMOTD.OBJ \
- SRC/M_ADDOMOTD.OBJ SRC/M_WALLOPS.OBJ SRC/M_GLOBOPS.OBJ SRC/M_LOCOPS.OBJ SRC/M_CHATOPS.OBJ \
- SRC/M_ADMIN.OBJ SRC/M_TRACE.OBJ SRC/M_NETINFO.OBJ SRC/M_LINKS.OBJ SRC/M_HELP.OBJ \
- SRC/M_RULES.OBJ SRC/M_CLOSE.OBJ SRC/M_MAP.OBJ SRC/M_EOS.OBJ SRC/M_SERVER.OBJ \
- SRC/M_STATS.OBJ SRC/M_SVSFLINE.OBJ SRC/M_DCCDENY.OBJ SRC/M_UNDCCDENY.OBJ \
- SRC/M_WHOWAS.OBJ SRC/M_CONNECT.OBJ
+OBJ_FILES=$(EXP_OBJ_FILES) SRC/GUI.OBJ SRC/SERVICE.OBJ SRC/DEBUG.OBJ SRC/RTF.OBJ \
+ SRC/EDITOR.OBJ SRC/WIN32.OBJ 
 
-ALL: CONF UNREAL.EXE WIRCD.EXE
+MOD_FILES=SRC/MODULES/L_COMMANDS.C SRC/MODULES/M_CHGHOST.C SRC/MODULES/M_SDESC.C \
+ SRC/MODULES/M_SETIDENT.C SRC/MODULES/M_SETNAME.C SRC/MODULES/M_SETHOST.C \
+ SRC/MODULES/M_CHGIDENT.C SRC/MODULES/M_SVSMOTD.C SRC/MODULES/M_SVSNLINE.C \
+ SRC/MODULES/M_WHO.C SRC/MODULES/M_SWHOIS.C SRC/MODULES/M_SVSMODE.C SRC/MODULES/M_AWAY.C \
+ SRC/MODULES/M_SVSNOOP.C SRC/MODULES/M_MKPASSWD.C SRC/MODULES/M_SVSO.C \
+ SRC/MODULES/M_SVSNICK.C SRC/MODULES/M_ADMINCHAT.C SRC/MODULES/M_AKILL.C \
+ SRC/MODULES/M_CHGNAME.C SRC/MODULES/M_GUEST.C SRC/MODULES/M_HTM.C SRC/MODULES/M_LAG.C \
+ SRC/MODULES/M_MESSAGE.C SRC/MODULES/WEBTV.C SRC/MODULES/M_NACHAT.C SRC/MODULES/M_OPER.C \
+ SRC/MODULES/M_PINGPONG.C SRC/MODULES/M_QUIT.C SRC/MODULES/M_RAKILL.C SRC/MODULES/M_RPING.C \
+ SRC/MODULES/M_SENDUMODE.C SRC/MODULES/M_SQLINE.C SRC/MODULES/M_KILL.C \
+ SRC/MODULES/M_TSCTL.C SRC/MODULES/M_UNKLINE.C SRC/MODULES/M_UNSQLINE.C \
+ SRC/MODULES/M_UNZLINE.C SRC/MODULES/M_WHOIS.C SRC/MODULES/M_TKL.C SRC/MODULES/M_VHOST.C \
+ SRC/MODULES/M_CYCLE.C SRC/MODULES/M_SVSJOIN.C SRC/MODULES/M_SVSPART.C \
+ SRC/MODULES/M_SVSLUSERS.C SRC/MODULES/M_SVSWATCH.C SRC/MODULES/M_SVSSILENCE.C \
+ SRC/MODULES/M_SENDSNO.C SRC/MODULES/M_SVSSNO.C SRC/MODULES/M_SAJOIN.C \
+ SRC/MODULES/M_SAPART.C SRC/MODULES/M_SAMODE.C SRC/MODULES/M_KICK.C SRC/MODULES/M_TOPIC.C \
+ SRC/MODULES/M_INVITE.C SRC/MODULES/M_LIST.C SRC/MODULES/M_TIME.C SRC/MODULES/M_SVSKILL.C \
+ SRC/MODULES/M_KNOCK.C SRC/MODULES/M_UMODE2.C SRC/MODULES/M_SQUIT.C \
+ SRC/MODULES/M_PROTOCTL.C SRC/MODULES/M_SJOIN.C SRC/MODULES/M_PASS.C \
+ SRC/MODULES/M_USERHOST.C SRC/MODULES/M_ISON.C SRC/MODULES/M_SILENCE.C \
+ SRC/MODULES/M_ADDLINE.C SRC/MODULES/M_ADDMOTD.C SRC/MODULES/M_ADDOMOTD.C \
+ SRC/MODULES/M_WALLOPS.C SRC/MODULES/M_GLOBOPS.C SRC/MODULES/M_LOCOPS.C \
+ SRC/MODULES/M_CHATOPS.C SRC/MODULES/M_ADMIN.C SRC/MODULES/M_TRACE.C \
+ SRC/MODULES/M_NETINFO.C SRC/MODULES/M_LINKS.C SRC/MODULES/M_HELP.C \
+ SRC/MODULES/M_RULES.C SRC/MODULES/M_CLOSE.C SRC/MODULES/M_MAP.C SRC/MODULES/M_EOS.C \
+ SRC/MODULES/M_SERVER.C SRC/MODULES/M_STATS.C SRC/MODULES/M_SVSFLINE.C \
+ SRC/MODULES/M_DCCDENY.C SRC/MODULES/M_UNDCCDENY.C SRC/MODULES/M_WHOWAS.C \
+ SRC/MODULES/M_CONNECT.C SRC/MODULES/M_DCCALLOW.C SRC/MODULES/M_USERIP.C \
+ SRC/MODULES/M_NICK.C SRC/MODULES/M_USER.C SRC/MODULES/M_MODE.C \
+ SRC/MODULES/M_WATCH.C SRC/MODULES/M_PART.C SRC/MODULES/M_JOIN.C \
+ SRC/MODULES/M_MOTD.C SRC/MODULES/M_OPERMOTD.C SRC/MODULES/M_BOTMOTD.C \
+ SRC/MODULES/M_LUSERS.C SRC/MODULES/M_NAMES.C SRC/MODULES/M_SVSNOLAG.C
+
+DLL_FILES=SRC/MODULES/M_CHGHOST.DLL SRC/MODULES/M_SDESC.DLL SRC/MODULES/M_SETIDENT.DLL \
+ SRC/MODULES/M_SETNAME.DLL SRC/MODULES/M_SETHOST.DLL SRC/MODULES/M_CHGIDENT.DLL \
+ SRC/MODULES/M_SVSMOTD.DLL SRC/MODULES/M_SVSNLINE.DLL SRC/MODULES/M_WHO.DLL \
+ SRC/MODULES/M_SWHOIS.DLL SRC/MODULES/M_SVSMODE.DLL SRC/MODULES/M_AWAY.DLL \
+ SRC/MODULES/M_SVSNOOP.DLL SRC/MODULES/M_MKPASSWD.DLL SRC/MODULES/M_SVSO.DLL \
+ SRC/MODULES/M_SVSNICK.DLL SRC/MODULES/M_ADMINCHAT.DLL SRC/MODULES/M_AKILL.DLL \
+ SRC/MODULES/M_CHGNAME.DLL SRC/MODULES/M_GUEST.DLL SRC/MODULES/M_HTM.DLL \
+ SRC/MODULES/M_LAG.DLL SRC/MODULES/M_MESSAGE.DLL SRC/MODULES/M_NACHAT.DLL \
+ SRC/MODULES/M_OPER.DLL SRC/MODULES/M_PINGPONG.DLL SRC/MODULES/M_QUIT.DLL \
+ SRC/MODULES/M_RAKILL.DLL SRC/MODULES/M_RPING.DLL SRC/MODULES/M_SENDUMODE.DLL \
+ SRC/MODULES/M_SQLINE.DLL SRC/MODULES/M_KILL.DLL SRC/MODULES/M_TSCTL.DLL \
+ SRC/MODULES/M_UNKLINE.DLL SRC/MODULES/M_UNSQLINE.DLL SRC/MODULES/M_UNZLINE.DLL \
+ SRC/MODULES/M_WHOIS.DLL SRC/MODULES/M_TKL.DLL SRC/MODULES/M_VHOST.DLL \
+ SRC/MODULES/M_CYCLE.DLL SRC/MODULES/M_SVSJOIN.DLL SRC/MODULES/M_SVSPART.DLL \
+ SRC/MODULES/M_SVSLUSERS.DLL SRC/MODULES/M_SVSWATCH.DLL SRC/MODULES/M_SVSSILENCE.DLL \
+ SRC/MODULES/M_SENDSNO.DLL SRC/MODULES/M_SVSSNO.DLL SRC/MODULES/M_SAJOIN.DLL \
+ SRC/MODULES/M_SAPART.DLL SRC/MODULES/M_SAMODE.DLL SRC/MODULES/M_KICK.DLL \
+ SRC/MODULES/M_TOPIC.DLL SRC/MODULES/M_INVITE.DLL SRC/MODULES/M_LIST.DLL \
+ SRC/MODULES/M_TIME.DLL SRC/MODULES/M_SVSKILL.DLL SRC/MODULES/M_KNOCK.DLL \
+ SRC/MODULES/M_UMODE2.DLL SRC/MODULES/M_SQUIT.DLL SRC/MODULES/M_PROTOCTL.DLL \
+ SRC/MODULES/M_SJOIN.DLL SRC/MODULES/M_PASS.DLL SRC/MODULES/M_USERHOST.DLL \
+ SRC/MODULES/M_ISON.DLL SRC/MODULES/M_SILENCE.DLL SRC/MODULES/M_ADDLINE.DLL \
+ SRC/MODULES/M_ADDMOTD.DLL SRC/MODULES/M_ADDOMOTD.DLL SRC/MODULES/M_WALLOPS.DLL \
+ SRC/MODULES/M_GLOBOPS.DLL SRC/MODULES/M_LOCOPS.DLL SRC/MODULES/M_CHATOPS.DLL \
+ SRC/MODULES/M_ADMIN.DLL SRC/MODULES/M_TRACE.DLL SRC/MODULES/M_NETINFO.DLL \
+ SRC/MODULES/M_LINKS.DLL SRC/MODULES/M_HELP.DLL SRC/MODULES/M_RULES.DLL \
+ SRC/MODULES/M_CLOSE.DLL SRC/MODULES/M_MAP.DLL SRC/MODULES/M_EOS.DLL \
+ SRC/MODULES/M_SERVER.DLL SRC/MODULES/M_STATS.DLL SRC/MODULES/M_SVSFLINE.DLL \
+ SRC/MODULES/M_DCCDENY.DLL SRC/MODULES/M_UNDCCDENY.DLL SRC/MODULES/M_WHOWAS.DLL \
+ SRC/MODULES/M_CONNECT.DLL SRC/MODULES/M_DCCALLOW.DLL SRC/MODULES/M_USERIP.DLL \
+ SRC/MODULES/M_NICK.DLL SRC/MODULES/M_USER.DLL SRC/MODULES/M_MODE.DLL \
+ SRC/MODULES/M_WATCH.DLL SRC/MODULES/M_PART.DLL SRC/MODULES/M_JOIN.DLL \
+ SRC/MODULES/M_MOTD.DLL SRC/MODULES/M_OPERMOTD.DLL SRC/MODULES/M_BOTMOTD.DLL \
+ SRC/MODULES/M_LUSERS.DLL SRC/MODULES/M_NAMES.DLL SRC/MODULES/M_SVSNOLAG.DLL \
+ SRC/MODULES/CLOAK.DLL
+
+
+ALL: CONF UNREAL.EXE WIRCD.EXE src/modules/commands.dll MODULES 
 
 CLEAN:
         -@erase src\*.obj >NUL
         -@erase src\win32.res >NUL
         -@erase src\version.c >NUL
         -@erase src\win32\*.obj >NUL
+	-@erase src\modules\*.obj >NUL
+	-@erase src\modules\*.dll >NUL
         -@erase .\*.exe >NUL
+	-@erase wircd.lib >NUL
+	-@erase src\modules\*.exp >NUL
+	-@erase src\modules\*.lib >NUL
+	-@erase src\modules\*.pdb >NUL
+	-@erase src\modules\*.ilk >NUL
 
 ./UNREAL.EXE: SRC/UNREAL.OBJ SRC/WIN32/UNREAL.RES
-	$(LINK) advapi32.lib src/unreal.obj src/win32/unreal.res
+	$(LINK) $(DBGLFLAGST) advapi32.lib src/unreal.obj src/win32/unreal.res
 
 CONF:
 	-@copy include\win32\setup.h include\setup.h >NUL
@@ -176,27 +253,24 @@ CONF:
 
 	
 
-./WIRCD.EXE: $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES
-        $(LINK) $(LFLAGS) $(OBJ_FILES) $(MOD_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB /MAPINFO:LINES /MAP
+./WIRCD.EXE: $(OBJ_FILES) SRC/win32/WIN32.RES
+        $(LINK) $(LFLAGS) $(OBJ_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB SRC/WIN32/ARESLIB.LIB /MAP
 	-@erase src\win32\win32.res
-!IFNDEF DEBUG
- @echo Non Debug version built 
+	$(MT) -manifest WIRCD.EXE.manifest -outputresource:WIRCD.EXE;1
+!IFNDEF DEBUGEXTRA
+ @echo Standard version built 
 !ELSE
- @echo Debug version built ... 
+ @echo Extra-Debug version built ... 
 !ENDIF
 
+#Source files
+
 src/version.obj: src/version.c
         $(CC) $(CFLAGS) src/version.c
 
 src/parse.obj: src/parse.c $(INCLUDES)
         $(CC) $(CFLAGS) src/parse.c
 
-src/badwords.obj: src/badwords.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/badwords.c
-
-src/webtv.obj: src/webtv.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/webtv.c
-
 src/socket.obj: src/socket.c $(INCLUDES)
         $(CC) $(CFLAGS) src/socket.c
 
@@ -246,11 +320,8 @@ src/list.obj: src/list.c $(INCLUDES)
 src/res.obj: src/res.c $(INCLUDES)
         $(CC) $(CFLAGS) src/res.c
 
-src/res_mkquery.obj: src/res_mkquery.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/res_mkquery.c
-
-src/res_skipname.obj: src/res_skipname.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/res_skipname.c
+src/timesynch.obj: src/timesynch.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/timesynch.c
 
 src/s_bsd.obj: src/s_bsd.c $(INCLUDES)
         $(CC) $(CFLAGS) src/s_bsd.c
@@ -286,6 +357,10 @@ src/s_user.obj: src/s_user.c $(INCLUDES) ./include/dbuf.h \
                 ./include/channel.h ./include/whowas.h
         $(CC) $(CFLAGS) src/s_user.c
 
+src/charsys.obj: src/charsys.c $(INCLUDES) ./include/dbuf.h \
+                ./include/channel.h ./include/whowas.h
+        $(CC) $(CFLAGS) src/charsys.c
+
 src/s_extra.obj: src/s_extra.c $(INCLUDES) ./include/dbuf.h \
                 ./include/channel.h ./include/whowas.h
         $(CC) $(CFLAGS) src/s_extra.c
@@ -305,32 +380,35 @@ src/hash.obj: src/hash.c $(INCLUDES) ./include/hash.h
 src/crule.obj: src/crule.c $(INCLUDES)
         $(CC) $(CFLAGS) src/crule.c
 
-src/win32gui.obj: src/win32/win32gui.c $(INCLUDES) ./include/resource.h
-        $(CC) $(CFLAGS) src/win32/win32gui.c
+src/gui.obj: src/win32/gui.c $(INCLUDES) ./include/resource.h
+        $(CC) $(CFLAGS) src/win32/gui.c
+
+src/rtf.obj: src/win32/rtf.c $(INCLUDES) ./src/win32/win32.h
+	$(CC) $(CFLAGS) src/win32/rtf.c
+
+src/editor.obj: src/win32/editor.c $(INCLUDES) ./include/resource.h ./src/win32/win32.h
+        $(CC) $(CFLAGS) src/win32/editor.c
 
 src/service.obj: src/win32/service.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/win32/service.c
 
-src/unreal.obj: src/win32/unreal.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/win32/unreal.c
-
 src/debug.obj: src/win32/debug.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/win32/debug.c
 
-src/res_comp.obj: src/res_comp.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/res_comp.c
+src/win32.obj: src/win32/win32.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/win32/win32.c
 
-src/res_init.obj: src/res_init.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/res_init.c
+src/unreal.obj: src/win32/unreal.c $(INCLUDES)
+	$(CC) $(CFLAGSST) src/win32/unreal.c
 
 src/help.obj: src/help.c $(INCLUDES)
         $(CC) $(CFLAGS) src/help.c
 
 src/modules.obj: src/modules.c $(INCLUDES)
-	  $(CC) $(CFLAGS) src/modules.c
+	$(CC) $(CFLAGS) src/modules.c
 
 src/events.obj: src/events.c $(INCLUDES)
-	  $(CC) $(CFLAGS) src/events.c
+	$(CC) $(CFLAGS) src/events.c
 
 src/umodes.obj: src/umodes.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/umodes.c
@@ -347,285 +425,27 @@ src/random.obj: src/random.c $(INCLUDES)
 src/extcmodes.obj: src/extcmodes.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/extcmodes.c
 
+src/md5.obj: src/md5.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/md5.c
+
 src/url.obj: src/url.c $(INCLUDES) ./include/url.h
 	$(CC) $(CFLAGS) src/url.c
 
 src/extbans.obj: src/extbans.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/extbans.c
 
+src/api-isupport.obj: src/api-isupport.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-isupport.c
+
+src/api-command.obj: src/api-command.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-command.c
+
 src/zip.obj: src/zip.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/zip.c
 
 src/ssl.obj: src/ssl.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/ssl.c
 
-src/l_commands.obj: src/modules/l_commands.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/l_commands.c
-
-src/m_chghost.obj: src/modules/m_chghost.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_chghost.c
-
-src/m_chgident.obj: src/modules/m_chgident.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_chgident.c
-
-src/m_sdesc.obj: src/modules/m_sdesc.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_sdesc.c
-
-src/m_sethost.obj: src/modules/m_sethost.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_sethost.c
-
-src/m_setident.obj: src/modules/m_setident.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_setident.c
-
-src/m_setname.obj: src/modules/m_setname.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_setname.c
-
-src/m_svsmotd.obj: src/modules/m_svsmotd.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsmotd.c
-
-src/m_svsmode.obj: src/modules/m_svsmode.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsmode.c
-
-src/m_tkl.obj: src/modules/m_tkl.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_tkl.c
-
-src/m_swhois.obj: src/modules/m_swhois.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_swhois.c
-
-src/m_svsnline.obj: src/modules/m_svsnline.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsnline.c
-
-src/m_who.obj: src/modules/m_who.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_who.c
-
-src/m_away.obj: src/modules/m_away.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_away.c
-
-src/m_mkpasswd.obj: src/modules/m_mkpasswd.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_mkpasswd.c
-
-src/m_svsnoop.obj: src/modules/m_svsnoop.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsnoop.c
-
-src/m_svso.obj: src/modules/m_svso.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svso.c
-
-src/m_svsnick.obj: src/modules/m_svsnick.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsnick.c
-
-src/m_adminchat.obj: src/modules/m_adminchat.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_adminchat.c
-
-src/m_akill.obj: src/modules/m_akill.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_akill.c
-
-src/m_chgname.obj: src/modules/m_chgname.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_chgname.c
-
-src/m_guest.obj: src/modules/m_guest.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_guest.c
-
-src/m_htm.obj: src/modules/m_htm.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_htm.c
-
-src/m_kill.obj: src/modules/m_kill.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_kill.c
-
-src/m_lag.obj: src/modules/m_lag.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_lag.c
-
-src/m_message.obj: src/modules/m_message.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_message.c
-
-src/m_nachat.obj: src/modules/m_nachat.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_nachat.c
-
-src/m_oper.obj: src/modules/m_oper.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_oper.c
-
-src/m_pingpong.obj: src/modules/m_pingpong.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_pingpong.c
-
-src/m_quit.obj: src/modules/m_quit.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_quit.c
-
-src/m_rakill.obj: src/modules/m_rakill.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_rakill.c
-
-src/m_rping.obj: src/modules/m_rping.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_rping.c
-
-src/m_sendumode.obj: src/modules/m_sendumode.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_sendumode.c
-
-src/m_sqline.obj: src/modules/m_sqline.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_sqline.c
-
-src/m_tsctl.obj: src/modules/m_tsctl.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_tsctl.c
-
-src/m_unkline.obj: src/modules/m_unkline.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_unkline.c
-
-src/m_unsqline.obj: src/modules/m_unsqline.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_unsqline.c
-
-src/m_unzline.obj: src/modules/m_unzline.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_unzline.c
-
-src/m_whois.obj: src/modules/m_whois.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_whois.c
-
-src/m_vhost.obj: src/modules/m_vhost.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_vhost.c
-
-src/m_cycle.obj: src/modules/m_cycle.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_cycle.c
-
-src/m_svsjoin.obj: src/modules/m_svsjoin.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsjoin.c
-
-src/m_svspart.obj: src/modules/m_svspart.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svspart.c
-
-src/m_svslusers.obj: src/modules/m_svslusers.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_svslusers.c
-
-src/m_svswatch.obj: src/modules/m_svswatch.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_svswatch.c
-
-src/m_svssilence.obj: src/modules/m_svssilence.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_svssilence.c
-
-src/m_sendsno.obj: src/modules/m_sendsno.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_sendsno.c
-
-src/m_svssno.obj: src/modules/m_svssno.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_svssno.c
-
-src/m_sajoin.obj: src/modules/m_sajoin.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_sajoin.c
-
-src/m_sapart.obj: src/modules/m_sapart.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_sapart.c
-
-src/m_samode.obj: src/modules/m_samode.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_samode.c
-
-src/m_kick.obj: src/modules/m_kick.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_kick.c
-
-src/m_topic.obj: src/modules/m_topic.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_topic.c
-
-src/m_invite.obj: src/modules/m_invite.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_invite.c
-
-src/m_list.obj: src/modules/m_list.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_list.c
-
-src/m_time.obj: src/modules/m_time.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_time.c
-
-src/m_svskill.obj: src/modules/m_svskill.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_svskill.c
-
-src/m_sjoin.obj: src/modules/m_sjoin.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_sjoin.c
-
-src/m_pass.obj: src/modules/m_pass.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_pass.c
-
-src/m_userhost.obj: src/modules/m_userhost.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_userhost.c
-
-src/m_ison.obj: src/modules/m_ison.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_ison.c
-
-src/m_silence.obj: src/modules/m_silence.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/modules/m_silence.c
-
-src/m_knock.obj: src/modules/m_knock.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_knock.c
-
-src/m_umode2.obj: src/modules/m_umode2.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_umode2.c
-
-src/m_squit.obj: src/modules/m_squit.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_squit.c
-
-src/m_protoctl.obj: src/modules/m_protoctl.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_protoctl.c
-
-src/m_addline.obj: src/modules/m_addline.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_addline.c
-
-src/m_addmotd.obj: src/modules/m_addmotd.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_addmotd.c
-
-src/m_addomotd.obj: src/modules/m_addomotd.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_addomotd.c
-
-src/m_wallops.obj: src/modules/m_wallops.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_wallops.c
-
-src/m_admin.obj: src/modules/m_admin.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_admin.c
-
-src/m_globops.obj: src/modules/m_globops.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_globops.c
-
-src/m_locops.obj: src/modules/m_locops.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_locops.c
-
-src/m_chatops.obj: src/modules/m_chatops.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_chatops.c
-
-src/m_trace.obj: src/modules/m_trace.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_trace.c
-
-src/m_netinfo.obj: src/modules/m_netinfo.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_netinfo.c
-
-src/m_links.obj: src/modules/m_links.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_links.c
-
-src/m_help.obj: src/modules/m_help.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_help.c
-
-src/m_rules.obj: src/modules/m_rules.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_rules.c
-
-src/m_close.obj: src/modules/m_close.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_close.c
-
-src/m_map.obj: src/modules/m_map.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_map.c
-
-src/m_eos.obj: src/modules/m_eos.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_eos.c
-
-src/m_server.obj: src/modules/m_server.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_server.c
-
-src/m_stats.obj: src/modules/m_stats.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_stats.c
-
-src/m_svsfline.obj: src/modules/m_svsfline.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_svsfline.c
-
-src/m_dccdeny.obj: src/modules/m_dccdeny.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_dccdeny.c
-
-src/m_undccdeny.obj: src/modules/m_undccdeny.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_undccdeny.c
-
-src/m_whowas.obj: src/modules/m_whowas.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_whowas.c
-
-src/m_connect.obj: src/modules/m_connect.c $(INCLUDES)
-        $(CC) $(CFLAGS) src/modules/m_connect.c
-
 src/win32/win32.res: src/win32/win32gui.rc
         $(RC) /l 0x409 /fosrc/win32/win32.res /i ./include /i ./src \
               /d NDEBUG src/win32/win32gui.rc
@@ -634,6 +454,335 @@ src/win32/unreal.res: src/win32/unreal.rc
         $(RC) /l 0x409 /fosrc/win32/unreal.res /i ./include /i ./src \
               /d NDEBUG src/win32/unreal.rc
 
+################# Modules #################
+
+CUSTOMMODULE: src/modules/$(MODULEFILE).c
+	$(CC) $(MODCFLAGS) src/modules/$(MODULEFILE).c $(MODLFLAGS) \
+	      /OUT:src/modules/$(MODULEFILE).dll $(EXLIBS)
+
+SYMBOLFILE: 
+	$(CC) src/win32/def-clean.c
+	dlltool --output-def wircd.def.in --export-all-symbols $(EXP_OBJ_FILES)
+	def-clean wircd.def.in wircd.def
+
+MODULES: $(DLL_FILES)
+
+src/modules/commands.dll: $(MOD_FILES) $(INCLUDES)
+	$(CC) $(MODDBGCFLAG) $(LIBCURL_INC) $(ZLIB_INC) $(OPENSSL_INC) /nologo \
+	      $(SSLCFLAGS) $(ZIPCFLAGS) $(CURLCFLAGS) /Fosrc/modules/ \
+	      /I ./INCLUDE /D NOSPOOF /D MODULE_COMPILE /D _CRT_SECURE_NO_DEPRECATE \
+	      /D _USE_32BIT_TIME_T $(MOD_FILES) \
+	      $(MODLFLAGS) src/win32/tre.lib /OUT:src/modules/commands.dll
+
+src/modules/m_chghost.dll: src/modules/m_chghost.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_chghost.c $(MODLFLAGS)
+
+src/modules/m_chgident.dll: src/modules/m_chgident.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_chgident.c $(MODLFLAGS)
+
+src/modules/m_sdesc.dll: src/modules/m_sdesc.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_sdesc.c $(MODLFLAGS)
+
+src/modules/m_sethost.dll: src/modules/m_sethost.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_sethost.c $(MODLFLAGS)
+
+src/modules/m_setident.dll: src/modules/m_setident.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_setident.c $(MODLFLAGS)
+
+src/modules/m_setname.dll: src/modules/m_setname.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_setname.c $(MODLFLAGS)
+
+src/modules/m_svsmotd.dll: src/modules/m_svsmotd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsmotd.c $(MODLFLAGS)
+
+src/modules/m_svsmode.dll: src/modules/m_svsmode.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsmode.c $(MODLFLAGS)
+
+src/modules/m_tkl.dll: src/modules/m_tkl.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_tkl.c $(MODLFLAGS) src/win32/tre.lib
+
+src/modules/m_swhois.dll: src/modules/m_swhois.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_swhois.c $(MODLFLAGS)
+
+src/modules/m_svsnline.dll: src/modules/m_svsnline.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsnline.c $(MODLFLAGS)
+
+src/modules/m_who.dll: src/modules/m_who.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_who.c $(MODLFLAGS)
+
+src/modules/m_away.dll: src/modules/m_away.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_away.c $(MODLFLAGS)
+
+src/modules/m_mkpasswd.dll: src/modules/m_mkpasswd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_mkpasswd.c $(MODLFLAGS)
+
+src/modules/m_svsnoop.dll: src/modules/m_svsnoop.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsnoop.c $(MODLFLAGS)
+
+src/modules/m_svso.dll: src/modules/m_svso.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svso.c $(MODLFLAGS)
+
+src/modules/m_svsnick.dll: src/modules/m_svsnick.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsnick.c $(MODLFLAGS)
+
+src/modules/m_adminchat.dll: src/modules/m_adminchat.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_adminchat.c $(MODLFLAGS)
+
+src/modules/m_akill.dll: src/modules/m_akill.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_akill.c $(MODLFLAGS)
+
+src/modules/m_chgname.dll: src/modules/m_chgname.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_chgname.c $(MODLFLAGS)
+
+src/modules/m_guest.dll: src/modules/m_guest.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_guest.c $(MODLFLAGS)
+
+src/modules/m_htm.dll: src/modules/m_htm.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_htm.c $(MODLFLAGS)
+
+src/modules/m_kill.dll: src/modules/m_kill.c $(INCLUDES) 
+	$(CC) $(MODCFLAGS) src/modules/m_kill.c $(MODLFLAGS)
+
+src/modules/m_lag.dll: src/modules/m_lag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_lag.c $(MODLFLAGS)
+
+src/modules/m_message.dll: src/modules/m_message.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_message.c src/modules/webtv.c $(MODLFLAGS) src/win32/tre.lib
+
+src/modules/m_nachat.dll: src/modules/m_nachat.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_nachat.c $(MODLFLAGS)
+
+src/modules/m_oper.dll: src/modules/m_oper.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_oper.c $(MODLFLAGS)
+
+src/modules/m_pingpong.dll: src/modules/m_pingpong.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_pingpong.c $(MODLFLAGS)
+
+src/modules/m_quit.dll: src/modules/m_quit.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_quit.c $(MODLFLAGS)
+
+src/modules/m_rakill.dll: src/modules/m_rakill.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_rakill.c $(MODLFLAGS)
+
+src/modules/m_rping.dll: src/modules/m_rping.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_rping.c $(MODLFLAGS)
+
+src/modules/m_sendumode.dll: src/modules/m_sendumode.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_sendumode.c $(MODLFLAGS)
+
+src/modules/m_sqline.dll: src/modules/m_sqline.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_sqline.c $(MODLFLAGS)
+
+src/modules/m_tsctl.dll: src/modules/m_tsctl.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_tsctl.c $(MODLFLAGS)
+
+src/modules/m_unkline.dll: src/modules/m_unkline.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_unkline.c $(MODLFLAGS)
+
+src/modules/m_unsqline.dll: src/modules/m_unsqline.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_unsqline.c $(MODLFLAGS)
+
+src/modules/m_unzline.dll: src/modules/m_unzline.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_unzline.c $(MODLFLAGS)
+
+src/modules/m_whois.dll: src/modules/m_whois.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_whois.c $(MODLFLAGS)
+
+src/modules/m_vhost.dll: src/modules/m_vhost.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_vhost.c $(MODLFLAGS)
+
+src/modules/m_cycle.dll: src/modules/m_cycle.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_cycle.c $(MODLFLAGS)
+
+src/modules/m_svsjoin.dll: src/modules/m_svsjoin.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsjoin.c $(MODLFLAGS)
+
+src/modules/m_svspart.dll: src/modules/m_svspart.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svspart.c $(MODLFLAGS)
+
+src/modules/m_svslusers.dll: src/modules/m_svslusers.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_svslusers.c $(MODLFLAGS)
+
+src/modules/m_svswatch.dll: src/modules/m_svswatch.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_svswatch.c $(MODLFLAGS)
+
+src/modules/m_svssilence.dll: src/modules/m_svssilence.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_svssilence.c $(MODLFLAGS)
+
+src/modules/m_sendsno.dll: src/modules/m_sendsno.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_sendsno.c $(MODLFLAGS)
+
+src/modules/m_svssno.dll: src/modules/m_svssno.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_svssno.c $(MODLFLAGS)
+
+src/modules/m_sajoin.dll: src/modules/m_sajoin.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_sajoin.c $(MODLFLAGS)
+
+src/modules/m_sapart.dll: src/modules/m_sapart.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_sapart.c $(MODLFLAGS)
+
+src/modules/m_samode.dll: src/modules/m_samode.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_samode.c $(MODLFLAGS)
+
+src/modules/m_kick.dll: src/modules/m_kick.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_kick.c $(MODLFLAGS)
+
+src/modules/m_topic.dll: src/modules/m_topic.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_topic.c $(MODLFLAGS)
+
+src/modules/m_invite.dll: src/modules/m_invite.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_invite.c $(MODLFLAGS)
+
+src/modules/m_list.dll: src/modules/m_list.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_list.c $(MODLFLAGS)
+
+src/modules/m_time.dll: src/modules/m_time.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_time.c $(MODLFLAGS)
+
+src/modules/m_svskill.dll: src/modules/m_svskill.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_svskill.c $(MODLFLAGS)
+
+src/modules/m_sjoin.dll: src/modules/m_sjoin.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_sjoin.c $(MODLFLAGS)
+
+src/modules/m_pass.dll: src/modules/m_pass.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_pass.c $(MODLFLAGS)
+
+src/modules/m_userhost.dll: src/modules/m_userhost.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_userhost.c $(MODLFLAGS)
+
+src/modules/m_ison.dll: src/modules/m_ison.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_ison.c $(MODLFLAGS)
+
+src/modules/m_silence.dll: src/modules/m_silence.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_silence.c $(MODLFLAGS)
+
+src/modules/m_knock.dll: src/modules/m_knock.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_knock.c $(MODLFLAGS)
+
+src/modules/m_umode2.dll: src/modules/m_umode2.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_umode2.c $(MODLFLAGS)
+
+src/modules/m_squit.dll: src/modules/m_squit.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_squit.c $(MODLFLAGS)
+
+src/modules/m_protoctl.dll: src/modules/m_protoctl.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_protoctl.c $(MODLFLAGS)
+
+src/modules/m_addline.dll: src/modules/m_addline.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_addline.c $(MODLFLAGS)
+
+src/modules/m_addmotd.dll: src/modules/m_addmotd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_addmotd.c $(MODLFLAGS)
+
+src/modules/m_addomotd.dll: src/modules/m_addomotd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_addomotd.c $(MODLFLAGS)
+
+src/modules/m_wallops.dll: src/modules/m_wallops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_wallops.c $(MODLFLAGS)
+
+src/modules/m_admin.dll: src/modules/m_admin.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_admin.c $(MODLFLAGS)
+
+src/modules/m_globops.dll: src/modules/m_globops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_globops.c $(MODLFLAGS)
+
+src/modules/m_locops.dll: src/modules/m_locops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_locops.c $(MODLFLAGS)
+
+src/modules/m_chatops.dll: src/modules/m_chatops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_chatops.c $(MODLFLAGS)
+
+src/modules/m_trace.dll: src/modules/m_trace.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_trace.c $(MODLFLAGS)
+
+src/modules/m_netinfo.dll: src/modules/m_netinfo.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_netinfo.c $(MODLFLAGS)
+
+src/modules/m_links.dll: src/modules/m_links.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_links.c $(MODLFLAGS)
+
+src/modules/m_help.dll: src/modules/m_help.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_help.c $(MODLFLAGS)
+
+src/modules/m_rules.dll: src/modules/m_rules.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_rules.c $(MODLFLAGS)
+ 
+src/modules/m_close.dll: src/modules/m_close.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_close.c $(MODLFLAGS)
+
+src/modules/m_map.dll: src/modules/m_map.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_map.c $(MODLFLAGS)
+
+src/modules/m_eos.dll: src/modules/m_eos.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_eos.c $(MODLFLAGS)
+
+src/modules/m_server.dll: src/modules/m_server.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_server.c $(MODLFLAGS)
+
+src/modules/m_stats.dll: src/modules/m_stats.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_stats.c $(MODLFLAGS)
+
+src/modules/m_svsfline.dll: src/modules/m_svsfline.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsfline.c $(MODLFLAGS)
+
+src/modules/m_dccdeny.dll: src/modules/m_dccdeny.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_dccdeny.c $(MODLFLAGS)
+
+src/modules/m_undccdeny.dll: src/modules/m_undccdeny.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_undccdeny.c $(MODLFLAGS)
+
+src/modules/m_whowas.dll: src/modules/m_whowas.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_whowas.c $(MODLFLAGS)
+
+src/modules/m_connect.dll: src/modules/m_connect.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_connect.c $(MODLFLAGS)
+
+src/modules/m_dccallow.dll: src/modules/m_dccallow.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_dccallow.c $(MODLFLAGS)
+
+src/modules/m_userip.dll: src/modules/m_userip.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_userip.c $(MODLFLAGS)
+
+src/modules/m_nick.dll: src/modules/m_nick.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_nick.c $(MODLFLAGS)
+
+src/modules/m_user.dll: src/modules/m_user.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_user.c $(MODLFLAGS)
+
+src/modules/m_mode.dll: src/modules/m_mode.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_mode.c $(MODLFLAGS)
+
+src/modules/m_watch.dll: src/modules/m_watch.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_watch.c $(MODLFLAGS)
+
+src/modules/m_part.dll: src/modules/m_part.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_part.c $(MODLFLAGS)
+
+src/modules/m_join.dll: src/modules/m_join.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_join.c $(MODLFLAGS)
+
+src/modules/m_motd.dll: src/modules/m_motd.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_motd.c $(MODLFLAGS)
+
+src/modules/m_opermotd.dll: src/modules/m_opermotd.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_opermotd.c $(MODLFLAGS)
+
+src/modules/m_botmotd.dll: src/modules/m_botmotd.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_botmotd.c $(MODLFLAGS)
+
+src/modules/m_lusers.dll: src/modules/m_lusers.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_lusers.c $(MODLFLAGS)
+
+src/modules/m_names.dll: src/modules/m_names.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/m_names.c $(MODLFLAGS)
+
+src/modules/cloak.dll: src/modules/cloak.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/cloak.c $(MODLFLAGS)
+
+src/modules/m_svsnolag.dll: src/modules/m_svsnolag.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/m_svsnolag.c $(MODLFLAGS)
+
 dummy:
 
 

spamfilter.conf

@@ -14,17 +14,17 @@
  */
 
 spamfilter {
-	regex "(.+ ){20}";
-	target dcc;
+	regex "\x01DCC (SEND|RESUME)[ ]+\"(.+ ){20}";
+	target { private; channel; };
 	reason "mIRC 6.0-6.11 exploit attempt";
 	action kill;
 };
 
 spamfilter {
-	regex ".{225}";
-	target dcc;
-	reason "mIRC 6.12 exploit attempt";
-	action block;
+	regex "\x01DCC (SEND|RESUME).{225}";
+	target { private; channel; };
+	reason "Possible mIRC 6.12 exploit attempt";
+	action kill;
 };
 
 spamfilter {
@@ -149,20 +149,20 @@ spamfilter {
 spamfilter {
 	regex ".*(http://jokes\.clubdepeche\.com|http://horny\.69sexy\.net|http://private\.a123sdsdssddddgfg\.com).*";
 	target private;
-	action block;
+	action gline;
 	reason "Infected by LOI trojan"; /* Name is still unsure */
 };
 
 /* This is a 'general sig' which might have a tad more false positives, hence just 'block' is used */
 spamfilter {
-	regex "C:\\WINNT\\system32\\[][0-9a-z_-{|}`]+\.zip";
+	regex "C:\\\\WINNT\\\\system32\\\\[][0-9a-z_-{|}`]+\.zip";
 	target dcc;
 	action block;
 	reason "Infected by Gaggle worm?";
 };
 
 spamfilter {
-	regex "C:\\WINNT\\system32\\(notes|videos|xxx|ManualSeduccion|postal|hechizos|images|sex|avril)\.zip";
+	regex "C:\\\\WINNT\\\\system32\\\\(notes|videos|xxx|ManualSeduccion|postal|hechizos|images|sex|avril)\.zip";
 	target dcc;
 	action dccblock;
 	reason "Infected by Gaggle worm";
@@ -174,3 +174,33 @@ spamfilter {
 	action block;
 	reason "Infected by Gaggle worm";
 };
+
+spamfilter {
+     regex "^Free porn pic.? and movies (www\.sexymovies\.da\.ru|www\.girlporn\.org)";
+     target private;
+     reason "Unknown virus. Site causes Backdoor.Delf.lq infection";
+     action block;
+};
+
+spamfilter {
+	regex "^LOL! //echo -a \$\(\$decode\(.+,m\),[0-9]\)$";
+	target channel;
+	reason "$decode exploit";
+	action block;
+};
+
+/*
+spamfilter {
+	regex "//write \$decode\(.+\|.+load -rs";
+	target { private; channel; };
+	reason "Generic $decode exploit";
+	action block;
+};
+*/
+
+spamfilter {
+	regex "^Want To Be An IRCOp\? Try This New Bug Type: //write \$decode\(.+=.?,m\) \| \.load -rs \$decode\(.+=.?,m\)$"; 
+	target private;
+	action block;
+	reason "Spamming users with an mIRC trojan. Type '/unload -rs newb' to remove the trojan.";
+};

src/Makefile

@@ -21,15 +21,14 @@
 
 CC = danger will robinson
 
-OBJS=auth.o aln.o badwords.o channel.o cloak.o crule.o dbuf.o \
+OBJS=timesynch.o res.o s_bsd.o auth.o aln.o channel.o cloak.o crule.o dbuf.o \
 	events.o fdlist.o hash.o help.o ircd.o ircsprintf.o list.o lusers.o \
-	match.o modules.o packet.o parse.o res.o \
-	res_init.o res_comp.o res_mkquery.o res_skipname.o s_auth.o \
-	s_bsd.o s_conf.o s_debug.o s_err.o s_extra.o s_kline.o \
+	match.o modules.o packet.o parse.o s_auth.o \
+	s_conf.o s_debug.o s_err.o s_extra.o s_kline.o \
 	s_misc.o s_numeric.o s_serv.o s_svs.o $(STRTOUL) socket.o \
-	ssl.o s_user.o scache.o send.o support.o umodes.o \
-	version.o webtv.o whowas.o zip.o cidr.o random.o extcmodes.o \
-	extbans.o $(URL)
+	ssl.o s_user.o charsys.o scache.o send.o support.o umodes.o \
+	version.o whowas.o zip.o cidr.o random.o extcmodes.o \
+	extbans.o md5.o api-isupport.o api-command.o $(URL)
 
 SRC=$(OBJS:%.o=%.c)
 
@@ -44,10 +43,17 @@ MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
 
 MAKE = make $(MAKEARGS)
 
-INCLUDES = ../include/struct.h ../include/config.h \
-	../include/sys.h ../include/common.h ../include/version.h \
-	../include/h.h ../include/numeric.h ../include/msg.h \
-	../include/dynconf.h ../include/modules.h ../include/setup.h
+INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \
+	../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \
+	../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \
+	../include/hash.h ../include/inet.h ../include/ircsprintf.h \
+	../include/license.h ../include/macros.h ../include/md5.h \
+	../include/modules.h ../include/modversion.h ../include/msg.h ../include/nameser.h \
+	../include/numeric.h ../include/proto.h \
+	../include/resource.h ../include/setup.h ../include/sjoin.h \
+	../include/sock.h ../include/ssl.h ../include/struct.h ../include/sys.h \
+	../include/threads.h ../include/types.h ../include/url.h \
+	../include/version.h ../include/whowas.h ../include/zip.h
 
 all: build
 
@@ -93,15 +99,12 @@ socket.o: socket.c $(INCLUDES)
 
 
 
-dbuf.o: dbuf.c $(INCLUDES) ../include/dbuf.h
+dbuf.o: dbuf.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c dbuf.c
 
 packet.o: packet.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c packet.c
 
-badwords.o: badwords.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c badwords.c
-
 aln.o: aln.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c aln.c
 
@@ -114,9 +117,6 @@ zip.o: zip.c $(INCLUDES)
 send.o: send.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c send.c
 
-webtv.o: webtv.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c webtv.c
-
 ssl.o: ssl.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c ssl.c
 
@@ -162,74 +162,76 @@ cleandir: clean
 depend:
 	makedepend -I${INCLUDEDIR} ${SRC}
 
-channel.o: channel.c $(INCLUDES) ../include/channel.h
+channel.o: channel.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c channel.c
 
-ircd.o: ircd.c ../include/dbuf.h $(INCLUDES)
+ircd.o: ircd.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c ircd.c
 
-list.o: list.c ../include/dbuf.h $(INCLUDES)
+list.o: list.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c list.c
 
-lusers.o: lusers.c ../include/dbuf.h $(INCLUDES)
+lusers.o: lusers.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c lusers.c
 
-res.o: res.c ../include/res.h $(INCLUDES)
+res.o: res.c $(INCLUDES) ../include/res.h
 	$(CC) $(CFLAGS) -c res.c
 
-cloak.o: cloak.c ../include/res.h $(INCLUDES)
+timesynch.o: timesynch.c $(INCLUDES)
+	$(CC) $(CFLAGS) -c timesynch.c
+
+cloak.o: cloak.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c cloak.c
 
-fdlist.o: fdlist.c ../include/fdlist.h $(INCLUDES)
+fdlist.o: fdlist.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c fdlist.c
 
-s_bsd.o: s_bsd.c ../include/dbuf.h $(INCLUDES)
+s_bsd.o: s_bsd.c $(INCLUDES) ../include/res.h
 	$(CC) $(CFLAGS) -c s_bsd.c
 
-s_auth.o: s_auth.c ../include/dbuf.h $(INCLUDES)
+s_auth.o: s_auth.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_auth.c
 
-s_conf.o: s_conf.c ../include/dbuf.h $(INCLUDES)
+s_conf.o: s_conf.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_conf.c
 
-s_debug.o: ../include/sys.h s_debug.c $(INCLUDES)
+s_debug.o: s_debug.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_debug.c
 
-s_err.o: ../include/msg.h s_err.c $(INCLUDES)
+s_err.o: s_err.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_err.c
 
-s_misc.o: s_misc.c ../include/dbuf.h $(INCLUDES)
+s_misc.o: s_misc.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_misc.c
 
-scache.o: scache.c ../include/dbuf.h $(INCLUDES)
+scache.o: scache.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c scache.c
 
-ircsprintf.o: ircsprintf.c ../include/dbuf.h $(INCLUDES)
+ircsprintf.o: ircsprintf.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c ircsprintf.c
 
-s_user.o: s_user.c $(INCLUDES) \
-	  ../include/dbuf.h ../include/channel.h ../include/whowas.h
+s_user.o: s_user.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_user.c
 
-s_extra.o: s_extra.c $(INCLUDES) \
-	  s_numeric.c ../include/dbuf.h ../include/channel.h ../include/whowas.h
+charsys.o: charsys.c $(INCLUDES)
+	$(CC) $(CFLAGS) -c charsys.c
+
+s_extra.o: s_extra.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_extra.c
 
-s_kline.o: s_kline.c $(INCLUDES) \
-	  s_numeric.c ../include/dbuf.h ../include/channel.h ../include/whowas.h
+s_kline.o: s_kline.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_kline.c
 
-s_serv.o: s_serv.c $(INCLUDES) \
-	  ../include/dbuf.h ../include/whowas.h
+s_serv.o: s_serv.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_serv.c
 
-s_numeric.o: s_numeric.c ../include/dbuf.h $(INCLUDES)
+s_numeric.o: s_numeric.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c s_numeric.c
 
-whowas.o: whowas.c ../include/dbuf.h ../include/whowas.h $(INCLUDES)
+whowas.o: whowas.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c whowas.c
 
-hash.o: hash.c ../include/hash.h $(INCLUDES)
+hash.o: hash.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c hash.c
 
 crule.o: crule.c $(INCLUDES)
@@ -247,7 +249,16 @@ extcmodes.o: extcmodes.c $(INCLUDES)
 extbans.o: extbans.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c extbans.c
 
-url.o: url.c $(INCLUDES) ../include/url.h
+md5.o: md5.c $(INCLUDES)
+	$(CC) $(CFLAGS) -c md5.c
+
+api-command.o: api-command.c $(INCLUDES)
+	$(CC) $(CFLAGS) -c api-command.c
+
+api-isupport.o: api-isupport.c $(INCLUDES)
+	$(CC) $(CFLAGS) -c api-isupport.c
+
+url.o: url.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c url.c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.

src/aln.c

@@ -232,13 +232,14 @@ static inline char *int_to_base64(long val)
 
 	base64buf[i] = '\0';
 
-	/* Temporary debugging code.. remove before 2038 ;p */
-	if (val > 2147483646)
+	/* Temporary debugging code.. remove before 2038 ;p.
+	 * This might happen in case of 64bit longs (opteron/ia64),
+	 * if the value is then too large it can easily lead to
+	 * a buffer underflow and thus to a crash. -- Syzop
+	 */
+	if (val > 2147483647L)
 	{
-		snprintf(trouble_info, sizeof(trouble_info),
-			"[BUG] int_to_base64() called for insane value %ld. Please report!", val);
-		ircd_log(LOG_ERROR, "%s", trouble_info);
-		val = 2147483647L; /* prevent buffer overflow */
+		abort();
 	}
 
 	do

src/api-command.c

@@ -0,0 +1,150 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, src/api-command.c
+ *   Copyright (C) 2004 Dominick Meglio and The UnrealIRCd Team
+ *
+ *   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 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "msg.h"
+#include "h.h"
+#include <string.h>
+
+char *cmdstr = NULL;
+
+int CommandExists(char *name)
+{
+	aCommand *p;
+	
+	for (p = CommandHash[toupper(*name)]; p; p = p->next)
+	{
+		if (!stricmp(p->cmd, name))
+			return 1;
+	}
+	for (p = TokenHash[*name]; p; p = p->next)
+	{
+		if (!strcmp(p->cmd, name))
+			return 1;
+	}
+	return 0;
+}
+
+Command *CommandAdd(Module *module, char *cmd, char *tok, int (*func)(), unsigned char params, int flags) {
+	Command *command;
+
+	if (find_Command_simple(cmd) || (tok && find_Command_simple(tok)))
+	{
+		if (module)
+			module->errorcode = MODERR_EXISTS;
+		return NULL;
+	}
+	command = MyMallocEx(sizeof(Command));
+	command->cmd = add_Command_backend(cmd,func,params, 0, flags);
+	command->tok = NULL;
+	command->cmd->owner = module;
+	if (tok) {
+		command->tok = add_Command_backend(tok,func,params,1,flags);
+		command->cmd->friend = command->tok;
+		command->tok->friend = command->cmd;
+		command->tok->owner = module;
+	}
+	else
+		command->cmd->friend = NULL;
+	if (module) {
+		ModuleObject *cmdobj = (ModuleObject *)MyMallocEx(sizeof(ModuleObject));
+		cmdobj->object.command = command;
+		cmdobj->type = MOBJ_COMMAND;
+		AddListItem(cmdobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	if (flags & M_ANNOUNCE)
+	{
+		char *tmp;
+		if (cmdstr)
+			tmp = MyMallocEx(strlen(cmdstr)+strlen(cmd)+2);
+		else
+			tmp = MyMallocEx(strlen(cmd)+2);
+		if (cmdstr)
+		{
+			strcpy(tmp, cmdstr);
+			strcat(tmp, ",");
+		}
+		strcat(tmp, cmd);
+		if (cmdstr)
+		{
+			IsupportSetValue(IsupportFind("CMDS"), tmp);
+			free(cmdstr);
+		}
+		else
+			IsupportAdd(NULL, "CMDS", tmp);
+		cmdstr = tmp;
+	}
+	return command;
+}
+
+
+void CommandDel(Command *command) {
+	Cmdoverride *ovr, *ovrnext;
+
+	if (command->cmd->flags & M_ANNOUNCE)
+	{
+		char *tmp = MyMallocEx(strlen(cmdstr)+1);
+		char *tok;
+		for (tok = strtok(cmdstr, ","); tok; tok = strtok(NULL, ","))
+		{
+			if (!stricmp(tok, command->cmd->cmd))
+				continue;
+			if (tmp)
+				strcat(tmp, ",");
+			strcat(tmp, tok);
+		}
+		free(cmdstr);
+		if (!*tmp)
+		{
+			IsupportDel(IsupportFind("CMDS"));
+			free(tmp);
+			cmdstr = NULL;
+		}
+		else
+			cmdstr = tmp;
+	}
+	DelListItem(command->cmd, CommandHash[toupper(*command->cmd->cmd)]);
+	if (command->tok)
+		DelListItem(command->tok, TokenHash[*command->tok->cmd]);
+	if (command->cmd->owner) {
+		ModuleObject *cmdobj;
+		for (cmdobj = command->cmd->owner->objects; cmdobj; cmdobj = (ModuleObject *)cmdobj->next) {
+			if (cmdobj->type == MOBJ_COMMAND && cmdobj->object.command == command) {
+				DelListItem(cmdobj,command->cmd->owner->objects);
+				MyFree(cmdobj);
+				break;
+			}
+		}
+	}
+	for (ovr = command->cmd->overriders; ovr; ovr = ovrnext)
+	{
+		ovrnext = ovr->next;
+		CmdoverrideDel(ovr);
+	}
+	MyFree(command->cmd->cmd);
+	MyFree(command->cmd);
+	if (command->tok) {
+		MyFree(command->tok->cmd);
+		MyFree(command->tok);
+	}
+	MyFree(command);
+}

src/api-isupport.c

@@ -0,0 +1,276 @@
+/************************************************************************
+ *   UnrealIRCd - Unreal Internet Relay Chat Daemon - src/api-isupport.c
+ *   (c) 2004 Dominick Meglio and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   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 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Id$
+ */
+
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "numeric.h"
+#include "msg.h"
+#include "channel.h"
+#include "version.h"
+#include <time.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <fcntl.h>
+#include "h.h"
+#include "proto.h"
+
+Isupport *Isupports; /* List of ISUPPORT (005) tokens */
+MODVAR char *IsupportStrings[5] = {0,0,0,0,0}; /* If we get more than 5 strings, God help us! */
+extern char *cmdstr;
+
+/**
+ * Builds isupport token strings.
+ * Respects both the 13 token limit and the 512 buffer limit.
+ */
+void make_isupportstrings(void)
+{
+	int i;
+	int bufsize = BUFSIZE-HOSTLEN-NICKLEN-39;
+	int tokcnt = 0, len = 0;
+	Isupport *isupport;
+	/* Clear out the old junk */
+	for (i = 0; IsupportStrings[i]; i++)
+	{
+		free(IsupportStrings[i]);
+		IsupportStrings[i] = NULL;
+	}
+
+	i = 0;
+	IsupportStrings[i] = MyMallocEx(bufsize);
+	for (isupport = Isupports; isupport; isupport = isupport->next)
+	{
+		int toklen;
+		/* Just a token */
+		if (!isupport->value)
+		{
+			toklen = strlen(isupport->token);
+			if (tokcnt == 13 || bufsize < len+toklen+1)
+			{
+				tokcnt = 0;
+				len = 0;
+				IsupportStrings[++i] = MyMallocEx(bufsize); 
+			}
+			if (IsupportStrings[i][0])
+			{
+				strcat(IsupportStrings[i], " ");
+				toklen++;
+			}
+			strcat(IsupportStrings[i], isupport->token);
+			len += toklen;
+			tokcnt++;
+		}
+		else
+		{
+			toklen = strlen(isupport->token)+strlen(isupport->value)+1;
+			if (tokcnt == 13 || bufsize < len+toklen+1)
+			{
+				tokcnt = 0;
+				len = 0;
+				IsupportStrings[++i] = MyMallocEx(bufsize);
+			}
+			if (IsupportStrings[i][0])
+			{
+				strcat(IsupportStrings[i], " ");
+				toklen++;
+			}
+			strcat(IsupportStrings[i], isupport->token);
+			strcat(IsupportStrings[i], "=");
+			strcat(IsupportStrings[i], isupport->value);
+			len += toklen;
+			tokcnt++;
+		}	
+	}
+}
+
+/**
+ * Initializes the builtin isupport tokens.
+ */
+void isupport_init(void)
+{
+	char tmpbuf[512];
+	IsupportAdd(NULL, "INVEX", NULL);
+	IsupportAdd(NULL, "EXCEPTS", NULL);
+#ifdef PREFIX_AQ
+	IsupportAdd(NULL, "STATUSMSG", "~&@%+");
+#else
+	IsupportAdd(NULL, "STATUSMSG", "@%+");
+#endif
+	IsupportAdd(NULL, "ELIST", "MNUCT");
+	ircsprintf(tmpbuf, "~,%s", extbanstr);
+	IsupportAdd(NULL, "EXTBAN", tmpbuf);
+	IsupportAdd(NULL, "CASEMAPPING", "ascii");
+	IsupportAdd(NULL, "NETWORK", ircnet005);
+	ircsprintf(tmpbuf, CHPAR1 "%s," CHPAR2 "%s," CHPAR3 "%s," CHPAR4 "%s",
+ 			EXPAR1, EXPAR2, EXPAR3, EXPAR4);
+	IsupportAdd(NULL, "CHANMODES", tmpbuf);
+	IsupportAdd(NULL, "PREFIX", CHPFIX);
+	IsupportAdd(NULL, "CHANTYPES", "#");
+	IsupportAdd(NULL, "MODES", my_itoa(MAXMODEPARAMS));
+	IsupportAdd(NULL, "SILENCE", my_itoa(SILENCE_LIMIT));
+	if (WATCH_AWAY_NOTIFICATION)
+		IsupportAdd(NULL, "WATCHOPTS", "A");
+	IsupportAdd(NULL, "WATCH", my_itoa(MAXWATCH));
+	IsupportAdd(NULL, "WALLCHOPS", NULL);
+	IsupportAdd(NULL, "MAXTARGETS", my_itoa(MAXTARGETS));
+	IsupportAdd(NULL, "AWAYLEN", my_itoa(TOPICLEN));
+	IsupportAdd(NULL, "KICKLEN", my_itoa(TOPICLEN));
+	IsupportAdd(NULL, "TOPICLEN", my_itoa(TOPICLEN));
+	IsupportAdd(NULL, "CHANNELLEN", my_itoa(CHANNELLEN));
+	IsupportAdd(NULL, "NICKLEN", my_itoa(NICKLEN));
+	ircsprintf(tmpbuf, "b:%d,e:%d,I:%d", MAXBANS, MAXBANS, MAXBANS);
+	IsupportAdd(NULL, "MAXLIST", tmpbuf);
+	ircsprintf(tmpbuf, "#:%d", MAXCHANNELSPERUSER);
+	IsupportAdd(NULL, "CHANLIMIT", tmpbuf);
+	IsupportAdd(NULL, "MAXCHANNELS", my_itoa(MAXCHANNELSPERUSER));
+	IsupportAdd(NULL, "HCN", NULL);
+	IsupportAdd(NULL, "SAFELIST", NULL);
+	IsupportAdd(NULL, "NAMESX", NULL);
+	IsupportAdd(NULL, "UHNAMES", NULL);
+	if (cmdstr)
+		IsupportAdd(NULL, "CMDS", cmdstr);
+}
+
+/**
+ * Sets or changes the value of an existing isupport token.
+ *
+ * @param isupport The pointer to the isupport handle.
+ * @param value    The new value of the token (NULL indicates no value).
+ */
+void IsupportSetValue(Isupport *isupport, const char *value)
+{
+	if (isupport->value)
+		free(isupport->value);
+	if (value)
+		isupport->value = strdup(value);
+	else
+		isupport->value = NULL;
+
+	make_isupportstrings();
+}
+
+/**
+ * Returns an isupport handle based on the given token name.
+ *
+ * @param token The isupport token to search for.
+ * @return Returns the handle to the isupport token if it was found,
+ *         otherwise NULL is returned.
+ */
+Isupport *IsupportFind(const char *token)
+{
+	Isupport *isupport;
+
+	for (isupport = Isupports; isupport; isupport = isupport->next)
+	{
+		if (!stricmp(token, isupport->token))
+			return isupport;
+	}
+	return NULL;
+}
+
+/**
+ * Adds a new isupport token.
+ *
+ * @param module The module which owns this token.
+ * @param token  The name of the token to create.
+ * @param value  The value of the token (NULL indicates no value).
+ * @return Returns the handle to the new token if successful, otherwise NULL.
+ *         The module's error code contains specific information about the
+ *         error.
+ */
+Isupport *IsupportAdd(Module *module, const char *token, const char *value)
+{
+	Isupport *isupport;
+	char *c;
+
+	if (IsupportFind(token))
+	{
+		if (module)
+			module->errorcode = MODERR_EXISTS;
+		return NULL;
+	}
+	/* draft-brocklesby-irc-isupport:
+	 * token = a-zA-Z0-9 and 20 or less characters
+	 * value = ASCII 0x21 - 0x7E
+         */
+	for (c = (char *)token; c && *c; c++)
+	{
+		if (!isalnum(*c))
+		{
+			if (module)
+				module->errorcode = MODERR_INVALID;
+			return NULL;
+		}
+	}
+	if (!token || !*token || c-token > 20)
+	{
+		if (module)
+			module->errorcode = MODERR_INVALID;
+		return NULL;
+	}
+	for (c = (char *)value; c && *c; c++)
+	{
+		if (*c < '!' || *c > '~')
+		{
+			if (module)
+				module->errorcode = MODERR_INVALID;
+			return NULL;
+		}
+	}
+
+	isupport = MyMallocEx(sizeof(Isupport));
+	isupport->owner = module;
+	isupport->token = strdup(token);
+	if (value)
+		isupport->value = strdup(value);
+	AddListItem(isupport, Isupports);
+	make_isupportstrings(); 
+	if (module)
+	{
+                ModuleObject *isupportobj = MyMallocEx(sizeof(ModuleObject));
+                isupportobj->object.isupport = isupport;
+                isupportobj->type = MOBJ_ISUPPORT;
+                AddListItem(isupportobj, module->objects);
+                module->errorcode = MODERR_NOERROR;
+	}
+	return isupport;
+}
+
+/**
+ * Removes the specified isupport token.
+ *
+ * @param isupport The token to remove.
+ */
+void IsupportDel(Isupport *isupport)
+{
+	DelListItem(isupport, Isupports);
+	free(isupport->token);
+	if (isupport->value)
+		free(isupport->value);
+	free(isupport);
+	make_isupportstrings();
+}

src/auth.c

@@ -39,16 +39,14 @@
 #include <fcntl.h>
 #include "h.h"
 
-anAuthStruct AuthTypes[] = {
+anAuthStruct MODVAR AuthTypes[] = {
 	{"plain",	AUTHTYPE_PLAINTEXT},
 	{"plaintext",   AUTHTYPE_PLAINTEXT},
 #ifdef AUTHENABLE_UNIXCRYPT
 	{"crypt",	AUTHTYPE_UNIXCRYPT},
 	{"unixcrypt",	AUTHTYPE_UNIXCRYPT},
 #endif
-#ifdef AUTHENABLE_MD5
 	{"md5",	        AUTHTYPE_MD5},
-#endif
 #ifdef AUTHENABLE_SHA1
 	{"sha1",	AUTHTYPE_SHA1},
 #endif
@@ -96,6 +94,12 @@ int		Auth_CheckError(ConfigEntry *ce)
 			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
 		return -1;
 	}
+	if (ce->ce_entries && ce->ce_entries->ce_next)
+	{
+		config_error("%s:%i: you may not have multiple authentication methods",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return -1;
+	}
 	if (ce->ce_entries)
 	{
 		if (ce->ce_entries->ce_varname)
@@ -174,6 +178,269 @@ void	Auth_DeleteAuthStruct(anAuthStruct *as)
 	MyFree(as);
 }
 
+/* Both values are pretty insane as of 2004, but... just in case. */
+#define MAXSALTLEN		127
+#define MAXHASHLEN		255
+
+/* RAW salt length (before b64_encode) to use in /MKPASSWD
+ * and REAL salt length (after b64_encode, including terminating nul),
+ * used for reserving memory.
+ */
+#define RAWSALTLEN		6
+#define REALSALTLEN		12
+
+/** Parses a password.
+ * This routine can parse a pass that has a salt (new as of unreal 3.2.1)
+ * and will set the 'salt' pointer and 'hash' accordingly.
+ * RETURN VALUES:
+ * 1 If succeeded, salt and hash can be used.
+ * 0 If it's a password without a salt ('old'), salt and hash are not touched.
+ */
+static int parsepass(char *str, char **salt, char **hash)
+{
+static char saltbuf[MAXSALTLEN+1], hashbuf[MAXHASHLEN+1];
+char *p;
+int max;
+
+	/* Syntax: $<salt>$<hash> */
+	if (*str != '$')
+		return 0;
+	p = strchr(str+1, '$');
+	if (!p || (p == str+1) || !p[1])
+		return 0;
+
+	max = p - str;
+	if (max > sizeof(saltbuf))
+		max = sizeof(saltbuf);
+	strlcpy(saltbuf, str+1, max);
+	strlcpy(hashbuf, p+1, sizeof(hashbuf));
+	*salt = saltbuf;
+	*hash = hashbuf;
+	return 1;
+}
+
+static int authcheck_md5(aClient *cptr, anAuthStruct *as, char *para)
+{
+static char buf[512];
+int	i, r;
+char *saltstr, *hashstr;
+
+	if (!para)
+		return -1;
+	r = parsepass(as->data, &saltstr, &hashstr);
+	if (r == 0) /* Old method without salt: b64(MD5(<pass>)) */
+	{
+		char result[16];
+		
+		DoMD5(result, para, strlen(para));
+		if ((i = b64_encode(result, sizeof(result), buf, sizeof(buf))))
+		{
+			if (!strcmp(buf, as->data))
+				return 2;
+			else
+				return -1;
+		} else
+			return -1;
+	} else {
+		/* New method with salt: b64(MD5(MD5(<pass>)+salt)) */
+		char result1[MAXSALTLEN+16+1];
+		char result2[16];
+		char rsalt[MAXSALTLEN+1];
+		int rsaltlen;
+		
+		/* First, decode the salt to something real... */
+		rsaltlen = b64_decode(saltstr, rsalt, sizeof(rsalt));
+		if (rsaltlen <= 0)
+			return -1;
+		
+		/* Then hash the password (1st round)... */
+		DoMD5(result1, para, strlen(para));
+
+		/* Add salt to result */
+		memcpy(result1+16, rsalt, rsaltlen); /* b64_decode already made sure bounds are ok */
+
+		/* Then hash it all together again (2nd round)... */
+		DoMD5(result2, result1, rsaltlen+16);
+		
+		/* Then base64 encode it all and we are done... */
+		if ((i = b64_encode(result2, sizeof(result2), buf, sizeof(buf))))
+		{
+			if (!strcmp(buf, hashstr))
+				return 2;
+			else
+				return -1;
+		} else
+			return -1;
+	}
+	return -1; /* NOTREACHED */
+}
+
+#ifdef AUTHENABLE_SHA1
+static int authcheck_sha1(aClient *cptr, anAuthStruct *as, char *para)
+{
+char buf[512];
+int i, r;
+char *saltstr, *hashstr;
+
+	if (!para)
+		return -1;
+	r = parsepass(as->data, &saltstr, &hashstr);
+	if (r)
+	{
+		/* New method with salt: b64(SHA1(SHA1(<pass>)+salt)) */
+		char result1[MAXSALTLEN+20+1];
+		char result2[20];
+		char rsalt[MAXSALTLEN+1];
+		int rsaltlen;
+#ifndef _WIN32
+		SHA_CTX hash;
+#else
+		HCRYPTPROV hProv;
+		HCRYPTHASH hHash;
+		DWORD size = 20;
+#endif
+		
+		/* First, decode the salt to something real... */
+		rsaltlen = b64_decode(saltstr, rsalt, sizeof(rsalt));
+		if (rsaltlen <= 0)
+			return -1;
+
+#ifdef _WIN32
+		if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+			return -1;
+#endif
+		
+		/* Then hash the password (1st round)... */
+#ifndef _WIN32
+		SHA1_Init(&hash);
+		SHA1_Update(&hash, para, strlen(para));
+		SHA1_Final(result1, &hash);
+#else
+		if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash)) return NULL;
+		if (!CryptHashData(hHash, para, strlen(para), 0)) return NULL;
+		if (!CryptGetHashParam(hHash, HP_HASHVAL, result1, &size, 0)) return NULL;
+		CryptDestroyHash(hHash);
+#endif
+		/* Add salt to result */
+		memcpy(result1+20, rsalt, rsaltlen); /* b64_decode already made sure bounds are ok */
+
+		/* Then hash it all together again (2nd round)... */
+#ifndef _WIN32
+		SHA1_Init(&hash);
+		SHA1_Update(&hash, result1, rsaltlen+20);
+		SHA1_Final(result2, &hash);
+#else
+		if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash)) return NULL;
+		if (!CryptHashData(hHash, result1, 20+rsaltlen, 0)) return NULL;
+		if (!CryptGetHashParam(hHash, HP_HASHVAL, result2, &size, 0)) return NULL;
+		CryptDestroyHash(hHash);
+		CryptReleaseContext(hProv, 0);
+#endif		
+		/* Then base64 encode it all and we are done... */
+		if ((i = b64_encode(result2, sizeof(result2), buf, sizeof(buf))))
+		{
+			if (!strcmp(buf, hashstr))
+				return 2;
+			else
+				return -1;
+		} else
+			return -1;
+	} else {
+		/* OLD auth */
+#ifndef _WIN32
+		if ((i = b64_encode(SHA1(para, strlen(para), NULL), 20, buf, sizeof(buf))))
+		{
+			if (!strcmp(buf, as->data))
+				return 2;
+			else
+				return -1;
+		} else
+			return -1;
+#else
+		HCRYPTPROV hProv;
+		HCRYPTHASH hHash;
+		char buf2[512];
+		DWORD size = 512;
+		if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
+		     CRYPT_VERIFYCONTEXT))
+			return -1;
+		if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash))
+			return -1;
+		if (!CryptHashData(hHash, para, strlen(para), 0))
+			return -1;
+		if (!CryptGetHashParam(hHash, HP_HASHVAL, buf, &size, 0))
+			return -1;
+		CryptDestroyHash(hHash);
+		CryptReleaseContext(hProv, 0);
+		b64_encode(buf, 20, buf2, sizeof(buf2));
+		if (!strcmp(buf2, as->data))
+			return 2;
+		else 
+			return -1;
+#endif
+	}
+}
+#endif /* AUTHENABLE_SHA1 */
+
+#ifdef AUTHENABLE_RIPEMD160
+static int authcheck_ripemd160(aClient *cptr, anAuthStruct *as, char *para)
+{
+char buf[512];
+int i, r;
+char *saltstr, *hashstr;
+
+	if (!para)
+		return -1;
+	r = parsepass(as->data, &saltstr, &hashstr);
+	if (r)
+	{
+		/* New method with salt: b64(RIPEMD160(RIPEMD160(<pass>)+salt)) */
+		char result1[MAXSALTLEN+20+1];
+		char result2[20];
+		char rsalt[MAXSALTLEN+1];
+		int rsaltlen;
+		RIPEMD160_CTX hash;
+		
+		/* First, decode the salt to something real... */
+		rsaltlen = b64_decode(saltstr, rsalt, sizeof(rsalt));
+		if (rsaltlen <= 0)
+			return -1;
+
+		/* Then hash the password (1st round)... */
+		RIPEMD160_Init(&hash);
+		RIPEMD160_Update(&hash, para, strlen(para));
+		RIPEMD160_Final(result1, &hash);
+		/* Add salt to result */
+		memcpy(result1+20, rsalt, rsaltlen); /* b64_decode already made sure bounds are ok */
+
+		/* Then hash it all together again (2nd round)... */
+		RIPEMD160_Init(&hash);
+		RIPEMD160_Update(&hash, result1, rsaltlen+20);
+		RIPEMD160_Final(result2, &hash);
+		/* Then base64 encode it all and we are done... */
+		if ((i = b64_encode(result2, sizeof(result2), buf, sizeof(buf))))
+		{
+			if (!strcmp(buf, hashstr))
+				return 2;
+			else
+				return -1;
+		} else
+			return -1;
+	} else {
+		/* OLD auth */
+		if ((i = b64_encode(RIPEMD160(para, strlen(para), NULL), 20, buf, sizeof(buf))))
+		{
+			if (!strcmp(buf, as->data))
+				return 2;
+			else
+				return -1;
+		} else
+			return -1;
+	}
+}
+#endif /* AUTHENABLE_RIPEMD160 */
+
+
 /*
  * cptr MUST be a local client
  * as is what it will be compared with
@@ -192,16 +459,13 @@ int	Auth_Check(aClient *cptr, anAuthStruct *as, char *para)
 #ifdef	AUTHENABLE_UNIXCRYPT
 	extern	char *crypt();
 #endif
-#if defined(AUTHENABLE_MD5) || defined(AUTHENABLE_SHA1) || defined(AUTHENABLE_RIPEMD160)
-        static char    buf[512];
-        int		i;
-#endif
 
 #ifdef AUTHENABLE_SSL_CLIENTCERT
 	X509 *x509_clientcert = NULL;
 	X509 *x509_filecert = NULL;
 	FILE *x509_f = NULL;
 #endif
+
 	if (!as)
 		return 1;
 		
@@ -229,108 +493,17 @@ int	Auth_Check(aClient *cptr, anAuthStruct *as, char *para)
 				return -1;
 			break;
 #endif
-#ifdef AUTHENABLE_MD5
 		case AUTHTYPE_MD5:
-			if (!para)
-				return -1;
-#ifndef _WIN32
-			if ((i = b64_encode(MD5(para, strlen(para), NULL),
-                                MD5_DIGEST_LENGTH, buf, sizeof(buf))))
-			{
-				if (!strcmp(buf, as->data))
-					return 2;
-				else
-					return -1;
-			}
-			else
-				return -1;
-		        break;
-#else
-			{
-				HCRYPTPROV hProv;
-				HCRYPTHASH hHash;
-				char buf2[512];
-				DWORD size = 512;
-				if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
-				    CRYPT_VERIFYCONTEXT))
-					return -1;
-				if (!CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash))
-					return -1;
-				if (!CryptHashData(hHash, para, strlen(para), 0))
-					return -1;
-				if (!CryptGetHashParam(hHash, HP_HASHVAL, buf, &size, 0))
-					return -1;
-				CryptDestroyHash(hHash);
-				CryptReleaseContext(hProv, 0);
-				b64_encode(buf, 16, buf2, sizeof(buf2));
-				if (!strcmp(buf2, as->data))
-					return 2;
-				else
-					return -1;
-			}
+			return authcheck_md5(cptr, as, para);
 			break;
-
-#endif
-#endif
 #ifdef AUTHENABLE_SHA1
 		case AUTHTYPE_SHA1:
-			if (!para)
-				return -1;
-#ifndef _WIN32
-			
-			if ((i = b64_encode(SHA1(para, strlen(para), NULL),
-                                SHA_DIGEST_LENGTH, buf, sizeof(buf))))
-			{
-				if (!strcmp(buf, as->data))
-					return 2;
-				else
-					return -1;
-			}
-			else
-				return -1;
-		        break;
-#else
-			{
-				HCRYPTPROV hProv;
-				HCRYPTHASH hHash;
-				char buf2[512];
-				DWORD size = 512;
-				if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
-				     CRYPT_VERIFYCONTEXT))
-					return -1;
-				if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash))
-					return -1;
-				if (!CryptHashData(hHash, para, strlen(para), 0))
-					return -1;
-				if (!CryptGetHashParam(hHash, HP_HASHVAL, buf, &size, 0))
-					return -1;
-				CryptDestroyHash(hHash);
-				CryptReleaseContext(hProv, 0);
-				b64_encode(buf, 20, buf2, sizeof(buf2));
-				if (!strcmp(buf2, as->data))
-					return 2;
-				else 
-					return -1;
-			}
+			return authcheck_sha1(cptr, as, para);
 			break;
 #endif
-#endif
 #ifdef AUTHENABLE_RIPEMD160
 		case AUTHTYPE_RIPEMD160:
-			if (!para)
-				return -1;
-			
-			if ((i = b64_encode(RIPEMD160(para, strlen(para), NULL),
-                                RIPEMD160_DIGEST_LENGTH, buf, sizeof(buf))))
-			{
-				if (!strcmp(buf, as->data))
-					return 2;
-				else
-					return -1;
-			}
-			else
-				return -1;
-		        break;
+			return authcheck_ripemd160(cptr, as, para);
 #endif
 #ifdef AUTHENABLE_SSL_CLIENTCERT
 		case AUTHTYPE_SSL_CLIENTCERT:
@@ -367,19 +540,197 @@ int	Auth_Check(aClient *cptr, anAuthStruct *as, char *para)
 	return -1;
 }
 
+static char *mkpass_md5(char *para)
+{
+static char buf[128];
+char result1[16+REALSALTLEN];
+char result2[16];
+char saltstr[REALSALTLEN]; /* b64 encoded printable string*/
+char saltraw[RAWSALTLEN];  /* raw binary */
+char xresult[64];
+int i;
+
+	if (!para) return NULL;
+
+	/* generate a random salt... */
+	for (i=0; i < RAWSALTLEN; i++)
+		saltraw[i] = getrandom8();
+
+	i = b64_encode(saltraw, RAWSALTLEN, saltstr, REALSALTLEN);
+	if (!i) return NULL;
+
+	/* b64(MD5(MD5(<pass>)+salt))
+	 *         ^^^^^^^^^^^
+	 *           step 1
+	 *     ^^^^^^^^^^^^^^^^^^^^^
+	 *     step 2
+	 * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+	 * step 3
+	 */
+
+	/* STEP 1 */
+	DoMD5(result1, para, strlen(para));
+
+	/* STEP 2 */
+	/* add salt to result */
+	memcpy(result1+16, saltraw, RAWSALTLEN);
+	/* Then hash it all together */
+	DoMD5(result2, result1, RAWSALTLEN+16);
+	
+	/* STEP 3 */
+	/* Then base64 encode it all together.. */
+	i = b64_encode(result2, sizeof(result2), xresult, sizeof(xresult));
+	if (!i) return NULL;
+
+	/* Good.. now create the whole string:
+	 * $<saltb64d>$<totalhashb64d>
+	 */
+	ircsprintf(buf, "$%s$%s", saltstr, xresult);
+	return buf;
+}
+
+#ifdef AUTHENABLE_SHA1
+static char *mkpass_sha1(char *para)
+{
+static char buf[128];
+char result1[20+REALSALTLEN];
+char result2[20];
+char saltstr[REALSALTLEN]; /* b64 encoded printable string*/
+char saltraw[RAWSALTLEN];  /* raw binary */
+char xresult[64];
+#ifndef _WIN32
+SHA_CTX hash;
+#else
+HCRYPTPROV hProv;
+HCRYPTHASH hHash;
+DWORD size = 20;
+#endif
+int i;
+
+	if (!para) return NULL;
+
+	/* generate a random salt... */
+	for (i=0; i < RAWSALTLEN; i++)
+		saltraw[i] = getrandom8();
+
+	i = b64_encode(saltraw, RAWSALTLEN, saltstr, REALSALTLEN);
+	if (!i) return NULL;
+
+#ifdef _WIN32
+	if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+		return NULL;
+#endif
+
+	/* b64(SHA1(SHA1(<pass>)+salt))
+	 *         ^^^^^^^^^^^
+	 *           step 1
+	 *     ^^^^^^^^^^^^^^^^^^^^^
+	 *     step 2
+	 * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+	 * step 3
+	 */
+
+	/* STEP 1 */
+#ifndef _WIN32
+	SHA1_Init(&hash);
+	SHA1_Update(&hash, para, strlen(para));
+	SHA1_Final(result1, &hash);
+#else
+	if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash)) return NULL;
+	if (!CryptHashData(hHash, para, strlen(para), 0)) return NULL;
+	if (!CryptGetHashParam(hHash, HP_HASHVAL, result1, &size, 0)) return NULL;
+	CryptDestroyHash(hHash);
+#endif
+	/* STEP 2 */
+	/* add salt to result */
+	memcpy(result1+20, saltraw, RAWSALTLEN);
+	/* Then hash it all together */
+#ifndef _WIN32
+	SHA1_Init(&hash);
+	SHA1_Update(&hash, result1, RAWSALTLEN+20);
+	SHA1_Final(result2, &hash);
+#else
+	if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash)) return NULL;
+	if (!CryptHashData(hHash, result1, RAWSALTLEN+20, 0)) return NULL;
+	if (!CryptGetHashParam(hHash, HP_HASHVAL, result2, &size, 0)) return NULL;
+	CryptDestroyHash(hHash);
+	CryptReleaseContext(hProv, 0);
+#endif	
+	/* STEP 3 */
+	/* Then base64 encode it all together.. */
+	i = b64_encode(result2, sizeof(result2), xresult, sizeof(xresult));
+	if (!i) return NULL;
+
+	/* Good.. now create the whole string:
+	 * $<saltb64d>$<totalhashb64d>
+	 */
+	ircsprintf(buf, "$%s$%s", saltstr, xresult);
+	return buf;
+}
+#endif /* AUTHENABLE_SHA1 */
+
+#ifdef AUTHENABLE_RIPEMD160
+static char *mkpass_ripemd160(char *para)
+{
+static char buf[128];
+char result1[20+REALSALTLEN];
+char result2[20];
+char saltstr[REALSALTLEN]; /* b64 encoded printable string*/
+char saltraw[RAWSALTLEN];  /* raw binary */
+char xresult[64];
+RIPEMD160_CTX hash;
+int i;
+
+	if (!para) return NULL;
+
+	/* generate a random salt... */
+	for (i=0; i < RAWSALTLEN; i++)
+		saltraw[i] = getrandom8();
+
+	i = b64_encode(saltraw, RAWSALTLEN, saltstr, REALSALTLEN);
+	if (!i) return NULL;
+
+	/* b64(RIPEMD160(RIPEMD160(<pass>)+salt))
+	 *         ^^^^^^^^^^^
+	 *           step 1
+	 *     ^^^^^^^^^^^^^^^^^^^^^
+	 *     step 2
+	 * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+	 * step 3
+	 */
+
+	/* STEP 1 */
+	RIPEMD160_Init(&hash);
+	RIPEMD160_Update(&hash, para, strlen(para));
+	RIPEMD160_Final(result1, &hash);
+
+	/* STEP 2 */
+	/* add salt to result */
+	memcpy(result1+20, saltraw, RAWSALTLEN);
+	/* Then hash it all together */
+	RIPEMD160_Init(&hash);
+	RIPEMD160_Update(&hash, result1, RAWSALTLEN+20);
+	RIPEMD160_Final(result2, &hash);
+
+	/* STEP 3 */
+	/* Then base64 encode it all together.. */
+	i = b64_encode(result2, sizeof(result2), xresult, sizeof(xresult));
+	if (!i) return NULL;
+
+	/* Good.. now create the whole string:
+	 * $<saltb64d>$<totalhashb64d>
+	 */
+	ircsprintf(buf, "$%s$%s", saltstr, xresult);
+	return buf;
+}
+#endif /* AUTHENABLE_RIPEMD160 */
+
 char	*Auth_Make(short type, char *para)
 {
 #ifdef	AUTHENABLE_UNIXCRYPT
 	char	salt[3];
 	extern	char *crypt();
 #endif
-#if defined(AUTHENABLE_MD5) || defined(AUTHENABLE_SHA1) || defined(AUTHENABLE_RIPEMD160)
-        static char    buf[512];
-	int		i;
-#endif
-#ifdef _WIN32
-	static char buf2[512];
-#endif
 
 	switch (type)
 	{
@@ -397,92 +748,20 @@ char	*Auth_Make(short type, char *para)
 			return(crypt(para, salt));
 			break;
 #endif
-#ifdef AUTHENABLE_MD5
+
 		case AUTHTYPE_MD5:
-			if (!para)
-				return NULL;
-#ifndef _WIN32
-			
-			if ((i = b64_encode(MD5(para, strlen(para), NULL),
-                                MD5_DIGEST_LENGTH, buf, sizeof(buf))))
-			{
-				return (buf);
-			}
-			else
-				return NULL;
-		        break;
-#else	
-			{
-				HCRYPTPROV hProv;
-				HCRYPTHASH hHash;
-				DWORD size = 512;
-				if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, 
-				     CRYPT_VERIFYCONTEXT))
-					return NULL;
-				if (!CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash))
-					return NULL;
-				if (!CryptHashData(hHash, para, strlen(para), 0))
-					return NULL;
-				if (!CryptGetHashParam(hHash, HP_HASHVAL, buf, &size, 0))
-					return NULL;
-				CryptDestroyHash(hHash);
-				CryptReleaseContext(hProv, 0);
-				b64_encode(buf, 16, buf2, sizeof(buf2));
-				return (buf2);
-			}
-			break;
-#endif
-#endif
+			return mkpass_md5(para);
+
 #ifdef AUTHENABLE_SHA1
 		case AUTHTYPE_SHA1:
-			if (!para)
-				return NULL;
-#ifndef _WIN32			
-			if ((i = b64_encode(SHA1(para, strlen(para), NULL),
-                                SHA_DIGEST_LENGTH, buf, sizeof(buf))))
-			{
-				return (buf);
-			}
-			else
-				return NULL;
-		        break;
-#else
-			{
-				HCRYPTPROV hProv;
-				HCRYPTHASH hHash;
-				DWORD size = 512;
-				if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
-				     CRYPT_VERIFYCONTEXT))
-					return NULL;
-				if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash))
-					return NULL;
-				if (!CryptHashData(hHash, para, strlen(para), 0))
-					return NULL;
-				if (!CryptGetHashParam(hHash, HP_HASHVAL, buf, &size, 0))
-					return NULL;
-				CryptDestroyHash(hHash);
-				CryptReleaseContext(hProv, 0);
-				b64_encode(buf, 20, buf2, sizeof(buf2));
-				return (buf2);
-			}
-			break;
+			return mkpass_sha1(para);
 #endif
 
-#endif
 #ifdef AUTHENABLE_RIPEMD160
 		case AUTHTYPE_RIPEMD160:
-			if (!para)
-				return NULL;
-			
-			if ((i = b64_encode(RIPEMD160(para, strlen(para), NULL),
-                                RIPEMD160_DIGEST_LENGTH, buf, sizeof(buf))))
-			{
-				return (buf);
-			}
-			else
-				return NULL;
-		        break;
+			return mkpass_ripemd160(para);
 #endif
+
 		default:
 			return (NULL);
 	}

src/badwords.c

@@ -1,289 +0,0 @@
-/*
- *   IRC - Internet Relay Chat, badwords.c
- *   Copyleft (C) 2000 meow <csi@gnu.net>
- * 
- *   Provides functions, for loading and filtering unwanted words out of
- *   a string, or in this case part of a message.  Please note that this
- *   is flawed because when mode_strip is set, mode_stripbadwords is not
- *   active.  This is due to the structure of m_message(), and therefore
- *   will not change until I (or someone else) revamps the code.
- *
- *   You can redistribute and/or modify this under the terms of the GNU
- *   General Public License as published by the Free Software Foundation.
- *
- *   Disclaimer: You have no rights.  Use at your own risk.  Don't drink
- *   too much pepsi.
- */
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-#include "config.h"
-#include "struct.h"
-#include "common.h"
-#include "h.h"
-#ifdef STRIPBADWORDS
-#include "badwords.h"
-
-/* This was modified a bit in order to use newconf. The loading functions
- * have been trashed and integrated into the config parser. The striping
- * function now only uses REPLACEWORD if no word is specifically defined
- * for the word found. Also the freeing function has been ditched. -- codemastr
- */
-
-#ifdef FAST_BADWORD_REPLACE
-/*
- * our own strcasestr implementation because strcasestr is often not
- * available or is not working correctly (??).
- */
-char *our_strcasestr(char *haystack, char *needle) {
-int i;
-int nlength = strlen (needle);
-int hlength = strlen (haystack);
-
-	if (nlength > hlength) return NULL;
-	if (hlength <= 0) return NULL;
-	if (nlength <= 0) return haystack;
-	for (i = 0; i <= (hlength - nlength); i++) {
-		if (strncasecmp (haystack + i, needle, nlength) == 0)
-			return haystack + i;
-	}
-  return NULL; /* not found */
-}
-inline int fast_badword_match(ConfigItem_badword *badword, char *line)
-{
- 	char *p;
-	int bwlen = strlen(badword->word);
-	if ((badword->type & BADW_TYPE_FAST_L) && (badword->type & BADW_TYPE_FAST_R))
-		return (our_strcasestr(line, badword->word) ? 1 : 0);
-
-	p = line;
-	while((p = our_strcasestr(p, badword->word)))
-	{
-		if (!(badword->type & BADW_TYPE_FAST_L))
-		{
-			if ((p != line) && isalnum(*(p - 1))) /* aaBLA but no *BLA */
-				goto next;
-		}
-		if (!(badword->type & BADW_TYPE_FAST_R))
-		{
-			if (isalnum(*(p + bwlen)))  /* BLAaa but no BLA* */
-				goto next;
-		}
-		/* Looks like it matched */
-		return 1;
-next:
-		p += bwlen;
-	}
-	return 0;
-}
-/* fast_badword_replace:
- * a fast replace routine written by Syzop used for replacing badwords.
- * searches in line for huntw and replaces it with replacew,
- * buf is used for the result and max is sizeof(buf).
- * (Internal assumptions: max > 0 AND max > strlen(line)+1)
- */
-inline int fast_badword_replace(ConfigItem_badword *badword, char *line, char *buf, int max)
-{
-/* Some aliases ;P */
-char *replacew = badword->replace ? badword->replace : REPLACEWORD;
-char *pold = line, *pnew = buf; /* Pointers to old string and new string */
-char *poldx = line;
-int replacen = -1; /* Only calculated if needed. w00t! saves us a few nanosecs? lol */
-int searchn = -1;
-char *startw, *endw;
-char *c_eol = buf + max - 1; /* Cached end of (new) line */
-int run = 1;
-int cleaned = 0;
-
-	Debug((DEBUG_NOTICE, "replacing %s -> %s in '%s'", badword->word, replacew, line));
-
-	while(run) {
-		pold = our_strcasestr(pold, badword->word);
-		if (!pold)
-			break;
-		cleaned = 1;
-		if (replacen == -1)
-			replacen = strlen(replacew);
-		if (searchn == -1)
-			searchn = strlen(badword->word);
-		/* Hunt for start of word */
- 		if (pold > line) {
-			for (startw = pold; (isalnum(*startw) && (startw != line)); startw--);
-			if (!isalnum(*startw))
-				startw++; /* Don't point at the space/seperator but at the word! */
-		} else {
-			startw = pold;
-		}
-
-		if (!(badword->type & BADW_TYPE_FAST_L) && (pold != startw)) {
-			/* not matched */
-			pold++;
-			continue;
-		}
-
-		/* Hunt for end of word */
-		for (endw = pold; ((*endw != '\0') && (isalnum(*endw))); endw++);
-
-		if (!(badword->type & BADW_TYPE_FAST_R) && (pold+searchn != endw)) {
-			/* not matched */
-			pold++;
-			continue;
-		}
-
-		/* Do we have any not-copied-yet data? */
-		if (poldx != startw) {
-			int tmp_n = startw - poldx;
-			if (pnew + tmp_n >= c_eol) {
-				/* Partial copy and return... */
-				memcpy(pnew, poldx, c_eol - pnew);
-				*c_eol = '\0';
-				return 1;
-			}
-
-			memcpy(pnew, poldx, tmp_n);
-			pnew += tmp_n;
-		}
-		/* Now update the word in buf (pnew is now something like startw-in-new-buffer */
-
-		if (replacen) {
-			if ((pnew + replacen) >= c_eol) {
-				/* Partial copy and return... */
-				memcpy(pnew, replacew, c_eol - pnew);
-				*c_eol = '\0';
-				return 1;
-			}
-			memcpy(pnew, replacew, replacen);
-			pnew += replacen;
-		}
-		poldx = pold = endw;
-	}
-	/* Copy the last part */
-	if (*poldx) {
-		strncpy(pnew, poldx, c_eol - pnew);
-		*(c_eol) = '\0';
-	} else {
-		*pnew = '\0';
-	}
-	return cleaned;
-}
-#endif
-
-/*
- * Returns a string, which has been filtered by the words loaded via
- * the loadbadwords() function.  It's primary use is to filter swearing
- * in both private and public messages
- */
-
-void badwords_stats(aClient *sptr)
-{
-}
-
-char *stripbadwords(char *str, ConfigItem_badword *start_bw, int *blocked)
-{
-	regmatch_t pmatch[MAX_MATCH];
-	static char cleanstr[4096];
-	char buf[4096];
-	char *ptr;
-	int  matchlen, stringlen, cleaned;
-	ConfigItem_badword *this_word;
-	
-	*blocked = 0;
-
-	if (!start_bw)
-		return str;
-
-	/*
-	 * work on a copy
-	 */
-	stringlen = strlcpy(cleanstr, StripControlCodes(str), sizeof cleanstr);
-	memset(&pmatch, 0, sizeof pmatch);
-	matchlen = 0;
-	buf[0] = '\0';
-	cleaned = 0;
-
-	for (this_word = start_bw; this_word; this_word = (ConfigItem_badword *)this_word->next)
-	{
-#ifdef FAST_BADWORD_REPLACE
-		if (this_word->type & BADW_TYPE_FAST)
-		{
-			if (this_word->action == BADWORD_BLOCK)
-			{
-				if (fast_badword_match(this_word, cleanstr))
-				{
-					*blocked = 1;
-					return NULL;
-				}
-			}
-			else
-			{
-				int n;
-				/* fast_badword_replace() does size checking so we can use 512 here instead of 4096 */
-				n = fast_badword_replace(this_word, cleanstr, buf, 512);
-				if (!cleaned && n)
-					cleaned = n;
-				strcpy(cleanstr, buf);
-				memset(buf, 0, sizeof(buf)); /* regexp likes this somehow */
-			}
-		} else
-		if (this_word->type & BADW_TYPE_REGEX)
-		{
-#endif
-			if (this_word->action == BADWORD_BLOCK)
-			{
-				if (!regexec(&this_word->expr, cleanstr, 0, NULL, 0))
-				{
-					*blocked = 1;
-					return NULL;
-				}
-			}
-			else
-			{
-				ptr = cleanstr; /* set pointer to start of string */
-				while (regexec(&this_word->expr, ptr, MAX_MATCH, pmatch,0) != REG_NOMATCH)
-				{
-					if (pmatch[0].rm_so == -1)
-						break;
-					cleaned = 1;
-					matchlen += pmatch[0].rm_eo - pmatch[0].rm_so;
-					strlncat(buf, ptr, sizeof buf, pmatch[0].rm_so);
-					if (this_word->replace)
-						strlcat(buf, this_word->replace, sizeof buf); 
-					else
-						strlcat(buf, REPLACEWORD, sizeof buf);
-					ptr += pmatch[0].rm_eo;	/* Set pointer after the match pos */
-					memset(&pmatch, 0, sizeof(pmatch));
-				}
-
-				/* All the better to eat you with! */
-				strlcat(buf, ptr, sizeof buf);	
-				memcpy(cleanstr, buf, sizeof cleanstr);
-				memset(buf, 0, sizeof(buf));
-				if (matchlen == stringlen)
-					break;
-			}
-#ifdef FAST_BADWORD_REPLACE
-		}
-#endif
-	}
-
-	cleanstr[511] = '\0'; /* cutoff, just to be sure */
-
-	return (cleaned) ? cleanstr : str;
-}
-
-char inline *stripbadwords_channel(char *str, int *blocked)
-{
-	return stripbadwords(str, conf_badword_channel, blocked);
-}
-
-char inline *stripbadwords_message(char *str, int *blocked)
-{
-	return stripbadwords(str, conf_badword_message, blocked);
-}
-char inline *stripbadwords_quit(char *str, int *blocked)
-{
-	return stripbadwords(str, conf_badword_quit, blocked);
-}
-
-#endif

src/charsys.c

@@ -0,0 +1,679 @@
+/*
+ * Unreal Internet Relay Chat Daemon, src/charsys.c
+ * (C) Copyright 2005 Bram Matthys and The UnrealIRCd Team.
+ *
+ * Character system: This subsystem deals with finding out wheter a
+ * character should be allowed or not in nicks (nicks only for now).
+ *
+ * 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 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "config.h"
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "macros.h"
+#include "numeric.h"
+#include "msg.h"
+#include "channel.h"
+#include <time.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
+#include <fcntl.h>
+#include "h.h"
+#include "proto.h"
+#ifdef STRIPBADWORDS
+#include "badwords.h"
+#endif
+
+#ifdef _WIN32
+#include "version.h"
+#endif
+
+/* NOTE: it is guaranteed that char is unsigned by compiling options
+ *       (-funsigned-char @ gcc, /J @ MSVC)
+ * NOTE2: Original credit for supplying the correct chinese
+ *        coderanges goes to: RexHsu, Mr.WebBar and Xuefer
+ */
+
+/** Our multibyte structure */
+typedef struct _mblist MBList;
+struct _mblist
+{
+	MBList *next;
+	char s1, e1, s2, e2;
+};
+MBList *mblist = NULL, *mblist_tail = NULL;
+
+/* Use this to prevent mixing of certain combinations
+ * (such as GBK & high-ascii, etc)
+ */
+static int langav;
+char langsinuse[4096];
+
+/* bitmasks: */
+#define LANGAV_ASCII		0x0001 /* 8 bit ascii */
+#define LANGAV_LATIN1		0x0002 /* latin1 (western europe) */
+#define LANGAV_LATIN2		0x0004 /* latin2 (eastern europe, eg: polish) */
+#define LANGAV_ISO8859_7	0x0008 /* greek */
+#define LANGAV_ISO8859_8I	0x0010 /* hebrew */
+#define LANGAV_ISO8859_9	0x0020 /* turkish */
+#define LANGAV_W1250		0x0040 /* windows-1250 (eg: polish-w1250) */
+#define LANGAV_W1251		0x0080 /* windows-1251 (eg: russian) */
+#define LANGAV_LATIN2W1250	0x0100 /* Compatible with both latin2 AND windows-1250 (eg: hungarian) */
+#define LANGAV_GBK			0x1000 /* (Chinese) GBK encoding */
+
+typedef struct _langlist LangList;
+struct _langlist
+{
+	char *directive;
+	char *code;
+	int setflags;
+};
+
+/* MUST be alphabetized (first column) */
+static LangList langlist[] = {
+	{ "belarussian-w1251", "blr", LANGAV_ASCII|LANGAV_W1251 },
+	{ "catalan",      "cat", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "chinese",      "chi-j,chi-s,chi-t", LANGAV_GBK },
+	{ "chinese-ja",   "chi-j", LANGAV_GBK },
+	{ "chinese-simp", "chi-s", LANGAV_GBK },
+	{ "chinese-trad", "chi-t", LANGAV_GBK },
+	{ "czech",        "cze-m", LANGAV_ASCII|LANGAV_W1250 },
+	{ "danish",       "dan", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "dutch",        "dut", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "french",       "fre", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "gbk",          "chi-s,chi-t,chi-j", LANGAV_GBK },
+	{ "german",       "ger", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "greek",        "gre", LANGAV_ASCII|LANGAV_ISO8859_7 },
+	{ "hebrew",       "heb", LANGAV_ASCII|LANGAV_ISO8859_8I },
+	{ "hungarian",    "hun", LANGAV_ASCII|LANGAV_LATIN2W1250 },
+	{ "icelandic",    "ice", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "italian",      "ita", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "latin1",       "cat,dut,fre,ger,ita,spa,swe", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "latin2",       "hun,pol,rum", LANGAV_ASCII|LANGAV_LATIN2 },
+	{ "polish",       "pol", LANGAV_ASCII|LANGAV_LATIN2 },
+	{ "polish-w1250", "pol-m", LANGAV_ASCII|LANGAV_W1250 },
+	{ "romanian",     "rum", LANGAV_ASCII|LANGAV_LATIN2W1250 },
+	{ "russian-w1251","rus", LANGAV_ASCII|LANGAV_W1251 },
+	{ "slovak",       "slo-m", LANGAV_ASCII|LANGAV_W1250 },
+	{ "spanish",      "spa", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "swedish",      "swe", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "swiss-german", "swg", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "turkish",      "tur", LANGAV_ASCII|LANGAV_ISO8859_9 },
+	{ "ukrainian-w1251", "ukr", LANGAV_ASCII|LANGAV_W1251 },
+	{ "windows-1250", "cze-m,pol-m,rum,slo-m,hun",  LANGAV_ASCII|LANGAV_W1250 },
+	{ "windows-1251", "rus,ukr,blr", LANGAV_ASCII|LANGAV_W1251 },
+	{ NULL, NULL, 0 }
+};
+
+/* For temporary use during config_run */
+typedef struct _ilanglist ILangList;
+struct _ilanglist
+{
+	ILangList *prev, *next;
+	char *name;
+};
+ILangList *ilanglist = NULL;
+
+static int do_nick_name_multibyte(char *nick);
+static int do_nick_name_standard(char *nick);
+
+/* These characters are ALWAYS disallowed... from remote, in
+ * multibyte, etc.. even though this might mean a certain
+ * (legit) character cannot be used (eg: in chinese GBK).
+ * - no breaking space
+ * - ! (nick!user seperator)
+ * - prefix chars: +, %, @, &, ~
+ * - channel chars: #
+ * - scary chars: $, :, ', ", ?, *, ',', '.'
+ * NOTE: the caller should also check for ascii <= 32.
+ * [CHANGING THIS WILL CAUSE SECURITY/SYNCH PROBLEMS AND WILL
+ *  VIOLATE YOUR ""RIGHT"" ON SUPPORT IMMEDIATELY]
+ */
+const char *illegalnickchars = "\xA0!+%@&~#$:'\"?*,.";
+
+/** Called on boot and just before config run */
+void charsys_reset(void)
+{
+int i;
+MBList *m, *m_next;
+
+	/* First, reset everything */
+	for (i=0; i < 256; i++)
+		char_atribs[i] &= ~ALLOWN;
+	for (m=mblist; m; m=m_next)
+	{
+		m_next = m->next;
+		MyFree(m);
+	}
+	mblist=mblist_tail=NULL;
+	/* Then add the default which will always be allowed */
+	charsys_addallowed("0123456789-ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyzy{|}");
+	langav = 0;
+	langsinuse[0] = '\0';
+#ifdef DEBUGMODE
+	if (ilanglist)
+		abort();
+#endif
+}
+
+void charsys_reset_pretest(void)
+{
+	langav = 0;
+}
+
+static inline void ilang_swap(ILangList *one, ILangList *two)
+{
+char *tmp = one->name;
+	one->name = two->name;
+	two->name = tmp;
+}
+
+static void ilang_sort(void)
+{
+ILangList *outer, *inner;
+char *tmp;
+
+	/* Selection sort -- perhaps optimize to qsort/whatever if
+     * possible? ;)
+     */
+	for (outer=ilanglist; outer; outer=outer->next)
+	{
+		for (inner=outer->next; inner; inner=inner->next)
+		{
+			if (strcmp(outer->name, inner->name) > 0)
+				ilang_swap(outer, inner);
+		}
+	}
+}
+
+void charsys_finish(void)
+{
+ILangList *e, *e_next;
+
+	/* Sort alphabetically */
+	ilang_sort();
+
+	/* [note: this can be optimized] */
+	langsinuse[0] = '\0';
+	for (e=ilanglist; e; e=e->next)
+	{
+		strlcat(langsinuse, e->name, sizeof(langsinuse));
+		if (e->next)
+			strlcat(langsinuse, ",", sizeof(langsinuse));
+	}
+	
+	/* Free everything */
+	for (e=ilanglist; e; e=e_next)
+	{
+		e_next=e->next;
+		MyFree(e->name);
+		MyFree(e);
+	}
+	ilanglist = NULL;
+#ifdef DEBUGMODE
+	ircd_log(LOG_ERROR, "[Debug] langsinuse: '%s'", langsinuse);
+	if (strlen(langsinuse) > 490)
+		abort();
+#endif
+}
+
+/** Add a character range to the multibyte list.
+ * @param s1 Start of highest byte
+ * @param e1 End of highest byte
+ * @param s2 Start of lowest byte
+ * @param e2 End of lowest byte
+ * @example charsys_addmultibyterange(0xaa, 0xbb, 0x00, 0xff) for 0xaa00-0xbbff
+ */
+void charsys_addmultibyterange(char s1, char e1, char s2, char e2)
+{
+MBList *m = MyMallocEx(sizeof(MBList));
+
+	m->s1 = s1;
+	m->e1 = e1;
+	m->s2 = s2;
+	m->e2 = e2;
+
+	if (mblist_tail)
+		mblist_tail->next = m;
+	else
+		mblist = m;
+	mblist_tail = m;
+}
+
+/** Adds all characters in the specified string to the allowed list. */
+void charsys_addallowed(char *s)
+{
+	for (; *s; s++)
+	{
+		if ((*s <= 32) || strchr(illegalnickchars, *s))
+		{
+			config_error("INTERNAL ERROR: charsys_addallowed() called for illegal characters: %s", s);
+#ifdef DEBUGMODE
+			abort();
+#endif
+		}
+		char_atribs[(unsigned int)*s] |= ALLOWN;
+	}
+}
+
+int do_nick_name(char *nick)
+{
+	if (mblist)
+		return do_nick_name_multibyte(nick);
+	else
+		return do_nick_name_standard(nick);
+}
+
+static int do_nick_name_standard(char *nick)
+{
+int len;
+char *ch;
+
+	if ((*nick == '-') || isdigit(*nick))
+		return 0;
+
+	for (ch=nick,len=0; *ch && len <= NICKLEN; ch++, len++)
+		if (!isvalid(*ch))
+			return 0; /* reject the full nick */
+	*ch = '\0';
+	return len;
+}
+
+static int isvalidmbyte(unsigned char c1, unsigned char c2)
+{
+MBList *m;
+
+	for (m=mblist; m; m=m->next)
+	{
+		if ((c1 >= m->s1) && (c1 <= m->e1) &&
+		    (c2 >= m->s2) && (c2 <= m->e2))
+		    return 1;
+	}
+	return 0;
+}
+
+/* hmmm.. there must be some problems with multibyte &
+ * other high ascii characters I think (such as german etc).
+ * Not sure if this can be solved? I don't think so... -- Syzop.
+ */
+static int do_nick_name_multibyte(char *nick)
+{
+int len;
+char *ch;
+MBList *m;
+int firstmbchar = 0;
+
+	if ((*nick == '-') || isdigit(*nick))
+		return 0;
+
+	for (ch=nick,len=0; *ch && len <= NICKLEN; ch++, len++)
+	{
+		/* Some characters are ALWAYS illegal, so they have to be disallowed here */
+		if ((*ch <= 32) || strchr(illegalnickchars, *ch))
+			return 0;
+		if (firstmbchar)
+		{
+			if (!isvalidmbyte(ch[-1], *ch))
+				return 0;
+			firstmbchar = 0;
+		} else if ((*ch) & 0x80)
+			firstmbchar = 1;
+		else if (!isvalid(*ch))
+			return 0;
+	}
+	if (firstmbchar)
+		ch--;
+	*ch = '\0';
+	return len;
+}
+
+/** Does some very basic checking on remote nickname.
+ * It's only purpose is not to cause the whole network
+ * to fall down in pieces, that's all. Display problems
+ * are not really handled here. They are assumed to have been
+ * checked by PROTOCTL NICKCHARS= -- Syzop.
+ */
+int do_remote_nick_name(char *nick)
+{
+char *c;
+
+	for (c=nick; *c; c++)
+		if ((*c <= 32) || strchr(illegalnickchars, *c))
+			return 0;
+
+	return (c - nick);
+}
+
+/** Check if the specified charsets during the TESTING phase can be
+ * premitted without getting into problems.
+ * RETURNS: -1 in case of failure, 1 if ok
+ */
+int charsys_postconftest(void)
+{
+int x=0;
+	if ((langav & LANGAV_ASCII) && (langav & LANGAV_GBK))
+	{
+		config_error("ERROR: set::allowed-nickchars specifies incorrect combination "
+		             "of languages: high-ascii languages (such as german, french, etc) "
+		             "cannot be mixed with chinese/..");
+		return -1;
+	}
+	if (langav & LANGAV_LATIN1)
+		x++;
+	if (langav & LANGAV_LATIN2)
+		x++;
+	if (langav & LANGAV_ISO8859_7)
+		x++;
+	if (langav & LANGAV_ISO8859_9)
+		x++;
+	if (langav & LANGAV_W1250)
+		x++;
+	if (langav & LANGAV_W1251)
+		x++;
+	if ((langav & LANGAV_LATIN2W1250) && !(langav & LANGAV_LATIN2) && !(langav & LANGAV_W1250))
+	    x++;
+	if (x > 1)
+	{
+		config_status("WARNING: set::allowed-nickchars: "
+		            "Mixing of charsets (eg: latin1+latin2) can cause display problems");
+	}
+	return 1;
+}
+
+static LangList *charsys_find_language(char *name)
+{
+int start = 0;
+int stop = ARRAY_SIZEOF(langlist)-1;
+int mid;
+
+	while (start <= stop)
+	{
+		mid = (start+stop)/2;
+		if (!langlist[mid].directive || smycmp(name, langlist[mid].directive) < 0)
+			stop = mid-1;
+		else if (strcmp(name, langlist[mid].directive) == 0)
+			return &langlist[mid];
+		else
+			start = mid+1;
+	}
+	return NULL;
+}
+
+/** Check if language is available. */
+int charsys_test_language(char *name)
+{
+LangList *l = charsys_find_language(name);
+
+	if (l)
+	{
+		langav |= l->setflags;
+		return 1;
+	}
+	if (!strcmp(name, "euro-west"))
+	{
+		config_error("set::allowed-nickchars: ERROR: 'euro-west' got renamed to 'latin1'");
+		return 0;
+	}
+	return 0;
+}
+
+static void charsys_doadd_language(char *name)
+{
+LangList *l;
+ILangList *li;
+int found;
+char tmp[512], *lang, *p;
+
+	l = charsys_find_language(name);
+	if (!l)
+	{
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return;
+	}
+
+	strlcpy(tmp, l->code, sizeof(tmp));
+	for (lang = strtoken(&p, tmp, ","); lang; lang = strtoken(&p, NULL, ","))
+	{
+		/* Check if present... */
+		found=0;
+		for (li=ilanglist; li; li=li->next)
+			if (!strcmp(li->name, lang))
+			{
+				found = 1;
+				break;
+			}
+		if (!found)
+		{
+			/* Add... */
+			li = MyMallocEx(sizeof(ILangList));
+			li->name = strdup(lang);
+			AddListItem(li, ilanglist);
+		}
+	}
+}
+
+void charsys_add_language(char *name)
+{
+char latin1=0, latin2=0, w1250=0, w1251=0, chinese=0;
+
+	/** Note: there could well be some characters missing in the lists below.
+	 *        While I've seen other altnernatives that just allow pretty much
+	 *        every accent that exists even for dutch (where we rarely use
+	 *        accents except for like 3 types), I rather prefer to use a bit more
+	 *        reasonable aproach ;). That said, anyone is welcome to make
+	 *        suggestions about characters that should be added (or removed)
+	 *        of course. -- Syzop
+	 */
+
+	/* Add our language to our list */
+	charsys_doadd_language(name);
+
+	/* GROUPS */
+	if (!strcmp(name, "latin1"))
+		latin1 = 1;
+	else if (!strcmp(name, "latin2"))
+		latin2 = 1;
+	else if (!strcmp(name, "windows-1250"))
+		w1250 = 1;
+	else if (!strcmp(name, "windows-1251"))
+		w1251 = 1;
+	else if (!strcmp(name, "chinese") || !strcmp(name, "gbk"))
+		chinese = 1;
+	
+	/* INDIVIDUAL CHARSETS */
+
+	/* [LATIN1] */
+	if (latin1 || !strcmp(name, "german"))
+	{
+		/* a", A", o", O", u", U" and es-zett */
+		charsys_addallowed("äÄöÖüÜß");
+	}
+	if (latin1 || !strcmp(name, "swiss-german"))
+	{
+		/* a", A", o", O", u", U"  */
+		charsys_addallowed("äÄöÖüÜ");
+	}
+	if (latin1 || !strcmp(name, "dutch"))
+	{
+		/* Ok, even though I'm Dutch myself, I've trouble getting
+		 * a proper list of this ;). I think I got them all now, but
+		 * I did not include "borrow-words" like words we use in Dutch
+		 * that are literal French. So if you really want to use them all,
+		 * I suggest you to use just latin1 :P.
+		 */
+		/* e', e", o", i", u", e`. */
+		charsys_addallowed("éëöïüè");
+	}
+	if (latin1 || !strcmp(name, "danish"))
+	{
+		/* supplied by klaus:
+		 * <ae>, <AE>, ao, Ao, o/, O/ */
+		charsys_addallowed("æÆåÅøØ");
+	}
+	if (latin1 || !strcmp(name, "french"))
+	{
+		/* A`, A^, a`, a^, weird-C, weird-c, E`, E', E^, E", e`, e', e^, e",
+		 * I^, I", i^, i", O^, o^, U`, U^, U", u`, u", u`, y" [not in that order, sry]
+		 * Hmm.. there might be more, but I'm not sure how common they are
+		 * and I don't think they are always displayed correctly (?).
+		 */
+		charsys_addallowed("ÀÂàâÇçÈÉÊËèéêëÎÏîïÔôÙÛÜùûüÿ");
+	}
+	if (latin1 || !strcmp(name, "spanish"))
+	{
+		/* a', A', e', E', i', I', o', O', u', U', u", U", n~, N~ */
+		charsys_addallowed("áÁéÉíÍóÓúÚüÜñÑ");
+	}
+	if (latin1 || !strcmp(name, "italian"))
+	{
+		/* A`, E`, E', I`, I', O`, O', U`, U', a`, e`, e', i`, i', o`, o', u`, u' */
+		charsys_addallowed("ÀÈÉÌÍÒÓÙÚàèéìíòóùú");
+	}
+	if (latin1 || !strcmp(name, "catalan"))
+	{
+		/* supplied by Trocotronic */
+		/* a`, A`, e`, weird-c, weird-C, E`, e', E', i', I', o`, O`, o', O', u', U', i", I", u", U", weird-dot */
+		charsys_addallowed("àÀçÇèÈéÉíÍòÒóÓúÚïÏüÜ");
+	}
+	if (latin1 || !strcmp(name, "swedish"))
+	{
+		/* supplied by Tank */
+		/* ao, Ao, a", A", o", O" */ 
+		charsys_addallowed("åÅäÄöÖ");
+	}
+	if (latin1 || !strcmp(name, "icelandic"))
+	{
+		/* supplied by Saevar */
+		charsys_addallowed("ÆæÖöÁáÍíÐðÚúÓóÝýÞþ");
+	}
+
+	/* [LATIN2] */
+	/* actually hungarian is a special case, include it in both w1250 and latin2 ;p */
+	if (latin2 || w1250 || !strcmp(name, "hungarian"))
+	{
+		/* supplied by AngryWolf */
+		/* a', e', i', o', o", o~, u', u", u~, A', E', I', O', O", O~, U', U", U~ */
+		charsys_addallowed("áéíóöõúüûÁÉÍÓÖÕÚÜÛ");
+	}
+	/* same is true for romanian: latin2 & w1250 compatible */
+	if (latin2 || w1250 || !strcmp(name, "romanian"))
+	{
+		/* With some help from crazytoon */
+		/* 'S,' 's,' 'A^' 'A<' 'I^' 'T,' 'a^' 'a<' 'i^' 't,' */
+		charsys_addallowed("ªºÂÃÎÞâãîþ");
+	}
+	
+	if (latin2 || !strcmp(name, "polish"))
+	{
+		/* supplied by k4be */
+		charsys_addallowed("±æê³ñ󶿼¡ÆÊ£ÑÓ¦¯¬");
+	}
+
+	/* [windows 1250] */
+	if (w1250 || !strcmp(name, "polish-w1250"))
+	{
+		/* supplied by k4be */
+		charsys_addallowed("¹æê³ñ󜿟¥ÆÊ£ÑÓŒ¯�");
+	}
+	if (w1250 || !strcmp(name, "czech-w1250"))
+	{
+		/* Syzop [probably incomplete] */
+		charsys_addallowed("Š�Žš�žÁÈÉÌÍÏÒÓØÙÚÝáèéìíïòóøùúý");
+	}
+	if (w1250 || !strcmp(name, "slovak-w1250"))
+	{
+		/* Syzop [probably incomplete] */
+		charsys_addallowed("Š�Žš�ž¼¾ÀÁÄÅÈÉÍÏàáäåèéíïòóôúý");
+	}
+
+	/* [windows 1251] */
+	if (w1251 || !strcmp(name, "russian-w1251"))
+	{
+		/* supplied by Roman Parkin:
+		 * 128-159 and 223-254
+		 */
+		charsys_addallowed("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ¨¸");
+	}
+	
+	if (w1251 || !strcmp(name, "belarussian-w1251"))
+	{
+		/* supplied by Bock (Samets Anton) & ss:
+		 * 128-159, 161, 162, 178, 179 and 223-254
+		 * Corrected 01.11.2006 to more "correct" behavior by Bock
+		 */
+		charsys_addallowed("ÀÁÂÃÄŨÆDzÉÊËÌÍÎÏÐÑÒÓ¡ÔÕÖ×ØÛÜÝÞßàáâãäå¸æç³éêëìíîïðñòó¢ôõö÷øûüýþÿ");
+	}	
+	
+	if (w1251 || !strcmp(name, "ukrainian-w1251"))
+	{
+		/* supplied by Anton Samets & ss:
+		 * 128-159, 170, 175, 178, 179, 186, 191 and 223-254
+		 * Corrected 01.11.2006 to more "correct" behavior by core
+		 */
+		charsys_addallowed("ÀÁÂÃ¥ÄŪÆÇȲ¯ÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÜÞßàáâã´äåºæç賿éêëìíîïðñòóôõö÷øùüþÿ");
+	}	
+
+	/* [GREEK] */	
+	if (!strcmp(name, "greek"))
+	{
+		/* supplied by GSF */
+		/* ranges from rfc1947 / iso 8859-7 */
+		charsys_addallowed("¶¸¹º¼¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóô");
+	}
+
+	/* [TURKISH] */
+	if (!strcmp(name, "turkish"))
+	{
+		/* Supplied by Ayberk Yancatoral */
+		charsys_addallowed("öÖçÇþÞüÜðÐý");
+	}
+
+	/* [HEBREW] */
+	if (!strcmp(name, "hebrew"))
+	{
+		/* Supplied by PHANTOm. */
+		/* 0xE0 - 0xFE */
+		charsys_addallowed("àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ");
+	}
+
+	/* [CHINESE] */
+	if (chinese || !strcmp(name, "chinese-ja"))
+	{
+		charsys_addmultibyterange(0xa4, 0xa4, 0xa1, 0xf3); /* JIS_PIN */
+		charsys_addmultibyterange(0xa5, 0xa5, 0xa1, 0xf6); /* JIS_PIN */
+	}
+	if (chinese || !strcmp(name, "chinese-simp"))
+	{
+		charsys_addmultibyterange(0xb0, 0xd6, 0xa1, 0xfe); /* GBK/2 BC with GB2312 */
+		charsys_addmultibyterange(0xd7, 0xd7, 0xa1, 0xf9); /* GBK/2 BC with GB2312 */
+		charsys_addmultibyterange(0xd8, 0xf7, 0xa1, 0xfe); /* GBK/2 BC with GB2312 */
+	}
+	if (chinese || !strcmp(name, "chinese-trad"))
+	{
+		charsys_addmultibyterange(0x81, 0xa0, 0x40, 0x7e); /* GBK/3 - lower half */
+		charsys_addmultibyterange(0x81, 0xa0, 0x80, 0xfe); /* GBK/3 - upper half */
+		charsys_addmultibyterange(0xaa, 0xfe, 0x40, 0x7e); /* GBK/4 - lower half */
+		charsys_addmultibyterange(0xaa, 0xfe, 0x80, 0xa0); /* GBK/4 - upper half */
+	}
+}

src/cidr.c

@@ -18,342 +18,375 @@
  * $Id$ 
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include "struct.h"
+#include "common.h"
+#include "sys.h"
 #include "h.h"
-/* The following functions have been taken from Hybrid7-beta8 simply because
+#include "msg.h"
+#include <stdarg.h>
+#include <stdio.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
+#include <string.h>
+
+/* The following functions have been taken from Hybrid-7.0.1 simply because
  * I didn't feel like writing my own when they had ones that work just fine :)
+ * However, several bugs were found and some stuff was moved around to work
+ * better.
  */
 
 #ifdef INET6
-static int parse_v6_netmask(const char *, struct IN_ADDR *, int *);
+static int parse_v6_netmask(const char *, struct IN_ADDR *addr, short int *b);
 #endif
-static int parse_v4_netmask(const char *, struct IN_ADDR *, int *);
+static int parse_v4_netmask(const char *, struct IN_ADDR *addr, short int *b);
 
-#define DigitParse(ch) if (ch >= '0' && ch <= '9') \
+#define DigitParse(ch) do { \
+                       if (ch >= '0' && ch <= '9') \
                          ch = ch - '0'; \
                        else if (ch >= 'A' && ch <= 'F') \
-                         ch = ch - 'A' + '0'; \
+                         ch = ch - 'A' + 10; \
                        else if (ch >= 'a' && ch <= 'f') \
-                         ch = ch - 'a' + '0';
+                         ch = ch - 'a' + 10; \
+                       } while(0);
 
 /* The mask parser/type determination code... */
 
-/* int parse_v6_netmask(const char *, struct IN_ADDR*, int *);
+/* int parse_v6_netmask(const char *, struct IN_ADDR*, short int *);
  * Input: An possible IPV6 address as a string.
  * Output: An integer describing whether it is an IPV6 or hostmask,
  *         an address(if it is IPV6), a bitlength(if it is IPV6).
  * Side effects: None
  * Comments: Called from parse_netmask
  */
+/* Fixed so ::/0 (any IPv6 address) is valid
+   Also a bug in DigitParse above.
+   -Gozem 2002-07-19 gozem@linux.nu
+ */
 #ifdef INET6
-static int
-parse_v6_netmask(const char *text, struct IN_ADDR *addr, int *b)
+static int parse_v6_netmask(const char *text, struct IN_ADDR *addr, short int *b)
 {
-  const char *p;
-  char c;
-  int d[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }, dp = 0, nyble = 4, finsert =
-    -1, bits = 0, deficit = 0;
-  short dc[8];
+	const char *p;
+	char c;
+	int d[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+	int dp = 0;
+	int nyble = 4;
+	int finsert = -1;
+	short int bits = 128;
+	int deficit = 0;
+	unsigned short dc[8];
 
-  for (p = text; (c = *p); p++)
-    if (isxdigit(c))
-    {
-      if (nyble == 0)
-        return HM_HOST;
-      DigitParse(c);
-      d[dp] |= c << (4 * --nyble);
-    }
-    else if (c == ':')
-    {
-      if (p > text && *(p - 1) == ':')
-      {
-        if (finsert >= 0)
-          return HM_HOST;
-        finsert = dp;
-      }
-      else
-      {
-        /* If there were less than 4 hex digits, e.g. :ABC: shift right
-         * so we don't interpret it as ABC0 -A1kmm */
-        d[dp] = d[dp] >> 4 * nyble;
-        nyble = 4;
-        if (++dp >= 8)
-          return HM_HOST;
-      }
-    }
-    else if (c == '*')
-    {
-      /* * must be last, and * is ambiguous if there is a ::... -A1kmm */
-      if (finsert >= 0 || *(p + 1) || dp == 0 || *(p - 1) != ':')
-        return HM_HOST;
-      bits = dp * 16;
-    }
-    else if (c == '/')
-    {
-      char *after;
+	for (p = text; (c = *p); p++)
+		/* Parse a digit */
+		if (isxdigit(c))
+		{
+			if (nyble == 0)
+				return HM_HOST;
+			DigitParse(c);
+			d[dp] |= c << (4 * --nyble);
+		}
+		else if (c == ':')
+		{
+			/* It's a :: */
+			if (p > text && *(p - 1) == ':')
+			{
+				if (finsert >= 0) /* Error: already has a :: */
+					return HM_HOST;
+				finsert = dp;
+			}
+			/* Just a regular : */
+			else
+			{
+				/* If there were less than 4 hex digits, e.g. :ABC: shift right
+				 * so we don't interpret it as ABC0 -A1kmm */
+				d[dp] = d[dp] >> 4 * nyble;
+				nyble = 4;
+				if (++dp >= 8) /* Error: more than 8 segments */
+					return HM_HOST;
+			}
+		}
+		/* Wildcard */
+		else if (c == '*')
+		{
+			/* Error: there was a ::, or it is not the last segment */
+			if (finsert >= 0 || *(p + 1) || dp == 0 || *(p - 1) != ':')
+				return HM_HOST;
+			bits = dp * 16;
+		}
+		/* Bit section */
+		else if (c == '/')
+		{
+			char *after;
 
-      d[dp] = d[dp] >> 4 * nyble;
-      dp++;
-      if (p > text && *(p - 1) == ':')
-        return HM_HOST;
-      bits = strtoul(p + 1, &after, 10);
-      if (bits == 0 || *after)
-        return HM_HOST;
-      if (bits > dp * 4 && !(finsert >= 0 && bits <= 128))
-        return HM_HOST;
-      break;
-    }
-    else
-      return HM_HOST;
+			d[dp] = d[dp] >> 4 * nyble;
+			dp++;
+			bits = strtoul(p + 1, &after, 10);
+			if (bits < 0 || *after) /* Error: bits is invalid or not the end */
+				return HM_HOST;
+			/* Error: Bits is greater than the number of bits given
+			 * and there is no :: */
+			if (bits > dp * 16 && !(finsert >= 0 && bits <= 128))
+				return HM_HOST;
+			break;
+		}
+		else /* Error: Illegal character */
+			return HM_HOST;
 
-  d[dp] = d[dp] >> 4 * nyble;
-  if (c == 0)
-    dp++;
-  if (finsert < 0 && bits == 0)
-    bits = dp * 16;
-  else if (bits == 0)
-    bits = 128;
-  /* How many words are missing? -A1kmm */
-  deficit = bits / 16 + ((bits % 16) ? 1 : 0) - dp;
-  /* Now fill in the gaps(from ::) in the copied table... -A1kmm */
-  for (dp = 0, nyble = 0; dp < 8; dp++)
-  {
-    if (nyble == finsert && deficit)
-    {
-      dc[dp] = 0;
-      deficit--;
-    }
-    else
-      dc[dp] = d[nyble++];
-  }
-  /* Set unused bits to 0... -A1kmm */
-  if (bits < 128 && (bits % 16 != 0))
-    dc[bits / 16] &= ~((1 << (15 - bits % 16)) - 1);
-  for (dp = bits / 16 + (bits % 16 ? 1 : 0); dp < 8; dp++)
-    dc[dp] = 0;
-  /* And assign... -A1kmm */
-  if (addr)
-    for (dp = 0; dp < 8; dp++)
-      /* The cast is a kludge to make netbsd work. */
-      ((unsigned short *)&addr->s6_addr)[dp] = htons(dc[dp]);
-  if (b)
-    *b = bits;
-  return HM_IPV6;
+	/* This is handled above if it was a / */
+	if (c != '/')
+		d[dp] = d[dp] >> 4 * nyble;
+	if (c == 0)
+		dp++;
+
+	/* If there was no bit section, set the number of bits */
+	if (finsert < 0 && bits == 0)
+		bits = dp * 16;
+	/* How many words are missing? -A1kmm */
+	/* The original check was wrong -- codemastr */
+	deficit = 8 - dp;
+
+	/* Now fill in the gaps(from ::) in the copied table... -A1kmm */
+	for (dp = 0, nyble = 0; dp < 8; dp++)
+	{
+		if (nyble == finsert && deficit)
+		{
+			dc[dp] = 0;
+			deficit--;
+		}
+		else
+			dc[dp] = d[nyble++];
+	}
+	/* Set unused bits to 0... -A1kmm */
+	/* This check was wrong as well -- codemastr */
+	if (bits < 128 && (bits % 16 != 0))
+		dc[bits / 16] &= ~((1 << (16 - bits % 16)) - 1);
+	for (dp = bits / 16 + (bits % 16 ? 1 : 0); dp < 8; dp++)
+		dc[dp] = 0;
+	/* And assign... -A1kmm */
+	if (addr)
+		for (dp = 0; dp < 8; dp++)
+			/* The cast is a kludge to make netbsd work. */
+			((unsigned short *)&addr->s6_addr)[dp] = htons(dc[dp]);
+	if (b != NULL)
+		*b = bits;
+	return HM_IPV6;
 }
 #endif
 
-/* int parse_v4_netmask(const char *, struct IN_ADDR *, int *);
- * Input: An possible IPV4 address as a string.
+/* int parse_v4_netmask(const char *, struct IN_ADDR *, short int *);
+ * Input: A possible IPV4 address as a string.
  * Output: An integer describing whether it is an IPV4 or hostmask,
  *         an address(if it is IPV4), a bitlength(if it is IPV4).
  * Side effects: None
  * Comments: Called from parse_netmask
  */
-static int
-parse_v4_netmask(const char *text, struct IN_ADDR *addr, int *b)
+static int parse_v4_netmask(const char *text, struct IN_ADDR *addr, short int *b)
 {
+	const char *p;
+	const char *digits[4];
+	unsigned char addb[4];
+	int n = 0, bits = 0;
+	char c;
+
+	digits[n++] = text;
+
+	for (p = text; (c = *p); p++)
+		if (c >= '0' && c <= '9')   /* empty */
+			;
+	else if (c == '.')
+	{
+		if (n >= 4) /* Error: More than four sections */
+			return HM_HOST;
+		digits[n++] = p + 1;
+	}
+	else if (c == '*')
+	{
+		if (*(p + 1) || n == 0 || *(p - 1) != '.') /* Error: * is not at the end
+							    * or not its own section */
+			return HM_HOST;
+		bits = (n - 1) * 8;
+		break;
+	}
+	else if (c == '/')
+	{
+		char *after;
+		bits = strtoul(p + 1, &after, 10);
+		if (!bits || *after) /* Error: Invalid number or not end */
+			return HM_HOST;
+		if (bits > n * 8) /* Error: More than the bits given */
+			return HM_HOST;
+		break;
+	}
+	else /* Error: Illegal character */
+		return HM_HOST;
+
+	if (n < 4 && bits == 0)
+		bits = n * 8;
+	if (bits)
+		while (n < 4)
+			digits[n++] = "0";
+	for (n = 0; n < 4; n++)
+		addb[n] = strtoul(digits[n], NULL, 10);
+	if (bits == 0)
+		bits = 32;
+	/* Set unused bits to 0... -A1kmm */
+	if (bits < 32 && bits % 8)
+		addb[bits / 8] &= ~((1 << (8 - bits % 8)) - 1);
+	for (n = bits / 8 + (bits % 8 ? 1 : 0); n < 4; n++)
+		addb[n] = 0;
+	if (addr)
+	{
 #ifndef INET6
-  const char *p;
-  const char *digits[4];
-  unsigned char addb[8]; /* will only use 4, but space for overflow [?]. -- Syzop*/
-  int n = 0, bits = 0;
-  char c;
-
-  digits[n++] = text;
-
-  for (p = text; (c = *p); p++)
-    if (c >= '0' && c <= '9')   /* empty */
-      ;
-    else if (c == '.')
-    {
-      if (n >= 4)
-        return HM_HOST;
-      digits[n++] = p + 1;
-    }
-    else if (c == '*')
-    {
-      if (*(p + 1) || n == 0 || *(p - 1) != '.')
-        return HM_HOST;
-      bits = (n - 1) * 8;
-      break;
-    }
-    else if (c == '/')
-    {
-      char *after;
-      bits = strtoul(p + 1, &after, 10);
-      if (!bits || *after)
-        return HM_HOST;
-      if (bits > n * 8)
-        return HM_HOST;
-      break;
-    }
-    else
-      return HM_HOST;
-
-  if (n < 4 && bits == 0)
-    bits = n * 8;
-  if (bits)
-    while (n < 4)
-      digits[n++] = "0";
-  for (n = 0; n < 4; n++)
-    addb[n] = strtoul(digits[n], NULL, 10);
-  if (bits == 0)
-    bits = 32;
-  /* Set unused bits to 0... -A1kmm */
-  if (bits < 32 && bits % 8)
-    addb[bits / 8] &= ~((1 << (8 - bits % 8)) - 1);
-  for (n = bits / 8 + (bits % 8 ? 1 : 0); n < 8; n++)
-    addb[n] = 0;
-  if (addr)
-    addr->S_ADDR =
-      htonl(addb[0] << 24 | addb[1] << 16 | addb[2] << 8 | addb[3]);
-  if (b)
-    *b = bits;
-  return HM_IPV4;
+		addr->s_addr = htonl(addb[0] << 24 | addb[1] << 16 | addb[2] << 8 | addb[3]);
 #else
-  u_char *cp;
-  const char *p;
-  const char *digits[4];
-  unsigned char addb[4];
-  int n = 0, bits = 0;
-  char c;
-
-  digits[n++] = text;
-
-  for (p = text; (c = *p); p++)
-    if (c >= '0' && c <= '9')   /* empty */
-      ;
-    else if (c == '.')
-    {
-      if (n >= 4)
-        return HM_HOST;
-      digits[n++] = p + 1;
-    }
-    else if (c == '*')
-    {
-      if (*(p + 1) || n == 0 || *(p - 1) != '.')
-        return HM_HOST;
-      bits = (n - 1) * 8;
-      break;
-    }
-    else if (c == '/')
-    {
-      char *after;
-      bits = strtoul(p + 1, &after, 10);
-      if (!bits || *after)
-        return HM_HOST;
-      if (bits > n * 8)
-        return HM_HOST;
-      break;
-    }
-    else
-      return HM_HOST;
-
-  if (n < 4 && bits == 0)
-    bits = n * 8;
-  if (bits)
-    while (n < 4)
-      digits[n++] = "0";
-  for (n = 0; n < 4; n++)
-    addb[n] = strtoul(digits[n], NULL, 10);
-  if (bits == 0)
-    bits = 32;
-  /* Set unused bits to 0... -A1kmm */
-  if (bits < 32 && bits % 8)
-    addb[bits / 8] &= ~((1 << (8 - bits % 8)) - 1);
-  for (n = bits / 8 + (bits % 8 ? 1 : 0); n < 8; n++)
-    addb[n] = 0;
-  if (addr)
-  {  
-    cp = (u_char *)addr->s6_addr;
-    for (n = 0; n <= 9; n++)
-    	cp[n] = 0;
-    cp[10] = 0xff;
-    cp[11] = 0xff;
-    cp[12] = addb[0];
-    cp[13] = addb[1];
-    cp[14] = addb[2];
-    cp[15] = addb[3];
-  }
-  if (b)
-    *b = bits;
-  return HM_IPV4;
-  
+		for (n = 0; n <= 9; n++)
+			addr->s6_addr[n] = 0;
+		addr->s6_addr[10] = 0xff;
+		addr->s6_addr[11] = 0xff;
+		addr->s6_addr[12] = addb[0];
+		addr->s6_addr[13] = addb[1];
+		addr->s6_addr[14] = addb[2];
+		addr->s6_addr[15] = addb[3];
 #endif
+	}
+	if (b)
+		*b = bits;
+	return HM_IPV4;
 }
 
-/* int parse_netmask(const char *, struct IN_ADDR *, int *);
+/* int parse_netmask(const char *, struct irc_netmask *);
  * Input: A hostmask, or an IPV4/6 address.
  * Output: An integer describing whether it is an IPV4, IPV6 address or a
  *         hostmask, an address(if it is an IP mask),
  *         a bitlength(if it is IP mask).
  * Side effects: None
  */
-int
-parse_netmask(const char *text, struct IN_ADDR *addr, int *b)
+int parse_netmask(const char *text, struct irc_netmask *netmask)
 {
+	char *c;
+	const char *host;
+
+	/* So a user@ip can be specified -- codemastr */
+	if ((c = strchr(text, '@')) && *(c+1))
+		host = c+1;
+	else
+		host = text;
 #ifdef INET6
-  if (strchr(text, ':'))
-    return parse_v6_netmask(text, addr, b);
+	if (strchr(host, ':'))
+		return parse_v6_netmask(host, &netmask->mask, &netmask->bits);
+	else
 #endif
-  if (strchr(text, '.'))
-    return parse_v4_netmask(text, addr, b);
-  return HM_HOST;
+	if (strchr(host, '.'))
+		return parse_v4_netmask(host, &netmask->mask, &netmask->bits);
+	else
+	{
+		/* Well, lets just try and see?
+		 * This is here because ffff/10, for example,
+		 * is valid for our purposes */
+		if (parse_v4_netmask(host, &netmask->mask, &netmask->bits) == HM_IPV4)
+			return HM_IPV4;
+#ifdef INET6
+		return parse_v6_netmask(host, &netmask->mask, &netmask->bits);
+#endif
+	}
+	return HM_HOST;
 }
 
 /* The address matching stuff... */
 /* int match_ipv6(struct IN_ADDR *, struct IN_ADDR *, int)
  * Input: An IP address, an IP mask, the number of bits in the mask.
- * Output: if match, 0 else 1
+ * Output: if match, 1 else 0
  * Side effects: None
  */
 #ifdef INET6
-int
-match_ipv6(struct IN_ADDR *addr, struct IN_ADDR *mask, int bits)
+int match_ipv6(struct IN_ADDR *addr, struct IN_ADDR *mask, int bits)
 {
-  int i, m, n = bits / 8;
+	int i, m, n = bits / 8;
 
-  for (i = 0; i < n; i++)
-    if (addr->S_ADDR[i] != mask->S_ADDR[i])
-      return 1;
-  if ((m = bits % 8) == 0)
-    return 0;
-  if ((addr->S_ADDR[n] & ~((1 << (8 - m)) - 1)) ==
-      mask->S_ADDR[n])
-    return 0;
-  return 1;
+	for (i = 0; i < n; i++)
+		if (addr->s6_addr[i] != mask->s6_addr[i])
+			return 0;
+	if ((m = bits % 8) == 0)
+		return 1;
+	if ((addr->s6_addr[n] & ~((1 << (8 - m)) - 1)) == mask->s6_addr[n])
+		return 1;
+	return 0;
 }
 #endif
 
 /* int match_ipv4(struct IN_ADDR *, struct IN_ADDR *, int)
  * Input: An IP address, an IP mask, the number of bits in the mask.
- * Output: if match, 0 else 1
+ * Output: if match, 1 else 0
  * Side Effects: None
  */
-int
-match_ipv4(struct IN_ADDR *addr, struct IN_ADDR *mask, int bits)
+int match_ipv4(struct IN_ADDR *addr, struct IN_ADDR *mask, int bits)
 {
 #ifndef INET6
-  if ((ntohl(addr->S_ADDR) & ~((1 << (32 - bits)) - 1)) !=
-      ntohl(mask->S_ADDR))
-
-    return 1;
-  return 0;
+	if ((ntohl(addr->s_addr) & ~((1 << (32 - bits)) - 1)) == ntohl(mask->s_addr))
+		return 1;
+	return 0;
 #else
-  struct in_addr ipv4addr, ipv4mask;
-  
-  ipv4addr.s_addr = inet_addr((char *)Inet_ia2p(addr));
-  ipv4mask.s_addr = inet_addr((char *)Inet_ia2p(mask));
-  if ((ntohl(ipv4addr.s_addr) & ~((1 << (32 - bits)) - 1)) !=
-      ntohl(ipv4mask.s_addr))
+	struct in_addr ipv4addr, ipv4mask;
+	u_char *cp;
+	cp = (u_char *)((struct IN_ADDR *)addr)->s6_addr;
 
-    return 1;
-  return 0;
-  
+	/* Make sure the address is IPv4 */
+	if (cp[0] == 0 && cp[1] == 0 && cp[2] == 0 && cp[3] == 0 && cp[4] == 0
+            && cp[5] == 0 && cp[6] == 0 && cp[7] == 0 && cp[8] == 0
+            && cp[9] == 0 && cp[10] == 0xff && cp[11] == 0xff)
+	{
+		/* Convert the v6 representation to v4 */
+		bcopy(&addr->s6_addr[12], &ipv4addr, sizeof(struct in_addr));
+		bcopy(&mask->s6_addr[12], &ipv4mask, sizeof(struct in_addr));
+		if ((ntohl(ipv4addr.s_addr) & ~((1 << (32 - bits)) - 1)) ==
+		    ntohl(ipv4mask.s_addr))
+			return 1;
+	}
+	return 0;
 #endif
 }
 
+/* int match_ip(struct IN_ADDR addr, char *uhost, char *mask, struct irc_netmask *netmask)
+ * Input: an IP, a userhost, string mask, and a netmask struct
+ * Output: if match, 1 else 0
+ * Side Effects: None
+ */
+
+int match_ip(struct IN_ADDR addr, char *uhost, char *mask, struct irc_netmask *netmask)
+{
+	char *end;
+
+	if (!netmask)
+		return (!match(mask, uhost));
+
+	/* If it is an IP mask, we need to extract the user portion of both 
+         * and run a match. 
+         */
+	if (mask && (end = strchr(mask, '@')))
+	{
+		char username[USERLEN+1], usermask[USERLEN+1];
+		strlcpy(usermask, mask, end-mask+1 > USERLEN+1 ? USERLEN+1 : end-mask+1);
+		if ((end = strchr(uhost, '@')))
+		{
+			strlcpy(username, uhost, end-uhost+1 > USERLEN+1 ? USERLEN+1 : end-uhost+1);
+			if (match(usermask, username))
+				return 0;
+		}
+	}
+
+	switch (netmask->type)
+	{
+		case HM_HOST:
+			return (!match(mask, uhost));
+		case HM_IPV4:
+			return match_ipv4(&addr, &netmask->mask, netmask->bits);
+#ifdef INET6
+		case HM_IPV6:
+			return match_ipv6(&addr, &netmask->mask, netmask->bits);
+#endif
+		default:
+			return 0;
+	}
+}