[IRC-Dev CVS] [CVS] Module ircdh: Change committed

[Toni G. <zo...@us...>]

CVSROOT    : /cvsroot/irc-dev
Module     : ircdh
Commit time: 2003-01-19 21:22:43 UTC

Modified files:
     doc/example.conf

Log message:

Nuevo ircd.conf

---------------------- diff included ----------------------
Index: ircdh/doc/example.conf
diff -u ircdh/doc/example.conf:1.2 ircdh/doc/example.conf:1.3
--- ircdh/doc/example.conf:1.2	Sat Jan 18 15:16:08 2003
+++ ircdh/doc/example.conf	Sun Jan 19 13:22:33 2003
@@ -1,12 +1,15 @@
-# ircd.conf  configuration file for ircd version ircu2.9.mu and ircu2.10
+# ircd.conf - configuration file for ircd version ircu2.10
 #
-# Last Updated:  26, June 2001.
+# Last Updated:  20, March 2002.
 #
 # Written by Niels <ni...@un...>, based on the original example.conf,
 # server code and some real-life (ahem) experience.
 #
 # Updated and heavily modified by Braden <db...@ya...>.
 #
+# Rewritten by A1kmm(Andrew Miller)<a1...@mw...> to support
+# the new flex/bison configuration parser.
+#
 # Thanks and credits to: Run, Trillian, Cym, Morrissey, Chaos, Flynn,
 #                        Xorath, WildThang, Mmmm, SeKs, Ghostwolf and
 #                        all other Undernet IRC Admins and Operators,
@@ -19,16 +22,18 @@
 # but if all the other hubs in Europe aren't in service, it can connect
 # to one in the US by itself.
 #
-# All configuration options start with a letter identifying the option,
-# and a colon separated list of options. Unused fields should be left
-# blank.
+# The configuration format consists of a number of blocks in the format
+#  BlockName { setting = number; setting2 = "string"; setting3 = yes; };
+# Note that comments start from a #(hash) and go to the end of the line.
+# Whitespace(space, tab, or carriage return/linefeed) are ignored and may
+# be used to make the configuration file more readable.
 #
 # Please note that when ircd puts the configuration lines into practice,
 # it parses them exactly the other way round than they are listed here.
-# It reads the lines in reverse order.
+# It uses the blocks in reverse order.
 #
-# This means that you should start your I: lines with the "fall through",
-# most vanilla one and end with the most detailed.
+# This means that you should start your Client blocks with the
+# "fall through", most vanilla one, and end with the most detailed.
 #
 # There is a difference between the "hostname" and the "server name"
 # of the machine that the server is run on. For example, the host can
@@ -42,78 +47,142 @@
 # it to work.
 
 
-# [M:line]
+# [General]
 #
 # First some information about the server.
-# M:<server name>:<virtual host>:<description>:<not used>:<server numeric>
+# General {
+#         name = "servername";
+#         vhost = "virtualhost";
+#         description = "description";
+#         numeric = numericnumber;
+# };
 #
 # <virtual host> must contain either a * or a valid IPv4 address in
 # dotted quad notation. (127.0.0.1) The address MUST be the address
 # of a physical interface on the host. This address is used for outgoing
-# connections only, see P:lines for listener virtual hosting.
+# connections only, see Port{} for listener virtual hosting.
 # If in doubt put a * or the IP of your primary interface here.
 # The server must be compiled with virtual hosting turned on to get this
 # to work correctly.
 #
 # Note that <server numeric> has to be unique on the network your server
 # is running on, must be between 0 and 4095, and is not updated on a rehash.
-M:London.UK.Eu.UnderNet.org::University of London, England::1
-
+General {
+         name = "London.UK.Eu.UnderNet.org";
+         description = "University of London, England";
+         numeric = 1;
+};
 
-# [A:line]
+# [Admin]
 #
 # This sets information that can be retrieved with the /ADMIN command.
 # It should contain at least an admin Email contact address.
-# A:<line 1>:<line 2>:<line 3>
-A:The University of London:Undernet IRC server:IRC Admins <ir...@lo...>
-
+Admin {
+  Location = "The University of London";
+  # At most two contact lines are allowed...
+  Contact = "Undernet IRC server";
+  Contact = "IRC Admins <ir...@lo...>";
+};
 
-# [Y:lines]
+# [Classes]
 #
 # All connections to the server are associated with a certain "connection
 # class", be they incoming or outgoing (initiated by the server), be they
 # clients, servers or Martians. (Note that ircd doesn't have direct support
+# Recommended client classes:
 # for Martians (yet?); they will have to register as normal users. ;-)
-# Take the following Y: lines only as a guide.
-# Y:<class>:<ping freq>:<connect freq>:<maximum links>:<sendq size>
+# Take the following class blocks only as a guide.
+# Class {
+#  name = "<class>";
+#  pingfreq = time;
+#  connectfreq = time;
+#  maxlinks = number;
+#  sendq = size;
+# };
 #
 # <connect freq> applies only to servers, and specifies the frequency 
 # that the server tries to autoconnect. setting this to 0 will cause
 # the server to attempt to connect repeatedly with no delay until the 
 # <maximum links> condition is satisfied. This is a Bad Thing(tm).
+# Note that times can be specified as a number, or by giving something
+# like: 1 minutes 20 seconds, or 1*60+20.
+# Client {
+#  host = "user@host";
+#  ip = "ip@host";
+#  password = "password";
+#  class = "classname";
+# };
 #
 # <maximum links> should be set at either 0 or 1.
 #
-# Server classes: 90 = all your uplinks for who you do not wish to hub;
-# 80 = leaf servers (only used if your server is a hub)
-Y:90:90:300:1:9000000
-Y:80:90:300:0:9000000
+# Recommended server classes:
+# All your server uplinks you are not a hub for.
+Class {
+ name = "Server";
+ pingfreq = 1 minutes 30 seconds;
+ connectfreq = 5 minutes;
+ maxlinks = 1;
+ sendq = 9000000;
+};
+# All the leaf servers you hub for.
+Class {
+ name = "LeafServer";
+ pingfreq = 1 minutes 30 seconds;
+ connectfreq = 5 minutes;
+ maxlinks = 0;
+ sendq = 9000000;
+};
 
+# Recommended client classes:
 # Client classes. 10 = locals; 2 = for all .net and .com that are not
 # in Europe; 1 = for everybody.
-Y:10:90:0:100:160000
-Y:2:90:0:5:80000
-Y:1:90:0:400:160000
+Class {
+ name = "Local";
+ pingfreq = 1 minutes 30 seconds;
+ sendq = 160000;
+ maxlinks = 100;
+};
+Client
+{
+ class = "Other";
+ host = "*@*";
+};
+Class {
+ name = "America";
+ pingfreq = 1 minutes 30 seconds;
+ sendq = 80000;
+ maxlinks = 5;
+};
+Class {
+ name = "Other";
+ pingfreq = 1 minutes 30 seconds;
+ sendq = 160000;
+ maxlinks = 400;
+};
 
-
-# [I:lines]
+# [Client]
 #
 # To allow clients to connect, they need authorization. This can be
 # done based on hostmask, address mask, and/or with a password.
 # With intelligent use of classes and the maxconnections field in the
-# Y: lines, you can let in a specific domain, but get rid of all other
+# Client blocks, you can let in a specific domain, but get rid of all other
 # domains in the same toplevel, thus setting up some sort of "reverse
-# K: line".
-# I:<IP mask or crap to force resolving>:<opt passwd>:<hostmask>::<class>
+# Kill block".
+# Client {
+#  host = "user@host";
+#  ip = "ip@host";
+#  password = "password";
+#  class = "classname";
+# };
 #
 # Technical description (for examples, see below):
 # For every connecting client, the IP address is known.  A reverse lookup
 # on this IP-number is done to get the (/all) hostname(s).
 # Each hostname that belongs to this IP-number is matched to <hostmask>,
-# and the I: line is used when any matches; the client will then show
+# and the Client {} is used when any matches; the client will then show
 # with this particular hostname.  If none of the hostnames match, then
 # the IP-number is matched against the <IP mask ...> field, if this matches
-# then the I: line is used nevertheless and the client will show with the
+# then the Client{} is used nevertheless and the client will show with the
 # first (main) hostname if any; if the IP-number did not resolve then the
 # client will show with the dot notation of the IP-number.
 # There is a special case for the UNIX domain sockets and localhost connections
@@ -123,82 +192,127 @@
 # 002 Your host is 2.undernet.org[jolan.ppro], running version ...
 # Then the "jolan.ppro" is the name used for matching.
 # Therefore, unix domain sockets, and connections to localhost would
-# match this I: line:
-# I:jolan.ppro::foobar::1
-# Finally, I: lines with empty <IP mask ..> or <hostmask> fields are skipped.
+# match this block:
+# host = "*@jolan.ppro";
 #
 # This is the "fallback" entry. All .uk, .nl, and all unresolved are
 # in these two lines.
 # By using two different lines, multiple connections from a single IP
 # are only allowed from hostnames which have both valid forward and
 # reverse DNS mappings.
-I:*@*:1:Unresolved::1
-I:Resolved::*@*::1
+Client
+{
+ class = "Other";
+ ip = "*@*";
+};
+
 
+Client
+{
+ class = "Other";
+ host = "*@*";
+};
 # If you don't want unresolved dudes to be able to connect to your
-# server, use just:
-# I:NotMatchingCrap::*@*::1
+# server, do not specify any "ip = " settings.
 #
 # Here, take care of all American ISPs.
-I:Resolved::*@*.com::2
-I:Resolved::*@*.net::2
-
+Client
+{
+ host = "*@*.com";
+ class = "America";
+};
+
+Client
+{
+ host = "*@*.net";
+ class = "America";
+};
 # Now list all the .com / .net domains that you wish to have access...
 # actually it's less work to do it this way than to do it the other
-# way around - K: lining every single ISP in the US.
+# way around - K-lining every single ISP in the US.
 # I wish people in Holland just got a .nl domain, and not try to be
 # cool and use .com...
-I:Resolved::*@*.wirehub.net::1
-I:Resolved::*@*.planete.net::1
-I:Resolved::*@*.ivg.com::1
-I:Resolved::*@*.ib.com::1
-I:Resolved::*@*.ibm.net::1
-I:Resolved::*@*.hydro.com::1
-I:Resolved::*@*.NL.net::1
+Client { host = "*@*.wirehub.net"; class = "Other";};
+Client { host = "*@*.planete.net"; class = "Other";};
+Client { host = "*@*.ivg.com"; class = "Other";};
+Client { host = "*@*.ib.com"; class = "Other";};
+Client { host = "*@*.ibm.net"; class = "Other";};
+Client { host = "*@*.hydro.com"; class = "Other";};
+Client { host = "*@*.nl.net"; class = "Local";};
 
 # You can request a more complete listing, including the "list of standard
-# K-lines" from the Routing Committee; it will also be sent to you if
+# Kill blocks" from the Routing Committee; it will also be sent to you if
 # you apply for a server and get accepted.
 #
 # Ourselves - this makes sure that we can get in, no matter how full
 # the server is (hopefully).
-I:*@193.37.*::*@*.london.ac.uk::10
+Client
+{
+ host = "*@*.london.ac.uk";
+ ip = "*@193.37.*";
+ class = "Local";
+};
 
-# You can put a digit (0..9) in the password field, which will make ircd
+# You can put a digit (0..9) in the password value, which will make ircd
 # only accept a client when the total number of connections to the network
 # from the same IP number doesn't exceed this number.
 # The following example would accept at most one connection per IP number
 # from "*.swipnet.se" and at most two connections from dial up accounts
 # that have "dial??.*" as host mask:
-# I:Resolved:1:*@*.swipnet.se::1
-# I:Resolved:2:*@dial??.*::1
+# Client {
+#  host = "*@*.swipnet.se";
+#  password = "1";
+#  class = "Other";
+# };
+# Client {
+#  host = "*@dial??.*";
+#  password = "2";
+#  class = "Other";
+# };
 #
 # If you are not worried about who connects, this line will allow everyone
 # to connect.
-I:*::*::1
+Client {
+ host = "*@*";
+ ip = "*@*";
+ class = "Other";
+};
 
 
-# [T:lines]
+# [motd]
 #
 # It is possible to show a different Message of the Day to a connecting
 # client depending on its origin.
-# T:<hostmask>:<path to motd file>
-# or:
-# T:<classnumber>:<path to motd file>
+# motd {
+#  # Note: host can also be a classname.
+#  host = "Other";
+#  file = "path/to/motd/file";
+# };
 #
 # DPATH/net_com.motd contains a special MOTD where users are encouraged
-# to register their domains and get their own I: lines if they're in
+# to register their domains and get their own client{} lines if they're in
 # Europe, or move to US.UnderNet.org if they're in the USA.
-T:*.net:net_com.motd
-T:*.com:net_com.motd
-T:2:net_com.motd
+motd {
+ host = "*.net";
+ file = "net_com.motd";
+};
+motd {
+ host = "*.com";
+ file = "net_com.motd";
+};
+motd {
+ host = "America";
+ file = "net_com.motd";
+};
 
 # A different MOTD for ourselves, where we point out that the helpdesk
 # better not be bothered with questions regarding irc...
-T:*.london.ac.uk:london.motd
-
+motd {
+ host = "*.london.ac.uk";
+ file = "london.motd";
+};
 
-# [U:lines]
+# [Server]
 #
 # One of the many nice features of Undernet is "Uworld", a program
 # connected to the net as a server. This allows it to broadcast any mode
@@ -207,7 +321,17 @@
 # There is only one slight problem: the TimeStamp protocol prevents this.
 # So there is a configuration option to allow them anyway from a certain
 # server.
-# U:<Server Name>:<Juped Nicks>:*
+# Server {
+#  # The servername or wildcard mask for it that this applies to.
+#  name = "relservername";
+#  # The mask of servers they are allowed to introduce(for hub=yes;) or
+#  # not allowed to introduce(for leaf=yes).
+#  mask = "servermask";
+#  # No is assumed for these unless you set it to yes.
+#  uworld = no;
+#  leaf = no;
+#  hub = yes;
+# };
 #
 # Note: (1) These lines are agreed on by every server admin on Undernet;
 # (2) These lines must be the same on every single server, or results
@@ -218,58 +342,145 @@
 # servers will try to undo the mode hacks that Uworld does.  Make SURE that
 # all of the servers have the EXACT same Ulines.
 #
-# As of ircu2.10.05 is it possible to Jupe nicks. Juped nicks need to be
-# added to U: lines.  As per CFV-0095, the following nicks must be juped,
-# it is not allowed to jupe others as well.
-U:Uworld.EU.undernet.org:EuWorld,E,StatServ,NoteServ:*
-U:Uworld2.undernet.org:UWorld2,ChanSvr,ChanSaver,ChanServ:*
-U:Uworld.undernet.org:Uworld,NickSvr,NickSaver,NickServ:*
-U:channels.undernet.org:LPT1,X,login:*
-U:channels2.undernet.org:LPT2,W,Undernet:*
-U:channels3.undernet.org:COM1,V,protocol:*
-U:channels4.undernet.org:COM2,U,pass:*
-U:channels5.undernet.org:COM3,Y,AUX:*
-U:channels6.undernet.org:COM4,Z,newpass:*
-
+# If your server starts on a bit larger network, you'll probably get
+# assigned one or two uplinks to which your server can connect.
+# If your uplink(s) also connect to other servers than yours (which is
+# probable), you need to define your uplink as being allowed to "hub".
+# To do this, set "hub = yes;"
+# You can also force a server(even one that doesn't connect to you)
+# to be a leaf with "leaf = yes;"
+
+Server {
+ name = "uworld.eu.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "uworld2.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "uworld.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "channels.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "channels2.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "channels3.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "channels4.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "channels5.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "channels6.undernet.org";
+ mask = "*";
+ uworld = yes;
+ hub = yes;
+};
+Server {
+ name = "Amsterdam.NL.Eu.UnderNet.org";
+ mask = "*";
+ hub = yes;
+};
+# An example just to make sure IRCnet doesn't get on undernet...
+Server {
+ name = "*";
+ mask = "eris.berkeley.edu";
+ hub = yes;
+};
+
+# As of ircu2.10.05 is it possible to Jupe nicks. As per CFV-0095, the
+# following nicks must be juped, it is not allowed to jupe others as well.
+Jupe {
+ nick = "EuWorld,E,StatServ,NoteServ";
+ nick = "UWorld2,ChanSvr,ChanSaver,ChanServ";
+ nick = "Uworld,NickSvr,NickSaver,NickServ";
+ nick = "LPT1,X,login,LPT2,W,Undernet,COM1,V,protocol,COM2";
+ nick = "U,pass,COM3,Y,AUX,COM4,Z,newpass";
+};
 
-# [K:lines]
+# [Kill]
 #
 # While running your server, you will most probably encounter individuals
 # or groups of persons that you do not wish to have access to your server.
 #
-# For this purpose, the ircd understands "kill lines".
-# K:<host/IP mask>:"<opt reason>":<username mask>
+# For this purpose, the ircd understands "kill blocks". These are also
+# known as K-lines, by virtue of the former config file format.
+# Kill
+# {
+#   host = "user@host";
+#   reason = "The reason the user will see";
+# };
+# It is possible to ban on the basis of the real name.
+# It is also possible to use a file as comment for the ban, using
+# file = "file":
+# Kill
+# {
+#   realname = "realnametoban";
+#   file = "path/to/file/with/reason/to/show";
+# };
 #
-# It is possible to use a file as comment for the ban.
-# K:<host/IP mask>:!<path to file>:<usermask>
 #
 # The default reason is: "You are banned from this server"
-# Note that K: lines are local to the server; if you ban a person or a
+# Note that K-lines are local to the server; if you ban a person or a
 # whole domain from your server, they can get on IRC via any other server
-# that doesn't have them K: lined (yet).
+# that doesn't have them K-lined (yet).
 #
 # With a simple comment, using quotes:
-K:*.au:"Please use a nearer server":*
-K:*.edu:"Please use a nearer server":*
+Kill { host = "*.au"; reason = "Please use a nearer server"; };
+Kill { host = "*.edu"; reason = "Please use a nearer server"; };
 
-# With a file, prepending a '!' before the filename.
 # The file can contain for example, a reason, a link to the
 # server rules and a contact address.
-K:unixbox.flooder.co.uk:!kline/youflooded.txt:*luser
-
-#
-# IP-based kill lines are designated with a lowercase 'k'.  These lines
-# use the same format as normal K: lines, except they apply to all hosts,
-# even if an IP address has a properly resolving host name.
-k:192.168.*:!klines/martians:*
-
-# Additionally, you may specify a hostmask prefixed with $R to indicate
-# a match should be performed against the "real-name" / "info" field
-# instead of the host/IP.
-K:$R*sub7*:"You are infected with a Trojan":*
+Kill
+{
+ host = "*lu...@un...";
+ file = "kline/youflooded.txt";
+};
+
+# IP-based kill lines apply to all hosts, even if an IP address has a
+# properly resolving host name.
+Kill
+{
+ host = "192.168.*";
+ file = "klines/martians";
+};
+
+# The realname field lets you ban by realname...
+Kill
+{
+ host = "*sub7*";
+ reason = "You are infected with a Trojan";
+};
 
-
-# [C:lines]
+# [Connect]
 #
 # You probably want your server connected to other servers, so your users
 # have other users to chat with.
@@ -282,52 +493,62 @@
 # server links is provided for ircd to decide what links to allow, what
 # to let humans do themselves, and what links to (forcefully) disallow.
 #
-# The Connection lines (also known as C lines)
+# The Connect blocks
 # define what servers the server connect to, and which servers are
 # allowed to connect.
-# C:<remote hostname or IP>:<password>:<remote server name>:<port>:<class>
+# Connect {
+#  name = "servername";
+#  host = "hostnameORip";
+#  password = "passwd";
+#  port = portno;
+#  class = "classname";
+# };
 #
 # The "port" field defines the default port the server tries to connect
 # to if an operator uses /connect without specifying a port. This is also
 # the port used when the server attempts to auto-connect to the remote 
-# server. (See Y:lines for more informationa about auto-connects).
+# server. (See Class blocks for more informationa about auto-connects).
 #
 # Our primary uplink.
-C:1.2.3.4:passwd:Amsterdam.NL.Eu.UnderNet.org:4400:90
-
+Connect {
+ name = "Amsterdam.NL.Eu.UnderNet.org";
+ host = "1.2.3.4";
+ password = "passwd";
+ port = 4400;
+ class = "Servers";
+};
 
-# [H:lines]
-#
-# If your server starts on a bit larger network, you'll probably get
-# assigned one or two uplinks to which your server can connect.
-# If your uplink(s) also connect to other servers than yours (which is
-# probable), you need to define your uplink as being allowed to "hub".
-# H:<allowed hostmask>::<server name>:<maximum hops that can be introduced>
-H:*.*::Amsterdam.NL.Eu.UnderNet.org
-
-
-# [L:lines]
-#
-# Of course, the opposite is also possible: forcing a server to be
-# a leaf. L: lines follow Murphy's Law: if you use them, there's a big
-# chance that routing will be screwed up afterwards.
-# L:<opt disallowed hostmask>::<server mask>:<opt max depth>
-
-
-# [D:lines]
+# [crule]
 #
 # For an advanced, real-time rule-based routing decision making system
-# you can use Disallow lines. For more information, see doc/readme.crules.
-# D:<server mask that ircd will refuse to connect to>::<rule>
-# d:<server mask that ircd will not autoconnect to>::<rule>
-# D:*.US.UnderNet.org::connected(*.US.UnderNet.org)
-# d:*.EU.UnderNet.org::connected(Amsterdam.NL.EU.*)
-#
-# The following line is recommended for leaf servers:
-# d:*::directcon(*)
+# you can use crule blocks. For more information, see doc/readme.crules.
+# CRULE
+# {
+#  server = "servermask";
+#  rule = "connectrule";
+#  # Setting all to yes makes the rule always apply. Otherwise it only
+#  # applies to autoconnects.
+#  all = yes;
+# };
+CRULE
+{
+ server = "*.US.UnderNet.org";
+ rule = "connected(*.US.UnderNet.org)";
+};
+CRULE
+{
+ server = "*.EU.UnderNet.org";
+ rule = "connected(Amsterdam.NL.EU.*)";
+};
+
+# The following block is recommended for leaf servers:
+CRULE
+{
+ server = "*";
+ rule = "directcon(*)";
+};
 
-
-# [O:lines]
+# [Operator]
 #
 # Inevitably, you have reached the part about "IRC Operators". Oper status
 # grants some special privileges to a user, like the power to make the
@@ -344,28 +565,42 @@
 # them from using Uworld as well.
 # Depending on some defines in include/config.h, local operators are also
 # not allowed to /DIE and /RESTART the server.
-# Local operators are designated with a lowercase 'o'
-# O:<host/IP mask>:<encrypted password>:<Nick>::<connection class>
-# o:<host/IP mask>:<encrypted password>:<Nick>::<connection class>
+# Operator {
+#  local = no;
+#  host = "host/IP mask";
+#  name = "opername";
+#  password = "encryptedpass";
+#  class = "classname";
+# };
 #
 # The encrypted password is optional.  If you wish to encrypt your password,
 # there is a utility in the ircd.  Please read the file tools/README.  
-O:*@*.cs.vu.nl:VRKLKuGKn0jLs:Niels::10
-o:*@*.uu.net:noncryptedpass:Braden::10
+Operator {
+ local = no;
+ host = "*@*.cs.vu.nl";
+ password = "VRKLKuGKn0jLt";
+ name = "Niels";
+ class = "Local";
+};
+Operator {
+ local = yes;
+ host = "*@*.uu.net";
+ password = "notencryptedpass";
+ name = "Niels";
+ class = "Local";
+};
 
 # Note that the <connection class> is optional, but leaving it away
-# puts the O: lines in class 0, which usually only accepts one connection
-# at a time.  If you want users to Oper up more then once per O: line,
-# then use a connection class that allows more then one connection,
-# for example (using class 10 as in the example above):
+# puts the opers in class "default", which usually only accepts one
+# connection at a time.  If you want users to Oper up more then once per
+# block, then use a connection class that allows more then one connection,
+# for example (using class Local as in the example above):
 #
 # Once you OPER your connection class changes no matter where you are or
-# your previous connection classes.  If the defined connection class is 10
-# for the O:line, then your new connection class is 10.
-# Y:10:90:0:100:160000
-
+# your previous connection classes.  If the defined connection class is
+# Local for the operator block, then your new connection class is Local.
 
-# [P:lines]
+# [Port]
 # When your server gets more full, you will notice delays when trying to
 # connect to your server's primary listening port. It is possible via the
 # Port lines to specify additional ports for the ircd to listen to.
@@ -373,12 +608,21 @@
 # ports;
 # Undernet uses 4400 for server listener ports.
 # These are just hints, they are in no way official IANA or IETF policies.
-# IANA says we should use port 194, but that requires us to run as root, so
-# we don't do that.
+# IANA says we should use port 194, but that requires us to run as root,
+# so we don't do that.
 #
-# P:<hostmask>:<interface>:<[CS][H]>:<port number>
+# Port {
+#  port = number;
+#  mask = "ipmask";
+#  # Use this to control the interface you bind to.
+#  vhost = "virtualhostip";
+#  # Setting to yes makes this server only.
+#  server = yes;
+#  # Setting to yes makes the port "hidden" from stats.
+#  hidden = yes;
+# };
 #
-# The hostmask setting allows you to specify a range of IP addresses that
+# The mask setting allows you to specify a range of IP addresses that
 # you will allow connections from. This should only contain IP addresses
 # and '*' if used. This field only uses IP addresses. This does not use
 # DNS in any way so you can't use it to allow *.nl or *.uk. Attempting
@@ -392,59 +636,41 @@
 # If you want to use virtual hosting *YOU* *MUST* *USE* *THIS* otherwise it
 # WILL bind to all interfaces - not what most people seem to expect.
 #
-# The [CS][H] field is an optional field to specify that a port is a
-# server port or a client port and whether it's hidden or not.
-# If used the first character MUST be either a C or S.
-# If you want to hide a port from /stats p from non-opers follow the C
-# or S with an H
-#
-# C = Client (Ports 6660-6669)
-# S = Server (Port 4400)
-#
-# P:<hostmask>:<interface>:<[CS][H]>:<port number>
-#
-# This is a normal server port, you need to have at least one server
-# port defined if you want to connect your server to other servers.
-P:::S:4400
+Port {
+ server = yes;
+ port = 4400;
+};
 
 # This is a Server port that is Hidden
-#P:::SH:4401
+Port {
+ server = yes;
+ hidden = yes;
+ port = 4401;
+};
 
 # The following are normal client ports
-P:::C:6667
-P::::6668
-P:192.168.*:::6666
+Port { port = 6667; };
+Port { port = 6668; };
+Port {
+ mask = "192.168.*";
+ port = 6666;
+};
 
 # This is a hidden client port, listening on the interface associated
 # with the IP address 168.8.21.107
-#P:*:168.8.21.107:CH:7000
+Port {
+ mask = "168.8.21.107";
+ hidden = yes;
+ port = 7000;
+};
 
-
-# [Q:lines]
-#
-# This allows you (the admin) to disallow the usage of /OPMODE and
-# /CLEARMODE on certain sensitive channels. Opers trying to do that
-# will receive a short notice. Depending on the setting of
-# OPER_FORCE_OPMODE, OPER_FORCE_LOPMODE and LOCOP_FORCE_LOPMODE,
-# global/local opers may override these lines by prefixing the
-# channel name with an exclamation mark ('!')
-#
-# Q:<channel>:<reason>
-#
-# Note that since the hash mark ('#') is used to start a comment,
-# you will have to escape it in the channel name (see below).
-
-# Q:\#shells:"Thou shalt not support the h4><0rz"
-# Q:&kiddies:"They can take care of themselves"
-
-
-# [F:lines]
-#
+# [features]
 # IRC servers have a large number of options and features.  Most of these
 # are set at compile time through the use of #define's--see "make config"
 # for more details--but we are working to move many of these into the
-# configuration file.  Feature lines are the hook we're using for this.
-# F:<Option>:<Value>
+# configuration file.  Features let you configure these at runtime.
+# You only need one feature block in which you use
+# "featurename" = "value1" , "value2", ..., "valuen-1", "valuen";
 #
 # The entire purpose of F:lines are so that you do not have to recompile
 # the IRCD everytime you want to change a feature.  All of the features
@@ -455,134 +681,87 @@
 # found at doc/readme.log.  The defaults used by the Undernet network are
 # below.
 #
-# F:DOMAINNAME:<obtained from /etc/resolv.conf by ./configure>
-# F:RELIABLE_CLOCK:FALSE
-# F:BUFFERPOOL:27000000
-# F:HAS_FERGUSON_FLUSHER:FALSE
-# F:CLIENT_FLOOD:1024
-# F:SERVER_PORT:4400
-# F:NODEFAULTMOTD:TRUE
-# F:MOTD_BANNER
-# F:KILL_IPMISMATCH:FALSE
-# F:IDLE_FROM_MSG:TRUE
-# F:HUB:FALSE
-# F:WALLOPS_OPER_ONLY:FALSE
-# F:NODNS:FALSE
-# F:RANDOM_SEED:<you should set one explicitly>
-# F:DEFAULT_LIST_PARAM
-# F:NICKNAMEHISTORYLENGTH:800
-# F:HOST_HIDING:TRUE
-# F:HIDDEN_HOST:users.undernet.org
-# F:HIDDEN_IP:127.0.0.1
-# F:CONNEXIT_NOTICES:FALSE
-# F:KILLCHASETIMELIMIT:30
-# F:MAXCHANNELSPERUSER:10
-# F:AVBANLEN:40
-# F:MAXBANS:45
-# F:MAXSILES:15
-# F:HANGONGOODLINK:300
-# F:HANGONRETRYDELAY:10
-# F:CONNECTTIMEOUT:90
-# F:TIMESEC:60
-# F:MAXIMUM_LINKS:1
-# F:PINGFREQUENCY:120
-# F:CONNECTFREQUENCY:600
-# F:DEFAULTMAXSENDQLENGTH:40000
-# F:GLINEMAXUSERCOUNT:20
-# F:MPATH:ircd.motd
-# F:RPATH:remote.motd
-# F:PPATH:ircd.pid
-# F:VIRTUAL_HOST:FALSE
-# F:TOS_SERVER:0x08
-# F:TOS_CLIENT:0x08
-# F:POLLS_PER_LOOP:200
-# F:CRYPT_OPER_PASSWORD:TRUE
-# F:OPER_NO_CHAN_LIMIT:TRUE
-# F:OPER_MODE_LCHAN:TRUE
-# F:OPER_WALK_THROUGH_LMODES:FALSE
-# F:NO_OPER_DEOP_LCHAN:FALSE
-# F:SHOW_INVISIBLE_USERS:TRUE
-# F:SHOW_ALL_INVISIBLE_USERS:TRUE
-# F:UNLIMIT_OPER_QUERY:FALSE
-# F:LOCAL_KILL_ONLY:FALSE
-# F:CONFIG_OPERCMDS:FALSE
-# F:OPER_KILL:TRUE
-# F:OPER_REHASH:TRUE
-# F:OPER_RESTART:TRUE
-# F:OPER_DIE:TRUE
-# F:OPER_GLINE:TRUE
-# F:OPER_LGLINE:TRUE
-# F:OPER_JUPE:TRUE
-# F:OPER_LJUPE:TRUE
-# F:OPER_OPMODE:TRUE
-# F:OPER_LOPMODE:TRUE
-# F:OPER_FORCE_OPMODE:TRUE
-# F:OPER_FORCE_LOPMODE:TRUE
-# F:OPER_BADCHAN:FALSE
-# F:OPER_LBADCHAN:FALSE
-# F:OPER_SET:FALSE
-# F:OPERS_SEE_IN_SECRET_CHANNELS:TRUE
-# F:OPER_WIDE_GLINE:TRUE
-# F:LOCOP_KILL:TRUE
-# F:LOCOP_REHASH:TRUE
-# F:LOCOP_RESTART:FALSE
-# F:LOCOP_DIE:FALSE
-# F:LOCOP_LGLINE:TRUE
-# F:LOCOP_LJUPE:TRUE
-# F:LOCOP_LOPMODE:TRUE
-# F:LOCOP_FORCE_LOPMODE:TRUE
-# F:LOCOP_LBADCHAN:FALSE
-# F:LOCOP_SET:FALSE
-# F:LOCOP_SEE_IN_SECRET_CHANNELS:FALSE
-# F:LOCOP_WIDE_GLINE:FALSE
-# F:HIS_MAP:TRUE
-# F:HIS_SNOTICES:TRUE
-# F:HIS_SNOTICES_OPER_ONLY:TRUE
-# F:HIS_DESYNCS:TRUE
-# F:HIS_DEBUG_OPER_ONLY:TRUE
-# F:HIS_WALLOPS:TRUE
-# F:HIS_LINKS:TRUE
-# F:HIS_TRACE:TRUE
-# F:HIS_STATS_l:TRUE
-# F:HIS_STATS_c:TRUE
-# F:HIS_STATS_g:TRUE
-# F:HIS_STATS_h:TRUE
-# F:HIS_STATS_k:TRUE
-# F:HIS_STATS_f:TRUE
-# F:HIS_STATS_i:TRUE
-# F:HIS_STATS_j:TRUE
-# F:HIS_STATS_M:TRUE
-# F:HIS_STATS_m:TRUE
-# F:HIS_STATS_o:TRUE
-# F:HIS_STATS_p:TRUE
-# F:HIS_STATS_q:TRUE
-# F:HIS_STATS_r:TRUE
-# F:HIS_STATS_d:TRUE
-# F:HIS_STATS_e:TRUE
-# F:HIS_STATS_t:TRUE
-# F:HIS_STATS_T:TRUE
-# F:HIS_STATS_u:FALSE
-# F:HIS_STATS_U:TRUE
-# F:HIS_STATS_v:TRUE
-# F:HIS_STATS_w:FALSE
-# F:HIS_STATS_x:TRUE
-# F:HIS_STATS_y:TRUE
-# F:HIS_STATS_z:TRUE
-# F:HIS_WHOIS_SERVERNAME:TRUE
-# F:HIS_WHOIS_IDLETIME:TRUE
-# F:HIS_WHO_SERVERNAME:TRUE
-# F:HIS_WHO_HOPCOUNT:TRUE
-# F:HIS_BANWHO:TRUE
-# F:HIS_KILLWHO:TRUE
-# F:HIS_REWRITE:TRUE
-# F:HIS_REMOTE:1
-# F:HIS_NETSPLIT:TRUE
-# F:HIS_SERVERNAME:"*.undernet.org"
-# F:HIS_SERVERINFO:"The Undernet Underworld"
-# F:HIS_URLSERVERS:"http://www.undernet.org/servers.php"
-# F:NETWORK:"UnderNet"
-# F:URL_CLIENTS:"ftp://ftp.undernet.org/pub/irc/clients"
-
+features
+{
+#  "DOMAINNAME"="<obtained from /etc/resolv.conf by ./configure>";
+#  "RELIABLE_CLOCK"="FALSE";
+#  "BUFFERPOOL"="27000000";
+#  "HAS_FERGUSON_FLUSHER"="FALSE";
+#  "CLIENT_FLOOD"="1024";
+#  "SERVER_PORT"="4400";
+#  "NODEFAULTMOTD"="TRUE";
+#  "MOTD_BANNER"="TRUE";
+#  "KILL_IPMISMATCH"="FALSE";
+#  "IDLE_FROM_MSG"="TRUE";
+#  "HUB"="FALSE";
+#  "WALLOPS_OPER_ONLY"="FALSE";
+#  "NODNS"="FALSE";
+#  "RANDOM_SEED"="<you should set one explicitly>";
+#  "DEFAULT_LIST_PARAM"="TRUE";
+#  "NICKNAMEHISTORYLENGTH"="800";
+#  "HOST_HIDING"="FALSE";
+#  "HIDDEN_HOST"="users.undernet.org";
+#  "HIDDEN_IP"="127.0.0.1";
+#  "KILLCHASETIMELIMIT"="30";
+#  "MAXCHANNELSPERUSER"="10";
+#  "AVBANLEN"="40";
+#  "MAXBANS"="30";
+#  "MAXSILES"="15";
+#  "HANGONGOODLINK="300";
+# "HANGONRETRYDELAY" = "10";
+# "CONNECTTIMEOUT" = "90";
+# "TIMESEC" = "60";
+# "MAXIMUM_LINKS" = "1";
+# "PINGFREQUENCY" = "120";
+# "CONNECTFREQUENCY" = "600";
+# "DEFAULTMAXSENDQLENGTH" = "40000";
+# "GLINEMAXUSERCOUNT" = "20";
+# "MPATH" = "ircd.motd";
+# "RPATH" = "remote.motd";
+# "PPATH" = "ircd.pid";
+# "VIRTUAL_HOST" = "FALSE";
+# "TOS_SERVER" = "0x08";
+# "TOS_CLIENT" = "0x08";
+# "POLLS_PER_LOOP" = "200";
+# "CRYPT_OPER_PASSWORD" = "TRUE";
+# "OPER_NO_CHAN_LIMIT" = "TRUE";
+# "OPER_MODE_LCHAN" = "TRUE";
+# "OPER_WALK_THROUGH_LMODES" = "FALSE";
+# "NO_OPER_DEOP_LCHAN" = "FALSE";
+# "SHOW_INVISIBLE_USERS" = "TRUE";
+# "SHOW_ALL_INVISIBLE_USERS" = "TRUE";
+# "UNLIMIT_OPER_QUERY" = "FALSE";
+# "LOCAL_KILL_ONLY" = "FALSE";
+# "CONFIG_OPERCMDS" = "FALSE";
+# "OPER_KILL" = "TRUE";
+# "OPER_REHASH" = "TRUE";
+# "OPER_RESTART" = "TRUE";
+# "OPER_DIE" = "TRUE";
+# "OPER_GLINE" = "TRUE";
+# "OPER_LGLINE" = "TRUE";
+# "OPER_JUPE" = "TRUE";
+# "OPER_LJUPE" = "TRUE";
+# "OPER_OPMODE" = "TRUE";
+# "OPER_LOPMODE" = "TRUE";
+# "OPER_BADCHAN" = "FALSE";
+# "OPER_LBADCHAN" = "FALSE";
+# "OPER_SET" = "FALSE";
+# "OPERS_SEE_IN_SECRET_CHANNELS" = "TRUE";
+# "OPER_WIDE_GLINE" = "TRUE";
+# "OPER_LIST_CHAN" = "TRUE";
+# "LOCOP_KILL" = "TRUE";
+# "LOCOP_REHASH" = "TRUE";
+# "LOCOP_RESTART" = "FALSE";
+# "LOCOP_DIE" = "FALSE";
+# "LOCOP_LGLINE" = "TRUE";
+# "LOCOP_LJUPE" = "TRUE";
+# "LOCOP_LOPMODE" = "TRUE";
+# "LOCOP_LBADCHAN" = "FALSE";
+# "LOCOP_SET" = "FALSE";
+# "LOCOP_SEE_IN_SECRET_CHANNELS" = "FALSE";
+# "LOCOP_WIDE_GLINE" = "FALSE";
+# "LOCOP_LIST_CHAN" = "FALSE";
+};
 
 # Well, you have now reached the end of this sample configuration
 # file. If you have any questions, feel free to mail
----------------------- End of diff -----------------------