[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...> - 2005-10-26 14:55:38
|
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2005-10-26 14:55:18 UTC
Modified files:
ChangeLog ChangeLog.es Makefile.in include/capab.h include/dbuf.h
include/hash.h include/ircd_features.h include/msg.h
include/numeric.h include/patchlevel.h include/s_conf.h
include/s_user.h ircd/IPcheck.c ircd/Makefile.in ircd/channel.c
ircd/class.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_smd5.c ircd/ircd_events.c ircd/ircd_features.c
ircd/ircd_log.c ircd/ircd_parser.y ircd/ircd_relay.c
ircd/ircd_res.c ircd/ircd_string.c ircd/jupe.c ircd/list.c
ircd/m_burst.c ircd/m_cap.c ircd/m_clearmode.c ircd/m_connect.c
ircd/m_create.c ircd/m_destruct.c ircd/m_join.c ircd/m_kick.c
ircd/m_kill.c ircd/m_list.c ircd/m_mode.c ircd/m_nick.c
ircd/m_oper.c ircd/m_privs.c ircd/m_quit.c ircd/m_settime.c
ircd/m_stats.c ircd/m_time.c ircd/m_topic.c ircd/m_trace.c
ircd/m_userhost.c ircd/m_userip.c ircd/m_version.c ircd/m_who.c
ircd/m_whois.c ircd/m_whowas.c ircd/match.c ircd/msgq.c
ircd/numnicks.c ircd/packet.c ircd/parse.c ircd/s_auth.c
ircd/s_conf.c ircd/s_debug.c ircd/s_err.c ircd/s_misc.c
ircd/s_numeric.c ircd/s_serv.c ircd/s_stats.c ircd/s_user.c
ircd/send.c ircd/umkpasswd.c ircd/test/ircd_chattr_t.c
ircd/test/ircd_in_addr_t.c tools/Bounce/Bounce.cpp
tools/Bounce/Bounce.h tools/convert-conf.py tools/hashtoy
tools/untabify tools/linesync/linesync.sh
Log message:
Author: zoltan <zo...@ir...>
Log message:
2005-10-26 Toni García <zo...@ir...> 1.0.alpha46
* Limpieza de código
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.47 ircd-ircdev/ChangeLog:1.48
--- ircd-ircdev/ChangeLog:1.47 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ChangeLog Wed Oct 26 07:54:43 2005
@@ -1,10 +1,13 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.47 2005/10/25 09:52:43 zolty Exp $
+# $Id: ChangeLog,v 1.48 2005/10/26 14:54:43 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2005-10-26 Toni García <zo...@ir...> 1.0.alpha46
+ * Cleanup code
+
2005-10-25 Toni García <zo...@ir...> 1.0.alpha45
* Dynamic ISSUPORT
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.47 ircd-ircdev/ChangeLog.es:1.48
--- ircd-ircdev/ChangeLog.es:1.47 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ChangeLog.es Wed Oct 26 07:54:43 2005
@@ -1,10 +1,13 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.47 2005/10/25 09:52:43 zolty Exp $
+# $Id: ChangeLog.es,v 1.48 2005/10/26 14:54:43 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2005-10-26 Toni García <zo...@ir...> 1.0.alpha46
+ * Limpieza de código
+
2005-10-25 Toni García <zo...@ir...> 1.0.alpha45
* ISSUPORT dinámico
Index: ircd-ircdev/Makefile.in
diff -u ircd-ircdev/Makefile.in:1.8 ircd-ircdev/Makefile.in:1.9
--- ircd-ircdev/Makefile.in:1.8 Tue Feb 15 08:31:49 2005
+++ ircd-ircdev/Makefile.in Wed Oct 26 07:54:43 2005
@@ -151,7 +151,7 @@
# Indent all headers and source files:
indent:
@test "`indent --version`" = "GNU indent 2.2.8" || \
- (echo "You need GNU indent 2.2.8; See doc/<language>/readme.indent" && exit -1);
+ (echo "You need GNU indent 2.2.8; See doc/<language>/indent.txt" && exit -1);
VERSION_CONTROL=none indent include/*.h ircd/*.c
# do a cvs update
Index: ircd-ircdev/include/capab.h
diff -u ircd-ircdev/include/capab.h:1.3 ircd-ircdev/include/capab.h:1.4
--- ircd-ircdev/include/capab.h:1.3 Mon Apr 11 01:44:59 2005
+++ ircd-ircdev/include/capab.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Interface and public definitions for capabilities extension
- * @version $Id: capab.h,v 1.3 2005/04/11 08:44:59 zolty Exp $
+ * @version $Id: capab.h,v 1.4 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_capab_h
#define INCLUDED_capab_h
@@ -35,11 +35,7 @@
#define CAPFL_PROTO 0x0004 /**< Cap must be acknowledged by client */
#define CAPFL_STICKY 0x0008 /**< Cap may not be cleared once set */
-
-/* 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 \
+#define CAPLIST \
_CAP(USERPFX, 0, "undernet.org/userpfx")
/** Client capabilities */
Index: ircd-ircdev/include/dbuf.h
diff -u ircd-ircdev/include/dbuf.h:1.4 ircd-ircdev/include/dbuf.h:1.5
--- ircd-ircdev/include/dbuf.h:1.4 Mon Jan 10 04:21:59 2005
+++ ircd-ircdev/include/dbuf.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Interfaces and declarations for dealing with data buffers.
- * @version $Id: dbuf.h,v 1.4 2005/01/10 12:21:59 zolty Exp $
+ * @version $Id: dbuf.h,v 1.5 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_dbuf_h
#define INCLUDED_dbuf_h
@@ -62,4 +62,5 @@
extern unsigned int dbuf_getmsg(struct DBuf *dyn, char *buf, unsigned int length);
extern void dbuf_count_memory(size_t *allocated, size_t *used);
+
#endif /* INCLUDED_dbuf_h */
Index: ircd-ircdev/include/hash.h
diff -u ircd-ircdev/include/hash.h:1.7 ircd-ircdev/include/hash.h:1.8
--- ircd-ircdev/include/hash.h:1.7 Sat Apr 2 11:47:34 2005
+++ ircd-ircdev/include/hash.h Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Hash table management APIs.
- * @version $Id: hash.h,v 1.7 2005/04/02 19:47:34 zolty Exp $
+ * @version $Id: hash.h,v 1.8 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_hash_h
#define INCLUDED_hash_h
@@ -100,7 +100,7 @@
extern int addNickJupes(const char *nicks);
extern void clearNickJupes(void);
extern void stats_nickjupes(struct Client* to, const struct StatDesc* sd,
- char* param);
+ char* param);
extern void list_next_channels(struct Client *cptr);
#endif /* INCLUDED_hash_h */
Index: ircd-ircdev/include/ircd_features.h
diff -u ircd-ircdev/include/ircd_features.h:1.14 ircd-ircdev/include/ircd_features.h:1.15
--- ircd-ircdev/include/ircd_features.h:1.14 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/include/ircd_features.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Public interfaces and declarations for dealing with configurable features.
- * @version $Id: ircd_features.h,v 1.14 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: ircd_features.h,v 1.15 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_features_h
#define INCLUDED_features_h
@@ -67,7 +67,6 @@
FEAT_KILLCHASETIMELIMIT,
FEAT_MAXCHANNELSPERUSER,
FEAT_NICKLEN,
-
FEAT_AVBANLEN,
FEAT_MAXBANS,
FEAT_MAXSILES,
@@ -124,7 +123,6 @@
FEAT_HIS_STATS_e,
FEAT_HIS_STATS_f,
FEAT_HIS_STATS_g,
- FEAT_HIS_STATS_h,
FEAT_HIS_STATS_i,
FEAT_HIS_STATS_j,
FEAT_HIS_STATS_J,
Index: ircd-ircdev/include/msg.h
diff -u ircd-ircdev/include/msg.h:1.13 ircd-ircdev/include/msg.h:1.14
--- ircd-ircdev/include/msg.h:1.13 Wed May 25 09:56:23 2005
+++ ircd-ircdev/include/msg.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Command and token declarations and structures.
- * @version $Id: msg.h,v 1.13 2005/05/25 16:56:23 zolty Exp $
+ * @version $Id: msg.h,v 1.14 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_msg_h
#define INCLUDED_msg_h
@@ -343,9 +343,9 @@
#define TOK_ACCOUNT "AC"
#define CMD_ACCOUNT MSG_ACCOUNT, TOK_ACCOUNT
-#define MSG_ASLL "ASLL" /* ASLL */
-#define TOK_ASLL "LL"
-#define CMD_ASLL MSG_ASLL, TOK_ASLL
+#define MSG_ASLL "ASLL" /* ASLL */
+#define TOK_ASLL "LL"
+#define CMD_ASLL MSG_ASLL, TOK_ASLL
#define MSG_POST "POST" /* POST */
#define TOK_POST "POST"
Index: ircd-ircdev/include/numeric.h
diff -u ircd-ircdev/include/numeric.h:1.15 ircd-ircdev/include/numeric.h:1.16
--- ircd-ircdev/include/numeric.h:1.15 Thu Sep 1 04:25:42 2005
+++ ircd-ircdev/include/numeric.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Declarations of numeric replies and supporting functions.
- * @version $Id: numeric.h,v 1.15 2005/09/01 11:25:42 zolty Exp $
+ * @version $Id: numeric.h,v 1.16 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_numeric_h
#define INCLUDED_numeric_h
@@ -66,9 +66,9 @@
#define RPL_MAP 15 /* Undernet extension */
#define RPL_MAPMORE 16 /* Undernet extension */
#define RPL_MAPEND 17 /* Undernet extension */
-#define RPL_APASSWARN_SET 30 /* Undernet extension */
-#define RPL_APASSWARN_SECRET 31 /* Undernet extension */
-#define RPL_APASSWARN_CLEAR 32 /* Undernet extension */
+#define RPL_APASSWARN_SET 30 /* Undernet extension */
+#define RPL_APASSWARN_SECRET 31 /* Undernet extension */
+#define RPL_APASSWARN_CLEAR 32 /* Undernet extension */
/* RPL_YOURID 42 IRCnet extension */
/* RPL_ATTEMPTINGJUNC 50 aircd extension */
/* RPL_ATTEMPTINGREROUTE 51 aircd extension */
@@ -106,7 +106,7 @@
/* RPL_STATSBLINE 220 Numerics List: Dalnet,unreal */
#define RPL_UMODEIS 221
/* RPL_SQLINE_NICK 222 Numerics List: Dalnet */
-#define RPL_STATSJLINE 222 /* Undernet extension */
+#define RPL_STATSJLINE 222 /* Undernet extension */
/* RPL_STATSELINE 223 dalnet */
/* RPL_STATSGLINE 223 unreal */
/* RPL_STATSFLINE 224 Hybrid extension,Dalnet */
@@ -121,12 +121,12 @@
#define RPL_STATSALINE 226 /* Hybrid, Undernet */
#define RPL_STATSQLINE 228 /* Undernet extension */
-/* RPL_SERVICEINFO 231 unused */
-/* RPL_ENDOFSERVICES 232 unused */
+/* RPL_SERVICEINFO 231 unused */
+/* RPL_ENDOFSERVICES 232 unused */
/* RPL_RULES 232 unreal */
-/* RPL_SERVICE 233 unused */
-/* RPL_SERVLIST 234 unused */
-/* RPL_SERVLISTEND 235 unused */
+/* RPL_SERVICE 233 unused */
+/* RPL_SERVLIST 234 unused */
+/* RPL_SERVLISTEND 235 unused */
#define RPL_STATSVERBOSE 236 /* Undernet verbose server list */
#define RPL_STATSENGINE 237 /* Undernet engine name */
@@ -161,7 +161,7 @@
#define RPL_ADMINLOC2 258
#define RPL_ADMINEMAIL 259
-/* RPL_TRACELOG 261 unused */
+/* RPL_TRACELOG 261 unused */
#define RPL_TRACEEND 262 /* efnet/IRCnet */
/* RPL_LOAD_THROTTLED 263 efnet/hybrid */
/* RPL_TRYAGAIN 263 Numerics List: IRCnet */
@@ -206,11 +206,11 @@
/* RPL_END_CHANINFO 299 aircd */
-/* RPL_NONE 300 unused */
+/* RPL_NONE 300 unused */
#define RPL_AWAY 301
#define RPL_USERHOST 302
#define RPL_ISON 303
-/* RPL_TEXT 304 unused */
+/* RPL_TEXT 304 unused */
#define RPL_UNAWAY 305
#define RPL_NOWAWAY 306
/* NotAway, aircd */
@@ -258,7 +258,7 @@
/* RPL_LISTSYNTAX 334 unreal */
/* RPL_CHANPASSOK 338 IRCnet extension (?)*/
#define RPL_WHOISACTUALLY 338 /* Undernet extension, dalnet */
-/* RPL_BADCHANPASS 339 IRCnet extension (?)*/
+/* RPL_BADCHANPASS 339 IRCnet extension (?) */
#define RPL_USERIP 340 /* Undernet extension */
#define RPL_INVITING 341
/* RPL_SUMMONING 342 removed from RFC1459 */
@@ -276,7 +276,7 @@
See also RPL_ENDOFWHO */
#define RPL_DELNAMREPLY 355 /* QuakeNet extension */
-/* RPL_KILLDONE 361 not used */
+/* RPL_KILLDONE 361 not used */
#define RPL_CLOSING 362
#define RPL_CLOSEEND 363
#define RPL_LINKS 364
@@ -288,7 +288,7 @@
#define RPL_INFO 371
#define RPL_MOTD 372
-#define RPL_INFOSTART 373 /* not used */
+/* RPL_INFOSTART 373 not used */
#define RPL_ENDOFINFO 374
#define RPL_MOTDSTART 375
#define RPL_ENDOFMOTD 376
@@ -303,8 +303,8 @@
#define RPL_YOUREOPER 381
#define RPL_REHASHING 382
/* RPL_YOURSERVICE 383 Numeric List: various */
-/* RPL_MYPORTIS 384 not used */
-/* RPL_NOTOPERANYMORE 385 Extension to RFC1459, not used */
+/* RPL_MYPORTIS 384 not used */
+/* RPL_NOTOPERANYMORE 385 Extension to RFC1459, not used */
/* RPL_QLIST 386 unreal */
/* RPL_ENDOFQLIST 387 unreal */
/* RPL_ALIST 388 unreal */
@@ -322,7 +322,7 @@
* Errors are in the range from 400-599 currently and are grouped by what
* commands they come from.
*/
-/* ERR_FIRSTERROR 400 unused */
+/* ERR_FIRSTERROR 400 unused */
#define ERR_NOSUCHNICK 401
#define ERR_NOSUCHSERVER 402
#define ERR_NOSUCHCHANNEL 403
@@ -333,7 +333,6 @@
/* ERR_NOSUCHSERVICE 408 IRCnet */
/* ERR_NOCOLORSONCHAN 408 Dalnet */
#define ERR_NOORIGIN 409
-
#define ERR_UNKNOWNCAPCMD 410
#define ERR_NORECIPIENT 411
#define ERR_NOTEXTTOSEND 412
@@ -455,12 +454,12 @@
#define ERR_TOOMANYUSERS 519 /* Undernet extension -Kev */
/* ERR_OPERONLY 520 unreal */
#define ERR_MASKTOOWIDE 520 /* Undernet extension -Kev */
-/* ERR_WHOTRUNC 520 austnet */
+/* ERR_WHOTRUNC 520 austnet */
#define ERR_NOSUCHGLINE 521 /* Undernet extension (new) */
/* ERR_LISTSYNTAX 521 dalnet
ERR_WHOSYNTAX 522 dalnet
ERR_WHOLIMEXCEED 523 dalnet */
-#define ERR_QUARANTINED 524 /* Undernet extension -Vampire */
+#define ERR_QUARANTINED 524 /* Undernet extension -Vampire */
#define ERR_NOTLOWEROPLEVEL 560 /* Undernet extension */
#define ERR_NOTMANAGER 561 /* Undernet extension */
Index: ircd-ircdev/include/patchlevel.h
diff -u ircd-ircdev/include/patchlevel.h:1.46 ircd-ircdev/include/patchlevel.h:1.47
--- ircd-ircdev/include/patchlevel.h:1.46 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/include/patchlevel.h Wed Oct 26 07:54:43 2005
@@ -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.46 2005/10/25 09:52:43 zolty Exp $
+ * $Id: patchlevel.h,v 1.47 2005/10/26 14:54:43 zolty Exp $
*
*/
-#define PATCHLEVEL "45"
+#define PATCHLEVEL "46"
#define RELEASE "1.0.alpha"
Index: ircd-ircdev/include/s_conf.h
diff -u ircd-ircdev/include/s_conf.h:1.13 ircd-ircdev/include/s_conf.h:1.14
--- ircd-ircdev/include/s_conf.h:1.13 Thu Sep 1 04:25:42 2005
+++ ircd-ircdev/include/s_conf.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file s_conf.h
* @brief ircd configuration file API.
- * @version $Id: s_conf.h,v 1.13 2005/09/01 11:25:42 zolty Exp $
+ * @version $Id: s_conf.h,v 1.14 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_s_conf_h
#define INCLUDED_s_conf_h
@@ -105,7 +105,7 @@
/** Local K-line structure. */
struct DenyConf {
struct DenyConf* next; /**< Next DenyConf in #denyConfList. */
- char* hostmask; /**< Mask for IP or hostname. */
+ char* hostmask; /**< Mask for IP or hostname. */
char* message; /**< Message to send to denied users. */
char* usermask; /**< Mask for client's username. */
char* realmask; /**< Mask for realname. */
Index: ircd-ircdev/include/s_user.h
diff -u ircd-ircdev/include/s_user.h:1.9 ircd-ircdev/include/s_user.h:1.10
--- ircd-ircdev/include/s_user.h:1.9 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/include/s_user.h Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file s_user.h
* @brief Miscellaneous user-related helper functions.
- * @version $Id: s_user.h,v 1.9 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: s_user.h,v 1.10 2005/10/26 14:54:43 zolty Exp $
*/
#ifndef INCLUDED_s_user_h
#define INCLUDED_s_user_h
@@ -117,7 +117,7 @@
extern int set_nick_name(struct Client* cptr, struct Client* sptr,
const char* nick, int parc, char* parv[], int flags);
extern void send_umode_out(struct Client* cptr, struct Client* sptr,
- struct Flags* old, int prop);
+ struct Flags* old, int prop);
extern int whisper(struct Client* source, const char* nick,
const char* channel, const char* text, int is_notice);
extern void send_user_info(struct Client* to, char* names, int rpl,
Index: ircd-ircdev/ircd/IPcheck.c
diff -u ircd-ircdev/ircd/IPcheck.c:1.12 ircd-ircdev/ircd/IPcheck.c:1.13
--- ircd-ircdev/ircd/IPcheck.c:1.12 Thu Sep 1 04:25:42 2005
+++ ircd-ircdev/ircd/IPcheck.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Code to count users connected from particular IP addresses.
- * @version $Id: IPcheck.c,v 1.12 2005/09/01 11:25:42 zolty Exp $
+ * @version $Id: IPcheck.c,v 1.13 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -284,7 +284,6 @@
}
/* Note that this also counts server connects.
* It is hard and not interesting, to change that.
- *
* Refuse connection if it would overflow the counter.
*/
if (0 == ++entry->connected)
@@ -311,7 +310,7 @@
/*
* Don't refuse connection when we just rebooted the server
*/
-#ifndef NOTHROTTLE
+#ifndef NOTHROTTLE
assert(entry->connected > 0);
--entry->connected;
Debug((DEBUG_DNS, "IPcheck refusing local connection from %s: too fast.", ircd_ntoa(&entry->addr)));
Index: ircd-ircdev/ircd/Makefile.in
diff -u ircd-ircdev/ircd/Makefile.in:1.29 ircd-ircdev/ircd/Makefile.in:1.30
--- ircd-ircdev/ircd/Makefile.in:1.29 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/Makefile.in Wed Oct 26 07:54:43 2005
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA
-# $Id: Makefile.in,v 1.29 2005/10/25 09:52:43 zolty Exp $
+# $Id: Makefile.in,v 1.30 2005/10/26 14:54:43 zolty Exp $
#### Start of system configuration section. ####
@@ -58,7 +58,6 @@
MPATH = ${DPATH}/ircd.motd
RPATH = ${DPATH}/remote.motd
-
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = -I. -I.. -I${top_srcdir}/include @CPPFLAGS@
Index: ircd-ircdev/ircd/channel.c
diff -u ircd-ircdev/ircd/channel.c:1.27 ircd-ircdev/ircd/channel.c:1.28
--- ircd-ircdev/ircd/channel.c:1.27 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/channel.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Channel management and maintanance
- * @version $Id: channel.c,v 1.27 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: channel.c,v 1.28 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -152,8 +152,8 @@
for (num_free = 0, ban = free_bans; ban; ban = ban->next)
num_free++;
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Bans: inuse %zu(%zu) free %zu alloc %zu",
- bans_inuse, bans_inuse * sizeof(*ban), num_free, bans_alloc);
- }
+ bans_inuse, bans_inuse * sizeof(*ban), num_free, bans_alloc);
+}
/** return the struct Membership* that represents a client on a channel
* This function finds a struct Membership* which holds the state about
@@ -275,8 +275,7 @@
* the same time as if it had an Apass (but removing +i and +l), and
* reopping the first user to rejoin. However, preventing net rides
* requires a backwards-incompatible protocol change..
- */
-
+ */
if (!chptr->mode.apass[0]) /* If no Apass, destroy now. */
destruct_channel(chptr);
else if (TStime() - chptr->creationtime < 172800) /* Channel younger than 48 hours? */
@@ -1069,7 +1068,7 @@
msgq_append(&me, mb, tbuf);
new_mode = 0;
}
- else if (feat_oplevels && flag_cnt > 1 && last_oplevel != member->oplevel)
+ else if (feat_oplevels && flag_cnt > 1 && last_oplevel != member->oplevel)
{
/*
* This can't be the first member of a (continued) BURST
@@ -1669,7 +1668,7 @@
if (mbuf->mb_add == 0 && mbuf->mb_rem == 0 && mbuf->mb_count == 0)
return 0;
- /* Ok, if we were given the OPMODE flag or if it's a server, hide source
+ /* Ok, if we were given the OPMODE flag, or its a server, hide the source.
*/
if (mbuf->mb_dest & MODEBUF_DEST_OPMODE || IsServer(mbuf->mb_source) || IsMe(mbuf->mb_source))
app_source = &his;
@@ -1869,7 +1868,7 @@
if (mbuf->mb_dest & MODEBUF_DEST_HACK4)
sendto_opmask_butone(0, SNO_HACK4, "HACK(4): %s MODE %s %s%s%s%s%s%s "
"[%Tu]",
- cli_name(feature_bool(FEAT_HIS_SNOTICES) ?
+ cli_name(feature_bool(FEAT_HIS_SNOTICES) ?
mbuf->mb_source : app_source),
mbuf->mb_channel->chname,
rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
Index: ircd-ircdev/ircd/class.c
diff -u ircd-ircdev/ircd/class.c:1.10 ircd-ircdev/ircd/class.c:1.11
--- ircd-ircdev/ircd/class.c:1.10 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/class.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of connection class handling functions.
- * @version $Id: class.c,v 1.10 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: class.c,v 1.11 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -304,4 +304,4 @@
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Classes: inuse: %d(%d)",
connClassAllocCount,
connClassAllocCount * sizeof(struct ConnectionClass));
-}
+}
\ No newline at end of file
Index: ircd-ircdev/ircd/gline.c
diff -u ircd-ircdev/ircd/gline.c:1.17 ircd-ircdev/ircd/gline.c:1.18
--- ircd-ircdev/ircd/gline.c:1.17 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/gline.c Wed Oct 26 07:54:43 2005
@@ -23,7 +23,7 @@
*/
/** @file
* @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.17 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: gline.c,v 1.18 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -88,9 +88,9 @@
continue;
ircd_snprintf(0, namebuf, sizeof(namebuf), "%s@%s",
- cli_user(acptr)->username, cli_user(acptr)->host);
+ cli_user(acptr)->username, cli_user(acptr)->host);
ircd_snprintf(0, ipbuf, sizeof(ipbuf), "%s@%s", cli_user(acptr)->username,
- ircd_ntoa(&cli_ip(acptr)));
+ ircd_ntoa(&cli_ip(acptr)));
if (!match(mask, namebuf) || !match(mask, ipbuf))
count++;
@@ -145,10 +145,8 @@
{
struct Gline *gline, *sgline, *after = 0;
- if (!(flags & GLINE_BADCHAN)) {
- /* search for overlapping glines first, skipping badchans and
- * special $ glines.
- */
+ if (!(flags & GLINE_BADCHAN)) { /* search for overlapping glines first */
+
for (gline = GlobalGlineList; gline; gline = sgline) {
sgline = gline->gl_next;
@@ -158,14 +156,14 @@
(gline->gl_host && !host) || (!gline->gl_host && host))
continue;
else if (!mmatch(gline->gl_user, user) /* gline contains new mask */
- && (gline->gl_host == NULL || !mmatch(gline->gl_host, host))) {
+ && (gline->gl_host == NULL || !mmatch(gline->gl_host, host))) {
if (expire <= gline->gl_expire) /* will expire before wider gline */
return 0;
else
after = gline; /* stick new gline after this one */
} else if (!mmatch(user, gline->gl_user) /* new mask contains gline */
- && (gline->gl_host==NULL || !mmatch(host, gline->gl_host))
- && gline->gl_expire <= expire) /* old expires before new */
+ && (gline->gl_host==NULL || !mmatch(host, gline->gl_host))
+ && gline->gl_expire <= expire) /* old expires before new */
gline_free(gline); /* save some memory */
}
}
@@ -269,7 +267,7 @@
/* let the ops know about it */
sendto_opmask_butone(0, SNO_GLINE, "G-line active for %s",
- get_client_name(acptr, SHOW_IP));
+ get_client_name(acptr, SHOW_IP));
/* and get rid of him */
if ((tval = exit_client_msg(cptr, acptr, &me, "G-lined (%s)",
@@ -375,7 +373,7 @@
sendcmdto_serv_butone(sptr, CMD_GLINE, cptr,
(GlineIsRemActive(gline) ?
"* +%s%s%s %Tu :%s" : "* -%s%s%s"),
- gline->gl_user,
+ gline->gl_user,
gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
gline->gl_expire - CurrentTime, gline->gl_reason);
@@ -471,14 +469,15 @@
/* Inform ops... */
sendto_opmask_butone(0, ircd_strncmp(reason, "AUTO", 4) ? SNO_GLINE :
- SNO_AUTO, "%s adding %s %s for %s%s%s, expiring at "
- "%Tu: %s",
- feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr) ?
- cli_name(sptr) : cli_name((cli_user(sptr))->server),
- flags & GLINE_LOCAL ? "local" : "global",
- flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", user,
- flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : "@",
- flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : host,
+ SNO_AUTO, "%s adding %s %s for %s%s%s, expiring at "
+ "%Tu: %s",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
+ cli_name(sptr) :
+ cli_name((cli_user(sptr))->server),
+ (flags & GLINE_LOCAL) ? "local" : "global",
+ (flags & GLINE_BADCHAN) ? "BADCHAN" : "GLINE", user,
+ (flags & (GLINE_BADCHAN|GLINE_REALNAME)) ? "" : "@",
+ (flags & (GLINE_BADCHAN|GLINE_REALNAME)) ? "" : host,
expire + TSoffset, reason);
/* and log it */
@@ -537,19 +536,20 @@
/* Inform ops and log it */
sendto_opmask_butone(0, SNO_GLINE, "%s activating global %s for %s%s%s, "
- "expiring at %Tu: %s",
- feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr) ?
- cli_name(sptr) : cli_name((cli_user(sptr))->server),
- GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
+ "expiring at %Tu: %s",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
+ cli_name(sptr) :
+ cli_name((cli_user(sptr))->server),
+ GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
gline->gl_user, gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
- gline->gl_expire + TSoffset, gline->gl_reason);
+ gline->gl_expire + TSoffset, gline->gl_reason);
log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
"%#C activating global %s for %s%s%s, expiring at %Tu: %s", sptr,
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
- gline->gl_host ? "@" : "",
- gline->gl_host ? gline->gl_host : "",
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
@@ -605,18 +605,19 @@
/* Inform ops and log it */
sendto_opmask_butone(0, SNO_GLINE, "%s %s %s for %s%s%s, expiring at %Tu: "
"%s",
- feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr) ?
- cli_name(sptr) : cli_name((cli_user(sptr))->server),
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
+ cli_name(sptr) :
+ cli_name((cli_user(sptr))->server),
msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
- gline->gl_user, gline->gl_host ? "@" : "",
+ gline->gl_user, gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
"%#C %s %s for %s%s%s, expiring at %Tu: %s", sptr, msg,
GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
- gline->gl_host ? "@" : "",
- gline->gl_host ? gline->gl_host : "",
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
@@ -681,14 +682,14 @@
(flags & GLINE_LASTMOD && !gline->gl_lastmod))
continue;
else if (flags & GLINE_EXACT) {
- if (((gline->gl_host && host && ircd_strcmp(gline->gl_host,host) == 0)
- ||(!gline->gl_host && !host)) &&
+ if (((gline->gl_host && host && ircd_strcmp(gline->gl_host, host) == 0)
+ || (!gline->gl_host && !host)) &&
(ircd_strcmp(gline->gl_user, user) == 0))
break;
} else {
- if (((gline->gl_host && host && match(gline->gl_host,host) == 0)
- ||(!gline->gl_host && !host)) &&
- (match(gline->gl_user, user) == 0))
+ if (((gline->gl_host && host && match(gline->gl_host, host) == 0)
+ || (!gline->gl_host && !host)) &&
+ (match(gline->gl_user, user) == 0))
break;
}
}
@@ -719,13 +720,13 @@
}
if ((flags & GLINE_GLOBAL && gline->gl_flags & GLINE_LOCAL) ||
- (flags & GLINE_LASTMOD && !gline->gl_lastmod))
+ (flags & GLINE_LASTMOD && !gline->gl_lastmod))
continue;
if (GlineIsRealName(gline)) {
- Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
+ Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
if (match(gline->gl_user+2, cli_info(cptr)) != 0)
- continue;
+ continue;
}
else {
if (match(gline->gl_user, (cli_user(cptr))->username) != 0)
@@ -785,9 +786,9 @@
else if (!GlineIsLocal(gline) && gline->gl_lastmod)
sendcmdto_one(&me, CMD_GLINE, cptr, "* %c%s%s%s %Tu %Tu :%s",
GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
- gline->gl_host ? "@" : "",
+ gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
- gline->gl_expire - CurrentTime, gline->gl_lastmod,
+ gline->gl_expire - CurrentTime, gline->gl_lastmod,
gline->gl_reason);
}
@@ -817,7 +818,7 @@
sendcmdto_one(&me, CMD_GLINE, cptr, "* %c%s%s%s %Tu %Tu :%s",
GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
- gline->gl_host ? "@" : "",
+ gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
gline->gl_expire - CurrentTime, gline->gl_lastmod,
gline->gl_reason);
@@ -844,7 +845,7 @@
/* send gline information along */
send_reply(sptr, RPL_GLIST, gline->gl_user,
- gline->gl_host ? "@" : "",
+ gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset,
GlineIsLocal(gline) ? cli_name(&me) : "*",
@@ -856,7 +857,7 @@
if (gline->gl_expire <= CurrentTime)
gline_free(gline);
else
- send_reply(sptr, RPL_GLIST, gline->gl_user,
+ send_reply(sptr, RPL_GLIST, gline->gl_user,
gline->gl_host ? "@" : "",
gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset,
@@ -900,8 +901,8 @@
gline_free(gline);
else
send_reply(sptr, RPL_STATSGLINE, 'G', gline->gl_user,
- gline->gl_host ? "@" : "",
- gline->gl_host ? gline->gl_host : "",
+ gline->gl_host ? "@" : "",
+ gline->gl_host ? gline->gl_host : "",
gline->gl_expire + TSoffset, gline->gl_reason);
}
}
Index: ircd-ircdev/ircd/hash.c
diff -u ircd-ircdev/ircd/hash.c:1.12 ircd-ircdev/ircd/hash.c:1.13
--- ircd-ircdev/ircd/hash.c:1.12 Sun Jul 3 13:21:42 2005
+++ ircd-ircdev/ircd/hash.c Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Hash table management.
- * @version $Id: hash.c,v 1.12 2005/07/03 20:21:42 zolty Exp $
+ * @version $Id: hash.c,v 1.13 2005/10/26 14:54:43 zolty Exp $
*
* This file used to use some very complicated hash function. Now it
* uses CRC-32, but effectively remaps each input byte according to a
@@ -509,6 +509,7 @@
/* Send all the matching channels in the bucket. */
for (chptr = channelTable[args->bucket]; chptr; chptr = chptr->hnext)
{
+ /* Zoltan: es para que liste los canales con 0 usuarios (+r) */
if (chptr->users >= args->min_users
&& chptr->users < args->max_users
&& chptr->creationtime > args->min_time
Index: ircd-ircdev/ircd/ircd.c
diff -u ircd-ircdev/ircd/ircd.c:1.23 ircd-ircdev/ircd/ircd.c:1.24
--- ircd-ircdev/ircd/ircd.c:1.23 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/ircd.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.23 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: ircd.c,v 1.24 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -87,6 +87,7 @@
* External stuff
*--------------------------------------------------------------------------*/
extern void init_counters(void);
+extern void init_isupport(void);
extern void mem_dbg_initialise(void);
/*----------------------------------------------------------------------------
@@ -364,7 +365,7 @@
Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s limit: %d current: %d",
cli_name(cptr),
- IsPingSent(cptr) ? "[Ping Sent]" : "[]",
+ IsPingSent(cptr) ? "[Ping Sent]" : "[]",
max_ping, (int)(CurrentTime - cli_lasttime(cptr))));
/* Ok, the thing that will happen most frequently, is that someone will
@@ -516,9 +517,9 @@
debugmode = optarg;
thisServer.bootopt |= BOOT_DEBUG;
break;
-
+
default:
- printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntv] [-k [-c clispec]]\n"
+ printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntv] [-k [-c clispec]]\n"
"\n -f config\t specify explicit configuration file"
"\n -x loglevel\t set debug logging verbosity"
"\n -n or -t\t don't detach"
@@ -676,12 +677,12 @@
int fd;
if ((fd = open("/dev/null", O_WRONLY)) < 0) {
fprintf(stderr, "Unable to open /dev/null (to reserve fd 2): %s\n",
- strerror(errno));
+ strerror(errno));
return 8;
}
if (fd != 2 && dup2(fd, 2) < 0) {
fprintf(stderr, "Unable to reserve fd 2; dup2 said: %s\n",
- strerror(errno));
+ strerror(errno));
return 8;
}
}
@@ -771,4 +772,4 @@
event_loop();
return 0;
-}
+}
\ No newline at end of file
Index: ircd-ircdev/ircd/ircd_alloc.c
diff -u ircd-ircdev/ircd/ircd_alloc.c:1.6 ircd-ircdev/ircd/ircd_alloc.c:1.7
--- ircd-ircdev/ircd/ircd_alloc.c:1.6 Tue Feb 15 08:31:51 2005
+++ ircd-ircdev/ircd/ircd_alloc.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief IRC daemon memory allocation functions.
- * @version $Id: ircd_alloc.c,v 1.6 2005/02/15 16:31:51 zolty Exp $
+ * @version $Id: ircd_alloc.c,v 1.7 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -102,5 +102,4 @@
(*noMemHandler)();
return t;
}
-#endif
-
+#endif
\ No newline at end of file
Index: ircd-ircdev/ircd/ircd_auth.c
diff -u ircd-ircdev/ircd/ircd_auth.c:1.8 ircd-ircdev/ircd/ircd_auth.c:1.9
--- ircd-ircdev/ircd/ircd_auth.c:1.8 Thu Sep 1 04:25:42 2005
+++ ircd-ircdev/ircd/ircd_auth.c Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief IAuth client implementation for an IRC server.
- * @version $Id: ircd_auth.c,v 1.8 2005/09/01 11:25:42 zolty Exp $
+ * @version $Id: ircd_auth.c,v 1.9 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
#include "client.h"
@@ -413,7 +413,7 @@
if (!addr) {
log_write(LS_IAUTH, L_NOTICE, 0, "IAuth connection to %s failed: host lookup failed", i_host(iauth));
} else {
- memcpy(&i_addr(iauth).addr, &addr, sizeof(i_addr(iauth).addr));
+ memcpy(&i_addr(iauth).addr, addr, sizeof(i_addr(iauth).addr));
if (!irc_in_addr_valid(&i_addr(iauth).addr)) {
log_write(LS_IAUTH, L_NOTICE, 0, "IAuth connection to %s failed: host came back as unresolved", i_host(iauth));
return;
Index: ircd-ircdev/ircd/ircd_crypt.c
diff -u ircd-ircdev/ircd/ircd_crypt.c:1.5 ircd-ircdev/ircd/ircd_crypt.c:1.6
--- ircd-ircdev/ircd/ircd_crypt.c:1.5 Sun Jul 3 13:21:42 2005
+++ ircd-ircdev/ircd/ircd_crypt.c Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
/**
* @file
* @brief Core password encryption routines.
- * @version $Id: ircd_crypt.c,v 1.5 2005/07/03 20:21:42 zolty Exp $
+ * @version $Id: ircd_crypt.c,v 1.6 2005/10/26 14:54:43 zolty Exp $
*
* This is a new look crypto API for ircu, it can handle different
* password formats by the grace of magic tokens at the beginning of the
@@ -237,7 +237,7 @@
crypt_mechs_root->next = crypt_mechs_root->prev = NULL;
/* temporary kludge until we're modular. manually call the
- register funtions for crypt mechanisms */
+ register functions for crypt mechanisms */
ircd_register_crypt_smd5();
ircd_register_crypt_plain();
ircd_register_crypt_native();
Index: ircd-ircdev/ircd/ircd_crypt_smd5.c
diff -u ircd-ircdev/ircd/ircd_crypt_smd5.c:1.4 ircd-ircdev/ircd/ircd_crypt_smd5.c:1.5
--- ircd-ircdev/ircd/ircd_crypt_smd5.c:1.4 Mon Mar 21 10:39:07 2005
+++ ircd-ircdev/ircd/ircd_crypt_smd5.c Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
/**
* @file
* @brief Routines for Salted MD5 passwords
- * @version $Id: ircd_crypt_smd5.c,v 1.4 2005/03/21 18:39:07 zolty Exp $
+ * @version $Id: ircd_crypt_smd5.c,v 1.5 2005/10/26 14:54:43 zolty Exp $
*
* ircd_crypt_smd5 is largely taken from md5_crypt.c from the Linux PAM
* source code. it's been modified to fit in with ircu and some of the
@@ -77,7 +77,7 @@
* @return The Salted MD5 password of key and salt
*
* Erm does exactly what the brief comment says. If you think I'm writing a
- * description of how MD5 works, you have another thing coming. Go and read
+ * description of how MD5 works, you have another think coming. Go and read
* Applied Cryptography by Bruce Schneier. The only difference is we use a
* salt at the beginning of the password to perturb it so that the same password
* doesn't always produce the same hash.
Index: ircd-ircdev/ircd/ircd_events.c
diff -u ircd-ircdev/ircd/ircd_events.c:1.7 ircd-ircdev/ircd/ircd_events.c:1.8
--- ircd-ircdev/ircd/ircd_events.c:1.7 Sat Apr 2 11:47:35 2005
+++ ircd-ircdev/ircd/ircd_events.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of event loop mid-layer.
- * @version $Id: ircd_events.c,v 1.7 2005/04/02 19:47:35 zolty Exp $
+ * @version $Id: ircd_events.c,v 1.8 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -541,7 +541,6 @@
return;
}
gen_dequeue(timer); /* remove the timer from the queue */
-
timer_enqueue(timer); /* re-queue the timer */
}
Index: ircd-ircdev/ircd/ircd_features.c
diff -u ircd-ircdev/ircd/ircd_features.c:1.16 ircd-ircdev/ircd/ircd_features.c:1.17
--- ircd-ircdev/ircd/ircd_features.c:1.16 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/ircd_features.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of configurable feature support.
- * @version $Id: ircd_features.c,v 1.16 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: ircd_features.c,v 1.17 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -436,7 +436,6 @@
F_B(HIS_STATS_e, 0, 1, 0),
F_B(HIS_STATS_f, 0, 1, 0),
F_B(HIS_STATS_g, 0, 1, 0),
- F_B(HIS_STATS_h, 0, 1, 0),
F_B(HIS_STATS_i, 0, 1, 0),
F_B(HIS_STATS_j, 0, 1, 0),
F_B(HIS_STATS_J, 0, 1, 0),
Index: ircd-ircdev/ircd/ircd_log.c
diff -u ircd-ircdev/ircd/ircd_log.c:1.12 ircd-ircdev/ircd/ircd_log.c:1.13
--- ircd-ircdev/ircd/ircd_log.c:1.12 Thu Sep 1 04:25:42 2005
+++ ircd-ircdev/ircd/ircd_log.c Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief IRC logging implementation.
- * @version $Id: ircd_log.c,v 1.12 2005/09/01 11:25:42 zolty Exp $
+ * @version $Id: ircd_log.c,v 1.13 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -971,7 +971,7 @@
{
if (logDesc[i].mark & LOG_MARK_FILE) /* report file */
send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F LOG %s FILE %s",
- logDesc[i].name, (logDesc[i].file && logDesc[i].file->file ?
+ logDesc[i].name, (logDesc[i].file && logDesc[i].file->file ?
logDesc[i].file->file : "(terminal)"));
if (logDesc[i].mark & LOG_MARK_FACILITY) /* report facility */
Index: ircd-ircdev/ircd/ircd_parser.y
diff -u ircd-ircdev/ircd/ircd_parser.y:1.23 ircd-ircdev/ircd/ircd_parser.y:1.24
--- ircd-ircdev/ircd/ircd_parser.y:1.23 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/ircd_parser.y Wed Oct 26 07:54:43 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: ircd_parser.y,v 1.23 2005/10/25 09:52:43 zolty Exp $
+ * $Id: ircd_parser.y,v 1.24 2005/10/26 14:54:43 zolty Exp $
*
*/
%{
@@ -262,7 +262,8 @@
jupenick: NICK '=' QSTRING ';'
{
addNickJupes($3);
- MyFree($3);};
+ MyFree($3);
+};
generalblock: GENERAL
{
@@ -355,8 +356,8 @@
struct ConnectionClass *c_class;
add_class(name, tping, tconn, maxlinks, sendq);
c_class = find_class(name);
- c_class->default_umode = pass;
MyFree(c_class->default_umode);
+ c_class->default_umode = pass;
memcpy(&c_class->privs, &privs, sizeof(c_class->privs));
memcpy(&c_class->privs_dirty, &privs_dirty, sizeof(c_class->privs_dirty));
}
@@ -493,7 +494,7 @@
};
connectmaxhops: MAXHOPS '=' expr ';'
{
- maxlinks = $3;
+ maxlinks = $3;
};
connectauto: AUTOCONNECT '=' YES ';' { flags |= CONF_AUTOCONNECT; }
| AUTOCONNECT '=' NO ';' { flags &= ~CONF_AUTOCONNECT; };
@@ -644,7 +645,7 @@
portmask: MASK '=' QSTRING ';'
{
MyFree(pass);
- DupString(pass, $3);
+ pass = $3;
};
portserver: SERVER '=' YES ';'
@@ -767,7 +768,6 @@
} '{' killitems '}' ';'
{
if (dconf->usermask || dconf->hostmask ||dconf->realmask) {
- if (dconf->hostmask != NULL)
dconf->next = denyConfList;
denyConfList = dconf;
}
Index: ircd-ircdev/ircd/ircd_relay.c
diff -u ircd-ircdev/ircd/ircd_relay.c:1.8 ircd-ircdev/ircd/ircd_relay.c:1.9
--- ircd-ircdev/ircd/ircd_relay.c:1.8 Mon Jan 10 04:22:59 2005
+++ ircd-ircdev/ircd/ircd_relay.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Helper functions to relay various types of messages.
- * @version $Id: ircd_relay.c,v 1.8 2005/01/10 12:22:59 zolty Exp $
+ * @version $Id: ircd_relay.c,v 1.9 2005/10/26 14:54:43 zolty Exp $
*
* There are four basic types of messages, each with four subtypes.
*
@@ -399,7 +399,7 @@
if (0 == (acptr = findNUser(name)) || !IsUser(acptr)) {
send_reply(sptr, SND_EXPLICIT | ERR_NOSUCHNICK, "* :Target left %s. "
"Failed to deliver: [%.20s]", feature_str(FEAT_NETWORK),
- text);
+ text);
return;
}
if (is_silenced(sptr, acptr))
@@ -567,4 +567,4 @@
IsServer(cli_from(sptr)) ? cli_from(sptr) : 0,
host_mask ? MATCH_HOST : MATCH_SERVER,
"%s :%s", mask, text);
-}
+}
\ No newline at end of file
Index: ircd-ircdev/ircd/ircd_res.c
diff -u ircd-ircdev/ircd/ircd_res.c:1.11 ircd-ircdev/ircd/ircd_res.c:1.12
--- ircd-ircdev/ircd/ircd_res.c:1.11 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/ircd_res.c Wed Oct 26 07:54:43 2005
@@ -41,7 +41,7 @@
*/
/** @file
* @brief IRC resolver functions.
- * @version $Id: ircd_res.c,v 1.11 2005/10/25 09:52:43 zolty Exp $
+ * @version $Id: ircd_res.c,v 1.12 2005/10/26 14:54:43 zolty Exp $
*/
#include "client.h"
#include "ircd_alloc.h"
@@ -145,7 +145,6 @@
static struct dlink request_list;
static void rem_request(struct reslist *request);
-
static struct reslist *make_request(dns_callback_f callback, void *ctx);
static void do_query_name(dns_callback_f callback, void *ctx,
const char* name, struct reslist *request, int);
@@ -307,7 +306,7 @@
if (when > t_expire(&res_timeout))
/* do nothing */;
else if (t_onqueue(&res_timeout) && !(res_timeout.t_header.gh_flags & GEN_MARKED))
- timer_chg(&res_timeout, TT_ABSOLUTE, when);
+ timer_chg(&res_timeout, TT_ABSOLUTE, when);
else
timer_add(&res_timeout, timeout_resolver, NULL, TT_ABSOLUTE, when);
}
@@ -818,7 +817,7 @@
*/
Debug((DEBUG_DNS, "Request %p has bad response (state %d type %d rcode %d)", request, request->state, request->type, header->rcode));
(*request->callback)(request->callback_ctx, NULL, NULL);
- rem_request(request);
+ rem_request(request);
}
else
{
Index: ircd-ircdev/ircd/ircd_string.c
diff -u ircd-ircdev/ircd/ircd_string.c:1.12 ircd-ircdev/ircd/ircd_string.c:1.13
--- ircd-ircdev/ircd/ircd_string.c:1.12 Mon Oct 17 07:02:32 2005
+++ ircd-ircdev/ircd/ircd_string.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of string operations.
- * @version $Id: ircd_string.c,v 1.12 2005/10/17 14:02:32 zolty Exp $
+ * @version $Id: ircd_string.c,v 1.13 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -32,7 +32,7 @@
#include "res.h"
/* #include <assert.h> -- Now using assert in ircd_log.h */
-#include <regex.h>
+#include <string.h>
#include <sys/types.h>
#include <netinet/in.h>
Index: ircd-ircdev/ircd/jupe.c
diff -u ircd-ircdev/ircd/jupe.c:1.6 ircd-ircdev/ircd/jupe.c:1.7
--- ircd-ircdev/ircd/jupe.c:1.6 Mon Jan 10 04:23:01 2005
+++ ircd-ircdev/ircd/jupe.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of juped server handling functions.
- * @version $Id: jupe.c,v 1.6 2005/01/10 12:23:01 zolty Exp $
+ * @version $Id: jupe.c,v 1.7 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -209,10 +209,10 @@
/* Inform ops and log it */
sendto_opmask_butone(0, SNO_NETWORK, "%s activating JUPE for %s, expiring "
- "at %Tu: %s",
- (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
- cli_name(sptr) :
- cli_name((cli_user(sptr))->server),
+ "at %Tu: %s",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
+ cli_name(sptr) :
+ cli_name((cli_user(sptr))->server),
jupe->ju_server, jupe->ju_expire + TSoffset,
jupe->ju_reason);
@@ -263,9 +263,9 @@
/* Inform ops and log it */
sendto_opmask_butone(0, SNO_NETWORK, "%s %s JUPE for %s, expiring at %Tu: "
"%s",
- (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
- cli_name(sptr) :
- cli_name((cli_user(sptr))->server),
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
+ cli_name(sptr) :
+ cli_name((cli_user(sptr))->server),
JupeIsLocal(jupe) ? "removing local" : "deactivating",
jupe->ju_server, jupe->ju_expire + TSoffset,
jupe->ju_reason);
Index: ircd-ircdev/ircd/list.c
diff -u ircd-ircdev/ircd/list.c:1.9 ircd-ircdev/ircd/list.c:1.10
--- ircd-ircdev/ircd/list.c:1.9 Sun Jul 3 13:21:42 2005
+++ ircd-ircdev/ircd/list.c Wed Oct 26 07:54:43 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Singly and doubly linked list manipulation implementation.
- * @version $Id: list.c,v 1.9 2005/07/03 20:21:42 zolty Exp $
+ * @version $Id: list.c,v 1.10 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -90,7 +90,6 @@
connectionFreeList = con;
connections.alloc++;
}
-
}
/** Allocate a new Client structure.
@@ -417,7 +416,7 @@
assert(cli_prev(client) == prev);
/* Verify that the list hasn't become circular */
assert(cli_next(client) != GlobalClientList);
- assert(visited <= client.alloc);
+ assert(visited <= clients.alloc);
/* Remember what should precede us */
prev = client;
}
Index: ircd-ircdev/ircd/m_burst.c
diff -u ircd-ircdev/ircd/m_burst.c:1.15 ircd-ircdev/ircd/m_burst.c:1.16
--- ircd-ircdev/ircd/m_burst.c:1.15 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/m_burst.c Wed Oct 26 07:54:43 2005
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_burst.c,v 1.15 2005/10/25 09:52:43 zolty Exp $
+ * $Id: m_burst.c,v 1.16 2005/10/26 14:54:43 zolty Exp $
*
*/
@@ -403,7 +403,7 @@
strcpy(newban->who, "*");
*/
newban->when = TStime();
- newban->flags = BAN_BURSTED;
+ newban->flags |= BAN_BURSTED;
newban->next = 0;
if (lp)
lp->next = newban; /* link it in */
@@ -518,7 +518,7 @@
if (current_mode & CHFL_CHANOP)
{
if (chptr->mode.apass[0])
- nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel);
+ nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel);
else
nickstr[nickpos++] = 'o';
}
@@ -546,8 +546,6 @@
member->status |= CHFL_BURST_JOINED | (current_mode & (CHFL_CHANOP|CHFL_VOICE));
SetOpLevel(member, oplevel);
}
-
-
#else
nickstr[nickpos++] = ':'; /* add a specifier */
@@ -597,9 +595,9 @@
#endif
#if defined(UNDERNET)
if ((member->status & CHFL_CHANOP) && !(member->status & CHFL_BURST_ALREADY_OPPED))
- modebuf_mode_client(mbuf, MODE_ADD | CHFL_CHANOP, member->user, OpLevel(member));
- if ((member->status & CHFL_VOICE) && !(member->status & CHFL_BURST_ALREADY_VOICED))
- modebuf_mode_client(mbuf, MODE_ADD | CHFL_VOICE, member->user, OpLevel(member));
+ modebuf_mode_client(mbuf, MODE_ADD | CHFL_CHANOP, member->user, OpLevel(member));
+ if ((member->status & CHFL_VOICE) && !(member->status & CHFL_BURST_ALREADY_VOICED))
+ modebuf_mode_client(mbuf, MODE_ADD | CHFL_VOICE, member->user, OpLevel(member));
#else
if (member->status & CHFL_CHANOP)
modebuf_mode_client(mbuf, MODE_ADD | CHFL_CHANOP, member->user, 0);
@@ -608,17 +606,17 @@
#endif
} else if (parse_flags & MODE_PARSE_WIPEOUT) { /* wipeout old ops */
#if defined(UNDERNET)
- if (member->status & CHFL_CHANOP)
- modebuf_mode_client(mbuf, MODE_DEL | CHFL_CHANOP, member->user, OpLevel(member));
- if (member->status & CHFL_VOICE)
- modebuf_mode_client(mbuf, MODE_DEL | CHFL_VOICE, member->user, OpLevel(member));
+ if (member->status & CHFL_CHANOP)
+ modebuf_mode_client(mbuf, MODE_DEL | CHFL_CHANOP, member->user, OpLevel(member));
+ if (member->status & CHFL_VOICE)
+ modebuf_mode_client(mbuf, MODE_DEL | CHFL_VOICE, member->user, OpLevel(member));
#else
if (member->status & CHFL_CHANOP)
modebuf_mode_client(mbuf, MODE_DEL | CHFL_CHANOP, member->user, 0);
if (member->status & CHFL_VOICE)
modebuf_mode_client(mbuf, MODE_DEL | CHFL_VOICE, member->user, 0);
#endif
- member->status = (member->status
+ member->status = (member->status
#if defined(UNDERNET)
& ~(CHFL_CHANNEL_MANAGER | CHFL_CHANOP | CHFL_VOICE))
#elif defined(DDB) || defined(SERVICES)
@@ -626,7 +624,7 @@
#else
& ~(CHFL_CHANOP | CHFL_VOICE))
#endif
- | CHFL_DEOPPED;
+ | CHFL_DEOPPED;
}
}
@@ -641,7 +639,7 @@
DupString(bandup, lp->banstr);
modebuf_mode_string(mbuf, MODE_DEL | MODE_BAN,
- bandup, 1); /* let it free banstr */
+ bandup, 1);
*lp_p = lp->next; /* clip out of list */
free_ban(lp);
continue;
Index: ircd-ircdev/ircd/m_cap.c
diff -u ircd-ircdev/ircd/m_cap.c:1.3 ircd-ircdev/ircd/m_cap.c:1.4
--- ircd-ircdev/ircd/m_cap.c:1.3 Mon Apr 11 01:45:00 2005
+++ ircd-ircdev/ircd/m_cap.c Wed Oct 26 07:54:43 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Capability negotiation commands
- * @version $Id: m_cap.c,v 1.3 2005/04/11 08:45:00 zolty Exp $
+ * @version $Id: m_cap.c,v 1.4 2005/10/26 14:54:43 zolty Exp $
*/
#include "config.h"
@@ -179,7 +179,7 @@
}
loc += ircd_snprintf(0, capbuf + loc, sizeof(capbuf) - loc, "%s%s",
- pfx, capab_list[i].name);
+ pfx, capab_list[i].name);
}
msgq_append(0, mb, "%s", capbuf); /* append capabilities to the final cmd */
@@ -215,7 +215,7 @@
memset(&rem, 0, sizeof(rem));
while (cl) { /* walk through the capabilities list... */
if (!(cap = find_cap(&cl, &neg)) /* look up capability... */
- || (!neg && (cap->flags & CAPFL_PROHIBIT)) /* is it prohibited? */
+ || (!neg && (cap->flags & CAPFL_PROHIBIT)) /* is it prohibited? */
|| (neg && (cap->flags & CAPFL_STICKY))) { /* is it sticky? */
sendcmdto_one(&me, CMD_CAP, sptr, "NAK :%s", caplist);
return 0; /* can't complete requested op... */
@@ -289,6 +289,7 @@
if (!(cap->flags & CAPFL_PROTO))
CapClr(cli_active(sptr), cap->cap);
}
+ send_caplist(sptr, 0, &cleared, "ACK");
return 0;
}
Index: ircd-ircdev/ircd/m_clearmode.c
diff -u ircd-ircdev/ircd/m_clearmode.c:1.10 ircd-ircdev/ircd/m_clearmode.c:1.11
--- ircd-ircdev/ircd/m_clearmode.c:1.10 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/m_clearmode.c Wed Oct 26 07:54:43 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_clearmode.c,v 1.10 2005/10/25 09:52:43 zolty Exp $
+ * $Id: m_clearmode.c,v 1.11 2005/10/26 14:54:43 zolty Exp $
*
*/
@@ -200,7 +200,7 @@
/* Drop channel operator status */
if (IsChanOp(member) && del_mode & MODE_CHANOP) {
#if defined(UNDERNET)
- modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, member->user, MAXOPLEVEL + 1);
+ modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, member->user, MAXOPLEVEL + 1);
#else
modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, member->user, 0);
#endif
@@ -210,7 +210,7 @@
/* Drop voice */
if (HasVoice(member) && del_mode & MODE_VOICE) {
#if defined(UNDERNET)
- modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, member->user, MAXOPLEVEL + 1);
+ modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, member->user, MAXOPLEVEL + 1);
#else
modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, member->user, 0);
#endif
Index: ircd-ircdev/ircd/m_connect.c
diff -u ircd-ircdev/ircd/m_connect.c:1.6 ircd-ircdev/ircd/m_connect.c:1.7
--- ircd-ircdev/ircd/m_connect.c:1.6 Mon Jan 10 04:23:01 2005
+++ ircd-ircdev/ircd/m_connect.c Wed Oct 26 07:54:43 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_connect.c,v 1.6 2005/01/10 12:23:01 zolty Exp $
+ * $Id: m_connect.c,v 1.7 2005/10/26 14:54:43 zolty Exp $
*
*/
@@ -194,7 +194,7 @@
* Notify all operators about remote connect requests
*/
sendwallto_group_butone(&me, WALL_WALLOPS, 0,
- "Remote CONNECT %s %s from %s", parv[1],
+ "Remote CONNECT %s %s from %s", parv[1],
parv[2] ? parv[2] : "",
get_client_name(sptr, HIDE_IP));
log_write(LS_NETWORK, L_INFO, 0, "CONNECT From %C : %s %s", sptr, parv[1],
Index: ircd-ircdev/ircd/m_create.c
diff -u ircd-ircdev/ircd/m_create.c:1.7 ircd-ircdev/ircd/m_create.c:1.8
--- ircd-ircdev/ircd/m_create.c:1.7 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/m_create.c Wed Oct 26 07:54:43 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_create.c,v 1.7 2005/10/25 09:52:43 zolty Exp $
+ * $Id: m_create.c,v 1.8 2005/10/26 14:54:43 zolty Exp $
*
*/
@@ -174,7 +174,7 @@
MODEBUF_DEST_BOUNCE)); /* And bounce the mode */
#if defined(UNDERNET)
- modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr, MAXOPLEVEL + 1);
+ modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr, MAXOPLEVEL + 1);
#else
modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr, 0);
#endif
Index: ircd-ircdev/ircd/m_destruct.c
diff -u ircd-ircdev/ircd/m_destruct.c:1.6 ircd-ircdev/ircd/m_destruct.c:1.7
--- ircd-ircdev/ircd/m_destruct.c:1.6 Mon Mar 21 10:39:08 2005
+++ ircd-ircdev/ircd/m_destruct.c Wed Oct 26 07:54:43 2005
@@ -18,66 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_destruct.c,v 1.6 2005/03/21 18:39:08 zolty Exp $
+ * $Id: m_destruct.c,v 1.7 2005/10/26 14:54:43 zolty Exp $
*
*/
-
-/*
- * m_functions execute protocol messages on this server:
- *
- * cptr is always NON-NULL, pointing to a *LOCAL* client
- * structure (with an open socket connected!). This
- * identifies the physical socket where the message
- * originated (or which caused the m_function to be
- * executed--some m_functions may call others...).
- *
- * sptr is the source of the message, defined by the
- * prefix part of the message if present. If not
- * or prefix not found, then sptr==cptr.
- *
- * (!IsServer(cptr)) => (cptr == sptr), because
- * prefixes are taken *only* from servers...
- *
- * (IsServer(cptr))
- * (sptr == cptr) => the message didn't
- * have the prefix.
- *
- * (sptr != cptr && IsServer(sptr) means
- * the prefix specified servername. (?)
- *
- * (sptr != cptr && !IsServer(sptr) means
- * that message originated from a remote
- * user (not local).
- *
- * combining
- *
- * (!IsServer(sptr)) means that, sptr can safely
- * taken as defining the target structure of the
- * message in this server.
- *
- * *Always* true (if 'parse' and others are working correct):
- *
- * 1) sptr->from == cptr (note: cptr->from == cptr)
- *
- * 2) MyConnect(sptr) <=> sptr == cptr (e.g. sptr
- * *cannot* be a local connection, unless it's
- * actually cptr!). [MyConnect(x) should probably
- * be defined as (x == x->from) --msa ]
- *
- * parc number of variable parameter strings (if zero,
- * parv is allowed to be NULL)
- *
- * parv a NULL terminated list of parameter pointers,
- *
- * parv[0], sender (prefix string), if not present
- * this points to an empty string.
- * parv[1]...parv[parc-1]
- * pointers to additional parameters
- * parv[parc] == NULL, *always*
- *
- * note: it is guaranteed that parv[0]..parv[parc-1] are all
- * non-NULL pointers.
- */
#include "config.h"
#include "channel.h"
Index: ircd-ircdev/ircd/m_join.c
diff -u ircd-ircdev/ircd/m_join.c:1.15 ircd-ircdev/ircd/m_join.c:1.16
--- ircd-ircdev/ircd/m_join.c:1.15 Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/ircd/m_join.c Wed Oct 26 07:54:43 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_join.c,v 1.15 2005/10/25 09:52:43 zolty Exp $
+ * $Id: m_join.c,v 1.16 2005/10/26 14:54:43 zolty Exp $
*
*/
@@ -90,7 +90,6 @@
0);
joinbuf_flush(&part);
-
}
return chanlist;
@@ -158,7 +157,7 @@
if (!(chptr = FindChannel(name))) {
if (((name[0] == '&') && !feature_bool(FEAT_LOCAL_CHANNELS))
- || strlen(name) >= IRCD_MIN(CHANNELLEN, feature_int(FEAT_CHANNELLEN))) {
+ || strlen(name) >= IRCD_MIN(CHANNELLEN, feature_int(FEAT_CHANNELLEN))) {
send_reply(sptr, ERR_NOSUCHCHANNEL, name);
continue;
}
@@ -363,7 +362,7 @@
else { /* We have a valid channel? */
if ((member = find_member_link(chptr, sptr)))
{
- /* It is impossible to get here --Run */
+ /* It is impossible to get here --Run */
if (!IsZombie(member)) /* already on channel */
continue;
Index: ircd-ircdev/ircd/m_kick.c
diff -u ircd-ircdev/ircd/m_kick.c:1.12 ircd-ircdev/ircd/m_kick.c:1.1...
[truncated message content] |
