[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
|
From: Toni G. <zo...@us...> - 2004-12-28 11:16:27
|
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2004-12-28 11:15:58 UTC
Modified files:
ChangeLog ChangeLog.es INSTALL INSTALL.es TODO.es doc/.cvsignore
doc/ircd.sample-es.conf include/channel.h include/client.h
include/handlers.h include/ircd_log.h include/msg.h
include/numeric.h include/numnicks.h include/patchlevel.h
include/send.h ircd/IPcheck.c ircd/Makefile.in ircd/channel.c
ircd/class.c ircd/client.c ircd/dbuf.c ircd/destruct_event.c
ircd/engine_devpoll.c ircd/engine_epoll.c ircd/engine_kqueue.c
ircd/engine_poll.c ircd/engine_select.c ircd/fileio.c
ircd/gline.c ircd/hash.c ircd/ircd.c ircd/ircd_alloc.c
ircd/ircd_auth.c ircd/ircd_crypt.c ircd/ircd_crypt_native.c
ircd/ircd_crypt_plain.c ircd/ircd_crypt_smd5.c ircd/ircd_events.c
ircd/ircd_features.c ircd/ircd_lexer.l ircd/ircd_log.c
ircd/ircd_parser.y ircd/ircd_relay.c ircd/ircd_reply.c
ircd/ircd_res.c ircd/ircd_signal.c ircd/ircd_snprintf.c
ircd/ircd_string.c ircd/jupe.c ircd/list.c ircd/listener.c
ircd/m_account.c ircd/m_admin.c ircd/m_asll.c ircd/m_away.c
ircd/m_burst.c ircd/m_clearmode.c ircd/m_close.c ircd/m_connect.c
ircd/m_cprivmsg.c ircd/m_create.c ircd/m_defaults.c
ircd/m_destruct.c ircd/m_desynch.c ircd/m_die.c ircd/m_endburst.c
ircd/m_error.c ircd/m_get.c ircd/m_gline.c ircd/m_help.c
ircd/m_info.c ircd/m_invite.c ircd/m_ison.c ircd/m_join.c
ircd/m_jupe.c ircd/m_kick.c ircd/m_kill.c ircd/m_links.c
ircd/m_list.c ircd/m_lusers.c ircd/m_map.c ircd/m_mode.c
ircd/m_motd.c ircd/m_names.c ircd/m_nick.c ircd/m_notice.c
ircd/m_oper.c ircd/m_opmode.c ircd/m_part.c ircd/m_pass.c
ircd/m_ping.c ircd/m_pong.c ircd/m_privmsg.c ircd/m_privs.c
ircd/m_proto.c ircd/m_pseudo.c ircd/m_quit.c ircd/m_rehash.c
ircd/m_reset.c ircd/m_restart.c ircd/m_rping.c ircd/m_rpong.c
ircd/m_server.c ircd/m_set.c ircd/m_settime.c ircd/m_silence.c
ircd/m_squit.c ircd/m_stats.c ircd/m_time.c ircd/m_tmpl.c
ircd/m_topic.c ircd/m_trace.c ircd/m_uping.c ircd/m_user.c
ircd/m_userhost.c ircd/m_userip.c ircd/m_users.c ircd/m_version.c
ircd/m_wallchops.c ircd/m_wallops.c ircd/m_wallusers.c
ircd/m_wallvoices.c ircd/m_watch.c ircd/m_who.c ircd/m_whois.c
ircd/m_whowas.c ircd/memdebug.c ircd/motd.c ircd/msgq.c
ircd/numnicks.c ircd/os_generic.c ircd/packet.c ircd/parse.c
ircd/s_auth.c ircd/s_bsd.c ircd/s_conf.c ircd/s_debug.c
ircd/s_err.c ircd/s_misc.c ircd/s_serv.c ircd/s_user.c
ircd/send.c ircd/umkpasswd.c ircd/uping.c ircd/version.c.SH
ircd/watch.c ircd/whowas.c ircd/test/ircd_chattr_t.c
Added files:
ircd-patch doc/en/Authors include/capab.h ircd/m_cap.c
Removed files:
tools/crypter
Log message:
Author: zoltan <zo...@ir...>
Log message:
2004-11-28 Toni García <zo...@ir...> 1.0.alpha14
* Implementacion del estándar "IRC Capabilities"
* Sincronizacion Undernet
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.14 ircd-ircdev/ChangeLog:1.15
--- ircd-ircdev/ChangeLog:1.14 Wed Nov 24 08:11:30 2004
+++ ircd-ircdev/ChangeLog Tue Dec 28 03:15:43 2004
@@ -1,10 +1,14 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.14 2004/11/24 16:11:30 zolty Exp $
+# $Id: ChangeLog,v 1.15 2004/12/28 11:15:43 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2004-11-28 Toni García <zo...@ir...> 1.0.alpha14
+ * Implementation IRC capabilities draft
+ * Undernet synchorinization
+
2004-11-24 Toni García <zo...@ir...> 1.0.alpha13
* Doxygen commentarys
* Silence exceptions
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.14 ircd-ircdev/ChangeLog.es:1.15
--- ircd-ircdev/ChangeLog.es:1.14 Wed Nov 24 08:11:30 2004
+++ ircd-ircdev/ChangeLog.es Tue Dec 28 03:15:43 2004
@@ -1,10 +1,14 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.14 2004/11/24 16:11:30 zolty Exp $
+# $Id: ChangeLog.es,v 1.15 2004/12/28 11:15:43 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2004-11-28 Toni García <zo...@ir...> 1.0.alpha14
+ * Implementacion del estándar "IRC Capabilities"
+ * Sincronizacion Undernet
+
2004-11-24 Toni García <zo...@ir...> 1.0.alpha13
* Comentarios para Doxygen
* Excepciones de Silences
Index: ircd-ircdev/INSTALL
diff -u ircd-ircdev/INSTALL:1.1.1.1 ircd-ircdev/INSTALL:1.2
--- ircd-ircdev/INSTALL:1.1.1.1 Mon Sep 8 03:34:25 2003
+++ ircd-ircdev/INSTALL Tue Dec 28 03:15:43 2004
@@ -29,7 +29,8 @@
Once ircd-ircdev is compiled, install it by running "make install".
Next, you will have to configure your IRC server by setting up your ircd.conf
-file. Use the included doc/<language>/ircd.conf.sample as a starting point.
+file. Use the included doc/ircd.sample-en.conf as a starting point; it is
+installed in $HOME/lib/ircd.sample-en.conf by default.
Setting up ircd.conf can be a bit tricky, so if this is your first time doing
it, begin with a bare-bones configuration and extend it as you go.
Index: ircd-ircdev/INSTALL.es
diff -u ircd-ircdev/INSTALL.es:1.1.1.1 ircd-ircdev/INSTALL.es:1.2
--- ircd-ircdev/INSTALL.es:1.1.1.1 Mon Sep 8 03:34:26 2003
+++ ircd-ircdev/INSTALL.es Tue Dec 28 03:15:43 2004
@@ -31,8 +31,9 @@
Una vez que se compile el ircd-ircdev, instalalo ejecutando "make install".
Después, usted tendrá que configurar su servidor de IRC configurando el archivo
-"ircd.conf". Utilice el doc/es/ircd.conf.sample incluido como punto de partida. La
-creación del "ircd.conf" puede ser un poco díficil, así que si ésta es su primera
+"ircd.conf". Utilice el doc/ircd.sample-es.conf incluido como punto de partida;
+es instalado en $HOME/lib/ircd.sample-es.conf por defecto.
+La creación del "ircd.conf" puede ser un poco díficil, así que si ésta es su primera
vez que lo hace, comienza con una configuración mínima y la amplía mientras que
usted va aprendiendo.
Index: ircd-ircdev/TODO.es
diff -u ircd-ircdev/TODO.es:1.10 ircd-ircdev/TODO.es:1.11
--- ircd-ircdev/TODO.es:1.10 Wed Nov 24 08:22:22 2004
+++ ircd-ircdev/TODO.es Tue Dec 28 03:15:43 2004
@@ -1,7 +1,7 @@
#
# TODO para ircd-ircdev
#
-# $Id: TODO.es,v 1.10 2004/11/24 16:22:22 zolty Exp $
+# $Id: TODO.es,v 1.11 2004/12/28 11:15:43 zolty Exp $
#
# Insertar las nuevas entradas al principio de la lista TODO.
#
@@ -62,6 +62,7 @@
- [G] Soporte SSL para client<->server.
- [U] Soporte de modos de canal +A y +u y todo lo relacionado con el (.12).
- [G] Mirar si el aviso de invites lo haga con wallchops o con raw.
+ - [D] Documentar para Doxygen el Watch y el DDB
BUGS CONOCIDOS
--------------------------------------------------------------------------------------
Index: ircd-ircdev/doc/.cvsignore
diff -u ircd-ircdev/doc/.cvsignore:1.1.1.1 ircd-ircdev/doc/.cvsignore:1.2
--- ircd-ircdev/doc/.cvsignore:1.1.1.1 Mon Sep 8 03:34:26 2003
+++ ircd-ircdev/doc/.cvsignore Tue Dec 28 03:15:44 2004
@@ -1,2 +1,3 @@
Makefile
stamp-m
+doxygen
Index: ircd-ircdev/doc/en/Authors
diff -u /dev/null ircd-ircdev/doc/en/Authors:1.1
--- /dev/null Tue Dec 28 03:15:58 2004
+++ ircd-ircdev/doc/en/Authors Tue Dec 28 03:15:44 2004
@@ -0,0 +1,200 @@
+IRC was conceived of and written by Jarkko Oikarinen <jt...@to...>.
+IRC was originally written in University of Oulu, Computing Center.
+Jan 1991 - IRC 2.6 jt...@to...
+ - Multiple Channels and protocol changes
+
+Contributions were made by a cast of dozens, including the following:
+
+Markku Jarvinen <mt...@tu...>: Emacs-like editing facility for the client
+
+Kimmo Suominen <ki...@ka...>: HP-UX port
+
+Jeff Trim <jt...@or...>: enhancements and advice
+
+Vijay Subramaniam <vi...@ll...>: advice and ruthless publicity
+
+Karl Kleinpaste <ka...@ci...>: user's manual
+
+Greg Lindahl <gl...@vi...>: AUTOMATON code, the Wumpus GM automaton,
+myriad bug fixes
+
+Bill Wisner <wi...@ha...>: numerous bug fixes and code
+enhancements
+
+Tom Davis <con...@ze...> and Tim Russell <ru...@ze...>:
+VMS modifications
+
+Markku Savela <ms...@te...>: advice, support, and being the
+incentive to do some of our *own* coding. :)
+
+Tom Hopkins <ho...@bu...>: bug fixes, quarantine lines,
+consolidation of various patches.
+
+Christopher Davis <ck...@cs...>: EFnet/Anet gateway coding,
+many automata ;), documentation fixing.
+
+Helen Rose <hr...@cs...>: documentation updating, and fixing.
+
+Tom Hinds <ro...@bu...>: emacs client updating.
+
+Tim Miller <ce...@bu...>: various server and client-breaking
+features.
+
+Darren Reed <av...@co...>: various bug fixes and enhancements.
+Introduced nickname and channelname hash tables into the server.
+
+The version 2.2 release was coordinated by Mike Bolotski
+<mi...@sa...>.
+
+The version 2.4 release was coordinated by Markku Savela and
+Chelsea Ashley Dyerman
+
+The version 2.5.2 release was coordinated by Christopher Davis, Helen Rose,
+and Tom Hopkins.
+
+The versions 2.6.2, 2.7 and 2.8 releases were coordinated by Darren Reed.
+
+Contributions for the 2.8 release from the following people:
+Matthew Green <ph...@co...>
+Chuck Kane <ck...@ec...>
+Matt Lyle <ma...@oc...>
+Vesa Ruokonen <ruo...@lu...>
+
+Markku Savela <Mar...@vt...> / April 1990
+Fixed various bugs in 2.2PL1 release server (2.2msa.4) and changed
+sockets to use non-blocking mode (2.2msa.9). [I have absolutely
+nothing to do with clients :-]
+
+Chelsea Ashley Dyerman <ch...@ea...> / April 1990
+Rewrote the Makefiles, restructuring of source tree. Added libIrcd.a to
+the Makefile macros, numerous reformatting of server text messages, and
+added mkversion.sh to keep track of compilation statistics. Numerous
+bug fixes and enhancements, and co-coordinator of the 2.4 release.
+
+Jarle Lyngaas (nm...@al...) added Note functions to ircd.
+
+Armin Gruner <gr...@in...> / May, June 1990:
+* Patched KILL-line feature for ircd.conf, works now.
+ Enhancement: Time intervals can be specified in passwd-field.
+ Result: KILL-Line is only active during these intervals
+* Patched PRIVMSG handling, now OPER can specify masks for sending
+ private messages, advantage: msg to all at a specified server or host.
+* Little tests on irc 2.5 alpha, fixed some little typos in client code.
+ Change: common/debug.c has been moved to ircd/s_debug.c, and a
+ irc/c_debug.c has been created, for the benefit that wrong server msg
+ are displayed if client does not recognize them. (strange, if a server
+ sends an 'unknown command', isn't it?)
+
+Tom Hopkins <ho...@bu...> / September, October 1990:
+* Patched msa's K lines for servers (Q lines).
+* Consolidated several patches, including Stealth's logging patch.
+* Fixed several minor bugs.
+* Has done lots of other stuff that I can't seem to remember, but he
+ always works on code, so he has to have done alot more than three
+ lines worth. :)
+
+Thanks go to those persons not mentioned here who have added their advice,
+opinions, and code to IRC.
+
+Various modifications, bugreports, cleanups and testing by:
+
+Hugo Calendar <hu...@uc...>
+Bo Adler <ad...@cs...>
+Michael Sandrof <ms...@an...>
+Jon Solomon <js...@cs...>
+Jan Peterson <jl...@ha...>
+Nathan Glasser <na...@br...>
+Helen Rose <hr...@ef...>
+Mike Pelletier <st...@ca...>
+Basalat Ali Raja <gw...@ta...>
+Eric P. Scott <ep...@to...>
+Dan Goodwin <fo...@wp...>
+Noah Friedman <fri...@ai...>
+
+
+UNDERNET (1991 - 1999)
+--------
+
+The Undernet versions (TSpre8, u2.9 and u2.10) are based on ircd-2.8.10 and
+contain thousands of hours of work by Carlo Wood <ca...@al...>
+(Run on IRC). The number of protocol enhancements, changes and additions
+that have been added are too many to summarize. All patches are kept in the
+cvs repository at http://coder-com.undernet.org/. Discussions on this
+server code are currently on the mailing list cod...@un..., or in
+#coder-com on undernet.
+
+The current maintainer is Bleep.
+
+Various additions and bugfixes have been contributed by:
+
+Aaron <agi...@sc...>
+Bleep <to...@in...>
+CaptJay <ca...@su...>
+CapVideo <ma...@pu...>
+Chaos <si...@tr...>
+Cym <cy...@ac...>
+Derrick <di...@se...>
+Ensor <dh...@ra...>
+flux <cml...@uc...>
+Ghostwolf <fo...@tr...>
+Gte- <gt...@at...>
+Isomer <is...@co...>
+Jamey <wo...@du...>
+Jarle <ja...@II...>
+Kev <kl...@mi...>
+Nemesi <co...@ti...>
+Niels <ni...@ho...>
+Run <ca...@al...>
+record <jeg...@cl...>
+smg <sm...@lm...>
+SeKs <in...@st...>
+Simon- <si...@pe...>
+Starfox <st...@qu...>
+Trio <tr...@b6...>
+WildThang <dvm...@an...>
+Xorath <vo...@wh...>
+
+UNDERNET (2000 - 2004)
+--------
+
+The Undernet versions (P9, P10, u2.10.11 and u2.10.12) are based on
+ircu2.10.07 and contain many hours of work by Coder Commitee.
+The number of protocol enhancements, changes and additions
+that have been added are too many to summarize. All patches are kept in the
+cvs repository at http://coder-com.undernet.org/. Discussions on this
+server code are currently on the mailing list cod...@un..., or in
+#coder-com on undernet.
+
+The current maintainer is Isomer.
+
+Various additions, testings and bugfixes have been contributed by:
+
+A1kmm <irc...@mw...>
+Bleep <to...@in...>
+Gte- <gt...@at...>
+Isomer <is...@co...>
+Kev <kl...@mi...>
+Delete <de...@cy...>
+Ghostwolf <fo...@wt...>
+Braden <db...@ya...>
+net <ne...@as...>
+Steven <st...@do...>
+OmniDynmc <om...@dy...>
+Dianora <db...@db...>
+Sengaia <se...@un...>
+Cyberdude <Cyb...@un...>
+Maniac- <ma...@ce...>
+Vampire- <va...@p1...>
+mbuna <mb...@bu...>
+beware <ste...@to...>
+n3tguy <ne...@sp...>
+reed <re...@re...>
+Math <ma...@ro...>
+hikari <sh...@un...>
+Bleep <tom...@co...>
+froo <fr...@qu...>
+splidge <sp...@qu...>
+Zarjazz <za...@qu...>
+Spike <ek...@pa...>
+Jeekay <je...@ne...>
+Entrope <en...@ga...>
Index: ircd-ircdev/doc/ircd.sample-es.conf
diff -u ircd-ircdev/doc/ircd.sample-es.conf:1.4 ircd-ircdev/doc/ircd.sample-es.conf:1.5
--- ircd-ircdev/doc/ircd.sample-es.conf:1.4 Mon Dec 27 03:25:29 2004
+++ ircd-ircdev/doc/ircd.sample-es.conf Tue Dec 28 03:15:44 2004
@@ -824,7 +824,6 @@
# "CONFIG_OPERCMDS" = "FALSE";
# "HIS_SNOTICES" = "TRUE";
# "HIS_SNOTICES_OPER_ONLY" = "TRUE";
-# "HIS_DESYNCS" = "TRUE";
# "HIS_DEBUG_OPER_ONLY" = "TRUE";
# "HIS_WALLOPS" = "TRUE";
# "HIS_MAP" = "TRUE";
Index: ircd-ircdev/include/capab.h
diff -u /dev/null ircd-ircdev/include/capab.h:1.1
--- /dev/null Tue Dec 28 03:15:59 2004
+++ ircd-ircdev/include/capab.h Tue Dec 28 03:15:44 2004
@@ -0,0 +1,660 @@
+/*
+ * IRC-Dev IRCD - An advanced and innovative IRC Daemon, include/capab.h
+ *
+ * Copyright (C) 2002-2004 IRC-Dev Development Team <de...@ir...>
+ * Copyright (C) 2004 Kevin L. Mitchell <kl...@mi...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+/** @file
+ * @brief Interface and public definitions for capabilities extension
+ * @version $Id: capab.h,v 1.1 2004/12/28 11:15:44 zolty Exp $
+ */
+#ifndef INCLUDED_capab_h
+#define INCLUDED_capab_h
+
+#ifndef INCLUDED_client_h
+#include "client.h"
+#endif
+
+#define CAPFL_HIDDEN 0x0001 /**< Do not advertize this capability */
+#define CAPFL_PROHIBIT 0x0002 /**< Client may not set this capability */
+#define CAPFL_PROTO 0x0004 /**< Cap must be acknowledged by client */
+
+/* XXX You can safely ignore all of these; they're only for testing purposes,
+ * XXX and don't result in any behavioral change.
+ */
+#define CAPLIST \
+ _CAP(USERPFX, 0, "undernet.org/userpfx"), \
+ _CAP(FOO, CAPFL_HIDDEN, "x-foo"), \
+ _CAP(BAR, CAPFL_PROHIBIT, "x-bar"), \
+ _CAP(BINK, CAPFL_PROTO, "x-bink"), \
+ _CAP(CAP000, 0, "x-cap000"), \
+ _CAP(CAP001, 0, "x-cap001"), \
+ _CAP(CAP002, 0, "x-cap002"), \
+ _CAP(CAP003, 0, "x-cap003"), \
+ _CAP(CAP004, 0, "x-cap004"), \
+ _CAP(CAP005, 0, "x-cap005"), \
+ _CAP(CAP006, 0, "x-cap006"), \
+ _CAP(CAP007, 0, "x-cap007"), \
+ _CAP(CAP008, 0, "x-cap008"), \
+ _CAP(CAP009, 0, "x-cap009"), \
+ _CAP(CAP010, 0, "x-cap010"), \
+ _CAP(CAP011, 0, "x-cap011"), \
+ _CAP(CAP012, 0, "x-cap012"), \
+ _CAP(CAP013, 0, "x-cap013"), \
+ _CAP(CAP014, 0, "x-cap014"), \
+ _CAP(CAP015, 0, "x-cap015"), \
+ _CAP(CAP016, 0, "x-cap016"), \
+ _CAP(CAP017, 0, "x-cap017"), \
+ _CAP(CAP018, 0, "x-cap018"), \
+ _CAP(CAP019, 0, "x-cap019"), \
+ _CAP(CAP020, 0, "x-cap020"), \
+ _CAP(CAP021, 0, "x-cap021"), \
+ _CAP(CAP022, 0, "x-cap022"), \
+ _CAP(CAP023, 0, "x-cap023"), \
+ _CAP(CAP024, 0, "x-cap024"), \
+ _CAP(CAP025, 0, "x-cap025"), \
+ _CAP(CAP026, 0, "x-cap026"), \
+ _CAP(CAP027, 0, "x-cap027"), \
+ _CAP(CAP028, 0, "x-cap028"), \
+ _CAP(CAP029, 0, "x-cap029"), \
+ _CAP(CAP030, 0, "x-cap030"), \
+ _CAP(CAP031, 0, "x-cap031"), \
+ _CAP(CAP032, 0, "x-cap032"), \
+ _CAP(CAP033, 0, "x-cap033"), \
+ _CAP(CAP034, 0, "x-cap034"), \
+ _CAP(CAP035, 0, "x-cap035"), \
+ _CAP(CAP036, 0, "x-cap036"), \
+ _CAP(CAP037, 0, "x-cap037"), \
+ _CAP(CAP038, 0, "x-cap038"), \
+ _CAP(CAP039, 0, "x-cap039"), \
+ _CAP(CAP040, 0, "x-cap040"), \
+ _CAP(CAP041, 0, "x-cap041"), \
+ _CAP(CAP042, 0, "x-cap042"), \
+ _CAP(CAP043, 0, "x-cap043"), \
+ _CAP(CAP044, 0, "x-cap044"), \
+ _CAP(CAP045, 0, "x-cap045"), \
+ _CAP(CAP046, 0, "x-cap046"), \
+ _CAP(CAP047, 0, "x-cap047"), \
+ _CAP(CAP048, 0, "x-cap048"), \
+ _CAP(CAP049, 0, "x-cap049"), \
+ _CAP(CAP050, 0, "x-cap050"), \
+ _CAP(CAP051, 0, "x-cap051"), \
+ _CAP(CAP052, 0, "x-cap052"), \
+ _CAP(CAP053, 0, "x-cap053"), \
+ _CAP(CAP054, 0, "x-cap054"), \
+ _CAP(CAP055, 0, "x-cap055"), \
+ _CAP(CAP056, 0, "x-cap056"), \
+ _CAP(CAP057, 0, "x-cap057"), \
+ _CAP(CAP058, 0, "x-cap058"), \
+ _CAP(CAP059, 0, "x-cap059"), \
+ _CAP(CAP060, 0, "x-cap060"), \
+ _CAP(CAP061, 0, "x-cap061"), \
+ _CAP(CAP062, 0, "x-cap062"), \
+ _CAP(CAP063, 0, "x-cap063"), \
+ _CAP(CAP064, 0, "x-cap064"), \
+ _CAP(CAP065, 0, "x-cap065"), \
+ _CAP(CAP066, 0, "x-cap066"), \
+ _CAP(CAP067, 0, "x-cap067"), \
+ _CAP(CAP068, 0, "x-cap068"), \
+ _CAP(CAP069, 0, "x-cap069"), \
+ _CAP(CAP070, 0, "x-cap070"), \
+ _CAP(CAP071, 0, "x-cap071"), \
+ _CAP(CAP072, 0, "x-cap072"), \
+ _CAP(CAP073, 0, "x-cap073"), \
+ _CAP(CAP074, 0, "x-cap074"), \
+ _CAP(CAP075, 0, "x-cap075"), \
+ _CAP(CAP076, 0, "x-cap076"), \
+ _CAP(CAP077, 0, "x-cap077"), \
+ _CAP(CAP078, 0, "x-cap078"), \
+ _CAP(CAP079, 0, "x-cap079"), \
+ _CAP(CAP080, 0, "x-cap080"), \
+ _CAP(CAP081, 0, "x-cap081"), \
+ _CAP(CAP082, 0, "x-cap082"), \
+ _CAP(CAP083, 0, "x-cap083"), \
+ _CAP(CAP084, 0, "x-cap084"), \
+ _CAP(CAP085, 0, "x-cap085"), \
+ _CAP(CAP086, 0, "x-cap086"), \
+ _CAP(CAP087, 0, "x-cap087"), \
+ _CAP(CAP088, 0, "x-cap088"), \
+ _CAP(CAP089, 0, "x-cap089"), \
+ _CAP(CAP090, 0, "x-cap090"), \
+ _CAP(CAP091, 0, "x-cap091"), \
+ _CAP(CAP092, 0, "x-cap092"), \
+ _CAP(CAP093, 0, "x-cap093"), \
+ _CAP(CAP094, 0, "x-cap094"), \
+ _CAP(CAP095, 0, "x-cap095"), \
+ _CAP(CAP096, 0, "x-cap096"), \
+ _CAP(CAP097, 0, "x-cap097"), \
+ _CAP(CAP098, 0, "x-cap098"), \
+ _CAP(CAP099, 0, "x-cap099"), \
+ _CAP(CAP100, 0, "x-cap100"), \
+ _CAP(CAP101, 0, "x-cap101"), \
+ _CAP(CAP102, 0, "x-cap102"), \
+ _CAP(CAP103, 0, "x-cap103"), \
+ _CAP(CAP104, 0, "x-cap104"), \
+ _CAP(CAP105, 0, "x-cap105"), \
+ _CAP(CAP106, 0, "x-cap106"), \
+ _CAP(CAP107, 0, "x-cap107"), \
+ _CAP(CAP108, 0, "x-cap108"), \
+ _CAP(CAP109, 0, "x-cap109"), \
+ _CAP(CAP110, 0, "x-cap110"), \
+ _CAP(CAP111, 0, "x-cap111"), \
+ _CAP(CAP112, 0, "x-cap112"), \
+ _CAP(CAP113, 0, "x-cap113"), \
+ _CAP(CAP114, 0, "x-cap114"), \
+ _CAP(CAP115, 0, "x-cap115"), \
+ _CAP(CAP116, 0, "x-cap116"), \
+ _CAP(CAP117, 0, "x-cap117"), \
+ _CAP(CAP118, 0, "x-cap118"), \
+ _CAP(CAP119, 0, "x-cap119"), \
+ _CAP(CAP120, 0, "x-cap120"), \
+ _CAP(CAP121, 0, "x-cap121"), \
+ _CAP(CAP122, 0, "x-cap122"), \
+ _CAP(CAP123, 0, "x-cap123"), \
+ _CAP(CAP124, 0, "x-cap124"), \
+ _CAP(CAP125, 0, "x-cap125"), \
+ _CAP(CAP126, 0, "x-cap126"), \
+ _CAP(CAP127, 0, "x-cap127"), \
+ _CAP(CAP128, 0, "x-cap128"), \
+ _CAP(CAP129, 0, "x-cap129"), \
+ _CAP(CAP130, 0, "x-cap130"), \
+ _CAP(CAP131, 0, "x-cap131"), \
+ _CAP(CAP132, 0, "x-cap132"), \
+ _CAP(CAP133, 0, "x-cap133"), \
+ _CAP(CAP134, 0, "x-cap134"), \
+ _CAP(CAP135, 0, "x-cap135"), \
+ _CAP(CAP136, 0, "x-cap136"), \
+ _CAP(CAP137, 0, "x-cap137"), \
+ _CAP(CAP138, 0, "x-cap138"), \
+ _CAP(CAP139, 0, "x-cap139"), \
+ _CAP(CAP140, 0, "x-cap140"), \
+ _CAP(CAP141, 0, "x-cap141"), \
+ _CAP(CAP142, 0, "x-cap142"), \
+ _CAP(CAP143, 0, "x-cap143"), \
+ _CAP(CAP144, 0, "x-cap144"), \
+ _CAP(CAP145, 0, "x-cap145"), \
+ _CAP(CAP146, 0, "x-cap146"), \
+ _CAP(CAP147, 0, "x-cap147"), \
+ _CAP(CAP148, 0, "x-cap148"), \
+ _CAP(CAP149, 0, "x-cap149"), \
+ _CAP(CAP150, 0, "x-cap150"), \
+ _CAP(CAP151, 0, "x-cap151"), \
+ _CAP(CAP152, 0, "x-cap152"), \
+ _CAP(CAP153, 0, "x-cap153"), \
+ _CAP(CAP154, 0, "x-cap154"), \
+ _CAP(CAP155, 0, "x-cap155"), \
+ _CAP(CAP156, 0, "x-cap156"), \
+ _CAP(CAP157, 0, "x-cap157"), \
+ _CAP(CAP158, 0, "x-cap158"), \
+ _CAP(CAP159, 0, "x-cap159"), \
+ _CAP(CAP160, 0, "x-cap160"), \
+ _CAP(CAP161, 0, "x-cap161"), \
+ _CAP(CAP162, 0, "x-cap162"), \
+ _CAP(CAP163, 0, "x-cap163"), \
+ _CAP(CAP164, 0, "x-cap164"), \
+ _CAP(CAP165, 0, "x-cap165"), \
+ _CAP(CAP166, 0, "x-cap166"), \
+ _CAP(CAP167, 0, "x-cap167"), \
+ _CAP(CAP168, 0, "x-cap168"), \
+ _CAP(CAP169, 0, "x-cap169"), \
+ _CAP(CAP170, 0, "x-cap170"), \
+ _CAP(CAP171, 0, "x-cap171"), \
+ _CAP(CAP172, 0, "x-cap172"), \
+ _CAP(CAP173, 0, "x-cap173"), \
+ _CAP(CAP174, 0, "x-cap174"), \
+ _CAP(CAP175, 0, "x-cap175"), \
+ _CAP(CAP176, 0, "x-cap176"), \
+ _CAP(CAP177, 0, "x-cap177"), \
+ _CAP(CAP178, 0, "x-cap178"), \
+ _CAP(CAP179, 0, "x-cap179"), \
+ _CAP(CAP180, 0, "x-cap180"), \
+ _CAP(CAP181, 0, "x-cap181"), \
+ _CAP(CAP182, 0, "x-cap182"), \
+ _CAP(CAP183, 0, "x-cap183"), \
+ _CAP(CAP184, 0, "x-cap184"), \
+ _CAP(CAP185, 0, "x-cap185"), \
+ _CAP(CAP186, 0, "x-cap186"), \
+ _CAP(CAP187, 0, "x-cap187"), \
+ _CAP(CAP188, 0, "x-cap188"), \
+ _CAP(CAP189, 0, "x-cap189"), \
+ _CAP(CAP190, 0, "x-cap190"), \
+ _CAP(CAP191, 0, "x-cap191"), \
+ _CAP(CAP192, 0, "x-cap192"), \
+ _CAP(CAP193, 0, "x-cap193"), \
+ _CAP(CAP194, 0, "x-cap194"), \
+ _CAP(CAP195, 0, "x-cap195"), \
+ _CAP(CAP196, 0, "x-cap196"), \
+ _CAP(CAP197, 0, "x-cap197"), \
+ _CAP(CAP198, 0, "x-cap198"), \
+ _CAP(CAP199, 0, "x-cap199"), \
+ _CAP(CAP200, 0, "x-cap200"), \
+ _CAP(CAP201, 0, "x-cap201"), \
+ _CAP(CAP202, 0, "x-cap202"), \
+ _CAP(CAP203, 0, "x-cap203"), \
+ _CAP(CAP204, 0, "x-cap204"), \
+ _CAP(CAP205, 0, "x-cap205"), \
+ _CAP(CAP206, 0, "x-cap206"), \
+ _CAP(CAP207, 0, "x-cap207"), \
+ _CAP(CAP208, 0, "x-cap208"), \
+ _CAP(CAP209, 0, "x-cap209"), \
+ _CAP(CAP210, 0, "x-cap210"), \
+ _CAP(CAP211, 0, "x-cap211"), \
+ _CAP(CAP212, 0, "x-cap212"), \
+ _CAP(CAP213, 0, "x-cap213"), \
+ _CAP(CAP214, 0, "x-cap214"), \
+ _CAP(CAP215, 0, "x-cap215"), \
+ _CAP(CAP216, 0, "x-cap216"), \
+ _CAP(CAP217, 0, "x-cap217"), \
+ _CAP(CAP218, 0, "x-cap218"), \
+ _CAP(CAP219, 0, "x-cap219"), \
+ _CAP(CAP220, 0, "x-cap220"), \
+ _CAP(CAP221, 0, "x-cap221"), \
+ _CAP(CAP222, 0, "x-cap222"), \
+ _CAP(CAP223, 0, "x-cap223"), \
+ _CAP(CAP224, 0, "x-cap224"), \
+ _CAP(CAP225, 0, "x-cap225"), \
+ _CAP(CAP226, 0, "x-cap226"), \
+ _CAP(CAP227, 0, "x-cap227"), \
+ _CAP(CAP228, 0, "x-cap228"), \
+ _CAP(CAP229, 0, "x-cap229"), \
+ _CAP(CAP230, 0, "x-cap230"), \
+ _CAP(CAP231, 0, "x-cap231"), \
+ _CAP(CAP232, 0, "x-cap232"), \
+ _CAP(CAP233, 0, "x-cap233"), \
+ _CAP(CAP234, 0, "x-cap234"), \
+ _CAP(CAP235, 0, "x-cap235"), \
+ _CAP(CAP236, 0, "x-cap236"), \
+ _CAP(CAP237, 0, "x-cap237"), \
+ _CAP(CAP238, 0, "x-cap238"), \
+ _CAP(CAP239, 0, "x-cap239"), \
+ _CAP(CAP240, 0, "x-cap240"), \
+ _CAP(CAP241, 0, "x-cap241"), \
+ _CAP(CAP242, 0, "x-cap242"), \
+ _CAP(CAP243, 0, "x-cap243"), \
+ _CAP(CAP244, 0, "x-cap244"), \
+ _CAP(CAP245, 0, "x-cap245"), \
+ _CAP(CAP246, 0, "x-cap246"), \
+ _CAP(CAP247, 0, "x-cap247"), \
+ _CAP(CAP248, 0, "x-cap248"), \
+ _CAP(CAP249, 0, "x-cap249"), \
+ _CAP(CAP250, 0, "x-cap250"), \
+ _CAP(CAP251, 0, "x-cap251"), \
+ _CAP(CAP252, 0, "x-cap252"), \
+ _CAP(CAP253, 0, "x-cap253"), \
+ _CAP(CAP254, 0, "x-cap254"), \
+ _CAP(CAP255, 0, "x-cap255"), \
+ _CAP(CAP256, 0, "x-cap256"), \
+ _CAP(CAP257, 0, "x-cap257"), \
+ _CAP(CAP258, 0, "x-cap258"), \
+ _CAP(CAP259, 0, "x-cap259"), \
+ _CAP(CAP260, 0, "x-cap260"), \
+ _CAP(CAP261, 0, "x-cap261"), \
+ _CAP(CAP262, 0, "x-cap262"), \
+ _CAP(CAP263, 0, "x-cap263"), \
+ _CAP(CAP264, 0, "x-cap264"), \
+ _CAP(CAP265, 0, "x-cap265"), \
+ _CAP(CAP266, 0, "x-cap266"), \
+ _CAP(CAP267, 0, "x-cap267"), \
+ _CAP(CAP268, 0, "x-cap268"), \
+ _CAP(CAP269, 0, "x-cap269"), \
+ _CAP(CAP270, 0, "x-cap270"), \
+ _CAP(CAP271, 0, "x-cap271"), \
+ _CAP(CAP272, 0, "x-cap272"), \
+ _CAP(CAP273, 0, "x-cap273"), \
+ _CAP(CAP274, 0, "x-cap274"), \
+ _CAP(CAP275, 0, "x-cap275"), \
+ _CAP(CAP276, 0, "x-cap276"), \
+ _CAP(CAP277, 0, "x-cap277"), \
+ _CAP(CAP278, 0, "x-cap278"), \
+ _CAP(CAP279, 0, "x-cap279"), \
+ _CAP(CAP280, 0, "x-cap280"), \
+ _CAP(CAP281, 0, "x-cap281"), \
+ _CAP(CAP282, 0, "x-cap282"), \
+ _CAP(CAP283, 0, "x-cap283"), \
+ _CAP(CAP284, 0, "x-cap284"), \
+ _CAP(CAP285, 0, "x-cap285"), \
+ _CAP(CAP286, 0, "x-cap286"), \
+ _CAP(CAP287, 0, "x-cap287"), \
+ _CAP(CAP288, 0, "x-cap288"), \
+ _CAP(CAP289, 0, "x-cap289"), \
+ _CAP(CAP290, 0, "x-cap290"), \
+ _CAP(CAP291, 0, "x-cap291"), \
+ _CAP(CAP292, 0, "x-cap292"), \
+ _CAP(CAP293, 0, "x-cap293"), \
+ _CAP(CAP294, 0, "x-cap294"), \
+ _CAP(CAP295, 0, "x-cap295"), \
+ _CAP(CAP296, 0, "x-cap296"), \
+ _CAP(CAP297, 0, "x-cap297"), \
+ _CAP(CAP298, 0, "x-cap298"), \
+ _CAP(CAP299, 0, "x-cap299"), \
+ _CAP(CAP300, 0, "x-cap300"), \
+ _CAP(CAP301, 0, "x-cap301"), \
+ _CAP(CAP302, 0, "x-cap302"), \
+ _CAP(CAP303, 0, "x-cap303"), \
+ _CAP(CAP304, 0, "x-cap304"), \
+ _CAP(CAP305, 0, "x-cap305"), \
+ _CAP(CAP306, 0, "x-cap306"), \
+ _CAP(CAP307, 0, "x-cap307"), \
+ _CAP(CAP308, 0, "x-cap308"), \
+ _CAP(CAP309, 0, "x-cap309"), \
+ _CAP(CAP310, 0, "x-cap310"), \
+ _CAP(CAP311, 0, "x-cap311"), \
+ _CAP(CAP312, 0, "x-cap312"), \
+ _CAP(CAP313, 0, "x-cap313"), \
+ _CAP(CAP314, 0, "x-cap314"), \
+ _CAP(CAP315, 0, "x-cap315"), \
+ _CAP(CAP316, 0, "x-cap316"), \
+ _CAP(CAP317, 0, "x-cap317"), \
+ _CAP(CAP318, 0, "x-cap318"), \
+ _CAP(CAP319, 0, "x-cap319"), \
+ _CAP(CAP320, 0, "x-cap320"), \
+ _CAP(CAP321, 0, "x-cap321"), \
+ _CAP(CAP322, 0, "x-cap322"), \
+ _CAP(CAP323, 0, "x-cap323"), \
+ _CAP(CAP324, 0, "x-cap324"), \
+ _CAP(CAP325, 0, "x-cap325"), \
+ _CAP(CAP326, 0, "x-cap326"), \
+ _CAP(CAP327, 0, "x-cap327"), \
+ _CAP(CAP328, 0, "x-cap328"), \
+ _CAP(CAP329, 0, "x-cap329"), \
+ _CAP(CAP330, 0, "x-cap330"), \
+ _CAP(CAP331, 0, "x-cap331"), \
+ _CAP(CAP332, 0, "x-cap332"), \
+ _CAP(CAP333, 0, "x-cap333"), \
+ _CAP(CAP334, 0, "x-cap334"), \
+ _CAP(CAP335, 0, "x-cap335"), \
+ _CAP(CAP336, 0, "x-cap336"), \
+ _CAP(CAP337, 0, "x-cap337"), \
+ _CAP(CAP338, 0, "x-cap338"), \
+ _CAP(CAP339, 0, "x-cap339"), \
+ _CAP(CAP340, 0, "x-cap340"), \
+ _CAP(CAP341, 0, "x-cap341"), \
+ _CAP(CAP342, 0, "x-cap342"), \
+ _CAP(CAP343, 0, "x-cap343"), \
+ _CAP(CAP344, 0, "x-cap344"), \
+ _CAP(CAP345, 0, "x-cap345"), \
+ _CAP(CAP346, 0, "x-cap346"), \
+ _CAP(CAP347, 0, "x-cap347"), \
+ _CAP(CAP348, 0, "x-cap348"), \
+ _CAP(CAP349, 0, "x-cap349"), \
+ _CAP(CAP350, 0, "x-cap350"), \
+ _CAP(CAP351, 0, "x-cap351"), \
+ _CAP(CAP352, 0, "x-cap352"), \
+ _CAP(CAP353, 0, "x-cap353"), \
+ _CAP(CAP354, 0, "x-cap354"), \
+ _CAP(CAP355, 0, "x-cap355"), \
+ _CAP(CAP356, 0, "x-cap356"), \
+ _CAP(CAP357, 0, "x-cap357"), \
+ _CAP(CAP358, 0, "x-cap358"), \
+ _CAP(CAP359, 0, "x-cap359"), \
+ _CAP(CAP360, 0, "x-cap360"), \
+ _CAP(CAP361, 0, "x-cap361"), \
+ _CAP(CAP362, 0, "x-cap362"), \
+ _CAP(CAP363, 0, "x-cap363"), \
+ _CAP(CAP364, 0, "x-cap364"), \
+ _CAP(CAP365, 0, "x-cap365"), \
+ _CAP(CAP366, 0, "x-cap366"), \
+ _CAP(CAP367, 0, "x-cap367"), \
+ _CAP(CAP368, 0, "x-cap368"), \
+ _CAP(CAP369, 0, "x-cap369"), \
+ _CAP(CAP370, 0, "x-cap370"), \
+ _CAP(CAP371, 0, "x-cap371"), \
+ _CAP(CAP372, 0, "x-cap372"), \
+ _CAP(CAP373, 0, "x-cap373"), \
+ _CAP(CAP374, 0, "x-cap374"), \
+ _CAP(CAP375, 0, "x-cap375"), \
+ _CAP(CAP376, 0, "x-cap376"), \
+ _CAP(CAP377, 0, "x-cap377"), \
+ _CAP(CAP378, 0, "x-cap378"), \
+ _CAP(CAP379, 0, "x-cap379"), \
+ _CAP(CAP380, 0, "x-cap380"), \
+ _CAP(CAP381, 0, "x-cap381"), \
+ _CAP(CAP382, 0, "x-cap382"), \
+ _CAP(CAP383, 0, "x-cap383"), \
+ _CAP(CAP384, 0, "x-cap384"), \
+ _CAP(CAP385, 0, "x-cap385"), \
+ _CAP(CAP386, 0, "x-cap386"), \
+ _CAP(CAP387, 0, "x-cap387"), \
+ _CAP(CAP388, 0, "x-cap388"), \
+ _CAP(CAP389, 0, "x-cap389"), \
+ _CAP(CAP390, 0, "x-cap390"), \
+ _CAP(CAP391, 0, "x-cap391"), \
+ _CAP(CAP392, 0, "x-cap392"), \
+ _CAP(CAP393, 0, "x-cap393"), \
+ _CAP(CAP394, 0, "x-cap394"), \
+ _CAP(CAP395, 0, "x-cap395"), \
+ _CAP(CAP396, 0, "x-cap396"), \
+ _CAP(CAP397, 0, "x-cap397"), \
+ _CAP(CAP398, 0, "x-cap398"), \
+ _CAP(CAP399, 0, "x-cap399"), \
+ _CAP(CAP400, 0, "x-cap400"), \
+ _CAP(CAP401, 0, "x-cap401"), \
+ _CAP(CAP402, 0, "x-cap402"), \
+ _CAP(CAP403, 0, "x-cap403"), \
+ _CAP(CAP404, 0, "x-cap404"), \
+ _CAP(CAP405, 0, "x-cap405"), \
+ _CAP(CAP406, 0, "x-cap406"), \
+ _CAP(CAP407, 0, "x-cap407"), \
+ _CAP(CAP408, 0, "x-cap408"), \
+ _CAP(CAP409, 0, "x-cap409"), \
+ _CAP(CAP410, 0, "x-cap410"), \
+ _CAP(CAP411, 0, "x-cap411"), \
+ _CAP(CAP412, 0, "x-cap412"), \
+ _CAP(CAP413, 0, "x-cap413"), \
+ _CAP(CAP414, 0, "x-cap414"), \
+ _CAP(CAP415, 0, "x-cap415"), \
+ _CAP(CAP416, 0, "x-cap416"), \
+ _CAP(CAP417, 0, "x-cap417"), \
+ _CAP(CAP418, 0, "x-cap418"), \
+ _CAP(CAP419, 0, "x-cap419"), \
+ _CAP(CAP420, 0, "x-cap420"), \
+ _CAP(CAP421, 0, "x-cap421"), \
+ _CAP(CAP422, 0, "x-cap422"), \
+ _CAP(CAP423, 0, "x-cap423"), \
+ _CAP(CAP424, 0, "x-cap424"), \
+ _CAP(CAP425, 0, "x-cap425"), \
+ _CAP(CAP426, 0, "x-cap426"), \
+ _CAP(CAP427, 0, "x-cap427"), \
+ _CAP(CAP428, 0, "x-cap428"), \
+ _CAP(CAP429, 0, "x-cap429"), \
+ _CAP(CAP430, 0, "x-cap430"), \
+ _CAP(CAP431, 0, "x-cap431"), \
+ _CAP(CAP432, 0, "x-cap432"), \
+ _CAP(CAP433, 0, "x-cap433"), \
+ _CAP(CAP434, 0, "x-cap434"), \
+ _CAP(CAP435, 0, "x-cap435"), \
+ _CAP(CAP436, 0, "x-cap436"), \
+ _CAP(CAP437, 0, "x-cap437"), \
+ _CAP(CAP438, 0, "x-cap438"), \
+ _CAP(CAP439, 0, "x-cap439"), \
+ _CAP(CAP440, 0, "x-cap440"), \
+ _CAP(CAP441, 0, "x-cap441"), \
+ _CAP(CAP442, 0, "x-cap442"), \
+ _CAP(CAP443, 0, "x-cap443"), \
+ _CAP(CAP444, 0, "x-cap444"), \
+ _CAP(CAP445, 0, "x-cap445"), \
+ _CAP(CAP446, 0, "x-cap446"), \
+ _CAP(CAP447, 0, "x-cap447"), \
+ _CAP(CAP448, 0, "x-cap448"), \
+ _CAP(CAP449, 0, "x-cap449"), \
+ _CAP(CAP450, 0, "x-cap450"), \
+ _CAP(CAP451, 0, "x-cap451"), \
+ _CAP(CAP452, 0, "x-cap452"), \
+ _CAP(CAP453, 0, "x-cap453"), \
+ _CAP(CAP454, 0, "x-cap454"), \
+ _CAP(CAP455, 0, "x-cap455"), \
+ _CAP(CAP456, 0, "x-cap456"), \
+ _CAP(CAP457, 0, "x-cap457"), \
+ _CAP(CAP458, 0, "x-cap458"), \
+ _CAP(CAP459, 0, "x-cap459"), \
+ _CAP(CAP460, 0, "x-cap460"), \
+ _CAP(CAP461, 0, "x-cap461"), \
+ _CAP(CAP462, 0, "x-cap462"), \
+ _CAP(CAP463, 0, "x-cap463"), \
+ _CAP(CAP464, 0, "x-cap464"), \
+ _CAP(CAP465, 0, "x-cap465"), \
+ _CAP(CAP466, 0, "x-cap466"), \
+ _CAP(CAP467, 0, "x-cap467"), \
+ _CAP(CAP468, 0, "x-cap468"), \
+ _CAP(CAP469, 0, "x-cap469"), \
+ _CAP(CAP470, 0, "x-cap470"), \
+ _CAP(CAP471, 0, "x-cap471"), \
+ _CAP(CAP472, 0, "x-cap472"), \
+ _CAP(CAP473, 0, "x-cap473"), \
+ _CAP(CAP474, 0, "x-cap474"), \
+ _CAP(CAP475, 0, "x-cap475"), \
+ _CAP(CAP476, 0, "x-cap476"), \
+ _CAP(CAP477, 0, "x-cap477"), \
+ _CAP(CAP478, 0, "x-cap478"), \
+ _CAP(CAP479, 0, "x-cap479"), \
+ _CAP(CAP480, 0, "x-cap480"), \
+ _CAP(CAP481, 0, "x-cap481"), \
+ _CAP(CAP482, 0, "x-cap482"), \
+ _CAP(CAP483, 0, "x-cap483"), \
+ _CAP(CAP484, 0, "x-cap484"), \
+ _CAP(CAP485, 0, "x-cap485"), \
+ _CAP(CAP486, 0, "x-cap486"), \
+ _CAP(CAP487, 0, "x-cap487"), \
+ _CAP(CAP488, 0, "x-cap488"), \
+ _CAP(CAP489, 0, "x-cap489"), \
+ _CAP(CAP490, 0, "x-cap490"), \
+ _CAP(CAP491, 0, "x-cap491"), \
+ _CAP(CAP492, 0, "x-cap492"), \
+ _CAP(CAP493, 0, "x-cap493"), \
+ _CAP(CAP494, 0, "x-cap494"), \
+ _CAP(CAP495, 0, "x-cap495"), \
+ _CAP(CAP496, 0, "x-cap496"), \
+ _CAP(CAP497, 0, "x-cap497"), \
+ _CAP(CAP498, 0, "x-cap498"), \
+ _CAP(CAP499, 0, "x-cap499"), \
+ _CAP(CAP500, 0, "x-cap500"), \
+ _CAP(CAP501, 0, "x-cap501"), \
+ _CAP(CAP502, 0, "x-cap502"), \
+ _CAP(CAP503, 0, "x-cap503"), \
+ _CAP(CAP504, 0, "x-cap504"), \
+ _CAP(CAP505, 0, "x-cap505"), \
+ _CAP(CAP506, 0, "x-cap506"), \
+ _CAP(CAP507, 0, "x-cap507"), \
+ _CAP(CAP508, 0, "x-cap508"), \
+ _CAP(CAP509, 0, "x-cap509"), \
+ _CAP(CAP510, 0, "x-cap510"), \
+ _CAP(CAP511, 0, "x-cap511"), \
+ _CAP(CAP512, 0, "x-cap512"), \
+ _CAP(CAP513, 0, "x-cap513"), \
+ _CAP(CAP514, 0, "x-cap514"), \
+ _CAP(CAP515, 0, "x-cap515"), \
+ _CAP(CAP516, 0, "x-cap516"), \
+ _CAP(CAP517, 0, "x-cap517"), \
+ _CAP(CAP518, 0, "x-cap518"), \
+ _CAP(CAP519, 0, "x-cap519"), \
+ _CAP(CAP520, 0, "x-cap520"), \
+ _CAP(CAP521, 0, "x-cap521"), \
+ _CAP(CAP522, 0, "x-cap522"), \
+ _CAP(CAP523, 0, "x-cap523"), \
+ _CAP(CAP524, 0, "x-cap524"), \
+ _CAP(CAP525, 0, "x-cap525"), \
+ _CAP(CAP526, 0, "x-cap526"), \
+ _CAP(CAP527, 0, "x-cap527"), \
+ _CAP(CAP528, 0, "x-cap528"), \
+ _CAP(CAP529, 0, "x-cap529"), \
+ _CAP(CAP530, 0, "x-cap530"), \
+ _CAP(CAP531, 0, "x-cap531"), \
+ _CAP(CAP532, 0, "x-cap532"), \
+ _CAP(CAP533, 0, "x-cap533"), \
+ _CAP(CAP534, 0, "x-cap534"), \
+ _CAP(CAP535, 0, "x-cap535"), \
+ _CAP(CAP536, 0, "x-cap536"), \
+ _CAP(CAP537, 0, "x-cap537"), \
+ _CAP(CAP538, 0, "x-cap538"), \
+ _CAP(CAP539, 0, "x-cap539"), \
+ _CAP(CAP540, 0, "x-cap540"), \
+ _CAP(CAP541, 0, "x-cap541"), \
+ _CAP(CAP542, 0, "x-cap542"), \
+ _CAP(CAP543, 0, "x-cap543"), \
+ _CAP(CAP544, 0, "x-cap544"), \
+ _CAP(CAP545, 0, "x-cap545"), \
+ _CAP(CAP546, 0, "x-cap546"), \
+ _CAP(CAP547, 0, "x-cap547"), \
+ _CAP(CAP548, 0, "x-cap548"), \
+ _CAP(CAP549, 0, "x-cap549"), \
+ _CAP(CAP550, 0, "x-cap550"), \
+ _CAP(CAP551, 0, "x-cap551"), \
+ _CAP(CAP552, 0, "x-cap552"), \
+ _CAP(CAP553, 0, "x-cap553"), \
+ _CAP(CAP554, 0, "x-cap554"), \
+ _CAP(CAP555, 0, "x-cap555"), \
+ _CAP(CAP556, 0, "x-cap556"), \
+ _CAP(CAP557, 0, "x-cap557"), \
+ _CAP(CAP558, 0, "x-cap558"), \
+ _CAP(CAP559, 0, "x-cap559"), \
+ _CAP(CAP560, 0, "x-cap560"), \
+ _CAP(CAP561, 0, "x-cap561"), \
+ _CAP(CAP562, 0, "x-cap562"), \
+ _CAP(CAP563, 0, "x-cap563"), \
+ _CAP(CAP564, 0, "x-cap564"), \
+ _CAP(CAP565, 0, "x-cap565"), \
+ _CAP(CAP566, 0, "x-cap566"), \
+ _CAP(CAP567, 0, "x-cap567"), \
+ _CAP(CAP568, 0, "x-cap568"), \
+ _CAP(CAP569, 0, "x-cap569"), \
+ _CAP(CAP570, 0, "x-cap570"), \
+ _CAP(CAP571, 0, "x-cap571"), \
+ _CAP(CAP572, 0, "x-cap572"), \
+ _CAP(CAP573, 0, "x-cap573"), \
+ _CAP(CAP574, 0, "x-cap574"), \
+ _CAP(CAP575, 0, "x-cap575"), \
+ _CAP(CAP576, 0, "x-cap576"), \
+ _CAP(CAP577, 0, "x-cap577"), \
+ _CAP(CAP578, 0, "x-cap578"), \
+ _CAP(CAP579, 0, "x-cap579"), \
+ _CAP(CAP580, 0, "x-cap580"), \
+ _CAP(CAP581, 0, "x-cap581"), \
+ _CAP(CAP582, 0, "x-cap582"), \
+ _CAP(CAP583, 0, "x-cap583"), \
+ _CAP(CAP584, 0, "x-cap584"), \
+ _CAP(CAP585, 0, "x-cap585"), \
+ _CAP(CAP586, 0, "x-cap586"), \
+ _CAP(CAP587, 0, "x-cap587"), \
+ _CAP(CAP588, 0, "x-cap588"), \
+ _CAP(CAP589, 0, "x-cap589"), \
+ _CAP(CAP590, 0, "x-cap590"), \
+ _CAP(CAP591, 0, "x-cap591"), \
+ _CAP(CAP592, 0, "x-cap592"), \
+ _CAP(CAP593, 0, "x-cap593"), \
+ _CAP(CAP594, 0, "x-cap594"), \
+ _CAP(CAP595, 0, "x-cap595"), \
+ _CAP(CAP596, 0, "x-cap596"), \
+ _CAP(CAP597, 0, "x-cap597"), \
+ _CAP(CAP598, 0, "x-cap598"), \
+ _CAP(CAP599, 0, "x-cap599")
+
+/** Client capabilities */
+enum Capab {
+#define _CAP(cap, flags, name) CAP_ ## cap
+ CAPLIST,
+#undef _CAP
+ _CAP_LAST_CAP
+};
+
+DECLARE_FLAGSET(CapSet, _CAP_LAST_CAP);
+
+#define CapHas(cs, cap) FlagHas(cs, cap)
+#define CapSet(cs, cap) FlagSet(cs, cap)
+#define CapClr(cs, cap) FlagClr(cs, cap)
+
+#endif /* INCLUDED_capab_h */
Index: ircd-ircdev/include/channel.h
diff -u ircd-ircdev/include/channel.h:1.6 ircd-ircdev/include/channel.h:1.7
--- ircd-ircdev/include/channel.h:1.6 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/channel.h Tue Dec 28 03:15:44 2004
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Channel management and maintenance.
- * @version $Id: channel.h,v 1.6 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: channel.h,v 1.7 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_channel_h
#define INCLUDED_channel_h
@@ -489,7 +489,7 @@
extern int joinbuf_flush(struct JoinBuf *jbuf);
extern struct Ban *make_ban(const char *banstr);
extern struct Ban *find_ban(struct Client *cptr, struct Ban *banlist);
-extern int apply_ban(struct Ban **banlist, struct Ban *newban);
+extern int apply_ban(struct Ban **banlist, struct Ban *newban, int free);
extern void free_ban(struct Ban *ban);
#endif /* INCLUDED_channel_h */
Index: ircd-ircdev/include/client.h
diff -u ircd-ircdev/include/client.h:1.7 ircd-ircdev/include/client.h:1.8
--- ircd-ircdev/include/client.h:1.7 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/client.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Structures and functions for handling local clients.
- * @version $Id: client.h,v 1.7 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: client.h,v 1.8 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_client_h
#define INCLUDED_client_h
@@ -146,6 +146,7 @@
FLAG_CLOSING, /**< set when closing to suppress errors */
FLAG_UPING, /**< has active UDP ping request */
FLAG_HUB, /**< server is a hub */
+ FLAG_IPV6, /**< server understands P10 IPv6 addrs */
FLAG_SERVICE, /**< server is a service */
FLAG_GOTID, /**< successful ident lookup achieved */
FLAG_DOID, /**< I-lines say must use ident return */
@@ -180,6 +181,8 @@
/** Declare flagset type for user flags. */
DECLARE_FLAGSET(Flags, FLAG_LAST_FLAG);
+#include "capab.h" /* client capabilities */
+
/** Represents a local connection.
* This contains a lot of stuff irrelevant to server connections, but
* those are so rare as to not be worth special-casing.
@@ -214,6 +217,7 @@
struct DNSReply* con_dns_reply; /**< DNS reply received during client
registration. */
struct ListingArgs* con_listing; /**< Current LIST status. */
+ unsigned long con_unreg; /**< Indicate what still needs to be done */
unsigned int con_max_sendq; /**< cached max send queue for client */
unsigned int con_ping_freq; /**< cached ping freq */
unsigned short con_lastsq; /**< # 2k blocks when sendqueued
@@ -232,6 +236,9 @@
client */
struct Timer con_proc; /**< process latent messages from
client */
+ struct Privs con_privs; /**< Oper privileges */
+ struct CapSet con_capab; /**< Client capabilities */
+ struct CapSet con_active; /**< Active client capabilities */
struct AuthRequest* con_auth; /**< auth request for client */
struct IAuthRequest* con_iauth; /**< iauth request for client */
};
@@ -258,12 +265,18 @@
unsigned int cli_hopcount; /**< number of servers to this 0 = local */
struct irc_in_addr cli_ip; /**< Real IP of client */
short cli_status; /**< Client type */
- struct Privs cli_privs; /**< Oper privileges */
char cli_name[HOSTLEN + 1]; /**< Unique name of the client, nick or host */
char cli_username[USERLEN + 1]; /**< username here now for auth stuff */
char cli_info[REALLEN + 1]; /**< Free form additional client information */
};
+#define CLIREG_NICK 0x0001 /**< Client must set nickname */
+#define CLIREG_USER 0x0002 /**< Client must set username */
+#define CLIREG_COOKIE 0x0004 /**< Client must return cookie */
+#define CLIREG_CAP 0x0008 /**< Client in capability negotiation */
+
+#define CLIREG_INIT (CLIREG_NICK | CLIREG_USER | CLIREG_COOKIE)
+
/** Magic constant to identify valid Client structures. */
#define CLIENT_MAGIC 0x4ca08286
@@ -310,7 +323,13 @@
/** Return non-zero if the client is local. */
#define cli_local(cli) (cli_from(cli) == cli)
/** Get oper privileges for client. */
-#define cli_privs(cli) ((cli)->cli_privs)
+#define cli_privs(cli) con_privs(cli_connect(cli))
+/** Get client capabilities for client */
+#define cli_capab(cli) con_capab(cli_connect(cli))
+/** Get active client capabilities for client */
+#define cli_active(cli) con_active(cli_connect(cli))
+/** Get flags for remaining registration tasks */
+#define cli_unreg(cli) con_unreg(cli_connect(cli))
/** Get client name. */
#define cli_name(cli) ((cli)->cli_name)
/** Get client username (ident). */
@@ -437,6 +456,8 @@
#define con_dns_reply(con) ((con)->con_dns_reply)
/** Get the LIST status for the connection. */
#define con_listing(con) ((con)->con_listing)
+/** Get remining steps before registration completes. */
+#define con_unreg(con) ((con)->con_unreg)
/** Get the maximum permitted SendQ size for the connection. */
#define con_max_sendq(con) ((con)->con_max_sendq)
/** Get the ping frequency for the connection. */
@@ -457,6 +478,12 @@
#define con_socket(con) ((con)->con_socket)
/** Get the Timer for processing more data from the connection. */
#define con_proc(con) ((con)->con_proc)
+/** Get the oper privilege set for the connection. */
+#define con_privs(con) (&(con)->con_privs)
+/** Get the peer's capabilities for the connection. */
+#define con_capab(con) (&(con)->con_capab)
+/** Get the active capabilities for the connection. */
+#define con_active(con) (&(con)->con_active)
/** Get the auth request for the connection. */
#define con_auth(con) ((con)->con_auth)
/** Get the iauth request for the connection. */
@@ -579,6 +606,8 @@
#define SendWallops(x) HasFlag(x, FLAG_WALLOP)
/** Return non-zero if the client claims to be a hub. */
#define IsHub(x) HasFlag(x, FLAG_HUB)
+/** Return non-zero if the client understands IPv6 addresses in P10. */
+#define IsIPv6(x) HasFlag(x, FLAG_IPV6)
/** Return non-zero if the client claims to be a services server. */
#define IsService(x) HasFlag(x, FLAG_SERVICE)
/** Return non-zero if the client has an account stamp. */
@@ -629,6 +658,8 @@
#define SetServNotice(x) SetFlag(x, FLAG_SERVNOTICE)
/** Mark a client as being a hub server. */
#define SetHub(x) SetFlag(x, FLAG_HUB)
+/** Mark a client as being an IPv6-grokking server. */
+#define SetIPv6(x) SetFlag(x, FLAG_IPV6)
/** Mark a client as being a services server. */
#define SetService(x) SetFlag(x, FLAG_SERVICE)
/** Mark a client as having an account stamp. */
@@ -720,7 +751,16 @@
#define SNO_NOISY (SNO_SERVKILL|SNO_UNAUTH)
/** Test whether a privilege has been granted to a client. */
-#define HasPriv(cli, priv) FlagHas(&cli_privs(cli), priv)
+#define HasPriv(cli, priv) FlagHas(cli_privs(cli), priv)
+/** Grant a privilege to a client. */
+#define SetPriv(cli, priv) FlagSet(cli_privs(cli), priv)
+/** Revoke a privilege from a client. */
+#define ClrPriv(cli, priv) FlagClr(cli_privs(cli), priv)
+
+/** Test whether a client has a capability */
+#define HasCap(cli, cap) CapHas(cli_capab(cli), (cap))
+/** Test whether a client has the capability active */
+#define CapActive(cli, cap) CapHas(cli_active(cli), (cap))
#define HIDE_IP 0 /**< Do not show IP address in get_client_name() */
#define SHOW_IP 1 /**< Show ident and IP address in get_client_name() */
Index: ircd-ircdev/include/handlers.h
diff -u ircd-ircdev/include/handlers.h:1.8 ircd-ircdev/include/handlers.h:1.9
--- ircd-ircdev/include/handlers.h:1.8 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/handlers.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Declarations for all protocol message handler functions.
- * @version $Id: handlers.h,v 1.8 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: handlers.h,v 1.9 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_handlers_h
#define INCLUDED_handlers_h
@@ -93,6 +93,7 @@
*/
extern int m_admin(struct Client*, struct Client*, int, char*[]);
extern int m_away(struct Client*, struct Client*, int, char*[]);
+extern int m_cap(struct Client*, struct Client*, int, char*[]);
extern int m_cnotice(struct Client*, struct Client*, int, char*[]);
extern int m_cprivmsg(struct Client*, struct Client*, int, char*[]);
extern int m_gline(struct Client*, struct Client*, int, char*[]);
@@ -154,9 +155,7 @@
extern int mo_clearmode(struct Client*, struct Client*, int, char*[]);
extern int mo_close(struct Client*, struct Client*, int, char*[]);
extern int mo_connect(struct Client*, struct Client*, int, char*[]);
-#if defined(DDB)
extern int mo_dbq(struct Client*, struct Client*, int, char*[]);
-#endif
extern int mo_die(struct Client*, struct Client*, int, char*[]);
extern int mo_get(struct Client*, struct Client*, int, char*[]);
extern int mo_gline(struct Client*, struct Client*, int, char*[]);
@@ -194,9 +193,7 @@
/*
* Server commands
*/
-#if defined(UNDERNET)
extern int ms_account(struct Client*, struct Client*, int, char*[]);
-#endif
extern int ms_admin(struct Client*, struct Client*, int, char*[]);
extern int ms_asll(struct Client*, struct Client*, int, char*[]);
extern int ms_away(struct Client*, struct Client*, int, char*[]);
@@ -204,10 +201,8 @@
extern int ms_clearmode(struct Client*, struct Client*, int, char*[]);
extern int ms_connect(struct Client*, struct Client*, int, char*[]);
extern int ms_create(struct Client*, struct Client*, int, char*[]);
-#if defined(DDB)
extern int ms_db(struct Client*, struct Client*, int, char*[]);
extern int ms_dbq(struct Client*, struct Client*, int, char*[]);
-#endif
extern int ms_destruct(struct Client*, struct Client*, int, char*[]);
extern int ms_desynch(struct Client*, struct Client*, int, char*[]);
extern int ms_end_of_burst(struct Client*, struct Client*, int, char*[]);
Index: ircd-ircdev/include/ircd_log.h
diff -u ircd-ircdev/include/ircd_log.h:1.3 ircd-ircdev/include/ircd_log.h:1.4
--- ircd-ircdev/include/ircd_log.h:1.3 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/ircd_log.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file
* @brief IRC logging interface.
- * @version $Id: ircd_log.h,v 1.3 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: ircd_log.h,v 1.4 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_ircd_log_h
#define INCLUDED_ircd_log_h
@@ -30,6 +30,10 @@
#include <stdarg.h> /* va_list */
#define INCLUDED_stdarg_h
#endif
+#ifndef INCLUDED_stdlib_h
+#include <stdlib.h> /* abort */
+#define INCLUDED_stdlib_h
+#endif
struct Client;
@@ -111,4 +115,47 @@
extern int log_feature_mark(int flag);
extern void log_feature_report(struct Client *to, int flag);
+extern int log_inassert;
+
#endif /* INCLUDED_ircd_log_h */
+
+/* The rest of this file implements our own custom version of assert.
+ * This version will log the assertion failure using the LS_SYSTEM log
+ * stream, thus putting the assertion failure message into a useful
+ * place, rather than elsewhere, as is currently the case...
+ */
+
+/* We've been included twice; clean up before creating assert() again */
+#ifdef _ircd_log_assert
+# undef _ircd_log_assert
+# undef assert
+#endif
+
+/* gcc has a nice way of hinting that an expression is expected to
+ * produce a specific result, which can improve optimization.
+ * Unfortunately, all the world's not gcc (at least, not yet), and not
+ * all gcc's support it. I don't know exactly when it appeared, but
+ * it does appear to be in all versions from 3 and up. So, we'll
+ * create a dummy define if (we think) this version of gcc doesn't
+ * have it...
+ */
+#ifndef _log_builtin_expect
+# define _log_builtin_expect
+# if __GNUC__ < 3
+# define __builtin_expect(expr, expect) (expr)
+# endif
+#endif
+
+/* let's try not to clash with the system assert()... */
+#ifndef assert
+# ifdef NDEBUG
+# define assert(expr) ((void)0)
+# else
+# define assert(expr) \
+ ((void)(__builtin_expect(!!(expr), 1) ? 0 : \
+ (__builtin_expect(log_inassert, 0) ? (abort(), 0) : \
+ ((log_inassert = 1), /* inhibit looping in assert() */ \
+ log_write(LS_SYSTEM, L_CRIT, 0, "Assertion failure at %s:%d: " \
+ "\"%s\"", __FILE__, __LINE__, #expr), abort(), 0))))
+# endif
+#endif
Index: ircd-ircdev/include/msg.h
diff -u ircd-ircdev/include/msg.h:1.7 ircd-ircdev/include/msg.h:1.8
--- ircd-ircdev/include/msg.h:1.7 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/msg.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Command and token declarations and structures.
- * @version $Id: msg.h,v 1.7 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: msg.h,v 1.8 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_msg_h
#define INCLUDED_msg_h
@@ -362,17 +362,18 @@
#define MSG_PRIVS "PRIVS" /* PRIV */
#define TOK_PRIVS "PRIVS"
+#define MSG_CAP "CAP"
+#define TOK_CAP "CAP"
+#define CMD_CAP MSG_CAP, TOK_CAP
+
#define MSG_WATCH "WATCH" /* WATC */
#define TOK_WATCH "WATCH"
-
-#if defined(DDB)
#define MSG_DB "DB" /* DB */
#define TOK_DB "DB"
#define MSG_DBQ "DBQ" /* DBQ */
#define TOK_DBQ "DBQ"
-#endif /* defined(DDB) */
/*
Index: ircd-ircdev/include/numeric.h
diff -u ircd-ircdev/include/numeric.h:1.7 ircd-ircdev/include/numeric.h:1.8
--- ircd-ircdev/include/numeric.h:1.7 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/numeric.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Declarations of numeric replies and supporting functions.
- * @version $Id: numeric.h,v 1.7 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: numeric.h,v 1.8 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_numeric_h
#define INCLUDED_numeric_h
@@ -331,6 +331,7 @@
/* ERR_NOCOLORSONCHAN 408 Dalnet */
#define ERR_NOORIGIN 409
+#define ERR_UNKNOWNCAPCMD 410
#define ERR_NORECIPIENT 411
#define ERR_NOTEXTTOSEND 412
#define ERR_NOTOPLEVEL 413
Index: ircd-ircdev/include/numnicks.h
diff -u ircd-ircdev/include/numnicks.h:1.3 ircd-ircdev/include/numnicks.h:1.4
--- ircd-ircdev/include/numnicks.h:1.3 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/numnicks.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Interface for numeric nickname functions.
- * @version $Id: numnicks.h,v 1.3 2004/11/24 16:00:43 zolty Exp $
+ * @version $Id: numnicks.h,v 1.4 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_numnicks_h
#define INCLUDED_numnicks_h
@@ -88,7 +88,7 @@
extern unsigned int base64toint(const char* str);
extern const char* inttobase64(char* buf, unsigned int v, unsigned int count);
-extern const char* iptobase64(char* buf, const struct irc_in_addr* addr, unsigned int count);
+extern const char* iptobase64(char* buf, const struct irc_in_addr* addr, unsigned int count, int v6_ok);
extern void base64toip(const char* s, struct irc_in_addr* addr);
#endif /* INCLUDED_numnicks_h */
Index: ircd-ircdev/include/patchlevel.h
diff -u ircd-ircdev/include/patchlevel.h:1.14 ircd-ircdev/include/patchlevel.h:1.15
--- ircd-ircdev/include/patchlevel.h:1.14 Wed Nov 24 08:00:43 2004
+++ ircd-ircdev/include/patchlevel.h Tue Dec 28 03:15:44 2004
@@ -17,10 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: patchlevel.h,v 1.14 2004/11/24 16:00:43 zolty Exp $
+ * $Id: patchlevel.h,v 1.15 2004/12/28 11:15:44 zolty Exp $
*
*/
-#define PATCHLEVEL ".alpha13"
+#define PATCHLEVEL ".alpha14"
#define RELEASE "1.0"
Index: ircd-ircdev/include/send.h
diff -u ircd-ircdev/include/send.h:1.4 ircd-ircdev/include/send.h:1.5
--- ircd-ircdev/include/send.h:1.4 Wed Nov 24 08:00:44 2004
+++ ircd-ircdev/include/send.h Tue Dec 28 03:15:44 2004
@@ -21,7 +21,7 @@
*/
/** @file send.h
* @brief Send messages to certain targets.
- * @version $Id: send.h,v 1.4 2004/11/24 16:00:44 zolty Exp $
+ * @version $Id: send.h,v 1.5 2004/12/28 11:15:44 zolty Exp $
*/
#ifndef INCLUDED_send_h
#define INCLUDED_send_h
@@ -66,6 +66,12 @@
const char *tok, struct Client *to,
const char *pattern, ...);
+/* Send command to servers by flags except one */
+extern void sendcmdto_flag_serv_butone(struct Client *from, const char *cmd,
+ const char *tok, struct Client *one,
+ int require, int forbid,
+ const char *pattern, ...);
+
/* Send command to all servers except one */
extern void sendcmdto_serv_butone(struct Client *from, const char *cmd,
const char *tok, struct Client *one,
Index: ircd-ircdev/ircd-patch
diff -u /dev/null ircd-ircdev/ircd-patch:1.1
--- /dev/null Tue Dec 28 03:16:00 2004
+++ ircd-ircdev/ircd-patch Tue Dec 28 03:15:43 2004
@@ -0,0 +1,229 @@
+#!/bin/sh
+#
+# IRC-Dev IRCD - An advanced and innovative IRC Daemon, ircd-patch
+
+# Copyright (C) 2002-2...
[truncated message content] |
